Merge pull request #193 from apptentive/branch_5.5.0

Release 5.5.0
apptentive · Nov 14, 2019 · a3e4b9f · a3e4b9f
2 parents 5d2686a + fe42651
commit a3e4b9f
Show file tree

Hide file tree

Showing 185 changed files with 952 additions and 597 deletions.
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.travis.yml b/.travis.yml
@@ -20,21 +20,21 @@ android:
     - tools # to get the new `repository-11.xml`
     - tools # see https://github.com/travis-ci/travis-ci/issues/6040#issuecomment-219367943)
     - platform-tools
-    - build-tools-28.0.3
+    - build-tools-29.0.2
     # - android-25
-    - android-28
+    - android-29
     - extra-android-m2repository
     - extra-google-m2repository
     - extra-google-google_play_services
-    - addon-google_apis-google-28
+    - addon-google_apis-google-29
     # - sys-img-armeabi-v7a-google_apis-25
     # - sys-img-armeabi-v7a-android-25
   licenses:
     - 'android-sdk-preview-license-52d11cd2'
     - 'android-sdk-license-.+'
     - 'google-gdk-license-.+'
 before_install:
-  - yes | sdkmanager "platforms;android-28"
+  - yes | sdkmanager "platforms;android-29"
 install: true
 before_script:
 # - echo "y" | android update sdk -a --no-ui --filter android-25

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 2019-11-12 - v5.5.0
+
+#### Fixes
+
+* Added support for AndroidX.
+
 # 2019-10-24 - v5.4.7
 
 #### Fixes

diff --git a/README.md b/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|5.4.7|aar)
+##### Binary releases are hosted for Maven [here](http://search.maven.org/#artifactdetails|com.apptentive|apptentive-android|5.5.0|aar)
 
 #### Reporting Bugs
 

diff --git a/apptentive/build.gradle b/apptentive/build.gradle
@@ -3,34 +3,35 @@ init()
 apply plugin: 'com.android.library'
 
 dependencies {
-    implementation 'com.android.support:support-v4:28.0.0'
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support:cardview-v7:28.0.0'
-    implementation 'com.android.support:design:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
+
     testImplementation 'junit:junit:4.12'
-    testImplementation "org.powermock:powermock-module-junit4:1.6.2"
-    testImplementation "org.powermock:powermock-module-junit4-rule:1.6.2"
-    testImplementation "org.powermock:powermock-api-mockito:1.6.2"
-    testImplementation "org.powermock:powermock-classloading-xstream:1.6.2"
+    testImplementation 'org.powermock:powermock-module-junit4:1.6.6'
+    testImplementation 'org.powermock:powermock-module-junit4-rule:1.6.6'
+    testImplementation 'org.powermock:powermock-api-mockito:1.6.6'
+    testImplementation 'org.powermock:powermock-classloading-xstream:1.6.6'
 
     // Required for instrumented tests
-    androidTestImplementation 'com.android.support:support-annotations:28.0.0'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test:rules:1.0.2'
+    androidTestImplementation 'androidx.annotation:annotation:1.1.0'
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation 'androidx.test:rules:1.2.0'
 }
 
 android {
-    compileSdkVersion 28
-    buildToolsVersion '28.0.3'
+    compileSdkVersion 29
+    buildToolsVersion '29.0.2'
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 28
+        targetSdkVersion 29
         // BUILD_NUMBER is provided by Jenkins. Default to 1 in dev builds.
         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"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         resValue "string", "apptentive_distribution_version", versionName
         vectorDrawables.useSupportLibrary = true
     }
@@ -182,6 +183,9 @@ artifacts {
 afterEvaluate {
     androidJavadocs.classpath += project.android.libraryVariants.toList().first().javaCompile.classpath
 }
+repositories {
+    mavenCentral()
+}
 
 def init() {
     // Set project information that will be available to all tasks.

diff --git a/apptentive/consumer-proguard-rules.pro b/apptentive/consumer-proguard-rules.pro
@@ -15,5 +15,5 @@
 
 -keep class android.os.Build { *; }
 -keep class android.graphics.Typeface { *; }
--keep class android.support.v4.app.Fragment { *; }
--keep class android.support.v4.app.FragmentManagerImpl { *; }
+-keep class androidx.fragment.app.Fragment { *; }
+-keep class androidx.fragment.app.FragmentManagerImpl { *; }
diff --git a/apptentive/src/androidTest/java/com/apptentive/android/sdk/InstrumentationTestCaseBase.java b/apptentive/src/androidTest/java/com/apptentive/android/sdk/InstrumentationTestCaseBase.java
@@ -7,7 +7,7 @@
 package com.apptentive.android.sdk;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
+import androidx.test.InstrumentationRegistry;
 
 public class InstrumentationTestCaseBase extends TestCaseBase {
 	protected Context getContext() {

diff --git a/...ve/src/androidTest/java/com/apptentive/android/sdk/conversation/FileMessageStoreTest.java b/...ve/src/androidTest/java/com/apptentive/android/sdk/conversation/FileMessageStoreTest.java
@@ -6,8 +6,7 @@
 
 package com.apptentive.android.sdk.conversation;
 
-import android.support.test.InstrumentationRegistry;
-
+import androidx.test.InstrumentationRegistry;
 import com.apptentive.android.sdk.ApptentiveInternal;
 import com.apptentive.android.sdk.Encryption;
 import com.apptentive.android.sdk.TestCaseBase;

diff --git a/...tive/src/androidTest/java/com/apptentive/android/sdk/encryption/AesCbcEncryptionTest.java b/...tive/src/androidTest/java/com/apptentive/android/sdk/encryption/AesCbcEncryptionTest.java
@@ -2,7 +2,7 @@
 
 import android.security.keystore.KeyGenParameterSpec;
 import android.security.keystore.KeyProperties;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.apptentive.android.sdk.Encryption;
 

diff --git a/...ntive/src/androidTest/java/com/apptentive/android/sdk/encryption/SecurityManagerTest.java b/...ntive/src/androidTest/java/com/apptentive/android/sdk/encryption/SecurityManagerTest.java
@@ -2,7 +2,7 @@
 
 import android.security.keystore.KeyGenParameterSpec;
 import android.security.keystore.KeyProperties;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.apptentive.android.sdk.Encryption;
 import com.apptentive.android.sdk.InstrumentationTestCaseBase;

diff --git a/...ndroidTest/java/com/apptentive/android/sdk/module/engagement/InteractionLauncherTest.java b/...ndroidTest/java/com/apptentive/android/sdk/module/engagement/InteractionLauncherTest.java
@@ -7,8 +7,8 @@
 package com.apptentive.android.sdk.module.engagement;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.annotation.NonNull;
+import androidx.test.runner.AndroidJUnit4;
 
 import com.apptentive.android.sdk.InstrumentationTestCaseBase;
 import com.apptentive.android.sdk.module.engagement.interaction.model.Interaction;

diff --git a/...ve/android/sdk/module/engagement/InteractionNotificationBroadcastReceiverHandlerTest.java b/...ve/android/sdk/module/engagement/InteractionNotificationBroadcastReceiverHandlerTest.java
@@ -8,7 +8,7 @@
 
 import android.content.Context;
 import android.content.Intent;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.runner.AndroidJUnit4;
 
 import com.apptentive.android.sdk.InstrumentationTestCaseBase;
 import com.apptentive.android.sdk.module.engagement.interaction.model.Interaction;

diff --git a/.../com/apptentive/android/sdk/module/engagement/NoteInteractionNotificationAdapterTest.java b/.../com/apptentive/android/sdk/module/engagement/NoteInteractionNotificationAdapterTest.java
@@ -7,8 +7,8 @@
 package com.apptentive.android.sdk.module.engagement;
 
 import android.content.Context;
-import android.support.test.runner.AndroidJUnit4;
 
+import androidx.test.runner.AndroidJUnit4;
 import com.apptentive.android.sdk.InstrumentationTestCaseBase;
 import com.apptentive.android.sdk.module.engagement.interaction.model.Interaction;
 import com.apptentive.android.sdk.module.engagement.interaction.model.TextModalInteraction;

diff --git a/...src/androidTest/java/com/apptentive/android/sdk/storage/ApptentiveDatabaseHelperTest.java b/...src/androidTest/java/com/apptentive/android/sdk/storage/ApptentiveDatabaseHelperTest.java
@@ -7,32 +7,15 @@
 package com.apptentive.android.sdk.storage;
 
 import android.content.Context;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-
-import com.apptentive.android.sdk.encryption.EncryptionKey;
-import com.apptentive.android.sdk.model.AppReleasePayload;
-import com.apptentive.android.sdk.model.DevicePayload;
-import com.apptentive.android.sdk.model.EventPayload;
-import com.apptentive.android.sdk.model.Payload;
-import com.apptentive.android.sdk.model.PersonPayload;
-import com.apptentive.android.sdk.model.SdkPayload;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+import com.apptentive.android.sdk.model.*;
 import com.apptentive.android.sdk.module.messagecenter.model.MessageFactory;
-
-import org.json.JSONException;
 import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.List;
+import java.io.*;
 
 @RunWith(AndroidJUnit4.class)
 public class ApptentiveDatabaseHelperTest {

diff --git a/...droidTest/java/com/apptentive/android/sdk/util/threading/ConcurrentDispatchQueueTest.java b/...droidTest/java/com/apptentive/android/sdk/util/threading/ConcurrentDispatchQueueTest.java
@@ -6,8 +6,7 @@
 
 package com.apptentive.android.sdk.util.threading;
 
-import android.support.test.runner.AndroidJUnit4;
-
+import androidx.test.runner.AndroidJUnit4;
 import com.apptentive.android.sdk.TestCaseBase;
 
 import org.junit.After;

diff --git a/...c/androidTest/java/com/apptentive/android/sdk/util/threading/SerialDispatchQueueTest.java b/...c/androidTest/java/com/apptentive/android/sdk/util/threading/SerialDispatchQueueTest.java
@@ -6,7 +6,7 @@
 
 package com.apptentive.android.sdk.util.threading;
 
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.runner.AndroidJUnit4;
 
 import com.apptentive.android.sdk.TestCaseBase;