Make lifecycles atomic group
Test: N/A
Change-Id: I42610189e0e4caac9dd8a23ef36ed7d5bc5e1218
diff --git a/buildSrc/public/src/main/kotlin/androidx/build/LibraryGroups.kt b/buildSrc/public/src/main/kotlin/androidx/build/LibraryGroups.kt
index 2015165..4954f27 100644
--- a/buildSrc/public/src/main/kotlin/androidx/build/LibraryGroups.kt
+++ b/buildSrc/public/src/main/kotlin/androidx/build/LibraryGroups.kt
@@ -65,7 +65,7 @@
val JETIFIER = LibraryGroup("com.android.tools.build.jetifier", null)
val LEANBACK = LibraryGroup("androidx.leanback", null)
val LEGACY = LibraryGroup("androidx.legacy", null)
- val LIFECYCLE = LibraryGroup("androidx.lifecycle", null)
+ val LIFECYCLE = LibraryGroup("androidx.lifecycle", LibraryVersions.LIFECYCLE)
val LOADER = LibraryGroup("androidx.loader", LibraryVersions.LOADER)
val LOCALBROADCASTMANAGER = LibraryGroup("androidx.localbroadcastmanager", LibraryVersions.LOCALBROADCASTMANAGER)
val MEDIA = LibraryGroup("androidx.media", null)
diff --git a/lifecycle/lifecycle-common-java8/build.gradle b/lifecycle/lifecycle-common-java8/build.gradle
index db21aff..18e371b9 100644
--- a/lifecycle/lifecycle-common-java8/build.gradle
+++ b/lifecycle/lifecycle-common-java8/build.gradle
@@ -15,7 +15,6 @@
*/
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions;
import androidx.build.Publish
plugins {
@@ -34,7 +33,6 @@
androidx {
name = "Android Lifecycle-Common for Java 8 Language"
publish = Publish.SNAPSHOT_AND_RELEASE
- mavenVersion = LibraryVersions.LIFECYCLE
mavenGroup = LibraryGroups.LIFECYCLE
inceptionYear = "2017"
description = "Android Lifecycle-Common for Java 8 Language"
diff --git a/lifecycle/lifecycle-common/build.gradle b/lifecycle/lifecycle-common/build.gradle
index 6392520..98f2da4 100644
--- a/lifecycle/lifecycle-common/build.gradle
+++ b/lifecycle/lifecycle-common/build.gradle
@@ -15,7 +15,6 @@
*/
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
plugins {
@@ -33,7 +32,6 @@
androidx {
name = "Android Lifecycle-Common"
publish = Publish.SNAPSHOT_AND_RELEASE
- mavenVersion = LibraryVersions.LIFECYCLE
mavenGroup = LibraryGroups.LIFECYCLE
inceptionYear = "2017"
description = "Android Lifecycle-Common"
diff --git a/lifecycle/lifecycle-compiler/build.gradle b/lifecycle/lifecycle-compiler/build.gradle
index 9003034..0e4f4d8 100644
--- a/lifecycle/lifecycle-compiler/build.gradle
+++ b/lifecycle/lifecycle-compiler/build.gradle
@@ -16,7 +16,6 @@
import androidx.build.LibraryGroups
import androidx.build.LibraryType
-import androidx.build.LibraryVersions
plugins {
id("AndroidXPlugin")
@@ -52,7 +51,6 @@
androidx {
name = "Android Lifecycles Compiler"
type = LibraryType.ANNOTATION_PROCESSOR
- mavenVersion = LibraryVersions.LIFECYCLE
mavenGroup = LibraryGroups.LIFECYCLE
inceptionYear = "2017"
description = "Android Lifecycles annotation processor"
diff --git a/lifecycle/lifecycle-extensions/build.gradle b/lifecycle/lifecycle-extensions/build.gradle
index e2a5747..670c19c 100644
--- a/lifecycle/lifecycle-extensions/build.gradle
+++ b/lifecycle/lifecycle-extensions/build.gradle
@@ -15,7 +15,6 @@
*/
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
import androidx.build.RunApiTasks
@@ -55,7 +54,6 @@
name = "Android Lifecycle Extensions"
publish = Publish.NONE
runApiTasks = new RunApiTasks.Yes("Need to track API surface before moving to publish")
- mavenVersion = LibraryVersions.LIFECYCLE_EXTENSIONS
mavenGroup = LibraryGroups.LIFECYCLE
inceptionYear = "2017"
description = "Android Lifecycle Extensions"
diff --git a/lifecycle/lifecycle-livedata-core-ktx-lint/build.gradle b/lifecycle/lifecycle-livedata-core-ktx-lint/build.gradle
index 12b0831..0ae127f 100644
--- a/lifecycle/lifecycle-livedata-core-ktx-lint/build.gradle
+++ b/lifecycle/lifecycle-livedata-core-ktx-lint/build.gradle
@@ -14,9 +14,9 @@
* limitations under the License.
*/
+
import androidx.build.LibraryGroups
import androidx.build.LibraryType
-import androidx.build.LibraryVersions
plugins {
id("AndroidXPlugin")
@@ -37,7 +37,6 @@
androidx {
name = "Android LiveData Kotlin Lint Checks"
type = LibraryType.LINT
- mavenVersion = LibraryVersions.LIFECYCLE
mavenGroup = LibraryGroups.LIFECYCLE
inceptionYear = "2019"
description = "Lint Checks for LiveData Kotlin Extensions"
diff --git a/lifecycle/lifecycle-livedata-core-ktx/build.gradle b/lifecycle/lifecycle-livedata-core-ktx/build.gradle
index ab16f08..92b25e4 100644
--- a/lifecycle/lifecycle-livedata-core-ktx/build.gradle
+++ b/lifecycle/lifecycle-livedata-core-ktx/build.gradle
@@ -14,8 +14,8 @@
* limitations under the License.
*/
+
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@@ -41,7 +41,6 @@
androidx {
name = "LiveData Core Kotlin Extensions"
publish = Publish.SNAPSHOT_AND_RELEASE
- mavenVersion = LibraryVersions.LIFECYCLE
mavenGroup = LibraryGroups.LIFECYCLE
inceptionYear = "2018"
description = "Kotlin extensions for 'livedata-core' artifact"
diff --git a/lifecycle/lifecycle-livedata-core-truth/build.gradle b/lifecycle/lifecycle-livedata-core-truth/build.gradle
index 727d7b7..2ac9ac6 100644
--- a/lifecycle/lifecycle-livedata-core-truth/build.gradle
+++ b/lifecycle/lifecycle-livedata-core-truth/build.gradle
@@ -14,8 +14,8 @@
* limitations under the License.
*/
+
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
plugins {
@@ -37,7 +37,6 @@
androidx {
name = "LiveData Core Truth Extensions"
publish = Publish.NONE
- mavenVersion = LibraryVersions.LIFECYCLE
mavenGroup = LibraryGroups.LIFECYCLE
inceptionYear = "2019"
description = "Truth extensions for 'livedata-core' artifact"
diff --git a/lifecycle/lifecycle-livedata-core/build.gradle b/lifecycle/lifecycle-livedata-core/build.gradle
index a68baa2..5c73fa6 100644
--- a/lifecycle/lifecycle-livedata-core/build.gradle
+++ b/lifecycle/lifecycle-livedata-core/build.gradle
@@ -15,7 +15,6 @@
*/
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
plugins {
@@ -39,8 +38,7 @@
androidx {
name = "Android Lifecycle LiveData Core"
publish = Publish.SNAPSHOT_AND_RELEASE
- mavenVersion = LibraryVersions.LIFECYCLE
mavenGroup = LibraryGroups.LIFECYCLE
inceptionYear = "2017"
description = "Android Lifecycle LiveData Core"
- }
+}
diff --git a/lifecycle/lifecycle-livedata-ktx/build.gradle b/lifecycle/lifecycle-livedata-ktx/build.gradle
index 27fbede..ee14b81 100644
--- a/lifecycle/lifecycle-livedata-ktx/build.gradle
+++ b/lifecycle/lifecycle-livedata-ktx/build.gradle
@@ -14,8 +14,8 @@
* limitations under the License.
*/
+
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@@ -53,7 +53,6 @@
androidx {
name = "LiveData Kotlin Extensions"
publish = Publish.SNAPSHOT_AND_RELEASE
- mavenVersion = LibraryVersions.LIFECYCLE
mavenGroup = LibraryGroups.LIFECYCLE
inceptionYear = "2018"
description = "Kotlin extensions for 'livedata' artifact"
diff --git a/lifecycle/lifecycle-livedata/build.gradle b/lifecycle/lifecycle-livedata/build.gradle
index 769df0e..20ceb44 100644
--- a/lifecycle/lifecycle-livedata/build.gradle
+++ b/lifecycle/lifecycle-livedata/build.gradle
@@ -15,7 +15,6 @@
*/
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
plugins {
@@ -38,7 +37,6 @@
androidx {
name = "Android Lifecycle LiveData"
publish = Publish.SNAPSHOT_AND_RELEASE
- mavenVersion = LibraryVersions.LIFECYCLE
mavenGroup = LibraryGroups.LIFECYCLE
inceptionYear = "2017"
description = "Android Lifecycle LiveData"
diff --git a/lifecycle/lifecycle-process/build.gradle b/lifecycle/lifecycle-process/build.gradle
index bc8b86f..e23e82d 100644
--- a/lifecycle/lifecycle-process/build.gradle
+++ b/lifecycle/lifecycle-process/build.gradle
@@ -14,8 +14,8 @@
* limitations under the License.
*/
+
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
plugins {
@@ -40,7 +40,6 @@
androidx {
name = "Android Lifecycle Process"
publish = Publish.SNAPSHOT_AND_RELEASE
- mavenVersion = LibraryVersions.LIFECYCLE
mavenGroup = LibraryGroups.LIFECYCLE
inceptionYear = "2018"
description = "Android Lifecycle Process"
diff --git a/lifecycle/lifecycle-reactivestreams-ktx/build.gradle b/lifecycle/lifecycle-reactivestreams-ktx/build.gradle
index ba2bd36..c454794 100644
--- a/lifecycle/lifecycle-reactivestreams-ktx/build.gradle
+++ b/lifecycle/lifecycle-reactivestreams-ktx/build.gradle
@@ -14,8 +14,8 @@
* limitations under the License.
*/
+
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@@ -40,7 +40,6 @@
androidx {
name = "Android Lifecycle ReactiveStreams KTX"
publish = Publish.SNAPSHOT_AND_RELEASE
- mavenVersion = LibraryVersions.LIFECYCLE
mavenGroup = LibraryGroups.LIFECYCLE
inceptionYear = "2018"
description = "Kotlin extensions for Lifecycle ReactiveStreams"
diff --git a/lifecycle/lifecycle-reactivestreams/build.gradle b/lifecycle/lifecycle-reactivestreams/build.gradle
index c301bf7..f12ce21 100644
--- a/lifecycle/lifecycle-reactivestreams/build.gradle
+++ b/lifecycle/lifecycle-reactivestreams/build.gradle
@@ -14,8 +14,8 @@
* limitations under the License.
*/
+
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
plugins {
@@ -43,7 +43,6 @@
androidx {
name = "Android Lifecycle Reactivestreams"
publish = Publish.SNAPSHOT_AND_RELEASE
- mavenVersion = LibraryVersions.LIFECYCLE
mavenGroup = LibraryGroups.LIFECYCLE
inceptionYear = "2017"
description = "Android Lifecycle Reactivestreams"
diff --git a/lifecycle/lifecycle-runtime-ktx-lint/build.gradle b/lifecycle/lifecycle-runtime-ktx-lint/build.gradle
index 524870d..f0497c3 100644
--- a/lifecycle/lifecycle-runtime-ktx-lint/build.gradle
+++ b/lifecycle/lifecycle-runtime-ktx-lint/build.gradle
@@ -14,9 +14,9 @@
* limitations under the License.
*/
+
import androidx.build.LibraryGroups
import androidx.build.LibraryType
-import androidx.build.LibraryVersions
plugins {
id("AndroidXPlugin")
@@ -36,7 +36,6 @@
androidx {
name = "Android Lifecycles Lint Checks"
type = LibraryType.LINT
- mavenVersion = LibraryVersions.LIFECYCLE
mavenGroup = LibraryGroups.LIFECYCLE
inceptionYear = "2019"
description = "Android Lifecycles Lint Checks"
diff --git a/lifecycle/lifecycle-runtime-ktx/build.gradle b/lifecycle/lifecycle-runtime-ktx/build.gradle
index e6076bc..64e154e 100644
--- a/lifecycle/lifecycle-runtime-ktx/build.gradle
+++ b/lifecycle/lifecycle-runtime-ktx/build.gradle
@@ -14,8 +14,8 @@
* limitations under the License.
*/
+
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@@ -47,7 +47,6 @@
androidx {
name = "Android Lifecycle Kotlin Extensions"
publish = Publish.SNAPSHOT_AND_RELEASE
- mavenVersion = LibraryVersions.LIFECYCLE
mavenGroup = LibraryGroups.LIFECYCLE
inceptionYear = "2019"
description = "Kotlin extensions for 'lifecycle' artifact"
diff --git a/lifecycle/lifecycle-runtime-testing/build.gradle b/lifecycle/lifecycle-runtime-testing/build.gradle
index 3a2a4cda..590d847 100644
--- a/lifecycle/lifecycle-runtime-testing/build.gradle
+++ b/lifecycle/lifecycle-runtime-testing/build.gradle
@@ -15,7 +15,6 @@
*/
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@@ -43,7 +42,6 @@
androidx {
name = "Android Lifecycle Runtime Testing"
publish = Publish.SNAPSHOT_AND_RELEASE
- mavenVersion = LibraryVersions.LIFECYCLE
mavenGroup = LibraryGroups.LIFECYCLE
inceptionYear = "2019"
description = "Testing utilities for 'lifecycle' artifact"
diff --git a/lifecycle/lifecycle-runtime/build.gradle b/lifecycle/lifecycle-runtime/build.gradle
index 241d488..9710976 100644
--- a/lifecycle/lifecycle-runtime/build.gradle
+++ b/lifecycle/lifecycle-runtime/build.gradle
@@ -1,5 +1,4 @@
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
plugins {
@@ -32,7 +31,6 @@
androidx {
name "Android Lifecycle Runtime"
publish = Publish.SNAPSHOT_AND_RELEASE
- mavenVersion = LibraryVersions.LIFECYCLE
mavenGroup LibraryGroups.LIFECYCLE
inceptionYear "2017"
description "Android Lifecycle Runtime"
diff --git a/lifecycle/lifecycle-service/build.gradle b/lifecycle/lifecycle-service/build.gradle
index 9d07cd7..f79150a 100644
--- a/lifecycle/lifecycle-service/build.gradle
+++ b/lifecycle/lifecycle-service/build.gradle
@@ -14,8 +14,8 @@
* limitations under the License.
*/
+
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
plugins {
@@ -35,7 +35,6 @@
androidx {
name = "Android Lifecycle Service"
publish = Publish.SNAPSHOT_AND_RELEASE
- mavenVersion = LibraryVersions.LIFECYCLE
mavenGroup = LibraryGroups.LIFECYCLE
inceptionYear = "2018"
description = "Android Lifecycle Service"
diff --git a/lifecycle/lifecycle-viewmodel-compose/build.gradle b/lifecycle/lifecycle-viewmodel-compose/build.gradle
index 5346124..53365eb 100644
--- a/lifecycle/lifecycle-viewmodel-compose/build.gradle
+++ b/lifecycle/lifecycle-viewmodel-compose/build.gradle
@@ -15,7 +15,6 @@
*/
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
import androidx.build.RunApiTasks
@@ -49,7 +48,6 @@
androidx {
name = "Lifecycle ViewModel Compose"
publish = Publish.SNAPSHOT_AND_RELEASE
- mavenVersion = LibraryVersions.LIFECYCLE_VIEWMODEL_COMPOSE
mavenGroup = LibraryGroups.LIFECYCLE
inceptionYear = "2021"
description = "Compose integration with Lifecycle ViewModel"
diff --git a/lifecycle/lifecycle-viewmodel-compose/samples/build.gradle b/lifecycle/lifecycle-viewmodel-compose/samples/build.gradle
index 70c9431e..f68dd90 100644
--- a/lifecycle/lifecycle-viewmodel-compose/samples/build.gradle
+++ b/lifecycle/lifecycle-viewmodel-compose/samples/build.gradle
@@ -15,7 +15,6 @@
*/
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.LibraryType
plugins {
@@ -34,7 +33,6 @@
androidx {
name = "AndroidX Lifecycle ViewModel Compose Integration Samples"
type = LibraryType.SAMPLES
- mavenVersion = LibraryVersions.LIFECYCLE
mavenGroup = LibraryGroups.LIFECYCLE
inceptionYear = "2021"
description = "Samples for Compose integration with Lifecycle ViewModel"
diff --git a/lifecycle/lifecycle-viewmodel-ktx/build.gradle b/lifecycle/lifecycle-viewmodel-ktx/build.gradle
index af9ab1f..1e717a6 100644
--- a/lifecycle/lifecycle-viewmodel-ktx/build.gradle
+++ b/lifecycle/lifecycle-viewmodel-ktx/build.gradle
@@ -14,8 +14,8 @@
* limitations under the License.
*/
+
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
plugins {
@@ -38,7 +38,6 @@
androidx {
name = "Android Lifecycle ViewModel Kotlin Extensions"
publish = Publish.SNAPSHOT_AND_RELEASE
- mavenVersion = LibraryVersions.LIFECYCLE
mavenGroup = LibraryGroups.LIFECYCLE
inceptionYear = "2018"
description = "Kotlin extensions for 'viewmodel' artifact"
diff --git a/lifecycle/lifecycle-viewmodel-savedstate/build.gradle b/lifecycle/lifecycle-viewmodel-savedstate/build.gradle
index d628653..85e49e0 100644
--- a/lifecycle/lifecycle-viewmodel-savedstate/build.gradle
+++ b/lifecycle/lifecycle-viewmodel-savedstate/build.gradle
@@ -14,8 +14,8 @@
* limitations under the License.
*/
+
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
plugins {
@@ -74,7 +74,6 @@
androidx {
name = "Android Lifecycle ViewModel with SavedState"
publish = Publish.SNAPSHOT_AND_RELEASE
- mavenVersion = LibraryVersions.LIFECYCLE
mavenGroup = LibraryGroups.LIFECYCLE
inceptionYear = "2018"
description = "Android Lifecycle ViewModel"
diff --git a/lifecycle/lifecycle-viewmodel/api/restricted_current.txt b/lifecycle/lifecycle-viewmodel/api/restricted_current.txt
index 13ea048..b2a64d8 100644
--- a/lifecycle/lifecycle-viewmodel/api/restricted_current.txt
+++ b/lifecycle/lifecycle-viewmodel/api/restricted_current.txt
@@ -44,25 +44,13 @@
method public <T extends androidx.lifecycle.ViewModel> T create(Class<T> modelClass);
}
- @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public abstract static class ViewModelProvider.KeyedFactory extends androidx.lifecycle.ViewModelProvider.OnRequeryFactory implements androidx.lifecycle.ViewModelProvider.Factory {
- method public abstract <T extends androidx.lifecycle.ViewModel> T create(String key, Class<T> modelClass);
- method public <T extends androidx.lifecycle.ViewModel> T create(Class<T> modelClass);
- }
-
public static class ViewModelProvider.NewInstanceFactory implements androidx.lifecycle.ViewModelProvider.Factory {
ctor public ViewModelProvider.NewInstanceFactory();
method public <T extends androidx.lifecycle.ViewModel> T create(Class<T> modelClass);
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static final androidx.lifecycle.ViewModelProvider.NewInstanceFactory getInstance();
field public static final androidx.lifecycle.ViewModelProvider.NewInstanceFactory.Companion Companion;
}
public static final class ViewModelProvider.NewInstanceFactory.Companion {
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public androidx.lifecycle.ViewModelProvider.NewInstanceFactory getInstance();
- property @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final androidx.lifecycle.ViewModelProvider.NewInstanceFactory instance;
- }
-
- @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static class ViewModelProvider.OnRequeryFactory {
- method public void onRequery(androidx.lifecycle.ViewModel viewModel);
}
public final class ViewModelProviderKt {
diff --git a/lifecycle/lifecycle-viewmodel/build.gradle b/lifecycle/lifecycle-viewmodel/build.gradle
index aceb9ec..575ce58a 100644
--- a/lifecycle/lifecycle-viewmodel/build.gradle
+++ b/lifecycle/lifecycle-viewmodel/build.gradle
@@ -14,8 +14,8 @@
* limitations under the License.
*/
+
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions
import androidx.build.Publish
plugins {
@@ -48,8 +48,7 @@
androidx {
name = "Android Lifecycle ViewModel"
publish = Publish.SNAPSHOT_AND_RELEASE
- mavenVersion = LibraryVersions.LIFECYCLE
mavenGroup = LibraryGroups.LIFECYCLE
inceptionYear = "2017"
description = "Android Lifecycle ViewModel"
- }
+}
