Move activity to 1.1.0-alpha01
Pin dependencies of those things relying
on 1.0.0.
Test: ./gradlew bOS
Change-Id: I51161641003f4a5a1704a4e17c59e9d321adc7c8
diff --git a/activity/activity-ktx/api/1.1.0-alpha01.txt b/activity/activity-ktx/api/1.1.0-alpha01.txt
new file mode 100644
index 0000000..c6e9a9a
--- /dev/null
+++ b/activity/activity-ktx/api/1.1.0-alpha01.txt
@@ -0,0 +1,15 @@
+// Signature format: 3.0
+package androidx.activity {
+
+ public final class ActivityViewModelLazyKt {
+ ctor public ActivityViewModelLazyKt();
+ method @MainThread public static inline <reified VM extends androidx.lifecycle.ViewModel> kotlin.Lazy<VM> viewModels(androidx.activity.ComponentActivity, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>? factoryProducer = null);
+ }
+
+ public final class OnBackPressedDispatcherKt {
+ ctor public OnBackPressedDispatcherKt();
+ method public static androidx.activity.OnBackPressedCallback addCallback(androidx.activity.OnBackPressedDispatcher, androidx.lifecycle.LifecycleOwner? owner = null, boolean enabled = true, kotlin.jvm.functions.Function1<? super androidx.activity.OnBackPressedCallback,kotlin.Unit> onBackPressed);
+ }
+
+}
+
diff --git a/activity/activity-ktx/api/res-1.1.0-alpha01.txt b/activity/activity-ktx/api/res-1.1.0-alpha01.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/activity/activity-ktx/api/res-1.1.0-alpha01.txt
diff --git a/activity/activity-ktx/api/restricted_1.1.0-alpha01.txt b/activity/activity-ktx/api/restricted_1.1.0-alpha01.txt
new file mode 100644
index 0000000..da4f6cc
--- /dev/null
+++ b/activity/activity-ktx/api/restricted_1.1.0-alpha01.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/activity/activity-ktx/build.gradle b/activity/activity-ktx/build.gradle
index df6a71d..50a48cf 100644
--- a/activity/activity-ktx/build.gradle
+++ b/activity/activity-ktx/build.gradle
@@ -26,10 +26,6 @@
}
android {
- compileOptions {
- sourceCompatibility = JavaVersion.VERSION_1_7
- targetCompatibility = JavaVersion.VERSION_1_7
- }
buildTypes {
debug {
testCoverageEnabled = false // Breaks Kotlin compiler.
diff --git a/activity/activity/api/1.1.0-alpha01.txt b/activity/activity/api/1.1.0-alpha01.txt
new file mode 100644
index 0000000..cd98da6
--- /dev/null
+++ b/activity/activity/api/1.1.0-alpha01.txt
@@ -0,0 +1,38 @@
+// Signature format: 3.0
+package androidx.activity {
+
+ public class ComponentActivity extends androidx.core.app.ComponentActivity implements androidx.lifecycle.LifecycleOwner androidx.activity.OnBackPressedDispatcherOwner androidx.savedstate.SavedStateRegistryOwner androidx.lifecycle.ViewModelStoreOwner {
+ ctor public ComponentActivity();
+ ctor @ContentView public ComponentActivity(@LayoutRes int);
+ method @Deprecated public Object? getLastCustomNonConfigurationInstance();
+ method public androidx.lifecycle.Lifecycle getLifecycle();
+ method public final androidx.activity.OnBackPressedDispatcher getOnBackPressedDispatcher();
+ method public final androidx.savedstate.SavedStateRegistry getSavedStateRegistry();
+ method public androidx.lifecycle.ViewModelStore getViewModelStore();
+ method @Deprecated public Object? onRetainCustomNonConfigurationInstance();
+ method public final Object? onRetainNonConfigurationInstance();
+ }
+
+ public abstract class OnBackPressedCallback {
+ ctor public OnBackPressedCallback(boolean);
+ method @MainThread public abstract void handleOnBackPressed();
+ method @MainThread public final boolean isEnabled();
+ method @MainThread public final void remove();
+ method @MainThread public final void setEnabled(boolean);
+ }
+
+ public final class OnBackPressedDispatcher {
+ ctor public OnBackPressedDispatcher();
+ ctor public OnBackPressedDispatcher(Runnable?);
+ method @MainThread public void addCallback(androidx.activity.OnBackPressedCallback);
+ method @MainThread public void addCallback(androidx.lifecycle.LifecycleOwner, androidx.activity.OnBackPressedCallback);
+ method @MainThread public boolean hasEnabledCallbacks();
+ method @MainThread public void onBackPressed();
+ }
+
+ public interface OnBackPressedDispatcherOwner extends androidx.lifecycle.LifecycleOwner {
+ method public androidx.activity.OnBackPressedDispatcher getOnBackPressedDispatcher();
+ }
+
+}
+
diff --git a/activity/activity/api/res-1.1.0-alpha01.txt b/activity/activity/api/res-1.1.0-alpha01.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/activity/activity/api/res-1.1.0-alpha01.txt
diff --git a/activity/activity/api/restricted_1.1.0-alpha01.txt b/activity/activity/api/restricted_1.1.0-alpha01.txt
new file mode 100644
index 0000000..da4f6cc
--- /dev/null
+++ b/activity/activity/api/restricted_1.1.0-alpha01.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/activity/activity/build.gradle b/activity/activity/build.gradle
index 95e5574..0efa316 100644
--- a/activity/activity/build.gradle
+++ b/activity/activity/build.gradle
@@ -9,13 +9,6 @@
id("kotlin-android")
}
-android {
- compileOptions {
- sourceCompatibility = JavaVersion.VERSION_1_7
- targetCompatibility = JavaVersion.VERSION_1_7
- }
-}
-
dependencies {
api("androidx.annotation:annotation:1.1.0")
api("androidx.core:core:1.1.0-rc01") {
diff --git a/buildSrc/src/main/kotlin/androidx/build/LibraryVersions.kt b/buildSrc/src/main/kotlin/androidx/build/LibraryVersions.kt
index b200d31..46ee036 100644
--- a/buildSrc/src/main/kotlin/androidx/build/LibraryVersions.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/LibraryVersions.kt
@@ -20,7 +20,7 @@
* The list of versions codes of all the libraries in this project.
*/
object LibraryVersions {
- val ACTIVITY = Version("1.0.0-rc01")
+ val ACTIVITY = Version("1.1.0-alpha01")
val ADS_IDENTIFIER = Version("1.0.0-alpha01")
val ANIMATION = Version("1.0.0-alpha01")
val ANIMATION_TESTING = Version("1.1.0-alpha01")
diff --git a/navigation/navigation-runtime/build.gradle b/navigation/navigation-runtime/build.gradle
index bc7c81f0..e222ddd 100644
--- a/navigation/navigation-runtime/build.gradle
+++ b/navigation/navigation-runtime/build.gradle
@@ -28,7 +28,7 @@
dependencies {
api(project(":navigation:navigation-common"))
- api(project(":activity:activity"))
+ api("androidx.activity:activity:1.0.0-rc01")
api("androidx.lifecycle:lifecycle-viewmodel:2.1.0-rc01")
androidTestImplementation(project(":navigation:navigation-testing"))
