Merge branch 'develop' into master-remote-auto-save

wordpress-mobile · Jun 7, 2019 · 71513ff · 71513ff
2 parents b928f8f + 6f0a73b
commit 71513ff
Show file tree

Hide file tree

Showing 153 changed files with 1,173 additions and 395 deletions.
diff --git a/.circleci/.firebase.secrets.json.enc b/.circleci/.firebase.secrets.json.enc
diff --git a/.circleci/gradle.properties.enc b/.circleci/gradle.properties.enc
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/build.gradle b/build.gradle
@@ -69,9 +69,11 @@ subprojects {
 }
 
 ext {
-    daggerVersion = '2.11'
+    daggerVersion = '2.22.1'
     wellSqlVersion = '1.4.0'
     supportLibraryVersion = '27.1.1'
     arch_paging_version = '1.0.1'
     arch_lifecycle_version = '1.1.1'
+    arch_core_version = '2.0.1'
+    appcompat_version = '1.0.2'
 }
diff --git a/config/checkstyle.xml b/config/checkstyle.xml
@@ -160,7 +160,7 @@
         </module>
 
         <module name="ImportOrder">
-            <property name="groups" value="android,com,junit,net,org,java,javax"/>
+            <property name="groups" value="android,androidx,com,junit,net,org,java,javax"/>
             <property name="ordered" value="false"/>
             <property name="separated" value="true"/>
             <property name="option" value="bottom"/>

diff --git a/example/build.gradle b/example/build.gradle
@@ -13,7 +13,7 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
     buildToolsVersion '28.0.3'
 
     defaultConfig {
@@ -26,7 +26,7 @@ android {
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -87,10 +87,13 @@ dependencies {
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
 
-    implementation "com.android.support:appcompat-v7:$supportLibraryVersion"
-    implementation "com.android.support:support-v4:$supportLibraryVersion"
-    implementation "com.android.support:recyclerview-v7:$supportLibraryVersion"
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation "androidx.appcompat:appcompat:$appcompat_version"
+    implementation "androidx.legacy:legacy-support-v4:1.0.0"
+    implementation "androidx.recyclerview:recyclerview:1.0.0"
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.annotation:annotation:1.0.2'
+    implementation "androidx.arch.core:core-common:$arch_core_version"
+    implementation "androidx.arch.core:core-runtime:$arch_core_version"
 
     // WordPress libs
     implementation ('org.wordpress:utils:1.20.0') {
@@ -114,16 +117,16 @@ dependencies {
     testImplementation 'org.mockito:mockito-core:2.23.0'
     testImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.1.0'
     testImplementation 'org.assertj:assertj-core:3.11.1'
-    testImplementation "android.arch.core:core-testing:$arch_lifecycle_version"
+    testImplementation "androidx.arch.core:core-testing:$arch_core_version"
 
     androidTestImplementation 'org.mockito:mockito-android:2.6.3'
     androidTestImplementation 'org.apache.commons:commons-lang3:3.5'
-    androidTestImplementation "android.arch.core:core-testing:1.1.1"
+    androidTestImplementation "androidx.arch.core:core-testing:$arch_core_version"
     kaptAndroidTest "com.google.dagger:dagger-compiler:$daggerVersion"
     androidTestCompileOnly 'org.glassfish:javax.annotation:10.0-b28'
     // Test orchestrator
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestUtil 'com.android.support.test:orchestrator:1.0.2'
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestUtil 'androidx.test:orchestrator:1.2.0'
 
     // Debug dependencies
     debugImplementation 'com.facebook.stetho:stetho:1.5.0'

diff --git a/example/gradle.properties-example b/example/gradle.properties-example
@@ -1,3 +1,5 @@
 # OAuth credentials for example app
 wp.OAUTH.APP.ID = wp
 wp.OAUTH.APP.SECRET = wp
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/example/src/androidTest/java/org/wordpress/android/fluxc/TestUtils.java b/example/src/androidTest/java/org/wordpress/android/fluxc/TestUtils.java
@@ -2,9 +2,10 @@
 
 import android.content.Context;
 import android.content.res.Configuration;
-import android.support.annotation.NonNull;
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
+
 import org.wordpress.android.fluxc.example.test.BuildConfig;
 import org.wordpress.android.util.AppLog;
 import org.wordpress.android.util.AppLog.T;

diff --git a/example/src/androidTest/java/org/wordpress/android/fluxc/mocked/MockedStack_AccountTest.java b/example/src/androidTest/java/org/wordpress/android/fluxc/mocked/MockedStack_AccountTest.java
@@ -1,6 +1,6 @@
 package org.wordpress.android.fluxc.mocked;
 
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.runner.AndroidJUnit4;
 
 import org.greenrobot.eventbus.Subscribe;
 import org.junit.After;

diff --git a/example/src/androidTest/java/org/wordpress/android/fluxc/mocked/MockedStack_Base.java b/example/src/androidTest/java/org/wordpress/android/fluxc/mocked/MockedStack_Base.java
@@ -13,7 +13,7 @@
 
 import javax.inject.Inject;
 
-import static android.support.test.InstrumentationRegistry.getInstrumentation;
+import static androidx.test.InstrumentationRegistry.getInstrumentation;
 
 public class MockedStack_Base {
     Context mAppContext;