Merge pull request #6 from frogermcs/feature/androidx

frogermcs · web-flow · commit b34ded300c8d · 2018-10-20T15:45:29.000+02:00
Feature/androidx
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ language: android
 
 android:
   components:
-    - build-tools-28.0.2
+    - build-tools-28.0.3
     - android-28
 
     - extra-google-m2repository
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,20 +7,21 @@ apply from: '../buildsystem/android_commons.gradle'
 android {
 
     defaultConfig {
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
         debug {
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'),
                     'proguard-rules.pro'
+            testProguardFile 'proguard-test-rules.pro'
         }
 
         release {
             minifyEnabled true
-            proguardFile 'proguard-rules.pro'
-            proguardFile getDefaultProguardFile('proguard-android.txt')
+            proguardFiles getDefaultProguardFile('proguard-android.txt') ,
+                    'proguard-rules.pro'
         }
     }
 
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -1,3 +1,7 @@
+# === General rules ===
+
+-dontobfuscate # Only because of easy debugging
+
 # === RxJava ===
 
 -dontwarn sun.misc.**
@@ -15,7 +19,7 @@
     rx.internal.util.atomic.LinkedQueueNode consumerNode;
 }
 
--dontnote rx.internal.util.PlatformDependent
+-dontnote rx.internal.util.**
 
 # ===endof RxJava ===
 
@@ -34,6 +38,8 @@
 # OkHttp platform used only on JVM and when Conscrypt dependency is available.
 -dontwarn okhttp3.internal.platform.ConscryptPlatform
 
+-dontnote okhttp3.**
+
 # ===endof OkHttp ===
 
 
@@ -77,4 +83,43 @@
 -dontwarn com.google.common.**
 -dontwarn com.google.auto.**
 
-# ===endof Google autofactory ===
+-dontnote com.google.common.**
+-dontnote com.google.auto.**
+
+# ===endof Google autofactory ===
+
+# === GSON ===
+
+# Gson uses generic type information stored in a class file when working with fields. Proguard
+# removes such information by default, so configure it to keep all of it.
+-keepattributes Signature
+
+# For using GSON @Expose annotation
+-keepattributes *Annotation*
+
+# Gson specific classes
+-dontwarn sun.misc.**
+#-keep class com.google.gson.stream.** { *; }
+
+# Application classes that will be serialized/deserialized over Gson
+-keep class com.google.gson.examples.android.model.** { *; }
+
+# Prevent proguard from stripping interface information from TypeAdapterFactory,
+# JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter)
+-keep class * implements com.google.gson.TypeAdapterFactory
+-keep class * implements com.google.gson.JsonSerializer
+-keep class * implements com.google.gson.JsonDeserializer
+
+-dontnote com.google.gson.internal.**
+
+# ===endof GSON ===
+
+
+
+# === App UI ===
+-keep class androidx.recyclerview.widget.RecyclerView {
+   public <methods>;
+}
+-keep class androidx.coordinatorlayout.widget.CoordinatorLayout$Behavior {*;}
+
+# ===endof App UI ===
diff --git a/app/proguard-test-rules.pro b/app/proguard-test-rules.pro
@@ -0,0 +1,20 @@
+-dontwarn org.xmlpull.v1.**
+
+-dontwarn androidx.test.espresso.**
+
+-dontwarn android.support.test.services.**
+-dontwarn android.support.test.runner.**
+-dontwarn android.support.test.orchestrator.**
+
+-dontnote androidx.transition.**
+-dontnote androidx.test.runner.**
+-dontnote androidx.test.espresso.**
+-dontnote android.support.test.**
+-dontnote org.junit.**
+-dontnote junit.framework.**
+-dontnote junit.runner.**
+-dontnote org.xmlpull.**
+-dontnote java.lang.invoke.**
+-dontnote org.apache.**
+-dontnote android.net.**
+
diff --git a/app/src/androidTest/java/com/frogermcs/multimodulegithubclient/endtoend/AppFlowTest.java b/app/src/androidTest/java/com/frogermcs/multimodulegithubclient/endtoend/AppFlowTest.java
@@ -1,13 +1,5 @@
 package com.frogermcs.multimodulegithubclient.endtoend;
 
-import android.support.test.espresso.UiController;
-import android.support.test.espresso.ViewAction;
-import android.support.test.espresso.contrib.RecyclerViewActions;
-import android.support.test.espresso.intent.rule.IntentsTestRule;
-import android.support.test.filters.LargeTest;
-import android.support.test.runner.AndroidJUnit4;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
 import android.view.View;
 import android.widget.TextView;
 
@@ -19,17 +11,26 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.action.ViewActions.typeText;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.intent.Intents.intended;
-import static android.support.test.espresso.intent.matcher.IntentMatchers.hasComponent;
-import static android.support.test.espresso.matcher.ViewMatchers.isAssignableFrom;
-import static android.support.test.espresso.matcher.ViewMatchers.isRoot;
-import static android.support.test.espresso.matcher.ViewMatchers.withHint;
-import static android.support.test.espresso.matcher.ViewMatchers.withParent;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
+import androidx.appcompat.widget.Toolbar;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.test.espresso.UiController;
+import androidx.test.espresso.ViewAction;
+import androidx.test.espresso.contrib.RecyclerViewActions;
+import androidx.test.espresso.intent.rule.IntentsTestRule;
+import androidx.test.filters.LargeTest;
+import androidx.test.runner.AndroidJUnit4;
+
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.action.ViewActions.typeText;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.intent.Intents.intended;
+import static androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent;
+import static androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom;
+import static androidx.test.espresso.matcher.ViewMatchers.isRoot;
+import static androidx.test.espresso.matcher.ViewMatchers.withHint;
+import static androidx.test.espresso.matcher.ViewMatchers.withParent;
+import static androidx.test.espresso.matcher.ViewMatchers.withText;
 import static org.hamcrest.CoreMatchers.allOf;
 import static org.hamcrest.CoreMatchers.instanceOf;
 
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.0'
+        classpath 'com.android.tools.build:gradle:3.2.1'
         classpath 'org.jacoco:org.jacoco.core:0.8.1'
         classpath 'com.jakewharton:butterknife-gradle-plugin:9.0.0-SNAPSHOT'
     }
diff --git a/buildsystem/dependencies.gradle b/buildsystem/dependencies.gradle
@@ -9,7 +9,7 @@ ext {
     butterknifeVersion = '9.0.0-SNAPSHOT'
 
     //Standard dependencies
-    supportLibraryVersion = '28.0.0'
+    supportLibraryVersion = '1.0.0'
     javaxAnnotationsVersion = '10.0-b28'
     autoFactoryVersion = '1.0-beta3'
     rxAndroidVersion = '1.2.1'
@@ -26,9 +26,9 @@ ext {
     mockitoVersion = '2.21.0'
 
     //Functional/end-to-end testing dependencies
-    espressoVersion = '3.0.2'
-    testRunnerVersion = '1.0.2'
-    testRulesVersion = '1.0.2'
+    espressoVersion = '3.1.0-alpha3'
+    testRunnerVersion = '1.1.0-alpha3'
+    testRulesVersion = '1.1.0-alpha3'
 
     //
     // ===== Libraries =====
@@ -40,8 +40,8 @@ ext {
     butterknifeCompiler = "com.jakewharton:butterknife-compiler:${butterknifeVersion}"
 
     //Standard dependencies
-    appCompatV7 = "com.android.support:appcompat-v7:${supportLibraryVersion}"
-    recyclerViewV7 = "com.android.support:recyclerview-v7:${supportLibraryVersion}"
+    appCompat = "androidx.appcompat:appcompat:${supportLibraryVersion}"
+    recyclerView = "androidx.recyclerview:recyclerview:${supportLibraryVersion}"
 
     butterknife = "com.jakewharton:butterknife:${butterknifeVersion}"
     dagger = "com.google.dagger:dagger:${daggerVersion}"
@@ -63,29 +63,36 @@ ext {
     mockito = "org.mockito:mockito-core:${mockitoVersion}"
 
     //Functional/end-to-end testing dependencies
-    espressoCore = "com.android.support.test.espresso:espresso-core:${espressoVersion}"
-    espressoIntents = "com.android.support.test.espresso:espresso-intents:${espressoVersion}"
-    espressoContrib = "com.android.support.test.espresso:espresso-contrib:${espressoVersion}"
-    testRunner = "com.android.support.test:runner:${testRunnerVersion}"
-    testRules = "com.android.support.test:rules:${testRulesVersion}"
+    espressoCore = "androidx.test.espresso:espresso-core:${espressoVersion}"
+    espressoIntents = "androidx.test.espresso:espresso-intents:${espressoVersion}"
+    espressoContrib = "androidx.test.espresso:espresso-contrib:${espressoVersion}"
+    testRunner = "androidx.test:runner:${testRunnerVersion}"
+    testRules = "androidx.test:rules:${testRulesVersion}"
+
+    espressoExcludes = {
+        exclude group: 'androidx.legacy', module: 'legacy-support-v4'
+        exclude module: 'recyclerview'
+    }
+
 
     //
     // ===== Modules =====
     //
     app = [
-            [configuration: "implementation", dependency: appCompatV7],
+            [configuration: "implementation", dependency: appCompat],
+            [configuration: "implementation", dependency: recyclerView],
     ]
 
     repository = [
     ]
 
     repos = [
-            [configuration: "implementation", dependency: recyclerViewV7],
+            [configuration: "implementation", dependency: recyclerView],
     ]
 
     base = [
             [configuration: "api", dependency: butterknife],
-            [configuration: "api", dependency: appCompatV7],
+            [configuration: "api", dependency: appCompat],
             [configuration: "api", dependency: dagger],
             [configuration: "api", dependency: javaxAnnotations],
             [configuration: "api", dependency: autoFactory],
@@ -109,9 +116,9 @@ ext {
 
     //Importend in app module only
     instrumentationTestsDependencies = [
-            [configuration: "androidTestImplementation", dependency: espressoCore],
-            [configuration: "androidTestImplementation", dependency: espressoIntents],
-            [configuration: "androidTestImplementation", dependency: espressoContrib],
+            [configuration: "androidTestImplementation", dependency: espressoCore, options: espressoExcludes],
+            [configuration: "androidTestImplementation", dependency: espressoIntents, options: espressoExcludes],
+            [configuration: "androidTestImplementation", dependency: espressoContrib, options: espressoExcludes],
             [configuration: "androidTestImplementation", dependency: testRunner],
             [configuration: "androidTestImplementation", dependency: testRules],
     ]
diff --git a/features/base/src/main/java/com/frogermcs/multimodulegithubclient/base/BaseActivity.java b/features/base/src/main/java/com/frogermcs/multimodulegithubclient/base/BaseActivity.java
@@ -1,8 +1,8 @@
 package com.frogermcs.multimodulegithubclient.base;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 
+import androidx.appcompat.app.AppCompatActivity;
 import butterknife.ButterKnife;
 
 public abstract class BaseActivity extends AppCompatActivity {
diff --git a/features/base/src/test/java/com/frogermcs/multimodulegithubclient/base/ExampleUnitTest.java b/features/base/src/test/java/com/frogermcs/multimodulegithubclient/base/ExampleUnitTest.java
@@ -2,7 +2,7 @@
 
 import org.junit.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 /**
  * Example local unit test, which will execute on the development machine (host).
diff --git a/features/repositories/src/main/java/com/frogermcs/multimodulegithubclient/repositories/RepositoriesListActivity.java b/features/repositories/src/main/java/com/frogermcs/multimodulegithubclient/repositories/RepositoriesListActivity.java
@@ -3,8 +3,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.widget.ProgressBar;
 
@@ -17,8 +15,9 @@
 
 import javax.inject.Inject;
 
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
-import butterknife.ButterKnife;
 
 
 public class RepositoriesListActivity extends BaseActivity {
diff --git a/features/repositories/src/main/java/com/frogermcs/multimodulegithubclient/repositories/RepositoriesListActivityModule.java b/features/repositories/src/main/java/com/frogermcs/multimodulegithubclient/repositories/RepositoriesListActivityModule.java
@@ -1,7 +1,5 @@
 package com.frogermcs.multimodulegithubclient.repositories;
 
-import android.support.v7.widget.LinearLayoutManager;
-
 import com.frogermcs.multimodulegithubclient.base.ActivityScope;
 import com.frogermcs.multimodulegithubclient.base.data.api.RepositoriesManager;
 import com.frogermcs.multimodulegithubclient.base.data.model.Repository;
@@ -11,6 +9,7 @@
 
 import javax.inject.Named;
 
+import androidx.recyclerview.widget.LinearLayoutManager;
 import dagger.Module;
 import dagger.Provides;
 import dagger.multibindings.IntKey;
diff --git a/features/repositories/src/main/java/com/frogermcs/multimodulegithubclient/repositories/RepositoriesListAdapter.java b/features/repositories/src/main/java/com/frogermcs/multimodulegithubclient/repositories/RepositoriesListAdapter.java
@@ -1,6 +1,5 @@
 package com.frogermcs.multimodulegithubclient.repositories;
 
-import android.support.v7.widget.RecyclerView;
 import android.view.ViewGroup;
 
 import com.frogermcs.multimodulegithubclient.base.data.model.Repository;
@@ -9,6 +8,8 @@
 import java.util.List;
 import java.util.Map;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 /**
  * Created by Miroslaw Stanek on 24.04.15.
  */
diff --git a/features/repositories/src/main/java/com/frogermcs/multimodulegithubclient/repositories/RepositoriesListViewHolderFactory.java b/features/repositories/src/main/java/com/frogermcs/multimodulegithubclient/repositories/RepositoriesListViewHolderFactory.java
@@ -1,8 +1,9 @@
 package com.frogermcs.multimodulegithubclient.repositories;
 
-import android.support.v7.widget.RecyclerView;
 import android.view.ViewGroup;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 /**
  * Created by Miroslaw Stanek on 11.06.2016.
  */
diff --git a/features/repositories/src/main/java/com/frogermcs/multimodulegithubclient/repositories/RepositoryViewHolder.java b/features/repositories/src/main/java/com/frogermcs/multimodulegithubclient/repositories/RepositoryViewHolder.java
@@ -1,10 +1,11 @@
 package com.frogermcs.multimodulegithubclient.repositories;
 
-import android.support.v7.widget.RecyclerView;
 import android.view.View;
 
 import com.frogermcs.multimodulegithubclient.base.data.model.Repository;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 /**
  * Created by Miroslaw Stanek on 11.06.2016.
  */
diff --git a/features/repositories/src/main/res/layout/activity_repositories_list.xml b/features/repositories/src/main/res/layout/activity_repositories_list.xml
@@ -4,7 +4,7 @@
     android:gravity="center"
     android:orientation="vertical">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rvRepositories"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
diff --git a/gradle.properties b/gradle.properties
@@ -6,6 +6,8 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit

Original file line number	Diff line number	Diff line change
`@@ -7,20 +7,21 @@ apply from: '../buildsystem/android_commons.gradle'`
`7`	`7`	`android {`
`8`	`8`
`9`	`9`	`defaultConfig {`
`10`		`- testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"`
	`10`	`+ testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`buildTypes {`
`14`	`14`	`debug {`
`15`	`15`	`minifyEnabled true`
`16`	`16`	`proguardFiles getDefaultProguardFile('proguard-android.txt'),`
`17`	`17`	`'proguard-rules.pro'`
	`18`	`+ testProguardFile 'proguard-test-rules.pro'`
`18`	`19`	`}`
`19`	`20`
`20`	`21`	`release {`
`21`	`22`	`minifyEnabled true`
`22`		`- proguardFile 'proguard-rules.pro'`
`23`		`- proguardFile getDefaultProguardFile('proguard-android.txt')`
	`23`	`+ proguardFiles getDefaultProguardFile('proguard-android.txt') ,`
	`24`	`+ 'proguard-rules.pro'`
`24`	`25`	`}`
`25`	`26`	`}`
`26`	`27`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ buildscript {`
`6`	`6`	`maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }`
`7`	`7`	`}`
`8`	`8`	`dependencies {`
`9`		`- classpath 'com.android.tools.build:gradle:3.2.0'`
	`9`	`+ classpath 'com.android.tools.build:gradle:3.2.1'`
`10`	`10`	`classpath 'org.jacoco:org.jacoco.core:0.8.1'`
`11`	`11`	`classpath 'com.jakewharton:butterknife-gradle-plugin:9.0.0-SNAPSHOT'`
`12`	`12`	`}`