Migrate to androidx namespace (#12)

* Migrate to android ktx * Fix build error
jraska · Aug 26, 2018 · a625e6c · a625e6c
1 parent bda725e
commit a625e6c
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 29 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,7 +3,7 @@ jobs:
   build:
     working_directory: ~/code
     docker:
-      - image: circleci/android:api-27-alpha
+      - image: circleci/android:api-28-alpha
     environment:
       JVM_OPTS: -Xmx4096m
     steps:

diff --git a/testing-ktx/build.gradle b/testing-ktx/build.gradle
@@ -23,13 +23,13 @@ dependencies {
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
   api project(':testing')
-  implementation 'com.android.support:support-annotations:27.1.1'
-  implementation 'android.arch.lifecycle:runtime:1.1.1'
-  implementation 'android.arch.lifecycle:livedata-core:1.1.1'
+  implementation 'androidx.annotation:annotation:1.0.0-rc01'
+  implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0-rc01'
+  implementation 'androidx.lifecycle:lifecycle-livedata-core:2.0.0-rc01'
 
   testImplementation 'junit:junit:4.12'
-  testImplementation 'android.arch.core:core-testing:1.1.1'
-  testImplementation 'org.assertj:assertj-core:3.10.0'
+  testImplementation 'androidx.arch.core:core-testing:2.0.0-rc01'
+  testImplementation 'org.assertj:assertj-core:3.11.0'
 }
 
 ext {

diff --git a/testing-ktx/src/main/java/com/jraska/livedata/TestObserver.kt b/testing-ktx/src/main/java/com/jraska/livedata/TestObserver.kt
@@ -1,6 +1,6 @@
 package com.jraska.livedata
 
-import android.arch.lifecycle.LiveData
+import androidx.lifecycle.LiveData
 
 fun <T> LiveData<T>.test(): TestObserver<T> {
   return TestObserver.test(this)

diff --git a/testing-ktx/src/test/java/com/jraska/livedata/TestObserverTest.kt b/testing-ktx/src/test/java/com/jraska/livedata/TestObserverTest.kt
@@ -1,7 +1,7 @@
 package com.jraska.livedata
 
-import android.arch.core.executor.testing.InstantTaskExecutorRule
-import android.arch.lifecycle.MutableLiveData
+import androidx.arch.core.executor.testing.InstantTaskExecutorRule
+import androidx.lifecycle.MutableLiveData
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Rule
 import org.junit.Test

diff --git a/testing-ktx/src/test/java/com/jraska/livedata/example/CounterViewModel.kt b/testing-ktx/src/test/java/com/jraska/livedata/example/CounterViewModel.kt
@@ -1,7 +1,7 @@
 package com.jraska.livedata.example
 
-import android.arch.lifecycle.LiveData
-import android.arch.lifecycle.MutableLiveData
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
 
 class CounterViewModel {
   private val counterData = MutableLiveData<Int>()

diff --git a/testing-ktx/src/test/java/com/jraska/livedata/example/ExampleJavaTest.java b/testing-ktx/src/test/java/com/jraska/livedata/example/ExampleJavaTest.java
@@ -1,7 +1,7 @@
 package com.jraska.livedata.example;
 
-import android.arch.core.executor.testing.InstantTaskExecutorRule;
-import android.arch.lifecycle.LiveData;
+import androidx.arch.core.executor.testing.InstantTaskExecutorRule;
+import androidx.lifecycle.LiveData;
 import com.jraska.livedata.TestObserver;
 import org.junit.Before;
 import org.junit.Rule;

diff --git a/testing-ktx/src/test/java/com/jraska/livedata/example/ExampleTest.kt b/testing-ktx/src/test/java/com/jraska/livedata/example/ExampleTest.kt
@@ -1,6 +1,6 @@
 package com.jraska.livedata.example
 
-import android.arch.core.executor.testing.InstantTaskExecutorRule
+import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import com.jraska.livedata.test
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Before

diff --git a/testing/build.gradle b/testing/build.gradle
@@ -4,11 +4,11 @@ apply plugin: 'kotlin-android'
 version = rootProject.ext.version
 
 android {
-  compileSdkVersion 27
-  buildToolsVersion '27.0.3'
+  compileSdkVersion 28
+  buildToolsVersion '28.0.2'
   defaultConfig {
     minSdkVersion 19
-    targetSdkVersion 27
+    targetSdkVersion 28
     versionName version
     versionCode rootProject.ext.versionCode
   }
@@ -20,14 +20,14 @@ android {
 }
 
 dependencies {
-  implementation 'com.android.support:support-annotations:27.1.1'
-  implementation 'android.arch.lifecycle:runtime:1.1.1'
-  implementation 'android.arch.lifecycle:livedata-core:1.1.1'
+  implementation 'androidx.annotation:annotation:1.0.0-rc01'
+  implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0-rc01'
+  implementation 'androidx.lifecycle:lifecycle-livedata-core:2.0.0-rc01'
 
   testImplementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
   testImplementation 'junit:junit:4.12'
-  testImplementation 'android.arch.core:core-testing:1.1.1'
-  testImplementation 'org.assertj:assertj-core:3.10.0'
+  testImplementation 'androidx.arch.core:core-testing:2.0.0-rc01'
+  testImplementation 'org.assertj:assertj-core:3.11.0'
 }
 
 ext {

diff --git a/testing/src/main/java/com/jraska/livedata/TestObserver.java b/testing/src/main/java/com/jraska/livedata/TestObserver.java
@@ -1,10 +1,11 @@
 package com.jraska.livedata;
 
-import android.arch.core.util.Function;
-import android.arch.lifecycle.LiveData;
-import android.arch.lifecycle.MutableLiveData;
-import android.arch.lifecycle.Observer;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.Nullable;
+import androidx.arch.core.util.Function;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
+import androidx.lifecycle.Observer;
 
 import java.util.ArrayList;
 import java.util.Collections;

diff --git a/testing/src/test/java/com/jraska/livedata/TestObserverTest.kt b/testing/src/test/java/com/jraska/livedata/TestObserverTest.kt
@@ -1,7 +1,7 @@
 package com.jraska.livedata
 
-import android.arch.core.executor.testing.InstantTaskExecutorRule
-import android.arch.lifecycle.MutableLiveData
+import androidx.arch.core.executor.testing.InstantTaskExecutorRule
+import androidx.lifecycle.MutableLiveData
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Rule
 import org.junit.Test