Zbigniewfr feature/androidx migration (#3)

micHar · web-flow · commit cb23bfb13702 · 2018-12-08T20:31:39.000+01:00
Version 0.3.0: migrate to androidx, update dependencies.
diff --git a/build.gradle b/build.gradle
@@ -1,11 +1,11 @@
 buildscript {
-    ext.kotlin_version = '1.2.21'
+    ext.kotlin_version = '1.3.11'
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
     }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Oct 11 13:59:42 CEST 2017
+#Thu Nov 22 13:12:15 CET 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/liverelay/build.gradle b/liverelay/build.gradle
@@ -5,14 +5,14 @@ apply plugin: 'com.github.dcendents.android-maven'
 group = 'com.github.futuremind'
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion "26.0.2"
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 1
-        versionName "0.2.0"
+        versionName "0.3.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
@@ -26,9 +26,9 @@ android {
 }
 
 dependencies {
-    implementation 'com.trello.rxlifecycle2:rxlifecycle-android-lifecycle-kotlin:2.2.1'
-    implementation 'com.jakewharton.rxrelay2:rxrelay:2.0.0'
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+    implementation 'com.trello.rxlifecycle3:rxlifecycle-android-lifecycle-kotlin:3.0.0'
+    implementation 'com.jakewharton.rxrelay2:rxrelay:2.1.0'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     testImplementation 'junit:junit:4.12'
 
 }
diff --git a/liverelay/src/main/java/com/futuremind/liverelay/BaseLiveRelay.kt b/liverelay/src/main/java/com/futuremind/liverelay/BaseLiveRelay.kt
@@ -1,8 +1,8 @@
 package com.futuremind.liverelay
 
-import android.arch.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleOwner
 import com.jakewharton.rxrelay2.Relay
-import com.trello.rxlifecycle2.android.lifecycle.kotlin.bindToLifecycle
+import com.trello.rxlifecycle3.android.lifecycle.kotlin.bindToLifecycle
 import io.reactivex.BackpressureStrategy.LATEST
 import io.reactivex.Flowable
 
diff --git a/liverelay/src/main/java/com/futuremind/liverelay/LiveEventRelay.kt b/liverelay/src/main/java/com/futuremind/liverelay/LiveEventRelay.kt
@@ -1,6 +1,5 @@
 package com.futuremind.liverelay
 
-import android.arch.lifecycle.LifecycleOwner
 import com.jakewharton.rxrelay2.PublishRelay
 import com.jakewharton.rxrelay2.Relay
 
diff --git a/liverelay/src/main/java/com/futuremind/liverelay/LiveRelay.kt b/liverelay/src/main/java/com/futuremind/liverelay/LiveRelay.kt
@@ -1,6 +1,6 @@
 package com.futuremind.liverelay
 
-import android.arch.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleOwner
 import com.jakewharton.rxrelay2.BehaviorRelay
 import com.jakewharton.rxrelay2.Relay
 
diff --git a/liverelay/src/main/java/com/futuremind/liverelay/LiveStateRelay.kt b/liverelay/src/main/java/com/futuremind/liverelay/LiveStateRelay.kt
@@ -1,6 +1,5 @@
 package com.futuremind.liverelay
 
-import android.arch.lifecycle.LifecycleOwner
 import com.jakewharton.rxrelay2.BehaviorRelay
 import com.jakewharton.rxrelay2.Relay
 
diff --git a/liverelay/src/test/java/com/futuremind/liverelay/LiveEventRelayTest.kt b/liverelay/src/test/java/com/futuremind/liverelay/LiveEventRelayTest.kt
@@ -1,11 +1,11 @@
 package com.futuremind.liverelay
 
-import android.arch.lifecycle.Lifecycle.Event.ON_CREATE
-import android.arch.lifecycle.Lifecycle.Event.ON_DESTROY
-import android.arch.lifecycle.Lifecycle.Event.ON_PAUSE
-import android.arch.lifecycle.Lifecycle.Event.ON_RESUME
-import android.arch.lifecycle.Lifecycle.Event.ON_START
-import android.arch.lifecycle.Lifecycle.Event.ON_STOP
+import androidx.lifecycle.Lifecycle.Event.ON_CREATE
+import androidx.lifecycle.Lifecycle.Event.ON_DESTROY
+import androidx.lifecycle.Lifecycle.Event.ON_PAUSE
+import androidx.lifecycle.Lifecycle.Event.ON_RESUME
+import androidx.lifecycle.Lifecycle.Event.ON_START
+import androidx.lifecycle.Lifecycle.Event.ON_STOP
 import org.junit.Before
 import org.junit.Test
 
diff --git a/liverelay/src/test/java/com/futuremind/liverelay/LiveStateRelayTest.kt b/liverelay/src/test/java/com/futuremind/liverelay/LiveStateRelayTest.kt
@@ -1,11 +1,11 @@
 package com.futuremind.liverelay
 
-import android.arch.lifecycle.Lifecycle.Event.ON_CREATE
-import android.arch.lifecycle.Lifecycle.Event.ON_DESTROY
-import android.arch.lifecycle.Lifecycle.Event.ON_PAUSE
-import android.arch.lifecycle.Lifecycle.Event.ON_RESUME
-import android.arch.lifecycle.Lifecycle.Event.ON_START
-import android.arch.lifecycle.Lifecycle.Event.ON_STOP
+import androidx.lifecycle.Lifecycle.Event.ON_CREATE
+import androidx.lifecycle.Lifecycle.Event.ON_DESTROY
+import androidx.lifecycle.Lifecycle.Event.ON_PAUSE
+import androidx.lifecycle.Lifecycle.Event.ON_RESUME
+import androidx.lifecycle.Lifecycle.Event.ON_START
+import androidx.lifecycle.Lifecycle.Event.ON_STOP
 import org.junit.Before
 import org.junit.Test
 
diff --git a/liverelay/src/test/java/com/futuremind/liverelay/MockLifecycleOwner.kt b/liverelay/src/test/java/com/futuremind/liverelay/MockLifecycleOwner.kt
@@ -1,8 +1,8 @@
 package com.futuremind.liverelay
 
-import android.arch.lifecycle.Lifecycle.Event
-import android.arch.lifecycle.LifecycleOwner
-import android.arch.lifecycle.LifecycleRegistry
+import androidx.lifecycle.Lifecycle.Event
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleRegistry
 
 
 class MockLifecycleOwner : LifecycleOwner {
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -3,12 +3,12 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion "26.0.2"
+    compileSdkVersion 28
+    buildToolsVersion "28.0.3"
     defaultConfig {
         applicationId "com.futuremind.liverelay.sample"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -19,18 +19,20 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-}
-
-configurations.all {
-    resolutionStrategy.eachDependency { DependencyResolveDetails details ->
-        if (details.requested.group == 'android.arch.lifecycle') {
-            details.useVersion '1.0.0'
+    packagingOptions {
+        exclude 'META-INF/proguard/androidx-annotations.pro'
+    }
+    configurations.all {
+        resolutionStrategy.eachDependency { DependencyResolveDetails details ->
+            if (details.requested.group == 'androidx.lifecycle') {
+                details.useVersion '2.0.0'
+            }
         }
     }
 }
 
 dependencies {
-    implementation 'com.android.support:appcompat-v7:27.0.2'
-    implementation"org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation project(':liverelay')
 }
diff --git a/sample/src/main/java/com/futuremind/liverelay/sample/MainActivity.kt b/sample/src/main/java/com/futuremind/liverelay/sample/MainActivity.kt
@@ -1,7 +1,7 @@
 package com.futuremind.liverelay.sample
 
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 
 class MainActivity : AppCompatActivity() {
 

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	`buildscript {`
`2`		`- ext.kotlin_version = '1.2.21'`
	`2`	`+ ext.kotlin_version = '1.3.11'`
`3`	`3`	`repositories {`
`4`	`4`	`google()`
`5`	`5`	`jcenter()`
`6`	`6`	`}`
`7`	`7`	`dependencies {`
`8`		`- classpath 'com.android.tools.build:gradle:3.0.1'`
	`8`	`+ classpath 'com.android.tools.build:gradle:3.2.1'`
`9`	`9`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"`
`10`	`10`	`classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'`
`11`	`11`	`}`