Merge pull request #491 from apptentive/next

Next

.gitignore

@@ -24,6 +24,7 @@ build/
 .idea/vcs.xml
 .idea/workspace.xml
 .idea/libraries
+.idea/runConfigurations
 projectFilesBackup/
 
 # Eclipse

.travis.yml

@@ -0,0 +1,43 @@
+language: android
+env:
+  global:
+    - SNAPSHOT_REPOSITORY_USERNAME=travis
+    - SNAPSHOT_REPOSITORY_URL=http://54.183.158.246:8081/artifactory/apptentive-snapshots
+    - secure: pc2twMw60say0ASdXiJiRAD6tx9Qy82DIMw83qPijB2wyVHLpLbjptqBFyTYy4+JYthZ8xcB5Yretiv//AQS4wdDPsJNwOKUGXamm8IBx+1wnhG/R/ROz67Ibj4XWHIX24GaKN/MD8tCN9VPdeNEL1jysSEVxqqsvOGBsxitAyI=
+jdk:
+  - oraclejdk8
+before_cache:
+  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
+  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+cache:
+  directories:
+    - $HOME/.gradle/caches/
+    - $HOME/.gradle/wrapper/
+    - $HOME/.android/build-cache
+android:
+  components:
+    - tools
+    - tools
+    - platform-tools
+    - build-tools-25.0.3
+    - android-24
+    - android-25
+    - extra-google-google_play_services
+    - extra-google-m2repository
+    - addon-google_apis-google-25
+    - sys-img-armeabi-v7a-android-19
+install: true
+before_script:
+  - echo no | android create avd --force -n test -t android-19 --abi armeabi-v7a
+  - emulator -avd test -no-audio -no-window &
+  - android-wait-for-emulator
+  - adb shell input keyevent 82 &
+script:
+  - ./gradlew :apptentive:test -i
+after_script:
+  - if [ "$TRAVIS_BRANCH" = "develop" ]; then
+      ./gradlew :apptentive:uploadArchives;
+    fi
+notifications:
+  slack:
+    secure: HejMl0EUociwGu+5djx95snbS+m/Yw8DseQKCSqeyWvMQLrAy8bi9oa89mZvXnvjqSVY3kKRZgJncEkQdIe9c7xwgNA9QYLkc7UVbXqga291HMoNnWaIMewD2ervbzM4aBQAHnkDr+GsXgb7+1YdOktIn8dA7jdIuB90ar4So9U=

CHANGELOG.md

@@ -1,3 +1,9 @@
+# 2017-07-19 - 4.0.0
+
+#### Improvements
+
+* Added the ability to log customers in to different private conversations. Customers who are logged in will be able to see a private conversation that is distinct from the converations of other customers using the same app on the same device. When they log out, their data is protected with strong encryption. Logging back in unlocks their data again, and Apptentive resumes providing services to the customer.
+
 # 2017-03-02 - 3.4.1
 
 #### Improvements

README.md

@@ -13,7 +13,7 @@ use your app, to talk to them at the right time, and in the right way.
 
 ##### [Release Notes](https://learn.apptentive.com/knowledge-base/android-sdk-release-notes/)
 
-##### Binary releases are hosted for Maven [here](http://search.maven.org/#artifactdetails|com.apptentive|apptentive-android|3.4.1|aar)
+##### Binary releases are hosted for Maven [here](http://search.maven.org/#artifactdetails|com.apptentive|apptentive-android|4.0.0|aar)
 
 #### Reporting Bugs
 

apptentive/build.gradle

@@ -2,10 +2,6 @@ init()
 
 apply plugin: 'com.android.library'
 
-repositories {
-    jcenter()
-}
-
 dependencies {
     compile 'com.android.support:support-v4:24.2.1'
     compile 'com.android.support:appcompat-v7:24.2.1'
@@ -24,14 +20,14 @@ dependencies {
 }
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion '24.0.3'
+    compileSdkVersion 25
+    buildToolsVersion '25.0.3'
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 24
+        targetSdkVersion 25
         // BUILD_NUMBER is provided by Jenkins. Default to 1 in dev builds.
-        versionCode System.getenv("BUILD_NUMBER") as Integer ?: 1
+        versionCode System.getenv("BUILD_NUMBER") as Integer ?: System.getenv("TRAVIS_BUILD_NUMBER") as Integer ?: 1
         versionName project.version
         consumerProguardFiles 'consumer-proguard-rules.pro'
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -72,22 +68,22 @@ def getReleaseRepositoryUrl() {
 }
 
 def getSnapshotRepositoryUrl() {
-    return hasProperty('SNAPSHOT_REPOSITORY_URL') ? SNAPSHOT_REPOSITORY_URL : ""
+    return hasProperty('SNAPSHOT_REPOSITORY_URL') ? SNAPSHOT_REPOSITORY_URL : System.getenv("SNAPSHOT_REPOSITORY_URL")
 }
 
 def getRepositoryUsername() {
     if (isReleaseBuild()) {
         return hasProperty('NEXUS_USERNAME') ? NEXUS_USERNAME : ""
     } else {
-        return hasProperty('SNAPSHOT_REPOSITORY_USERNAME') ? SNAPSHOT_REPOSITORY_USERNAME : ""
+        return hasProperty('SNAPSHOT_REPOSITORY_USERNAME') ? SNAPSHOT_REPOSITORY_USERNAME : System.getenv("SNAPSHOT_REPOSITORY_USERNAME")
     }
 }
 
 def getRepositoryPassword() {
     if (isReleaseBuild()) {
         return hasProperty('NEXUS_PASSWORD') ? NEXUS_PASSWORD : ""
     } else {
-        return hasProperty('SNAPSHOT_REPOSITORY_PASSWORD') ? SNAPSHOT_REPOSITORY_PASSWORD : ""
+        return hasProperty('SNAPSHOT_REPOSITORY_PASSWORD') ? SNAPSHOT_REPOSITORY_PASSWORD : System.getenv("SNAPSHOT_REPOSITORY_PASSWORD")
     }
 }
 
@@ -162,7 +158,7 @@ task androidJavadocs(type: Javadoc) {
     classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
 }
 
-androidJavadocs << {
+androidJavadocs.doLast {
     println "Javadocs written to: " + destinationDir
 }