Skip to content

Commit

Permalink
Merge pull request #343 from Iterable/version-3.2.14
Browse files Browse the repository at this point in the history
[MOB-2890] SDK version 3.2.14
  • Loading branch information
roninopf authored May 6, 2021
2 parents e290206 + b620102 commit d40afe2
Show file tree
Hide file tree
Showing 8 changed files with 161 additions and 7 deletions.
10 changes: 9 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,12 @@ freeline/
freeline_project_description.json

# MacOS generated files
.DS_Store
.DS_Store

# [Maven] ========================
target/
pom.xml.tag
pom.xml.releaseBackup
pom.xml.versionsBackup
pom.xml.next
release.properties
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
#### Fixed
- nothing yet

## [3.2.14](https://github.com/Iterable/iterable-android-sdk/releases/tag/3.2.14)
#### Fixed
- Non-silent inbox messages will now properly account for the read state.

## [3.2.13](https://github.com/Iterable/iterable-android-sdk/releases/tag/3.2.13)
#### Added
- In-app message prioritization - Ordering the display of in-app messages based on a priority you select in Iterable when creating in-app campaigns
Expand Down
1 change: 1 addition & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.kotlin_version = '1.3.72'
ext.mavenPublishEnabled = true
repositories {
google()
jcenter()
Expand Down
18 changes: 17 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,20 @@
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
android.enableJetifier=true
android.useAndroidX=true
android.useAndroidX=true

GROUP=com.iterable

POM_DESCRIPTION= Iterable is a growth marketing platform that helps you to create better experiences for—and deeper relationships with—your customers. Use it to send customized email, SMS, push notification, in-app message and web push notifications to your customers. This SDK helps you integrate your Android apps with Iterable. It supports Android API versions 15+.
POM_URL=https://github.com/Iterable/iterable-android-sdk.git
POM_SCM_URL=https://github.com/Iterable/iterable-android-sdk.git
POM_SCM_CONNECTION=[email protected]:Iterable/iterable-android-sdk.git
POM_SCM_DEV_CONNECTION=scm:[email protected]:Iterable/iterable-android-sdk.git
POM_LICENCE_NAME=The Apache Software License, Version 2.0
POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
POM_LICENCE_DIST=repo
POM_DEVELOPER_ID=Iterable
POM_DEVELOPER_NAME=Iterable
POM_PACKAGING=aar

org.gradle.daemon=true
5 changes: 4 additions & 1 deletion iterableapi-ui/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ ext {
siteUrl = 'https://github.com/Iterable/iterable-android-sdk'
gitUrl = 'https://github.com/Iterable/iterable-android-sdk.git'

libraryVersion = '3.2.13'
libraryVersion = '3.2.14'

developerId = 'davidtruong'
developerName = 'David Truong'
Expand All @@ -66,6 +66,9 @@ ext {

apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle'
apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle'
if(hasProperty("mavenPublishEnabled")) {
apply from: '../maven-push.gradle'
}

// A hack to import the classpath and BuildConfig into the javadoc task
afterEvaluate {
Expand Down
8 changes: 6 additions & 2 deletions iterableapi/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ android {
minSdkVersion 15
targetSdkVersion 27

buildConfigField "String", "ITERABLE_SDK_VERSION", "\"3.2.13\""
buildConfigField "String", "ITERABLE_SDK_VERSION", "\"3.2.14\""

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
Expand Down Expand Up @@ -72,7 +72,7 @@ ext {
siteUrl = 'https://github.com/Iterable/iterable-android-sdk'
gitUrl = 'https://github.com/Iterable/iterable-android-sdk.git'

libraryVersion = '3.2.13'
libraryVersion = '3.2.14'

developerId = 'davidtruong'
developerName = 'David Truong'
Expand All @@ -86,6 +86,10 @@ ext {

apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle'
apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle'
if(hasProperty("mavenPublishEnabled")) {
apply from: '../maven-push.gradle'
}

tasks.withType(Test) {
jacoco.includeNoLocationClasses = true
}
Expand Down
118 changes: 118 additions & 0 deletions maven-push.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
/*
* Copyright 2013 Chris Banes
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

apply plugin: 'maven'
apply plugin: 'signing'

Properties properties = new Properties()
properties.load(project.rootProject.file('local.properties').newDataInputStream())

def isReleaseBuild() {
return libraryVersion.contains("SNAPSHOT") == false
}

def getReleaseRepositoryUrl() {
return hasProperty('RELEASE_REPOSITORY_URL') ? RELEASE_REPOSITORY_URL
: "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
}

def getSnapshotRepositoryUrl() {
return hasProperty('SNAPSHOT_REPOSITORY_URL') ? SNAPSHOT_REPOSITORY_URL
: "https://oss.sonatype.org/content/repositories/snapshots/"
}

def getRepositoryUsername() {
return hasProperty('NEXUS_USERNAME') ? NEXUS_USERNAME : ""
}

def getRepositoryPassword() {
return hasProperty('NEXUS_PASSWORD') ? NEXUS_PASSWORD : ""
}

def keyID = properties.getProperty("signing.keyId")
def password = properties.getProperty("signing.password")
def keyRingLocation = properties.getProperty("signing.secretKeyRingFile")
def nexus_username = properties.getProperty("NEXUS_USERNAME")
def nexus_password = properties.getProperty("NEXUS_PASSWORD")

ext."signing.keyId" = keyID
ext."signing.secretKeyRingFile" = keyRingLocation
ext."signing.password" = password

afterEvaluate { project ->
uploadArchives {
repositories {
mavenDeployer {
beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }

pom.groupId = GROUP
pom.artifactId = libraryName
pom.version = libraryVersion

repository(url: getReleaseRepositoryUrl()) {
authentication(userName: nexus_username, password: nexus_password)
}
snapshotRepository(url: getSnapshotRepositoryUrl()) {
authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
}

pom.project {
name libraryName
packaging POM_PACKAGING
description POM_DESCRIPTION
url POM_URL

scm {
url POM_SCM_URL
connection POM_SCM_CONNECTION
developerConnection POM_SCM_DEV_CONNECTION
}

licenses {
license {
name POM_LICENCE_NAME
url POM_LICENCE_URL
distribution POM_LICENCE_DIST
}
}

developers {
developer {
id POM_DEVELOPER_ID
name POM_DEVELOPER_NAME
}
}
}
}
}
}

signing {
// required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") }
required true
sign configurations.archives
}


task androidSourcesJar(type: Jar) {
classifier = 'sources'
from android.sourceSets.main.java.sourceFiles
}

artifacts {
archives androidSourcesJar
}
}
4 changes: 2 additions & 2 deletions sample-apps/inbox-customization/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ dependencies {
implementation 'androidx.navigation:navigation-ui-ktx:2.1.0'
implementation 'com.google.android.material:material:1.1.0'

implementation 'com.iterable:iterableapi:3.2.13'
implementation 'com.iterable:iterableapi-ui:3.2.13'
implementation 'com.iterable:iterableapi:3.2.14'
implementation 'com.iterable:iterableapi-ui:3.2.14'
implementation 'com.squareup.okhttp3:mockwebserver:4.2.2'

testImplementation 'junit:junit:4.12'
Expand Down

0 comments on commit d40afe2

Please sign in to comment.