diff --git a/.travis.yml b/.travis.yml index ad99cae4..d9a004b7 100755 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ matrix: - tools # Tools - platform-tools # Platform tools - build-tools-28.0.3 # Build tools version - - android-25 # Target SDK version + - android-28 # Target SDK version - extra-android-m2repository # Support repo - sys-img-armeabi-v7a-android-18 # Emulator diff --git a/android/demos/memory-leaks/build.gradle b/android/demos/memory-leaks/build.gradle index 34516bb8..567281d7 100644 --- a/android/demos/memory-leaks/build.gradle +++ b/android/demos/memory-leaks/build.gradle @@ -67,8 +67,8 @@ dependencies { implementation deps.external.dagger implementation deps.external.rxbinding implementation deps.external.leakcanaryDebug - implementation deps.support.percent - implementation deps.support.appcompat + implementation deps.androidx.percent + implementation deps.androidx.appcompat compileOnly deps.apt.javax testImplementation project(":libraries:rib-test-utils") errorprone deps.build.errorProne diff --git a/android/demos/memory-leaks/src/main/java/com/uber/rib/root/RootInteractor.java b/android/demos/memory-leaks/src/main/java/com/uber/rib/root/RootInteractor.java index a5c15916..ca9fa24e 100644 --- a/android/demos/memory-leaks/src/main/java/com/uber/rib/root/RootInteractor.java +++ b/android/demos/memory-leaks/src/main/java/com/uber/rib/root/RootInteractor.java @@ -16,7 +16,7 @@ package com.uber.rib.root; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.uber.rib.core.Bundle; import com.uber.rib.core.Interactor; import com.uber.rib.core.RibInteractor; diff --git a/android/demos/memory-leaks/src/main/java/com/uber/rib/root/RootRouter.java b/android/demos/memory-leaks/src/main/java/com/uber/rib/root/RootRouter.java index 017bda80..ad47b441 100644 --- a/android/demos/memory-leaks/src/main/java/com/uber/rib/root/RootRouter.java +++ b/android/demos/memory-leaks/src/main/java/com/uber/rib/root/RootRouter.java @@ -16,7 +16,7 @@ package com.uber.rib.root; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.uber.rib.core.ViewRouter; import com.uber.rib.root.logged_in.LoggedInBuilder; diff --git a/android/demos/memory-leaks/src/main/java/com/uber/rib/root/RootView.java b/android/demos/memory-leaks/src/main/java/com/uber/rib/root/RootView.java index 395950cd..3174d612 100644 --- a/android/demos/memory-leaks/src/main/java/com/uber/rib/root/RootView.java +++ b/android/demos/memory-leaks/src/main/java/com/uber/rib/root/RootView.java @@ -17,7 +17,7 @@ package com.uber.rib.root; import android.content.Context; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.widget.FrameLayout; diff --git a/android/demos/memory-leaks/src/main/java/com/uber/rib/root/logged_out/LoggedOutInteractor.java b/android/demos/memory-leaks/src/main/java/com/uber/rib/root/logged_out/LoggedOutInteractor.java index d4e6112e..a9dbc389 100644 --- a/android/demos/memory-leaks/src/main/java/com/uber/rib/root/logged_out/LoggedOutInteractor.java +++ b/android/demos/memory-leaks/src/main/java/com/uber/rib/root/logged_out/LoggedOutInteractor.java @@ -16,7 +16,7 @@ package com.uber.rib.root.logged_out; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.uber.rib.core.Bundle; import com.uber.rib.core.Interactor; import com.uber.rib.core.RibInteractor; diff --git a/android/demos/memory-leaks/src/main/java/com/uber/rib/root/logged_out/LoggedOutView.java b/android/demos/memory-leaks/src/main/java/com/uber/rib/root/logged_out/LoggedOutView.java index cf923be6..8b5432f1 100644 --- a/android/demos/memory-leaks/src/main/java/com/uber/rib/root/logged_out/LoggedOutView.java +++ b/android/demos/memory-leaks/src/main/java/com/uber/rib/root/logged_out/LoggedOutView.java @@ -1,7 +1,7 @@ package com.uber.rib.root.logged_out; import android.content.Context; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.widget.LinearLayout; /* diff --git a/android/gradle.properties b/android/gradle.properties index fb492572..3b988496 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -24,3 +24,5 @@ POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt POM_LICENCE_DIST=repo POM_DEVELOPER_ID=uber POM_DEVELOPER_NAME=Uber Technologies +android.useAndroidX=true +android.enableJetifier=true \ No newline at end of file diff --git a/android/gradle/dependencies.gradle b/android/gradle/dependencies.gradle index e3aa51f0..b8b7f40d 100755 --- a/android/gradle/dependencies.gradle +++ b/android/gradle/dependencies.gradle @@ -16,7 +16,11 @@ def versions = [ dagger: "2.22.1", - support: '25.1.1', + androidx: [ + annotations: '1.1.0', + appcompat: '1.0.2', + percent: '1.0.0' + ], autodispose: '1.3.0', robolectric: "4.2.1", intellij: "2017.2", @@ -41,11 +45,11 @@ def apt = [ def build = [ buildToolsVersion: '28.0.3', - compileSdkVersion: 25, + compileSdkVersion: 28, gradlePluginsUrl : "https://plugins.gradle.org/m2/", ci: 'true' == System.getenv('CI'), minSdkVersion: 16, - targetSdkVersion: 25, + targetSdkVersion: 28, javaVersion: JavaVersion.VERSION_1_8, guava: "com.google.guava:guava:27.1-android", commonsLang: "commons-lang:commons-lang:2.6", @@ -63,10 +67,10 @@ def build = [ ] ] -def support = [ - appcompat: "com.android.support:appcompat-v7:${versions.support}", - annotations: "com.android.support:support-annotations:${versions.support}", - percent: "com.android.support:percent:${versions.support}" +def androidx = [ + annotations: "androidx.annotation:annotation:${versions.androidx.annotations}", + appcompat: "androidx.appcompat:appcompat:${versions.androidx.appcompat}", + percent: "androidx.percentlayout:percentlayout:${versions.androidx.percent}" ] def test = [ @@ -98,7 +102,7 @@ ext.deps = [ "apt": apt, "build": build, "external": external, - "support": support, + "androidx": androidx, "test": test, "versions": versions, "uber": uber, diff --git a/android/libraries/rib-android-test/build.gradle b/android/libraries/rib-android-test/build.gradle index 7321f9fb..476db60f 100644 --- a/android/libraries/rib-android-test/build.gradle +++ b/android/libraries/rib-android-test/build.gradle @@ -44,9 +44,9 @@ android { } dependencies { - implementation deps.support.appcompat + implementation deps.androidx.appcompat api project(":libraries:rib-android") testImplementation deps.external.roboelectricBase - testImplementation deps.support.appcompat + testImplementation deps.androidx.appcompat testImplementation project(":libraries:rib-test-utils") } diff --git a/android/libraries/rib-android-test/src/main/java/com/uber/rib/core/RibActivity.java b/android/libraries/rib-android-test/src/main/java/com/uber/rib/core/RibActivity.java index 348fe1f4..ab6d8242 100644 --- a/android/libraries/rib-android-test/src/main/java/com/uber/rib/core/RibActivity.java +++ b/android/libraries/rib-android-test/src/main/java/com/uber/rib/core/RibActivity.java @@ -16,8 +16,8 @@ package com.uber.rib.core; import android.content.Intent; -import android.support.annotation.CallSuper; -import android.support.annotation.Nullable; +import androidx.annotation.CallSuper; +import androidx.annotation.Nullable; import android.view.ViewGroup; import com.jakewharton.rxrelay2.BehaviorRelay; import com.jakewharton.rxrelay2.PublishRelay; @@ -30,7 +30,7 @@ import com.uber.rib.core.lifecycle.ActivityLifecycleEvent; import io.reactivex.Observable; import io.reactivex.functions.Function; import io.reactivex.functions.Predicate; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; /** Base implementation for all VIP {@link android.app.Activity}s. */ public abstract class RibActivity extends AppCompatActivity diff --git a/android/libraries/rib-android-test/src/main/java/com/uber/rib/core/lifecycle/ActivityCallbackEvent.java b/android/libraries/rib-android-test/src/main/java/com/uber/rib/core/lifecycle/ActivityCallbackEvent.java index 2711b448..475b3273 100644 --- a/android/libraries/rib-android-test/src/main/java/com/uber/rib/core/lifecycle/ActivityCallbackEvent.java +++ b/android/libraries/rib-android-test/src/main/java/com/uber/rib/core/lifecycle/ActivityCallbackEvent.java @@ -18,7 +18,7 @@ package com.uber.rib.core.lifecycle; import android.app.Activity; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import java.util.Locale; diff --git a/android/libraries/rib-android-test/src/main/java/com/uber/rib/core/lifecycle/ActivityLifecycleEvent.java b/android/libraries/rib-android-test/src/main/java/com/uber/rib/core/lifecycle/ActivityLifecycleEvent.java index f7443454..7502aae3 100644 --- a/android/libraries/rib-android-test/src/main/java/com/uber/rib/core/lifecycle/ActivityLifecycleEvent.java +++ b/android/libraries/rib-android-test/src/main/java/com/uber/rib/core/lifecycle/ActivityLifecycleEvent.java @@ -17,7 +17,7 @@ package com.uber.rib.core.lifecycle; import android.app.Activity; import android.os.Bundle; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import java.util.Locale; diff --git a/android/libraries/rib-android-test/src/test/java/com/uber/rib/core/RibActivityTest.java b/android/libraries/rib-android-test/src/test/java/com/uber/rib/core/RibActivityTest.java index 5dc4bc6a..5a6c6095 100644 --- a/android/libraries/rib-android-test/src/test/java/com/uber/rib/core/RibActivityTest.java +++ b/android/libraries/rib-android-test/src/test/java/com/uber/rib/core/RibActivityTest.java @@ -17,8 +17,8 @@ package com.uber.rib.core; import android.app.Activity; import android.content.Intent; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.View; import android.view.ViewGroup; import android.widget.FrameLayout; diff --git a/android/libraries/rib-android-test/src/test/java/com/uber/rib/core/ViewBuilderTest.java b/android/libraries/rib-android-test/src/test/java/com/uber/rib/core/ViewBuilderTest.java index afc9566a..5df1b827 100644 --- a/android/libraries/rib-android-test/src/test/java/com/uber/rib/core/ViewBuilderTest.java +++ b/android/libraries/rib-android-test/src/test/java/com/uber/rib/core/ViewBuilderTest.java @@ -16,7 +16,7 @@ package com.uber.rib.core; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.ContextThemeWrapper; import android.view.LayoutInflater; import android.view.View; diff --git a/android/libraries/rib-android/build.gradle b/android/libraries/rib-android/build.gradle index 01e3ccdd..4c77bc15 100644 --- a/android/libraries/rib-android/build.gradle +++ b/android/libraries/rib-android/build.gradle @@ -42,8 +42,8 @@ dependencies { api deps.external.rxrelay2 api deps.external.rxjava2 implementation deps.apt.javaxInject - implementation deps.support.annotations - implementation deps.support.appcompat + implementation deps.androidx.annotations + implementation deps.androidx.appcompat } apply from: rootProject.file('gradle/gradle-mvn-push.gradle') diff --git a/android/libraries/rib-android/src/main/java/com/uber/rib/core/RibActivity.java b/android/libraries/rib-android/src/main/java/com/uber/rib/core/RibActivity.java index d712a191..9654778f 100644 --- a/android/libraries/rib-android/src/main/java/com/uber/rib/core/RibActivity.java +++ b/android/libraries/rib-android/src/main/java/com/uber/rib/core/RibActivity.java @@ -16,8 +16,8 @@ package com.uber.rib.core; import android.content.Intent; -import android.support.annotation.CallSuper; -import android.support.annotation.Nullable; +import androidx.annotation.CallSuper; +import androidx.annotation.Nullable; import android.view.ViewGroup; import com.jakewharton.rxrelay2.BehaviorRelay; import com.jakewharton.rxrelay2.PublishRelay; @@ -33,7 +33,7 @@ import io.reactivex.CompletableSource; import io.reactivex.Observable; import io.reactivex.functions.Function; import io.reactivex.functions.Predicate; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; /** Base implementation for all VIP {@link android.app.Activity}s. */ public abstract class RibActivity extends AppCompatActivity diff --git a/android/libraries/rib-android/src/main/java/com/uber/rib/core/lifecycle/ActivityCallbackEvent.java b/android/libraries/rib-android/src/main/java/com/uber/rib/core/lifecycle/ActivityCallbackEvent.java index 2711b448..475b3273 100644 --- a/android/libraries/rib-android/src/main/java/com/uber/rib/core/lifecycle/ActivityCallbackEvent.java +++ b/android/libraries/rib-android/src/main/java/com/uber/rib/core/lifecycle/ActivityCallbackEvent.java @@ -18,7 +18,7 @@ package com.uber.rib.core.lifecycle; import android.app.Activity; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import java.util.Locale; diff --git a/android/libraries/rib-android/src/main/java/com/uber/rib/core/lifecycle/ActivityLifecycleEvent.java b/android/libraries/rib-android/src/main/java/com/uber/rib/core/lifecycle/ActivityLifecycleEvent.java index f7443454..7502aae3 100644 --- a/android/libraries/rib-android/src/main/java/com/uber/rib/core/lifecycle/ActivityLifecycleEvent.java +++ b/android/libraries/rib-android/src/main/java/com/uber/rib/core/lifecycle/ActivityLifecycleEvent.java @@ -17,7 +17,7 @@ package com.uber.rib.core.lifecycle; import android.app.Activity; import android.os.Bundle; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import java.util.Locale; diff --git a/android/libraries/rib-base/build.gradle b/android/libraries/rib-base/build.gradle index c9ed4eeb..1123576c 100644 --- a/android/libraries/rib-base/build.gradle +++ b/android/libraries/rib-base/build.gradle @@ -40,10 +40,10 @@ dependencies { compile deps.apt.javaxInject compileOnly deps.apt.daggerCompiler - compileOnly deps.support.annotations + compileOnly deps.androidx.annotations compileOnly deps.apt.androidApi - testCompile deps.support.annotations + testCompile deps.androidx.annotations testCompile deps.apt.androidApi testCompile deps.test.junit testCompile deps.test.mockito diff --git a/android/libraries/rib-base/src/main/java/com/uber/rib/core/Bundle.java b/android/libraries/rib-base/src/main/java/com/uber/rib/core/Bundle.java index 6d1541c9..bae28eab 100644 --- a/android/libraries/rib-base/src/main/java/com/uber/rib/core/Bundle.java +++ b/android/libraries/rib-base/src/main/java/com/uber/rib/core/Bundle.java @@ -16,7 +16,7 @@ package com.uber.rib.core; import android.os.Parcelable; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; /** Uber wrapper around Android Bundle to avoid Android and Robolectric dependencies. */ public class Bundle { diff --git a/android/libraries/rib-base/src/main/java/com/uber/rib/core/Interactor.java b/android/libraries/rib-base/src/main/java/com/uber/rib/core/Interactor.java index 24538795..1bdedbe0 100644 --- a/android/libraries/rib-base/src/main/java/com/uber/rib/core/Interactor.java +++ b/android/libraries/rib-base/src/main/java/com/uber/rib/core/Interactor.java @@ -15,9 +15,9 @@ */ package com.uber.rib.core; -import android.support.annotation.CallSuper; -import android.support.annotation.Nullable; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.CallSuper; +import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; import com.jakewharton.rxrelay2.BehaviorRelay; import com.jakewharton.rxrelay2.Relay; diff --git a/android/libraries/rib-base/src/main/java/com/uber/rib/core/Presenter.java b/android/libraries/rib-base/src/main/java/com/uber/rib/core/Presenter.java index 903c7079..44796547 100644 --- a/android/libraries/rib-base/src/main/java/com/uber/rib/core/Presenter.java +++ b/android/libraries/rib-base/src/main/java/com/uber/rib/core/Presenter.java @@ -15,7 +15,7 @@ */ package com.uber.rib.core; -import android.support.annotation.CallSuper; +import androidx.annotation.CallSuper; import com.jakewharton.rxrelay2.BehaviorRelay; import com.jakewharton.rxrelay2.Relay; diff --git a/android/libraries/rib-base/src/main/java/com/uber/rib/core/Rib.java b/android/libraries/rib-base/src/main/java/com/uber/rib/core/Rib.java index c633fdcc..05e160d2 100644 --- a/android/libraries/rib-base/src/main/java/com/uber/rib/core/Rib.java +++ b/android/libraries/rib-base/src/main/java/com/uber/rib/core/Rib.java @@ -15,7 +15,7 @@ */ package com.uber.rib.core; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; /** Holds configuration and settings for riblets. */ public class Rib { diff --git a/android/libraries/rib-base/src/main/java/com/uber/rib/core/RibRefWatcher.java b/android/libraries/rib-base/src/main/java/com/uber/rib/core/RibRefWatcher.java index 039e3230..81440cab 100644 --- a/android/libraries/rib-base/src/main/java/com/uber/rib/core/RibRefWatcher.java +++ b/android/libraries/rib-base/src/main/java/com/uber/rib/core/RibRefWatcher.java @@ -15,8 +15,8 @@ */ package com.uber.rib.core; -import android.support.annotation.MainThread; -import android.support.annotation.Nullable; +import androidx.annotation.MainThread; +import androidx.annotation.Nullable; /** * Used to watch objects in order to verify they have no inbound references. Used to find memory diff --git a/android/libraries/rib-base/src/main/java/com/uber/rib/core/Router.java b/android/libraries/rib-base/src/main/java/com/uber/rib/core/Router.java index 49a184a8..c2b354e2 100644 --- a/android/libraries/rib-base/src/main/java/com/uber/rib/core/Router.java +++ b/android/libraries/rib-base/src/main/java/com/uber/rib/core/Router.java @@ -16,10 +16,10 @@ package com.uber.rib.core; import android.os.Looper; -import android.support.annotation.CallSuper; -import android.support.annotation.MainThread; -import android.support.annotation.Nullable; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.CallSuper; +import androidx.annotation.MainThread; +import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; import java.util.List; import java.util.Locale; diff --git a/android/libraries/rib-base/src/main/java/com/uber/rib/core/WorkerBinder.java b/android/libraries/rib-base/src/main/java/com/uber/rib/core/WorkerBinder.java index ca4a287b..acda0b2e 100644 --- a/android/libraries/rib-base/src/main/java/com/uber/rib/core/WorkerBinder.java +++ b/android/libraries/rib-base/src/main/java/com/uber/rib/core/WorkerBinder.java @@ -15,7 +15,7 @@ */ package com.uber.rib.core; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import com.jakewharton.rxrelay2.PublishRelay; import com.uber.rib.core.lifecycle.InteractorEvent; diff --git a/android/libraries/rib-base/src/test/java/com/uber/rib/core/InteractorAndRouterTest.java b/android/libraries/rib-base/src/test/java/com/uber/rib/core/InteractorAndRouterTest.java index 0030cd4a..55d31827 100644 --- a/android/libraries/rib-base/src/test/java/com/uber/rib/core/InteractorAndRouterTest.java +++ b/android/libraries/rib-base/src/test/java/com/uber/rib/core/InteractorAndRouterTest.java @@ -15,8 +15,8 @@ */ package com.uber.rib.core; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.uber.autodispose.lifecycle.LifecycleEndedException; import com.uber.rib.core.lifecycle.InteractorEvent; diff --git a/android/libraries/rib-base/src/test/java/com/uber/rib/core/RecordingObserver.java b/android/libraries/rib-base/src/test/java/com/uber/rib/core/RecordingObserver.java index 39162b1e..1f1d5810 100644 --- a/android/libraries/rib-base/src/test/java/com/uber/rib/core/RecordingObserver.java +++ b/android/libraries/rib-base/src/test/java/com/uber/rib/core/RecordingObserver.java @@ -15,7 +15,7 @@ */ package com.uber.rib.core; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.util.NoSuchElementException; import java.util.concurrent.BlockingDeque; diff --git a/android/libraries/rib-compiler-app/build.gradle b/android/libraries/rib-compiler-app/build.gradle index 5cd2ea3d..da8f039c 100644 --- a/android/libraries/rib-compiler-app/build.gradle +++ b/android/libraries/rib-compiler-app/build.gradle @@ -26,7 +26,7 @@ dependencies { compile deps.external.dagger compile deps.apt.javapoet - compileOnly deps.support.annotations + compileOnly deps.androidx.annotations compileOnly deps.apt.autoService compileOnly deps.apt.androidApi diff --git a/android/libraries/rib-compiler-app/src/main/java/com/uber/rib/compiler/ErrorReporter.java b/android/libraries/rib-compiler-app/src/main/java/com/uber/rib/compiler/ErrorReporter.java index 7fd6781f..6bc7da98 100644 --- a/android/libraries/rib-compiler-app/src/main/java/com/uber/rib/compiler/ErrorReporter.java +++ b/android/libraries/rib-compiler-app/src/main/java/com/uber/rib/compiler/ErrorReporter.java @@ -15,7 +15,7 @@ */ package com.uber.rib.compiler; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import javax.annotation.processing.Messager; import javax.lang.model.element.Element; diff --git a/android/libraries/rib-compiler-app/src/main/java/com/uber/rib/compiler/RibInteractorProcessorPipeline.java b/android/libraries/rib-compiler-app/src/main/java/com/uber/rib/compiler/RibInteractorProcessorPipeline.java index adfb7e91..cc5ba7e1 100644 --- a/android/libraries/rib-compiler-app/src/main/java/com/uber/rib/compiler/RibInteractorProcessorPipeline.java +++ b/android/libraries/rib-compiler-app/src/main/java/com/uber/rib/compiler/RibInteractorProcessorPipeline.java @@ -15,7 +15,7 @@ */ package com.uber.rib.compiler; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.uber.rib.core.RibInteractor; diff --git a/android/libraries/rib-compiler-test/build.gradle b/android/libraries/rib-compiler-test/build.gradle index 8214b2af..5a3ae802 100644 --- a/android/libraries/rib-compiler-test/build.gradle +++ b/android/libraries/rib-compiler-test/build.gradle @@ -19,12 +19,12 @@ apply plugin: "java-library" dependencies { compile project(":libraries:rib-compiler-app") - compileOnly deps.support.annotations + compileOnly deps.androidx.annotations annotationProcessor deps.apt.autoService compileOnly deps.apt.autoService compileOnly deps.apt.androidApi - testCompile deps.support.annotations + testCompile deps.androidx.annotations testCompile deps.test.compileTesting } diff --git a/android/libraries/rib-compiler-test/src/test/java/com/uber/rib/compiler/InteractorTestGeneratorProcessorTestBase.java b/android/libraries/rib-compiler-test/src/test/java/com/uber/rib/compiler/InteractorTestGeneratorProcessorTestBase.java index 10aa8f36..ede3947c 100644 --- a/android/libraries/rib-compiler-test/src/test/java/com/uber/rib/compiler/InteractorTestGeneratorProcessorTestBase.java +++ b/android/libraries/rib-compiler-test/src/test/java/com/uber/rib/compiler/InteractorTestGeneratorProcessorTestBase.java @@ -15,7 +15,7 @@ */ package com.uber.rib.compiler; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.google.common.collect.ImmutableSet; import com.google.testing.compile.JavaFileObjects; diff --git a/android/libraries/rib-router-navigator/build.gradle b/android/libraries/rib-router-navigator/build.gradle index d4fea4a6..e9920b9a 100644 --- a/android/libraries/rib-router-navigator/build.gradle +++ b/android/libraries/rib-router-navigator/build.gradle @@ -21,7 +21,7 @@ targetCompatibility = deps.build.javaVersion.toString() dependencies { compile project(':libraries:rib-base') - compileOnly deps.support.annotations + compileOnly deps.androidx.annotations compileOnly deps.apt.androidApi testCompile deps.test.junit diff --git a/android/libraries/rib-router-navigator/src/main/java/com/uber/rib/core/ModernRouterNavigator.java b/android/libraries/rib-router-navigator/src/main/java/com/uber/rib/core/ModernRouterNavigator.java index 9724e27c..65f85a60 100644 --- a/android/libraries/rib-router-navigator/src/main/java/com/uber/rib/core/ModernRouterNavigator.java +++ b/android/libraries/rib-router-navigator/src/main/java/com/uber/rib/core/ModernRouterNavigator.java @@ -15,8 +15,8 @@ */ package com.uber.rib.core; -import android.support.annotation.IntRange; -import android.support.annotation.Nullable; +import androidx.annotation.IntRange; +import androidx.annotation.Nullable; import java.util.ArrayDeque; import java.util.Locale; diff --git a/android/libraries/rib-router-navigator/src/main/java/com/uber/rib/core/RouterNavigator.java b/android/libraries/rib-router-navigator/src/main/java/com/uber/rib/core/RouterNavigator.java index 5d0752b8..7081e089 100644 --- a/android/libraries/rib-router-navigator/src/main/java/com/uber/rib/core/RouterNavigator.java +++ b/android/libraries/rib-router-navigator/src/main/java/com/uber/rib/core/RouterNavigator.java @@ -15,8 +15,8 @@ */ package com.uber.rib.core; -import android.support.annotation.IntRange; -import android.support.annotation.Nullable; +import androidx.annotation.IntRange; +import androidx.annotation.Nullable; /** * Simple utility for switching a child router based on a state. diff --git a/android/libraries/rib-router-navigator/src/main/java/com/uber/rib/core/RouterNavigatorFactory.java b/android/libraries/rib-router-navigator/src/main/java/com/uber/rib/core/RouterNavigatorFactory.java index b41eec4e..ffd59196 100644 --- a/android/libraries/rib-router-navigator/src/main/java/com/uber/rib/core/RouterNavigatorFactory.java +++ b/android/libraries/rib-router-navigator/src/main/java/com/uber/rib/core/RouterNavigatorFactory.java @@ -15,7 +15,7 @@ */ package com.uber.rib.core; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; /** Factory for the creation of {@link RouterNavigator}s. */ public final class RouterNavigatorFactory { diff --git a/android/libraries/rib-screen-stack-base/build.gradle b/android/libraries/rib-screen-stack-base/build.gradle index f73dd9cb..7742d3ef 100644 --- a/android/libraries/rib-screen-stack-base/build.gradle +++ b/android/libraries/rib-screen-stack-base/build.gradle @@ -41,7 +41,7 @@ dependencies { api deps.external.rxjava2 api deps.external.rxrelay2 api deps.external.rxbinding - implementation deps.support.annotations + implementation deps.androidx.annotations } apply from: rootProject.file('gradle/gradle-mvn-push.gradle') diff --git a/android/libraries/rib-screen-stack-base/src/main/java/com/uber/rib/core/screenstack/ScreenStackBase.java b/android/libraries/rib-screen-stack-base/src/main/java/com/uber/rib/core/screenstack/ScreenStackBase.java index 9013e62b..307f72b0 100644 --- a/android/libraries/rib-screen-stack-base/src/main/java/com/uber/rib/core/screenstack/ScreenStackBase.java +++ b/android/libraries/rib-screen-stack-base/src/main/java/com/uber/rib/core/screenstack/ScreenStackBase.java @@ -16,7 +16,7 @@ package com.uber.rib.core.screenstack; -import android.support.annotation.IntRange; +import androidx.annotation.IntRange; /** Implementation of a view based screen stack. */ public interface ScreenStackBase { diff --git a/android/libraries/rib-screen-stack-base/src/main/java/com/uber/rib/core/screenstack/ViewProvider.java b/android/libraries/rib-screen-stack-base/src/main/java/com/uber/rib/core/screenstack/ViewProvider.java index 1b53e152..44319e11 100644 --- a/android/libraries/rib-screen-stack-base/src/main/java/com/uber/rib/core/screenstack/ViewProvider.java +++ b/android/libraries/rib-screen-stack-base/src/main/java/com/uber/rib/core/screenstack/ViewProvider.java @@ -16,7 +16,7 @@ package com.uber.rib.core.screenstack; -import android.support.annotation.CallSuper; +import androidx.annotation.CallSuper; import android.view.View; import android.view.ViewGroup; diff --git a/android/libraries/rib-test-utils/build.gradle b/android/libraries/rib-test-utils/build.gradle index da8e207e..7ae51467 100644 --- a/android/libraries/rib-test-utils/build.gradle +++ b/android/libraries/rib-test-utils/build.gradle @@ -21,7 +21,7 @@ targetCompatibility = deps.build.javaVersion.toString() dependencies { compile project(":libraries:rib-base") - compileOnly deps.support.annotations + compileOnly deps.androidx.annotations compile deps.external.rxjava2 compile deps.test.junit compile deps.test.assertj diff --git a/android/libraries/rib-test-utils/src/main/java/com/uber/rib/core/InteractorHelper.java b/android/libraries/rib-test-utils/src/main/java/com/uber/rib/core/InteractorHelper.java index f4883b5f..f141de77 100644 --- a/android/libraries/rib-test-utils/src/main/java/com/uber/rib/core/InteractorHelper.java +++ b/android/libraries/rib-test-utils/src/main/java/com/uber/rib/core/InteractorHelper.java @@ -15,7 +15,7 @@ */ package com.uber.rib.core; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import static org.mockito.AdditionalMatchers.or; import static org.mockito.Matchers.isA; diff --git a/android/libraries/rib-uava/build.gradle b/android/libraries/rib-uava/build.gradle index c4917cc5..5915b9f7 100644 --- a/android/libraries/rib-uava/build.gradle +++ b/android/libraries/rib-uava/build.gradle @@ -20,7 +20,7 @@ sourceCompatibility = deps.build.javaVersion.toString() targetCompatibility = deps.build.javaVersion.toString() dependencies { - compileOnly deps.support.annotations + compileOnly deps.androidx.annotations } apply from: rootProject.file('gradle/gradle-mvn-push.gradle') diff --git a/android/libraries/rib-uava/src/main/java/com/uber/rib/core/Absent.java b/android/libraries/rib-uava/src/main/java/com/uber/rib/core/Absent.java index 431bdb8d..afd0fcf6 100644 --- a/android/libraries/rib-uava/src/main/java/com/uber/rib/core/Absent.java +++ b/android/libraries/rib-uava/src/main/java/com/uber/rib/core/Absent.java @@ -15,7 +15,7 @@ package com.uber.rib.core; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import java.util.function.Function; diff --git a/android/libraries/rib-uava/src/main/java/com/uber/rib/core/Optional.java b/android/libraries/rib-uava/src/main/java/com/uber/rib/core/Optional.java index 84da02df..737ac814 100644 --- a/android/libraries/rib-uava/src/main/java/com/uber/rib/core/Optional.java +++ b/android/libraries/rib-uava/src/main/java/com/uber/rib/core/Optional.java @@ -15,7 +15,7 @@ package com.uber.rib.core; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import java.util.function.Function; diff --git a/android/libraries/rib-uava/src/main/java/com/uber/rib/core/Preconditions.java b/android/libraries/rib-uava/src/main/java/com/uber/rib/core/Preconditions.java index f4676a51..a40b38c7 100644 --- a/android/libraries/rib-uava/src/main/java/com/uber/rib/core/Preconditions.java +++ b/android/libraries/rib-uava/src/main/java/com/uber/rib/core/Preconditions.java @@ -15,7 +15,7 @@ package com.uber.rib.core; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; /** * Static convenience methods that help a method or constructor check whether it was invoked diff --git a/android/libraries/rib-workflow-test-utils/build.gradle b/android/libraries/rib-workflow-test-utils/build.gradle index 05b17a7b..8fdc5cfa 100644 --- a/android/libraries/rib-workflow-test-utils/build.gradle +++ b/android/libraries/rib-workflow-test-utils/build.gradle @@ -45,7 +45,7 @@ android { } dependencies { - compileOnly deps.support.annotations + compileOnly deps.androidx.annotations api project(":libraries:rib-workflow") api project(":libraries:rib-uava") api deps.external.rxjava2 diff --git a/android/libraries/rib-workflow-test-utils/src/main/java/com/uber/rib/workflow/core/StepTester.java b/android/libraries/rib-workflow-test-utils/src/main/java/com/uber/rib/workflow/core/StepTester.java index 8d87ee3a..3f84415f 100644 --- a/android/libraries/rib-workflow-test-utils/src/main/java/com/uber/rib/workflow/core/StepTester.java +++ b/android/libraries/rib-workflow-test-utils/src/main/java/com/uber/rib/workflow/core/StepTester.java @@ -16,7 +16,7 @@ package com.uber.rib.workflow.core; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.uber.rib.core.Optional; diff --git a/android/libraries/rib-workflow/build.gradle b/android/libraries/rib-workflow/build.gradle index bfe2ada8..654ee2d1 100644 --- a/android/libraries/rib-workflow/build.gradle +++ b/android/libraries/rib-workflow/build.gradle @@ -38,7 +38,7 @@ android { } dependencies { - implementation deps.support.annotations + implementation deps.androidx.annotations implementation deps.external.rxandroid2 api deps.external.rxjava2 api project(':libraries:rib-uava') diff --git a/android/libraries/rib-workflow/src/test/java/com/uber/rib/workflow/core/DelegatingScheduler.java b/android/libraries/rib-workflow/src/test/java/com/uber/rib/workflow/core/DelegatingScheduler.java index d02591a3..9efc240a 100644 --- a/android/libraries/rib-workflow/src/test/java/com/uber/rib/workflow/core/DelegatingScheduler.java +++ b/android/libraries/rib-workflow/src/test/java/com/uber/rib/workflow/core/DelegatingScheduler.java @@ -16,8 +16,8 @@ package com.uber.rib.workflow.core; -import android.support.annotation.RestrictTo; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.RestrictTo; +import androidx.annotation.VisibleForTesting; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; @@ -25,7 +25,7 @@ import java.util.concurrent.atomic.AtomicReference; import io.reactivex.Scheduler; import io.reactivex.schedulers.Schedulers; -import static android.support.annotation.RestrictTo.Scope.GROUP_ID; +import static androidx.annotation.RestrictTo.Scope.GROUP_ID; @RestrictTo(GROUP_ID) class DelegatingScheduler extends Scheduler { diff --git a/android/libraries/rib-workflow/src/test/java/com/uber/rib/workflow/core/StepTest.java b/android/libraries/rib-workflow/src/test/java/com/uber/rib/workflow/core/StepTest.java index c8096d09..29736956 100644 --- a/android/libraries/rib-workflow/src/test/java/com/uber/rib/workflow/core/StepTest.java +++ b/android/libraries/rib-workflow/src/test/java/com/uber/rib/workflow/core/StepTest.java @@ -16,7 +16,7 @@ package com.uber.rib.workflow.core; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.uber.rib.core.Optional; import com.uber.rib.core.lifecycle.InteractorEvent; diff --git a/android/libraries/rib-workflow/src/test/java/com/uber/rib/workflow/core/WorkflowTest.java b/android/libraries/rib-workflow/src/test/java/com/uber/rib/workflow/core/WorkflowTest.java index 74ee6696..3075c48e 100644 --- a/android/libraries/rib-workflow/src/test/java/com/uber/rib/workflow/core/WorkflowTest.java +++ b/android/libraries/rib-workflow/src/test/java/com/uber/rib/workflow/core/WorkflowTest.java @@ -16,7 +16,7 @@ package com.uber.rib.workflow.core; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.uber.rib.core.Optional; import com.uber.rib.core.lifecycle.InteractorEvent; diff --git a/android/tooling/rib-intellij-plugin/build.gradle b/android/tooling/rib-intellij-plugin/build.gradle index efb76ccd..4efc1230 100644 --- a/android/tooling/rib-intellij-plugin/build.gradle +++ b/android/tooling/rib-intellij-plugin/build.gradle @@ -18,7 +18,7 @@ dependencies { compile deps.apt.androidApi compile deps.build.commonsLang compile deps.build.guava - compile deps.support.annotations + compile deps.androidx.annotations testCompile(project(":libraries:rib-base")) { transitive = false diff --git a/android/tooling/rib-intellij-plugin/src/main/resources/templates/java/RibBuilder.java.template b/android/tooling/rib-intellij-plugin/src/main/resources/templates/java/RibBuilder.java.template index a5b46941..e406d3c9 100644 --- a/android/tooling/rib-intellij-plugin/src/main/resources/templates/java/RibBuilder.java.template +++ b/android/tooling/rib-intellij-plugin/src/main/resources/templates/java/RibBuilder.java.template @@ -1,6 +1,6 @@ package ${package_name}; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.uber.rib.core.Builder; import com.uber.rib.core.EmptyPresenter; diff --git a/android/tooling/rib-intellij-plugin/src/main/resources/templates/java/RibInteractorWithEmptyPresenter.java.template b/android/tooling/rib-intellij-plugin/src/main/resources/templates/java/RibInteractorWithEmptyPresenter.java.template index 429ef017..b7773d72 100644 --- a/android/tooling/rib-intellij-plugin/src/main/resources/templates/java/RibInteractorWithEmptyPresenter.java.template +++ b/android/tooling/rib-intellij-plugin/src/main/resources/templates/java/RibInteractorWithEmptyPresenter.java.template @@ -1,6 +1,6 @@ package ${package_name}; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.uber.rib.core.Bundle; import com.uber.rib.core.EmptyPresenter; diff --git a/android/tooling/rib-intellij-plugin/src/main/resources/templates/java/RibInteractorWithPresenter.java.template b/android/tooling/rib-intellij-plugin/src/main/resources/templates/java/RibInteractorWithPresenter.java.template index f1a756b0..a24839ef 100644 --- a/android/tooling/rib-intellij-plugin/src/main/resources/templates/java/RibInteractorWithPresenter.java.template +++ b/android/tooling/rib-intellij-plugin/src/main/resources/templates/java/RibInteractorWithPresenter.java.template @@ -1,6 +1,6 @@ package ${package_name}; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.uber.rib.core.Bundle; import com.uber.rib.core.Interactor; diff --git a/android/tooling/rib-intellij-plugin/src/main/resources/templates/java/RibRouter.java.template b/android/tooling/rib-intellij-plugin/src/main/resources/templates/java/RibRouter.java.template index 07f8e3dd..e7746874 100644 --- a/android/tooling/rib-intellij-plugin/src/main/resources/templates/java/RibRouter.java.template +++ b/android/tooling/rib-intellij-plugin/src/main/resources/templates/java/RibRouter.java.template @@ -1,6 +1,6 @@ package ${package_name}; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.View; import com.uber.rib.core.Router; diff --git a/android/tooling/rib-intellij-plugin/src/main/resources/templates/java/RibView.java.template b/android/tooling/rib-intellij-plugin/src/main/resources/templates/java/RibView.java.template index 3b08ec82..2748904a 100644 --- a/android/tooling/rib-intellij-plugin/src/main/resources/templates/java/RibView.java.template +++ b/android/tooling/rib-intellij-plugin/src/main/resources/templates/java/RibView.java.template @@ -1,8 +1,8 @@ package ${package_name}; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.view.View; diff --git a/android/tooling/rib-intellij-plugin/src/main/resources/templates/java/RibViewBuilder.java.template b/android/tooling/rib-intellij-plugin/src/main/resources/templates/java/RibViewBuilder.java.template index 63ded242..110bd92e 100644 --- a/android/tooling/rib-intellij-plugin/src/main/resources/templates/java/RibViewBuilder.java.template +++ b/android/tooling/rib-intellij-plugin/src/main/resources/templates/java/RibViewBuilder.java.template @@ -1,6 +1,6 @@ package ${package_name}; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.LayoutInflater; import android.view.ViewGroup; diff --git a/android/tooling/rib-intellij-plugin/src/main/resources/templates/java/RibViewRouter.java.template b/android/tooling/rib-intellij-plugin/src/main/resources/templates/java/RibViewRouter.java.template index 216dfa21..bc08bcac 100644 --- a/android/tooling/rib-intellij-plugin/src/main/resources/templates/java/RibViewRouter.java.template +++ b/android/tooling/rib-intellij-plugin/src/main/resources/templates/java/RibViewRouter.java.template @@ -1,6 +1,6 @@ package ${package_name}; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.View; import com.uber.rib.core.ViewRouter; diff --git a/android/tooling/rib-intellij-plugin/src/test/java/com/uber/presidio/intellij_plugin/action/rib/RibGeneratorsTest.java b/android/tooling/rib-intellij-plugin/src/test/java/com/uber/presidio/intellij_plugin/action/rib/RibGeneratorsTest.java index 1b4bb759..f62c40db 100644 --- a/android/tooling/rib-intellij-plugin/src/test/java/com/uber/presidio/intellij_plugin/action/rib/RibGeneratorsTest.java +++ b/android/tooling/rib-intellij-plugin/src/test/java/com/uber/presidio/intellij_plugin/action/rib/RibGeneratorsTest.java @@ -15,7 +15,7 @@ */ package com.uber.presidio.intellij_plugin.action.rib; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.google.testing.compile.JavaFileObjects; import com.uber.presidio.intellij_plugin.generator.Generator; diff --git a/android/tutorials/tutorial1/build.gradle b/android/tutorials/tutorial1/build.gradle index 27805943..f69465fd 100644 --- a/android/tutorials/tutorial1/build.gradle +++ b/android/tutorials/tutorial1/build.gradle @@ -53,7 +53,7 @@ dependencies { annotationProcessor deps.apt.daggerCompiler annotationProcessor deps.apt.nullAway implementation project(":libraries:rib-android") - implementation deps.support.appcompat + implementation deps.androidx.appcompat implementation deps.external.dagger implementation deps.external.rxbinding compileOnly deps.apt.javax diff --git a/android/tutorials/tutorial1/src/main/java/com/uber/rib/root/RootInteractor.java b/android/tutorials/tutorial1/src/main/java/com/uber/rib/root/RootInteractor.java index 6fd3fa11..ad548ace 100644 --- a/android/tutorials/tutorial1/src/main/java/com/uber/rib/root/RootInteractor.java +++ b/android/tutorials/tutorial1/src/main/java/com/uber/rib/root/RootInteractor.java @@ -16,7 +16,7 @@ package com.uber.rib.root; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.uber.rib.core.Bundle; import com.uber.rib.core.Interactor; diff --git a/android/tutorials/tutorial1/src/main/java/com/uber/rib/root/RootView.java b/android/tutorials/tutorial1/src/main/java/com/uber/rib/root/RootView.java index 395950cd..3174d612 100644 --- a/android/tutorials/tutorial1/src/main/java/com/uber/rib/root/RootView.java +++ b/android/tutorials/tutorial1/src/main/java/com/uber/rib/root/RootView.java @@ -17,7 +17,7 @@ package com.uber.rib.root; import android.content.Context; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.widget.FrameLayout; diff --git a/android/tutorials/tutorial2/build.gradle b/android/tutorials/tutorial2/build.gradle index 4bd6a641..65979c8a 100644 --- a/android/tutorials/tutorial2/build.gradle +++ b/android/tutorials/tutorial2/build.gradle @@ -55,8 +55,8 @@ dependencies { annotationProcessor project(":libraries:rib-compiler-test") annotationProcessor deps.apt.nullAway implementation project(":libraries:rib-android") - implementation deps.support.appcompat - implementation deps.support.percent + implementation deps.androidx.appcompat + implementation deps.androidx.percent implementation deps.external.dagger implementation deps.external.rxbinding compileOnly deps.apt.androidApi diff --git a/android/tutorials/tutorial2/src/main/java/com/uber/rib/root/RootInteractor.java b/android/tutorials/tutorial2/src/main/java/com/uber/rib/root/RootInteractor.java index edf6514c..f0f58be5 100644 --- a/android/tutorials/tutorial2/src/main/java/com/uber/rib/root/RootInteractor.java +++ b/android/tutorials/tutorial2/src/main/java/com/uber/rib/root/RootInteractor.java @@ -16,7 +16,7 @@ package com.uber.rib.root; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.uber.rib.core.Bundle; import com.uber.rib.core.Interactor; diff --git a/android/tutorials/tutorial2/src/main/java/com/uber/rib/root/RootRouter.java b/android/tutorials/tutorial2/src/main/java/com/uber/rib/root/RootRouter.java index 1521b12d..bdf7fd66 100644 --- a/android/tutorials/tutorial2/src/main/java/com/uber/rib/root/RootRouter.java +++ b/android/tutorials/tutorial2/src/main/java/com/uber/rib/root/RootRouter.java @@ -16,7 +16,7 @@ package com.uber.rib.root; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.uber.rib.core.ViewRouter; import com.uber.rib.root.logged_out.LoggedOutBuilder; diff --git a/android/tutorials/tutorial2/src/main/java/com/uber/rib/root/RootView.java b/android/tutorials/tutorial2/src/main/java/com/uber/rib/root/RootView.java index 395950cd..3174d612 100644 --- a/android/tutorials/tutorial2/src/main/java/com/uber/rib/root/RootView.java +++ b/android/tutorials/tutorial2/src/main/java/com/uber/rib/root/RootView.java @@ -17,7 +17,7 @@ package com.uber.rib.root; import android.content.Context; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.widget.FrameLayout; diff --git a/android/tutorials/tutorial2/src/main/java/com/uber/rib/root/logged_in/off_game/OffGameInteractor.java b/android/tutorials/tutorial2/src/main/java/com/uber/rib/root/logged_in/off_game/OffGameInteractor.java index 604fc4e9..cd837ff2 100644 --- a/android/tutorials/tutorial2/src/main/java/com/uber/rib/root/logged_in/off_game/OffGameInteractor.java +++ b/android/tutorials/tutorial2/src/main/java/com/uber/rib/root/logged_in/off_game/OffGameInteractor.java @@ -16,7 +16,7 @@ package com.uber.rib.root.logged_in.off_game; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.uber.rib.core.Bundle; import com.uber.rib.core.Interactor; diff --git a/android/tutorials/tutorial2/src/main/java/com/uber/rib/root/logged_in/off_game/OffGameView.java b/android/tutorials/tutorial2/src/main/java/com/uber/rib/root/logged_in/off_game/OffGameView.java index 9af85f98..e6e51b10 100644 --- a/android/tutorials/tutorial2/src/main/java/com/uber/rib/root/logged_in/off_game/OffGameView.java +++ b/android/tutorials/tutorial2/src/main/java/com/uber/rib/root/logged_in/off_game/OffGameView.java @@ -17,7 +17,7 @@ package com.uber.rib.root.logged_in.off_game; import android.content.Context; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.widget.Button; import android.widget.LinearLayout; diff --git a/android/tutorials/tutorial2/src/main/java/com/uber/rib/root/logged_in/tic_tac_toe/TicTacToeInteractor.java b/android/tutorials/tutorial2/src/main/java/com/uber/rib/root/logged_in/tic_tac_toe/TicTacToeInteractor.java index 5b19dd91..7a5ed509 100644 --- a/android/tutorials/tutorial2/src/main/java/com/uber/rib/root/logged_in/tic_tac_toe/TicTacToeInteractor.java +++ b/android/tutorials/tutorial2/src/main/java/com/uber/rib/root/logged_in/tic_tac_toe/TicTacToeInteractor.java @@ -16,7 +16,7 @@ package com.uber.rib.root.logged_in.tic_tac_toe; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.uber.rib.core.Bundle; import com.uber.rib.core.Interactor; diff --git a/android/tutorials/tutorial2/src/main/java/com/uber/rib/root/logged_in/tic_tac_toe/TicTacToeView.java b/android/tutorials/tutorial2/src/main/java/com/uber/rib/root/logged_in/tic_tac_toe/TicTacToeView.java index ad8b76a0..85b6c9c1 100644 --- a/android/tutorials/tutorial2/src/main/java/com/uber/rib/root/logged_in/tic_tac_toe/TicTacToeView.java +++ b/android/tutorials/tutorial2/src/main/java/com/uber/rib/root/logged_in/tic_tac_toe/TicTacToeView.java @@ -17,8 +17,8 @@ package com.uber.rib.root.logged_in.tic_tac_toe; import android.content.Context; -import android.support.annotation.Nullable; -import android.support.percent.PercentRelativeLayout; +import androidx.annotation.Nullable; +import androidx.percentlayout.widget.PercentRelativeLayout; import android.util.AttributeSet; import android.widget.TextView; diff --git a/android/tutorials/tutorial2/src/main/java/com/uber/rib/root/logged_out/LoggedOutInteractor.java b/android/tutorials/tutorial2/src/main/java/com/uber/rib/root/logged_out/LoggedOutInteractor.java index 3e8ebf38..a70ced70 100644 --- a/android/tutorials/tutorial2/src/main/java/com/uber/rib/root/logged_out/LoggedOutInteractor.java +++ b/android/tutorials/tutorial2/src/main/java/com/uber/rib/root/logged_out/LoggedOutInteractor.java @@ -1,6 +1,6 @@ package com.uber.rib.root.logged_out; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.Log; import android.widget.Toast; diff --git a/android/tutorials/tutorial2/src/main/java/com/uber/rib/root/logged_out/LoggedOutView.java b/android/tutorials/tutorial2/src/main/java/com/uber/rib/root/logged_out/LoggedOutView.java index bd7da239..8ec553a9 100644 --- a/android/tutorials/tutorial2/src/main/java/com/uber/rib/root/logged_out/LoggedOutView.java +++ b/android/tutorials/tutorial2/src/main/java/com/uber/rib/root/logged_out/LoggedOutView.java @@ -1,7 +1,7 @@ package com.uber.rib.root.logged_out; import android.content.Context; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.widget.FrameLayout; import android.widget.LinearLayout; diff --git a/android/tutorials/tutorial3-completed/build.gradle b/android/tutorials/tutorial3-completed/build.gradle index 5bba014b..a8daed4e 100644 --- a/android/tutorials/tutorial3-completed/build.gradle +++ b/android/tutorials/tutorial3-completed/build.gradle @@ -50,11 +50,11 @@ dependencies { annotationProcessor deps.apt.daggerCompiler annotationProcessor project(":libraries:rib-compiler-test") implementation project(":libraries:rib-android") - implementation deps.support.appcompat + implementation deps.androidx.appcompat implementation deps.external.dagger implementation deps.external.rxbinding implementation deps.build.guava - implementation deps.support.percent + implementation deps.androidx.percent compileOnly deps.apt.javax testImplementation project(":libraries:rib-test-utils") } diff --git a/android/tutorials/tutorial3-completed/src/main/java/com/uber/rib/root/RootInteractor.java b/android/tutorials/tutorial3-completed/src/main/java/com/uber/rib/root/RootInteractor.java index a0f113aa..475165d7 100644 --- a/android/tutorials/tutorial3-completed/src/main/java/com/uber/rib/root/RootInteractor.java +++ b/android/tutorials/tutorial3-completed/src/main/java/com/uber/rib/root/RootInteractor.java @@ -16,7 +16,7 @@ package com.uber.rib.root; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.uber.rib.core.Bundle; import com.uber.rib.core.Interactor; import com.uber.rib.core.RibInteractor; diff --git a/android/tutorials/tutorial3-completed/src/main/java/com/uber/rib/root/RootRouter.java b/android/tutorials/tutorial3-completed/src/main/java/com/uber/rib/root/RootRouter.java index 017bda80..ad47b441 100644 --- a/android/tutorials/tutorial3-completed/src/main/java/com/uber/rib/root/RootRouter.java +++ b/android/tutorials/tutorial3-completed/src/main/java/com/uber/rib/root/RootRouter.java @@ -16,7 +16,7 @@ package com.uber.rib.root; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.uber.rib.core.ViewRouter; import com.uber.rib.root.logged_in.LoggedInBuilder; diff --git a/android/tutorials/tutorial3-completed/src/main/java/com/uber/rib/root/RootView.java b/android/tutorials/tutorial3-completed/src/main/java/com/uber/rib/root/RootView.java index 395950cd..3174d612 100644 --- a/android/tutorials/tutorial3-completed/src/main/java/com/uber/rib/root/RootView.java +++ b/android/tutorials/tutorial3-completed/src/main/java/com/uber/rib/root/RootView.java @@ -17,7 +17,7 @@ package com.uber.rib.root; import android.content.Context; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.widget.FrameLayout; diff --git a/android/tutorials/tutorial3-completed/src/main/java/com/uber/rib/root/logged_in/LoggedInInteractor.java b/android/tutorials/tutorial3-completed/src/main/java/com/uber/rib/root/logged_in/LoggedInInteractor.java index 98724236..195d055c 100644 --- a/android/tutorials/tutorial3-completed/src/main/java/com/uber/rib/root/logged_in/LoggedInInteractor.java +++ b/android/tutorials/tutorial3-completed/src/main/java/com/uber/rib/root/logged_in/LoggedInInteractor.java @@ -16,7 +16,7 @@ package com.uber.rib.root.logged_in; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.uber.rib.core.Bundle; import com.uber.rib.core.EmptyPresenter; import com.uber.rib.core.Interactor; diff --git a/android/tutorials/tutorial3-completed/src/main/java/com/uber/rib/root/logged_in/off_game/OffGameInteractor.java b/android/tutorials/tutorial3-completed/src/main/java/com/uber/rib/root/logged_in/off_game/OffGameInteractor.java index 338011cf..553159ff 100644 --- a/android/tutorials/tutorial3-completed/src/main/java/com/uber/rib/root/logged_in/off_game/OffGameInteractor.java +++ b/android/tutorials/tutorial3-completed/src/main/java/com/uber/rib/root/logged_in/off_game/OffGameInteractor.java @@ -16,7 +16,7 @@ package com.uber.rib.root.logged_in.off_game; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.uber.rib.core.Bundle; import com.uber.rib.core.Interactor; import com.uber.rib.core.RibInteractor; diff --git a/android/tutorials/tutorial3-completed/src/main/java/com/uber/rib/root/logged_in/off_game/OffGameView.java b/android/tutorials/tutorial3-completed/src/main/java/com/uber/rib/root/logged_in/off_game/OffGameView.java index 7ee39611..f4583eb9 100644 --- a/android/tutorials/tutorial3-completed/src/main/java/com/uber/rib/root/logged_in/off_game/OffGameView.java +++ b/android/tutorials/tutorial3-completed/src/main/java/com/uber/rib/root/logged_in/off_game/OffGameView.java @@ -17,7 +17,7 @@ package com.uber.rib.root.logged_in.off_game; import android.content.Context; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.widget.Button; import android.widget.LinearLayout; diff --git a/android/tutorials/tutorial3-completed/src/main/java/com/uber/rib/root/logged_in/tic_tac_toe/TicTacToeInteractor.java b/android/tutorials/tutorial3-completed/src/main/java/com/uber/rib/root/logged_in/tic_tac_toe/TicTacToeInteractor.java index 3784da94..0879d822 100644 --- a/android/tutorials/tutorial3-completed/src/main/java/com/uber/rib/root/logged_in/tic_tac_toe/TicTacToeInteractor.java +++ b/android/tutorials/tutorial3-completed/src/main/java/com/uber/rib/root/logged_in/tic_tac_toe/TicTacToeInteractor.java @@ -16,7 +16,7 @@ package com.uber.rib.root.logged_in.tic_tac_toe; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.uber.rib.core.Bundle; import com.uber.rib.core.Interactor; import com.uber.rib.core.RibInteractor; diff --git a/android/tutorials/tutorial3-completed/src/main/java/com/uber/rib/root/logged_in/tic_tac_toe/TicTacToeView.java b/android/tutorials/tutorial3-completed/src/main/java/com/uber/rib/root/logged_in/tic_tac_toe/TicTacToeView.java index ad8b76a0..85b6c9c1 100644 --- a/android/tutorials/tutorial3-completed/src/main/java/com/uber/rib/root/logged_in/tic_tac_toe/TicTacToeView.java +++ b/android/tutorials/tutorial3-completed/src/main/java/com/uber/rib/root/logged_in/tic_tac_toe/TicTacToeView.java @@ -17,8 +17,8 @@ package com.uber.rib.root.logged_in.tic_tac_toe; import android.content.Context; -import android.support.annotation.Nullable; -import android.support.percent.PercentRelativeLayout; +import androidx.annotation.Nullable; +import androidx.percentlayout.widget.PercentRelativeLayout; import android.util.AttributeSet; import android.widget.TextView; diff --git a/android/tutorials/tutorial3-completed/src/main/java/com/uber/rib/root/logged_out/LoggedOutInteractor.java b/android/tutorials/tutorial3-completed/src/main/java/com/uber/rib/root/logged_out/LoggedOutInteractor.java index 33d624e3..01cde109 100644 --- a/android/tutorials/tutorial3-completed/src/main/java/com/uber/rib/root/logged_out/LoggedOutInteractor.java +++ b/android/tutorials/tutorial3-completed/src/main/java/com/uber/rib/root/logged_out/LoggedOutInteractor.java @@ -16,8 +16,8 @@ package com.uber.rib.root.logged_out; -import android.support.annotation.Nullable; -import android.support.v4.util.Pair; +import androidx.annotation.Nullable; +import androidx.core.util.Pair; import com.uber.rib.core.Bundle; import com.uber.rib.core.Interactor; diff --git a/android/tutorials/tutorial3-completed/src/main/java/com/uber/rib/root/logged_out/LoggedOutView.java b/android/tutorials/tutorial3-completed/src/main/java/com/uber/rib/root/logged_out/LoggedOutView.java index 5f8375bf..d5b5f1ce 100644 --- a/android/tutorials/tutorial3-completed/src/main/java/com/uber/rib/root/logged_out/LoggedOutView.java +++ b/android/tutorials/tutorial3-completed/src/main/java/com/uber/rib/root/logged_out/LoggedOutView.java @@ -1,8 +1,8 @@ package com.uber.rib.root.logged_out; import android.content.Context; -import android.support.annotation.Nullable; -import android.support.v4.util.Pair; +import androidx.annotation.Nullable; +import androidx.core.util.Pair; import android.util.AttributeSet; import android.widget.LinearLayout; /* diff --git a/android/tutorials/tutorial3-completed/src/test/java/com/uber/rib/root/logged_out/LoggedOutInteractorTest.java b/android/tutorials/tutorial3-completed/src/test/java/com/uber/rib/root/logged_out/LoggedOutInteractorTest.java index e57f1f05..6a29e6df 100644 --- a/android/tutorials/tutorial3-completed/src/test/java/com/uber/rib/root/logged_out/LoggedOutInteractorTest.java +++ b/android/tutorials/tutorial3-completed/src/test/java/com/uber/rib/root/logged_out/LoggedOutInteractorTest.java @@ -1,6 +1,6 @@ package com.uber.rib.root.logged_out; -import android.support.v4.util.Pair; +import androidx.core.util.Pair; import static org.mockito.Matchers.any; import static org.mockito.Mockito.never; diff --git a/android/tutorials/tutorial3/build.gradle b/android/tutorials/tutorial3/build.gradle index 1001821f..02731ae8 100644 --- a/android/tutorials/tutorial3/build.gradle +++ b/android/tutorials/tutorial3/build.gradle @@ -50,10 +50,10 @@ dependencies { annotationProcessor deps.apt.daggerCompiler annotationProcessor project(":libraries:rib-compiler-test") implementation project(":libraries:rib-android") - implementation deps.support.appcompat + implementation deps.androidx.appcompat implementation deps.external.dagger implementation deps.external.rxbinding - implementation deps.support.percent + implementation deps.androidx.percent implementation deps.build.guava compileOnly deps.apt.javax testImplementation project(":libraries:rib-test-utils") diff --git a/android/tutorials/tutorial3/src/main/java/com/uber/rib/root/RootInteractor.java b/android/tutorials/tutorial3/src/main/java/com/uber/rib/root/RootInteractor.java index 386b1d24..ba177cee 100644 --- a/android/tutorials/tutorial3/src/main/java/com/uber/rib/root/RootInteractor.java +++ b/android/tutorials/tutorial3/src/main/java/com/uber/rib/root/RootInteractor.java @@ -16,7 +16,7 @@ package com.uber.rib.root; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.uber.rib.core.Bundle; import com.uber.rib.core.Interactor; import com.uber.rib.core.RibInteractor; diff --git a/android/tutorials/tutorial3/src/main/java/com/uber/rib/root/RootRouter.java b/android/tutorials/tutorial3/src/main/java/com/uber/rib/root/RootRouter.java index e4861c52..dfb71b2b 100644 --- a/android/tutorials/tutorial3/src/main/java/com/uber/rib/root/RootRouter.java +++ b/android/tutorials/tutorial3/src/main/java/com/uber/rib/root/RootRouter.java @@ -16,7 +16,7 @@ package com.uber.rib.root; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.uber.rib.core.ViewRouter; import com.uber.rib.root.logged_in.LoggedInBuilder; diff --git a/android/tutorials/tutorial3/src/main/java/com/uber/rib/root/RootView.java b/android/tutorials/tutorial3/src/main/java/com/uber/rib/root/RootView.java index 395950cd..3174d612 100644 --- a/android/tutorials/tutorial3/src/main/java/com/uber/rib/root/RootView.java +++ b/android/tutorials/tutorial3/src/main/java/com/uber/rib/root/RootView.java @@ -17,7 +17,7 @@ package com.uber.rib.root; import android.content.Context; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.widget.FrameLayout; diff --git a/android/tutorials/tutorial3/src/main/java/com/uber/rib/root/logged_in/LoggedInInteractor.java b/android/tutorials/tutorial3/src/main/java/com/uber/rib/root/logged_in/LoggedInInteractor.java index 4cd25d97..5496d8eb 100644 --- a/android/tutorials/tutorial3/src/main/java/com/uber/rib/root/logged_in/LoggedInInteractor.java +++ b/android/tutorials/tutorial3/src/main/java/com/uber/rib/root/logged_in/LoggedInInteractor.java @@ -16,7 +16,7 @@ package com.uber.rib.root.logged_in; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.uber.rib.core.Bundle; import com.uber.rib.core.EmptyPresenter; import com.uber.rib.core.Interactor; diff --git a/android/tutorials/tutorial3/src/main/java/com/uber/rib/root/logged_in/off_game/OffGameInteractor.java b/android/tutorials/tutorial3/src/main/java/com/uber/rib/root/logged_in/off_game/OffGameInteractor.java index eb28b559..64171157 100644 --- a/android/tutorials/tutorial3/src/main/java/com/uber/rib/root/logged_in/off_game/OffGameInteractor.java +++ b/android/tutorials/tutorial3/src/main/java/com/uber/rib/root/logged_in/off_game/OffGameInteractor.java @@ -16,7 +16,7 @@ package com.uber.rib.root.logged_in.off_game; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.google.common.collect.ImmutableMap; import com.uber.autodispose.AutoDispose; import com.uber.rib.core.Bundle; diff --git a/android/tutorials/tutorial3/src/main/java/com/uber/rib/root/logged_in/off_game/OffGameView.java b/android/tutorials/tutorial3/src/main/java/com/uber/rib/root/logged_in/off_game/OffGameView.java index f08dd5b2..5561c117 100644 --- a/android/tutorials/tutorial3/src/main/java/com/uber/rib/root/logged_in/off_game/OffGameView.java +++ b/android/tutorials/tutorial3/src/main/java/com/uber/rib/root/logged_in/off_game/OffGameView.java @@ -17,7 +17,7 @@ package com.uber.rib.root.logged_in.off_game; import android.content.Context; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.widget.Button; import android.widget.LinearLayout; diff --git a/android/tutorials/tutorial3/src/main/java/com/uber/rib/root/logged_in/tic_tac_toe/TicTacToeInteractor.java b/android/tutorials/tutorial3/src/main/java/com/uber/rib/root/logged_in/tic_tac_toe/TicTacToeInteractor.java index 06c43df4..5cb84c4a 100644 --- a/android/tutorials/tutorial3/src/main/java/com/uber/rib/root/logged_in/tic_tac_toe/TicTacToeInteractor.java +++ b/android/tutorials/tutorial3/src/main/java/com/uber/rib/root/logged_in/tic_tac_toe/TicTacToeInteractor.java @@ -16,7 +16,7 @@ package com.uber.rib.root.logged_in.tic_tac_toe; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.uber.rib.core.Bundle; import com.uber.rib.core.Interactor; import com.uber.rib.core.RibInteractor; diff --git a/android/tutorials/tutorial3/src/main/java/com/uber/rib/root/logged_in/tic_tac_toe/TicTacToeView.java b/android/tutorials/tutorial3/src/main/java/com/uber/rib/root/logged_in/tic_tac_toe/TicTacToeView.java index e693a16e..8159e093 100644 --- a/android/tutorials/tutorial3/src/main/java/com/uber/rib/root/logged_in/tic_tac_toe/TicTacToeView.java +++ b/android/tutorials/tutorial3/src/main/java/com/uber/rib/root/logged_in/tic_tac_toe/TicTacToeView.java @@ -17,8 +17,8 @@ package com.uber.rib.root.logged_in.tic_tac_toe; import android.content.Context; -import android.support.annotation.Nullable; -import android.support.percent.PercentRelativeLayout; +import androidx.annotation.Nullable; +import androidx.percentlayout.widget.PercentRelativeLayout; import android.util.AttributeSet; import android.widget.TextView; import com.jakewharton.rxbinding2.view.RxView; diff --git a/android/tutorials/tutorial3/src/main/java/com/uber/rib/root/logged_out/LoggedOutInteractor.java b/android/tutorials/tutorial3/src/main/java/com/uber/rib/root/logged_out/LoggedOutInteractor.java index aead4bc8..8ec90dd9 100644 --- a/android/tutorials/tutorial3/src/main/java/com/uber/rib/root/logged_out/LoggedOutInteractor.java +++ b/android/tutorials/tutorial3/src/main/java/com/uber/rib/root/logged_out/LoggedOutInteractor.java @@ -16,8 +16,8 @@ package com.uber.rib.root.logged_out; -import android.support.annotation.Nullable; -import android.support.v4.util.Pair; +import androidx.annotation.Nullable; +import androidx.core.util.Pair; import com.uber.rib.core.Bundle; import com.uber.rib.core.Interactor; import com.uber.rib.core.RibInteractor; diff --git a/android/tutorials/tutorial3/src/main/java/com/uber/rib/root/logged_out/LoggedOutView.java b/android/tutorials/tutorial3/src/main/java/com/uber/rib/root/logged_out/LoggedOutView.java index a5eeb6f0..8a09c9f2 100644 --- a/android/tutorials/tutorial3/src/main/java/com/uber/rib/root/logged_out/LoggedOutView.java +++ b/android/tutorials/tutorial3/src/main/java/com/uber/rib/root/logged_out/LoggedOutView.java @@ -1,8 +1,8 @@ package com.uber.rib.root.logged_out; import android.content.Context; -import android.support.annotation.Nullable; -import android.support.v4.util.Pair; +import androidx.annotation.Nullable; +import androidx.core.util.Pair; import android.util.AttributeSet; import android.widget.Button; import android.widget.EditText; diff --git a/android/tutorials/tutorial3/src/test/java/com/uber/rib/root/logged_out/LoggedOutInteractorTest.java b/android/tutorials/tutorial3/src/test/java/com/uber/rib/root/logged_out/LoggedOutInteractorTest.java index 18bc920a..5156a55d 100644 --- a/android/tutorials/tutorial3/src/test/java/com/uber/rib/root/logged_out/LoggedOutInteractorTest.java +++ b/android/tutorials/tutorial3/src/test/java/com/uber/rib/root/logged_out/LoggedOutInteractorTest.java @@ -5,7 +5,7 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.support.v4.util.Pair; +import androidx.core.util.Pair; import com.uber.rib.core.InteractorHelper; import com.uber.rib.core.RibTestBasePlaceholder; import io.reactivex.Observable; diff --git a/android/tutorials/tutorial4/build.gradle b/android/tutorials/tutorial4/build.gradle index c7d0ccec..238c746d 100644 --- a/android/tutorials/tutorial4/build.gradle +++ b/android/tutorials/tutorial4/build.gradle @@ -53,11 +53,11 @@ dependencies { annotationProcessor project(":libraries:rib-compiler-test") implementation project(":libraries:rib-android") implementation project(":libraries:rib-workflow") - implementation deps.support.appcompat + implementation deps.androidx.appcompat implementation deps.external.dagger implementation deps.external.rxbinding implementation deps.uber.rave - implementation deps.support.percent + implementation deps.androidx.percent implementation deps.build.guava compileOnly deps.apt.javax compileOnly deps.apt.autoValueAnnotations diff --git a/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/RootInteractor.java b/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/RootInteractor.java index af70e60d..ba8c734b 100644 --- a/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/RootInteractor.java +++ b/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/RootInteractor.java @@ -16,7 +16,7 @@ package com.uber.rib.root; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.uber.rib.core.Bundle; import com.uber.rib.core.Interactor; import com.uber.rib.core.RibInteractor; diff --git a/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/RootRouter.java b/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/RootRouter.java index 3b123fc3..ecbcfdd5 100644 --- a/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/RootRouter.java +++ b/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/RootRouter.java @@ -16,7 +16,7 @@ package com.uber.rib.root; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.jakewharton.rxrelay2.BehaviorRelay; import com.uber.rib.core.Optional; diff --git a/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/RootView.java b/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/RootView.java index 395950cd..3174d612 100644 --- a/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/RootView.java +++ b/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/RootView.java @@ -17,7 +17,7 @@ package com.uber.rib.root; import android.content.Context; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.widget.FrameLayout; diff --git a/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/TrainingSessionsValidationFactory.java b/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/TrainingSessionsValidationFactory.java index d4e5f211..3a651003 100644 --- a/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/TrainingSessionsValidationFactory.java +++ b/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/TrainingSessionsValidationFactory.java @@ -1,6 +1,6 @@ package com.uber.rib.root; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.uber.rave.BaseValidator; import com.uber.rave.ValidatorFactory; diff --git a/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/UserName.java b/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/UserName.java index 57eea049..86369802 100644 --- a/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/UserName.java +++ b/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/UserName.java @@ -1,6 +1,6 @@ package com.uber.rib.root; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.google.auto.value.AutoValue; diff --git a/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/logged_in/LoggedInInteractor.java b/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/logged_in/LoggedInInteractor.java index 158156e5..3359e083 100644 --- a/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/logged_in/LoggedInInteractor.java +++ b/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/logged_in/LoggedInInteractor.java @@ -16,7 +16,7 @@ package com.uber.rib.root.logged_in; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.uber.rib.core.Bundle; import com.uber.rib.core.EmptyPresenter; import com.uber.rib.core.Interactor; diff --git a/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/logged_in/off_game/OffGameInteractor.java b/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/logged_in/off_game/OffGameInteractor.java index 29aa8a8b..819abe08 100644 --- a/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/logged_in/off_game/OffGameInteractor.java +++ b/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/logged_in/off_game/OffGameInteractor.java @@ -16,7 +16,7 @@ package com.uber.rib.root.logged_in.off_game; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.google.common.collect.ImmutableMap; import com.uber.autodispose.AutoDispose; import com.uber.rib.core.Bundle; diff --git a/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/logged_in/off_game/OffGameView.java b/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/logged_in/off_game/OffGameView.java index b43d1cb3..f881e952 100644 --- a/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/logged_in/off_game/OffGameView.java +++ b/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/logged_in/off_game/OffGameView.java @@ -17,7 +17,7 @@ package com.uber.rib.root.logged_in.off_game; import android.content.Context; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.view.LayoutInflater; import android.widget.Button; diff --git a/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/logged_in/random_winner/RandomWinnerInteractor.java b/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/logged_in/random_winner/RandomWinnerInteractor.java index f4beaee4..b96694d6 100644 --- a/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/logged_in/random_winner/RandomWinnerInteractor.java +++ b/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/logged_in/random_winner/RandomWinnerInteractor.java @@ -1,6 +1,6 @@ package com.uber.rib.root.logged_in.random_winner; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.uber.rib.core.Bundle; import com.uber.rib.core.Interactor; diff --git a/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/logged_in/random_winner/RandomWinnerView.java b/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/logged_in/random_winner/RandomWinnerView.java index b9741d7f..f5111085 100644 --- a/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/logged_in/random_winner/RandomWinnerView.java +++ b/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/logged_in/random_winner/RandomWinnerView.java @@ -1,8 +1,8 @@ package com.uber.rib.root.logged_in.random_winner; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.view.View; import android.widget.FrameLayout; diff --git a/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/logged_in/tic_tac_toe/TicTacToeInteractor.java b/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/logged_in/tic_tac_toe/TicTacToeInteractor.java index 68a50d25..2c8f7e3a 100644 --- a/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/logged_in/tic_tac_toe/TicTacToeInteractor.java +++ b/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/logged_in/tic_tac_toe/TicTacToeInteractor.java @@ -16,7 +16,7 @@ package com.uber.rib.root.logged_in.tic_tac_toe; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.uber.rib.core.Bundle; import com.uber.rib.core.Interactor; import com.uber.rib.core.RibInteractor; diff --git a/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/logged_in/tic_tac_toe/TicTacToeView.java b/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/logged_in/tic_tac_toe/TicTacToeView.java index 45ba7326..150008bb 100644 --- a/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/logged_in/tic_tac_toe/TicTacToeView.java +++ b/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/logged_in/tic_tac_toe/TicTacToeView.java @@ -17,8 +17,8 @@ package com.uber.rib.root.logged_in.tic_tac_toe; import android.content.Context; -import android.support.annotation.Nullable; -import android.support.percent.PercentRelativeLayout; +import androidx.annotation.Nullable; +import androidx.percentlayout.widget.PercentRelativeLayout; import android.util.AttributeSet; import android.widget.TextView; import com.jakewharton.rxbinding2.view.RxView; diff --git a/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/logged_out/LoggedOutInteractor.java b/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/logged_out/LoggedOutInteractor.java index c786109c..c66e5b5e 100644 --- a/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/logged_out/LoggedOutInteractor.java +++ b/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/logged_out/LoggedOutInteractor.java @@ -16,7 +16,7 @@ package com.uber.rib.root.logged_out; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.Pair; import com.uber.rib.core.Bundle; import com.uber.rib.core.Interactor; diff --git a/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/logged_out/LoggedOutView.java b/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/logged_out/LoggedOutView.java index b5f495b5..6c387e84 100644 --- a/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/logged_out/LoggedOutView.java +++ b/android/tutorials/tutorial4/src/main/java/com/uber/rib/root/logged_out/LoggedOutView.java @@ -1,7 +1,7 @@ package com.uber.rib.root.logged_out; import android.content.Context; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.util.Pair; import android.widget.Button;