From 61bf8377def25d70dfd0494c1d0da54f97be96eb Mon Sep 17 00:00:00 2001 From: Takeshi Hagikura Date: Thu, 16 Mar 2023 15:42:18 +0900 Subject: Update latest dependencies Fixes: 273540228 Fixes: 272069786 Fixes: 273872043 Test: TemplateTest Change-Id: I74d7983b77bf763119e6ce536c24d1feee8c85e3 --- BUILD.bazel | 27 +++++++-------- compilationTests/BUILD.bazel | 39 +++++++++++----------- extensions/build.gradle | 6 ++-- integration-tests/DynamicApp/app/build.gradle | 1 - integration-tests/KotlinTestApp/app/build.gradle | 2 +- integration-tests/TestApp/app/build.gradle | 2 +- .../app/build.gradle | 2 +- 7 files changed, 40 insertions(+), 39 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index ac71d8e2..5621b2b5 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -230,8 +230,8 @@ iml_module( jvm_target = "8", resources = ["compiler/src/main/resources"], test_data = [ - "//prebuilts/studio/sdk:platforms/latest", "//prebuilts/studio/sdk:platform-tools", + "//prebuilts/studio/sdk:platforms/latest", ], test_srcs = ["compiler/src/test/java"], visibility = ["//visibility:public"], @@ -330,12 +330,12 @@ maven_repository( "@maven//:android.arch.lifecycle.extensions_1.0.0", "@maven//:androidx.appcompat.appcompat_1.0.2", "@maven//:androidx.lifecycle.lifecycle-extensions_2.2.0", - "@maven//:androidx.lifecycle.lifecycle-livedata-ktx_2.4.0", - "@maven//:androidx.lifecycle.lifecycle-process_2.4.0", - "@maven//:androidx.lifecycle.lifecycle-runtime-ktx_2.4.0", - "@maven//:androidx.lifecycle.lifecycle-runtime_2.4.0", - "@maven//:androidx.lifecycle.lifecycle-service_2.4.0", - "@maven//:androidx.lifecycle.lifecycle-viewmodel-ktx_2.4.0", + "@maven//:androidx.lifecycle.lifecycle-livedata-ktx_2.6.1", + "@maven//:androidx.lifecycle.lifecycle-process_2.6.1", + "@maven//:androidx.lifecycle.lifecycle-runtime-ktx_2.6.1", + "@maven//:androidx.lifecycle.lifecycle-runtime_2.6.1", + "@maven//:androidx.lifecycle.lifecycle-service_2.6.1", + "@maven//:androidx.lifecycle.lifecycle-viewmodel-ktx_2.6.1", "@maven//:com.android.support.appcompat-v7_26.1.0", "@maven//:com.android.support.cardview-v7_26.1.0", "@maven//:com.github.gundy.semver4j_0.16.4", @@ -344,6 +344,7 @@ maven_repository( "@maven//:com.google.errorprone.error_prone_annotations_2.1.3", "@maven//:de.undercouch.gradle-download-task_4.0.2", "@maven//:org.jetbrains.intellij.deps.trove4j_1.0.20181211", + "@maven//:org.jetbrains.kotlin.kotlin-bom_1.8.0", "@maven//:org.jetbrains.kotlinx.kotlinx-coroutines-android_1.4.1", ], ) @@ -361,10 +362,10 @@ gradle_build( name = "runtimeLibrariesAndroidX", build_file = "extensions/build.gradle", data = [ - "//tools/base/build-system:gradle-distrib", - "//prebuilts/studio/sdk:platforms/latest", - "//prebuilts/studio/sdk:platform-tools", "//prebuilts/studio/sdk:build-tools/latest", + "//prebuilts/studio/sdk:platform-tools", + "//prebuilts/studio/sdk:platforms/latest", + "//tools/base/build-system:gradle-distrib", "//tools/base/common:agp_gradle_build_files", "//tools/buildSrc/base:dependencies.properties", "//tools/data-binding:databinding.properties", @@ -399,10 +400,10 @@ gradle_build( name = "runtimeLibrariesSupport", build_file = "extensions-support/build.gradle", #TODO rename to extensionSupport data = [ - "//tools/base/build-system:gradle-distrib", - "//prebuilts/studio/sdk:platforms/latest", - "//prebuilts/studio/sdk:platform-tools", "//prebuilts/studio/sdk:build-tools/latest", + "//prebuilts/studio/sdk:platform-tools", + "//prebuilts/studio/sdk:platforms/latest", + "//tools/base/build-system:gradle-distrib", "//tools/base/common:agp_gradle_build_files", "//tools/data-binding:databinding.properties", ] + glob( diff --git a/compilationTests/BUILD.bazel b/compilationTests/BUILD.bazel index 46824b42..cbe36699 100644 --- a/compilationTests/BUILD.bazel +++ b/compilationTests/BUILD.bazel @@ -15,11 +15,11 @@ iml_module( ":test_deps", "//prebuilts/studio/sdk:build-tools/latest", "//prebuilts/studio/sdk:platforms/latest", - "//tools/data-binding:data_binding_runtime.zip", "//tools/adt/idea/android/testData", - "//tools/base/build-system:gradle-distrib", "//tools/base/build-system:android_gradle_plugin.zip", "//tools/base/build-system:android_gradle_plugin_runtime_dependencies", + "//tools/base/build-system:gradle-distrib", + "//tools/data-binding:data_binding_runtime.zip", ] + glob(["testData/**"]), test_shard_count = 4, test_srcs = ["src/test/java"], @@ -52,7 +52,7 @@ maven_repository( "@maven//:android.arch.navigation.navigation-fragment_1.0.0", "@maven//:android.arch.navigation.navigation-ui_1.0.0", "@maven//:android.arch.persistence.room.runtime_1.0.0", - "@maven//:androidx.annotation.annotation_1.2.0-rc01", + "@maven//:androidx.annotation.annotation_1.6.0", "@maven//:androidx.appcompat.appcompat_1.0.2", "@maven//:androidx.appcompat.appcompat_1.3.0", "@maven//:androidx.benchmark.benchmark-gradle-plugin_1.1.1", @@ -60,7 +60,7 @@ maven_repository( "@maven//:androidx.compose.ui.ui-test-junit4_1.2.0", "@maven//:androidx.compose.ui.ui-tooling_1.2.0", "@maven//:androidx.constraintlayout.constraintlayout_1.1.3", - "@maven//:androidx.constraintlayout.constraintlayout_2.1.3", + "@maven//:androidx.constraintlayout.constraintlayout_2.1.4", "@maven//:androidx.core.core-ktx_1.0.1", "@maven//:androidx.core.core-ktx_1.2.0", "@maven//:androidx.core.core-ktx_1.3.0", @@ -73,23 +73,24 @@ maven_repository( "@maven//:androidx.leanback.leanback_1.0.0", "@maven//:androidx.legacy.legacy-support-v13_1.0.0", "@maven//:androidx.lifecycle.lifecycle-extensions_2.2.0", - "@maven//:androidx.lifecycle.lifecycle-livedata-ktx_2.4.0", - "@maven//:androidx.lifecycle.lifecycle-livedata_2.4.0", - "@maven//:androidx.lifecycle.lifecycle-process_2.4.0", - "@maven//:androidx.lifecycle.lifecycle-runtime-ktx_2.4.0", - "@maven//:androidx.lifecycle.lifecycle-runtime_2.4.0", - "@maven//:androidx.lifecycle.lifecycle-service_2.4.0", - "@maven//:androidx.lifecycle.lifecycle-viewmodel_2.4.0", - "@maven//:androidx.media.media_1.5.0", - "@maven//:androidx.navigation.navigation-fragment-ktx_2.5.2", - "@maven//:androidx.navigation.navigation-safe-args-gradle-plugin_2.5.2", - "@maven//:androidx.navigation.navigation-ui-ktx_2.5.2", + "@maven//:androidx.lifecycle.lifecycle-livedata-ktx_2.6.1", + "@maven//:androidx.lifecycle.lifecycle-livedata_2.6.1", + "@maven//:androidx.lifecycle.lifecycle-process_2.6.1", + "@maven//:androidx.lifecycle.lifecycle-runtime-ktx_2.6.1", + "@maven//:androidx.lifecycle.lifecycle-runtime_2.6.1", + "@maven//:androidx.lifecycle.lifecycle-service_2.6.1", + "@maven//:androidx.lifecycle.lifecycle-viewmodel-savedstate_2.6.1", + "@maven//:androidx.lifecycle.lifecycle-viewmodel_2.6.1", + "@maven//:androidx.media.media_1.6.0", + "@maven//:androidx.navigation.navigation-fragment-ktx_2.5.3", + "@maven//:androidx.navigation.navigation-safe-args-gradle-plugin_2.5.3", + "@maven//:androidx.navigation.navigation-ui-ktx_2.5.3", "@maven//:androidx.palette.palette-ktx_1.0.0", - "@maven//:androidx.recyclerview.recyclerview_1.2.1", + "@maven//:androidx.recyclerview.recyclerview_1.3.0", "@maven//:androidx.slice.slice-builders_1.0.0", "@maven//:androidx.test.espresso.espresso-core_3.1.0", "@maven//:androidx.test.espresso.espresso-core_3.2.0", - "@maven//:androidx.test.ext.junit_1.1.2", + "@maven//:androidx.test.ext.junit_1.1.5", "@maven//:androidx.wear.wear_1.2.0", "@maven//:com.android.support.appcompat-v7_25.4.0", "@maven//:com.android.support.constraint.constraint-layout_1.0.2", @@ -105,11 +106,11 @@ maven_repository( "@maven//:com.android.tools.desugar_jdk_libs_1.0.5", "@maven//:com.android.tools.lint.lint-checks_26.5.0", "@maven//:com.github.bumptech.glide.glide_4.11.0", - "@maven//:com.google.android.gms.play-services-ads_20.6.0", + "@maven//:com.google.android.gms.play-services-ads_21.5.0", "@maven//:com.google.android.gms.play-services-base_17.6.0", "@maven//:com.google.android.gms.play-services-gass_20.0.0", "@maven//:com.google.android.gms.play-services-maps_17.0.1", - "@maven//:com.google.android.gms.play-services-wearable_17.1.0", + "@maven//:com.google.android.gms.play-services-wearable_18.0.0", "@maven//:com.google.android.libraries.mapsplatform.secrets-gradle-plugin.secrets-gradle-plugin_2.0.1", "@maven//:com.google.android.material.material_1.1.0", "@maven//:com.google.android.material.material_1.3.0", diff --git a/extensions/build.gradle b/extensions/build.gradle index 0ee7a946..5d7b6cf6 100644 --- a/extensions/build.gradle +++ b/extensions/build.gradle @@ -104,7 +104,7 @@ buildscript { } ext.dataBindingConfig = databindingProperties def supportLibVersion = "1.0.0" - def lifecycleVersion = "2.4.0" + def lifecycleVersion = "2.6.1" ext.libs = [:] ext.libs.android_support_annotations = "androidx.annotation:annotation:$supportLibVersion" ext.libs.android_support_collection = "androidx.collection:collection:$supportLibVersion" @@ -185,8 +185,8 @@ subprojects { failOnVersionConflict() preferProjectModules() - force 'androidx.lifecycle:lifecycle-viewmodel:2.4.0' - force 'androidx.lifecycle:lifecycle-livedata-core:2.4.0' + force 'androidx.lifecycle:lifecycle-viewmodel:2.6.1' + force 'androidx.lifecycle:lifecycle-livedata-core:2.6.1' force 'androidx.fragment:fragment:1.0.0' } } diff --git a/integration-tests/DynamicApp/app/build.gradle b/integration-tests/DynamicApp/app/build.gradle index 3ed6dc43..860dafb8 100644 --- a/integration-tests/DynamicApp/app/build.gradle +++ b/integration-tests/DynamicApp/app/build.gradle @@ -45,7 +45,6 @@ android { dependencies { api 'androidx.appcompat:appcompat:1.0.0' - api 'androidx.lifecycle:lifecycle-extensions:2.2.0' testImplementation 'junit:junit:4.12' androidTestImplementation 'com.android.support.test:runner:1.0.1' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' diff --git a/integration-tests/KotlinTestApp/app/build.gradle b/integration-tests/KotlinTestApp/app/build.gradle index 55cccfe6..4b7b3059 100644 --- a/integration-tests/KotlinTestApp/app/build.gradle +++ b/integration-tests/KotlinTestApp/app/build.gradle @@ -51,7 +51,7 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KaptGenerateStubs.class).config dependencies { def supportVersion = "1.2.0" - def lifecycleVersion = "2.4.0" + def lifecycleVersion = "2.6.1" def testingVersion = "1.3.0" implementation fileTree(dir: 'libs', include: ['*.jar']) implementation project(":library1") diff --git a/integration-tests/TestApp/app/build.gradle b/integration-tests/TestApp/app/build.gradle index c5578c91..6505705f 100644 --- a/integration-tests/TestApp/app/build.gradle +++ b/integration-tests/TestApp/app/build.gradle @@ -33,7 +33,7 @@ android { dependencies { def supportVersion = "1.0.0" - def lifecycleVersion = "2.4.0" + def lifecycleVersion = "2.6.1" implementation fileTree(dir: 'libs', include: ['*.jar']) implementation "androidx.annotation:annotation:$supportVersion" compileOnly 'javax.annotation:jsr250-api:1.0' diff --git a/integration-tests/ViewBindingWithDataBindingTestApp/app/build.gradle b/integration-tests/ViewBindingWithDataBindingTestApp/app/build.gradle index 99441325..120ff089 100644 --- a/integration-tests/ViewBindingWithDataBindingTestApp/app/build.gradle +++ b/integration-tests/ViewBindingWithDataBindingTestApp/app/build.gradle @@ -51,7 +51,7 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KaptGenerateStubs.class).config dependencies { def supportVersion = "1.0.0" - def lifecycleVersion = "2.4.0" + def lifecycleVersion = "2.6.1" def testingVersion = "1.3.0" implementation fileTree(dir: 'libs', include: ['*.jar']) implementation "org.jetbrains.kotlin:kotlin-stdlib:$rootProject.kotlinVersion" -- cgit v1.2.3