diff --git a/activity/activity-compose/benchmark/build.gradle b/activity/activity-compose/benchmark/build.gradle index 233fc38047257..d82fc84ba3586 100644 --- a/activity/activity-compose/benchmark/build.gradle +++ b/activity/activity-compose/benchmark/build.gradle @@ -5,8 +5,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("androidx.benchmark") } @@ -25,7 +23,7 @@ dependencies { } android { - compileSdk = 36 + compileSdk { version = release(37) } namespace = "androidx.activity.compose.benchmark" // DO NOT CHECK IN! Enable experimental benchmarking with R8 - for local runs only diff --git a/activity/activity-compose/build.gradle b/activity/activity-compose/build.gradle index 913d90b9cda4c..cfdbd53328061 100644 --- a/activity/activity-compose/build.gradle +++ b/activity/activity-compose/build.gradle @@ -26,8 +26,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -80,6 +78,8 @@ androidx { } android { - compileSdk = 36 + compileSdk { + version = release(37) + } namespace = "androidx.activity.compose" } diff --git a/activity/activity-compose/samples/build.gradle b/activity/activity-compose/samples/build.gradle index 4e52a3d0a2d02..dec5ca6963ff4 100644 --- a/activity/activity-compose/samples/build.gradle +++ b/activity/activity-compose/samples/build.gradle @@ -26,8 +26,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -60,6 +58,8 @@ androidx { } android { - compileSdk = 36 + compileSdk { + version = release(37) + } namespace = "androidx.activity.compose.samples" } diff --git a/activity/activity-ktx/build.gradle b/activity/activity-ktx/build.gradle index 4de61da94821b..e4738d3fc2349 100644 --- a/activity/activity-ktx/build.gradle +++ b/activity/activity-ktx/build.gradle @@ -26,8 +26,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -49,6 +47,6 @@ androidx { } android { - compileSdk = 36 + compileSdk { version = release(37) } namespace = "androidx.activity.ktx" } diff --git a/activity/activity/build.gradle b/activity/activity/build.gradle index c6492069ad523..9a59bcc2216c0 100644 --- a/activity/activity/build.gradle +++ b/activity/activity/build.gradle @@ -9,13 +9,11 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("androidx.baselineprofile") } android { - compileSdk = 36 + compileSdk { version = release(37) } namespace = "androidx.activity" } diff --git a/activity/integration-tests/baselineprofile/build.gradle b/activity/integration-tests/baselineprofile/build.gradle index c31d676d347f4..e57cd26be9894 100644 --- a/activity/integration-tests/baselineprofile/build.gradle +++ b/activity/integration-tests/baselineprofile/build.gradle @@ -25,8 +25,6 @@ import com.android.build.api.dsl.ManagedVirtualDevice plugins { id("AndroidXPlugin") id("com.android.test") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("androidx.baselineprofile") } diff --git a/activity/integration-tests/macrobenchmark-target/build.gradle b/activity/integration-tests/macrobenchmark-target/build.gradle index 4f25c376b1bfe..8e013213a5a6a 100644 --- a/activity/integration-tests/macrobenchmark-target/build.gradle +++ b/activity/integration-tests/macrobenchmark-target/build.gradle @@ -7,12 +7,10 @@ plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { - compileSdk = 36 + compileSdk { version = release(37) } namespace = "androidx.activity.integration.macrobenchmark.target" } diff --git a/activity/integration-tests/macrobenchmark/build.gradle b/activity/integration-tests/macrobenchmark/build.gradle index ef907a20a66b3..9f5e2a0c8b807 100644 --- a/activity/integration-tests/macrobenchmark/build.gradle +++ b/activity/integration-tests/macrobenchmark/build.gradle @@ -17,8 +17,6 @@ plugins { id("AndroidXPlugin") id("com.android.test") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { diff --git a/activity/integration-tests/testapp/build.gradle b/activity/integration-tests/testapp/build.gradle index 9847f702ef22c..f47d180deb352 100644 --- a/activity/integration-tests/testapp/build.gradle +++ b/activity/integration-tests/testapp/build.gradle @@ -17,13 +17,13 @@ plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("androidx.baselineprofile") } android { - compileSdk = 36 + compileSdk { + version = release(37) + } defaultConfig { applicationId = "androidx.activity.integration.testapp" } diff --git a/annotation/annotation-experimental-lint/integration-tests/build.gradle b/annotation/annotation-experimental-lint/integration-tests/build.gradle index 959c06f1a3e3c..6d5f149378c4a 100644 --- a/annotation/annotation-experimental-lint/integration-tests/build.gradle +++ b/annotation/annotation-experimental-lint/integration-tests/build.gradle @@ -30,8 +30,6 @@ def isIdeBuild() { plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { diff --git a/annotation/annotation-experimental/build.gradle b/annotation/annotation-experimental/build.gradle index d52c2b64983c8..09f2a2ed01a53 100644 --- a/annotation/annotation-experimental/build.gradle +++ b/annotation/annotation-experimental/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/annotation/annotation-keep/samples/build.gradle b/annotation/annotation-keep/samples/build.gradle index 5a61f12cec9a3..4993560677876 100644 --- a/annotation/annotation-keep/samples/build.gradle +++ b/annotation/annotation-keep/samples/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { diff --git a/appcompat/appcompat-benchmark/build.gradle b/appcompat/appcompat-benchmark/build.gradle index 2cbcfb6945e49..adabdf8307459 100644 --- a/appcompat/appcompat-benchmark/build.gradle +++ b/appcompat/appcompat-benchmark/build.gradle @@ -19,8 +19,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("androidx.benchmark") } diff --git a/appcompat/appcompat-lint/integration-tests/build.gradle b/appcompat/appcompat-lint/integration-tests/build.gradle index 3a5e39c4cbb72..04f0ee4f8d896 100644 --- a/appcompat/appcompat-lint/integration-tests/build.gradle +++ b/appcompat/appcompat-lint/integration-tests/build.gradle @@ -7,8 +7,6 @@ plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -18,7 +16,7 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(35) } defaultConfig { vectorDrawables.useSupportLibrary = true } diff --git a/appcompat/appcompat-resources/build.gradle b/appcompat/appcompat-resources/build.gradle index 620eee0306e40..fa20bbbddd264 100644 --- a/appcompat/appcompat-resources/build.gradle +++ b/appcompat/appcompat-resources/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/appcompat/appcompat/build.gradle b/appcompat/appcompat/build.gradle index 1f155a5b6cdeb..616ed0e637516 100644 --- a/appcompat/appcompat/build.gradle +++ b/appcompat/appcompat/build.gradle @@ -11,7 +11,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("com.android.legacy-kapt") - id("com.android.experimental.built-in-kotlin") } dependencies { diff --git a/appcompat/integration-tests/receive-content-testapp/build.gradle b/appcompat/integration-tests/receive-content-testapp/build.gradle index a610d9d213050..d03284d6f63af 100644 --- a/appcompat/integration-tests/receive-content-testapp/build.gradle +++ b/appcompat/integration-tests/receive-content-testapp/build.gradle @@ -20,7 +20,7 @@ plugins { } android { - compileSdk = 35 + compileSdk { version = release(35) } namespace = "androidx.appcompat.demo.receivecontent" } diff --git a/appfunctions/appfunctions-service/build.gradle b/appfunctions/appfunctions-service/build.gradle index 65715da2c432e..87b113cb381d8 100644 --- a/appfunctions/appfunctions-service/build.gradle +++ b/appfunctions/appfunctions-service/build.gradle @@ -26,8 +26,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -67,7 +65,7 @@ dependencies { } android { - compileSdk = 36 + compileSdk { version = release(37) } namespace = "androidx.appfunctions.service" } diff --git a/appfunctions/appfunctions-stubs/build.gradle b/appfunctions/appfunctions-stubs/build.gradle index f9c5585ab85e0..bc56a81b27550 100644 --- a/appfunctions/appfunctions-stubs/build.gradle +++ b/appfunctions/appfunctions-stubs/build.gradle @@ -34,7 +34,7 @@ dependencies { } android { - compileSdk = 36 + compileSdk { version = release(36) } namespace = "com.android.extensions.appfunctions" } diff --git a/appfunctions/appfunctions-testing/build.gradle b/appfunctions/appfunctions-testing/build.gradle index e6f24f5507bb4..2ae8e1821480c 100644 --- a/appfunctions/appfunctions-testing/build.gradle +++ b/appfunctions/appfunctions-testing/build.gradle @@ -27,8 +27,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("com.google.devtools.ksp") } @@ -57,7 +55,7 @@ ksp { } android { - compileSdk = 36 + compileSdk { version = release(37) } namespace = "androidx.appfunctions.testing" } diff --git a/appfunctions/appfunctions/build.gradle b/appfunctions/appfunctions/build.gradle index 136f94e5895b8..9d0ebc2f6ab31 100644 --- a/appfunctions/appfunctions/build.gradle +++ b/appfunctions/appfunctions/build.gradle @@ -28,8 +28,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("com.android.legacy-kapt") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -79,7 +77,7 @@ kapt { } android { - compileSdk = 36 + compileSdk { version = release(37) } namespace = "androidx.appfunctions" } diff --git a/appfunctions/integration-tests/agentapp/build.gradle b/appfunctions/integration-tests/agentapp/build.gradle index 3ec0ff6c3d8a5..9fc723ca0d3ba 100644 --- a/appfunctions/integration-tests/agentapp/build.gradle +++ b/appfunctions/integration-tests/agentapp/build.gradle @@ -51,9 +51,9 @@ def prepareTargetApkTaskProvider = tasks.register("prepareTargetApk", PrepareTar android { namespace = "androidx.appfunctions.integration.test.agent" - compileSdk = 36 + compileSdk { version = release(37) } defaultConfig { - minSdk = 33 + minSdk { version = release(33) } testInstrumentationRunnerArgument("TARGET_APP_APK", targetAppApkName) } diff --git a/appfunctions/integration-tests/multi-modules-testapp/app/build.gradle b/appfunctions/integration-tests/multi-modules-testapp/app/build.gradle index cdd78ffbb8cb2..c5da4f18343e1 100644 --- a/appfunctions/integration-tests/multi-modules-testapp/app/build.gradle +++ b/appfunctions/integration-tests/multi-modules-testapp/app/build.gradle @@ -18,16 +18,14 @@ import com.android.build.api.artifact.SingleArtifact plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("com.google.devtools.ksp") } android { namespace = "androidx.appfunctions.integration.testapp" - compileSdk = 36 + compileSdk { version = release(37) } defaultConfig { - minSdk = 33 + minSdk { version = release(33) } } // Prevent assets file from being compressed. This is for Uri access test. aaptOptions { diff --git a/appfunctions/integration-tests/multi-modules-testapp/shared-library/build.gradle b/appfunctions/integration-tests/multi-modules-testapp/shared-library/build.gradle index cca32b89f4689..d4e758bcb06c9 100644 --- a/appfunctions/integration-tests/multi-modules-testapp/shared-library/build.gradle +++ b/appfunctions/integration-tests/multi-modules-testapp/shared-library/build.gradle @@ -16,17 +16,15 @@ plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("com.google.devtools.ksp") } android { namespace = "androidx.appfunctions.integration.testapp.shared_library" - compileSdk = 36 + compileSdk { version = release(37) } defaultConfig { - minSdk = 33 + minSdk { version = release(33) } } } diff --git a/appfunctions/integration-tests/shared-schema/build.gradle b/appfunctions/integration-tests/shared-schema/build.gradle index 30ecd50205462..a0c8b44e7bb4d 100644 --- a/appfunctions/integration-tests/shared-schema/build.gradle +++ b/appfunctions/integration-tests/shared-schema/build.gradle @@ -21,10 +21,10 @@ plugins { android { namespace = "androidx.appfunction.integration.test.sharedschema" - compileSdk = 36 + compileSdk { version = release(37) } defaultConfig { - minSdk = 33 + minSdk { version = release(33) } } } diff --git a/appsearch/appsearch-builtin-types/build.gradle b/appsearch/appsearch-builtin-types/build.gradle index 88322d5a088c4..5fb32fcaa8a3d 100644 --- a/appsearch/appsearch-builtin-types/build.gradle +++ b/appsearch/appsearch-builtin-types/build.gradle @@ -57,6 +57,6 @@ androidx { } android { - compileSdk = 36 + compileSdk { version = release(36) } namespace = "androidx.appsearch.builtintypes" } diff --git a/appsearch/appsearch-debug-view/build.gradle b/appsearch/appsearch-debug-view/build.gradle index 6c00a3d3684f4..a6b9f760cf22a 100644 --- a/appsearch/appsearch-debug-view/build.gradle +++ b/appsearch/appsearch-debug-view/build.gradle @@ -28,7 +28,7 @@ plugins { } android { - compileSdk = 36 + compileSdk { version = release(36) } namespace = "androidx.appsearch.debugview" } diff --git a/appsearch/appsearch-debug-view/samples/build.gradle b/appsearch/appsearch-debug-view/samples/build.gradle index 205d5ed64ad7e..073c8298effa0 100644 --- a/appsearch/appsearch-debug-view/samples/build.gradle +++ b/appsearch/appsearch-debug-view/samples/build.gradle @@ -28,7 +28,7 @@ plugins { } android { - compileSdk = 36 + compileSdk { version = release(36) } namespace = "androidx.appsearch.debugview.samples" } diff --git a/appsearch/appsearch-ktx/build.gradle b/appsearch/appsearch-ktx/build.gradle index 9ea150ff25ee4..fa23cc8fcf0ca 100644 --- a/appsearch/appsearch-ktx/build.gradle +++ b/appsearch/appsearch-ktx/build.gradle @@ -27,8 +27,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("com.android.legacy-kapt") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -50,6 +48,6 @@ androidx { } android { - compileSdk = 36 + compileSdk { version = release(36) } namespace = "androidx.appsearch.ktx" } diff --git a/appsearch/appsearch-local-storage/build.gradle b/appsearch/appsearch-local-storage/build.gradle index f70c48e855fc7..3d96dda92b8fb 100644 --- a/appsearch/appsearch-local-storage/build.gradle +++ b/appsearch/appsearch-local-storage/build.gradle @@ -30,11 +30,7 @@ plugins { } android { - compileSdk = 36 - compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 - } + compileSdk { version = release(36) } buildTypes.configureEach { // TODO(b/161836669): Minifiation is currently disabled because if it is on, the aar gets // desugared twice in some workflows, which fails. Decide how to handle this (e.g. diff --git a/appsearch/appsearch-platform-storage/build.gradle b/appsearch/appsearch-platform-storage/build.gradle index d58839d40c888..df0e791cc8c99 100644 --- a/appsearch/appsearch-platform-storage/build.gradle +++ b/appsearch/appsearch-platform-storage/build.gradle @@ -51,6 +51,6 @@ androidx { } android { - compileSdk = 36 + compileSdk { version = release(36) } namespace = "androidx.appsearch.platformstorage" } diff --git a/appsearch/appsearch-play-services-storage/build.gradle b/appsearch/appsearch-play-services-storage/build.gradle index 50ebe1bf6a7ea..8e5b7c4a9e1c8 100644 --- a/appsearch/appsearch-play-services-storage/build.gradle +++ b/appsearch/appsearch-play-services-storage/build.gradle @@ -51,7 +51,7 @@ androidx { } android { - compileSdk = 36 + compileSdk { version = release(36) } namespace = "androidx.appsearch.playservicesstorage" defaultConfig { } diff --git a/appsearch/appsearch-test-util/build.gradle b/appsearch/appsearch-test-util/build.gradle index af581150f9ce6..da5f5fbe11867 100644 --- a/appsearch/appsearch-test-util/build.gradle +++ b/appsearch/appsearch-test-util/build.gradle @@ -43,6 +43,6 @@ androidx { } android { - compileSdk = 36 + compileSdk { version = release(36) } namespace = "androidx.appsearch.testutil" } diff --git a/appsearch/appsearch/build.gradle b/appsearch/appsearch/build.gradle index e05db7296cc43..be4919a525aed 100644 --- a/appsearch/appsearch/build.gradle +++ b/appsearch/appsearch/build.gradle @@ -28,7 +28,7 @@ plugins { } android { - compileSdk = 36 + compileSdk { version = release(36) } namespace = "androidx.appsearch" } diff --git a/autofill/autofill/build.gradle b/autofill/autofill/build.gradle index 6b1c39b50982e..55eaf354441e9 100644 --- a/autofill/autofill/build.gradle +++ b/autofill/autofill/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/benchmark/benchmark-common/build.gradle b/benchmark/benchmark-common/build.gradle index 8df068c338c98..8a21193e3eae4 100644 --- a/benchmark/benchmark-common/build.gradle +++ b/benchmark/benchmark-common/build.gradle @@ -29,8 +29,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("com.squareup.wire") id("com.google.devtools.ksp") } diff --git a/benchmark/benchmark-junit4/build.gradle b/benchmark/benchmark-junit4/build.gradle index 318193911ca87..3c9a184a5c8b5 100644 --- a/benchmark/benchmark-junit4/build.gradle +++ b/benchmark/benchmark-junit4/build.gradle @@ -27,8 +27,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { diff --git a/benchmark/benchmark-macro-junit4/build.gradle b/benchmark/benchmark-macro-junit4/build.gradle index 9957dd8de37cc..bc9cf733bae44 100644 --- a/benchmark/benchmark-macro-junit4/build.gradle +++ b/benchmark/benchmark-macro-junit4/build.gradle @@ -27,8 +27,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { diff --git a/benchmark/benchmark-macro/build.gradle b/benchmark/benchmark-macro/build.gradle index 75e37f92be8a9..20ef93530747d 100644 --- a/benchmark/benchmark-macro/build.gradle +++ b/benchmark/benchmark-macro/build.gradle @@ -29,8 +29,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { diff --git a/benchmark/benchmark/build.gradle b/benchmark/benchmark/build.gradle index 847bf88bc5d36..ac393395e31b8 100644 --- a/benchmark/benchmark/build.gradle +++ b/benchmark/benchmark/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("androidx.benchmark") } diff --git a/benchmark/integration-tests/baselineprofile-consumer/build.gradle b/benchmark/integration-tests/baselineprofile-consumer/build.gradle index 9e898c268bc64..4964f86abc958 100644 --- a/benchmark/integration-tests/baselineprofile-consumer/build.gradle +++ b/benchmark/integration-tests/baselineprofile-consumer/build.gradle @@ -25,8 +25,6 @@ import com.android.build.api.artifact.SingleArtifact plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("androidx.baselineprofile") id("com.google.devtools.ksp") id("com.google.dagger.hilt.android") diff --git a/benchmark/integration-tests/baselineprofile-flavors-consumer/build.gradle b/benchmark/integration-tests/baselineprofile-flavors-consumer/build.gradle index f59142208e2e9..c427fc221a823 100644 --- a/benchmark/integration-tests/baselineprofile-flavors-consumer/build.gradle +++ b/benchmark/integration-tests/baselineprofile-flavors-consumer/build.gradle @@ -17,8 +17,6 @@ plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("androidx.baselineprofile") } diff --git a/benchmark/integration-tests/baselineprofile-flavors-producer/build.gradle b/benchmark/integration-tests/baselineprofile-flavors-producer/build.gradle index b74e6850cd305..827e389f55ee3 100644 --- a/benchmark/integration-tests/baselineprofile-flavors-producer/build.gradle +++ b/benchmark/integration-tests/baselineprofile-flavors-producer/build.gradle @@ -25,8 +25,6 @@ import com.android.build.api.dsl.ManagedVirtualDevice plugins { id("AndroidXPlugin") id("com.android.test") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("androidx.baselineprofile") } diff --git a/benchmark/integration-tests/baselineprofile-library-app-target/build.gradle b/benchmark/integration-tests/baselineprofile-library-app-target/build.gradle index f284ffda380a2..ac50d8b63e8bf 100644 --- a/benchmark/integration-tests/baselineprofile-library-app-target/build.gradle +++ b/benchmark/integration-tests/baselineprofile-library-app-target/build.gradle @@ -17,8 +17,6 @@ plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("androidx.baselineprofile") } diff --git a/benchmark/integration-tests/baselineprofile-library-consumer/build.gradle b/benchmark/integration-tests/baselineprofile-library-consumer/build.gradle index d237456ea8c94..b71c6c4d25aeb 100644 --- a/benchmark/integration-tests/baselineprofile-library-consumer/build.gradle +++ b/benchmark/integration-tests/baselineprofile-library-consumer/build.gradle @@ -17,8 +17,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("androidx.baselineprofile") } diff --git a/benchmark/integration-tests/baselineprofile-library-producer/build.gradle b/benchmark/integration-tests/baselineprofile-library-producer/build.gradle index 60d10f08daf5c..7d6be31bbca50 100644 --- a/benchmark/integration-tests/baselineprofile-library-producer/build.gradle +++ b/benchmark/integration-tests/baselineprofile-library-producer/build.gradle @@ -25,8 +25,6 @@ import com.android.build.api.dsl.ManagedVirtualDevice plugins { id("AndroidXPlugin") id("com.android.test") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("androidx.baselineprofile") } diff --git a/benchmark/integration-tests/baselineprofile-producer/build.gradle b/benchmark/integration-tests/baselineprofile-producer/build.gradle index ac3d532131603..a4c960b0d78a9 100644 --- a/benchmark/integration-tests/baselineprofile-producer/build.gradle +++ b/benchmark/integration-tests/baselineprofile-producer/build.gradle @@ -25,14 +25,12 @@ import com.android.build.api.dsl.ManagedVirtualDevice plugins { id("AndroidXPlugin") id("com.android.test") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("androidx.baselineprofile") } android { defaultConfig { - minSdk = 24 + minSdk { version = release(24) } } testOptions.managedDevices.allDevices { pixel6Api31(ManagedVirtualDevice) { diff --git a/benchmark/integration-tests/dry-run-benchmark/build.gradle b/benchmark/integration-tests/dry-run-benchmark/build.gradle index 4da65fe4cea3e..2a8ae37fa668a 100644 --- a/benchmark/integration-tests/dry-run-benchmark/build.gradle +++ b/benchmark/integration-tests/dry-run-benchmark/build.gradle @@ -19,8 +19,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("androidx.benchmark") } diff --git a/benchmark/integration-tests/macrobenchmark-target/build.gradle b/benchmark/integration-tests/macrobenchmark-target/build.gradle index e1adfd722f20e..badbb57245357 100644 --- a/benchmark/integration-tests/macrobenchmark-target/build.gradle +++ b/benchmark/integration-tests/macrobenchmark-target/build.gradle @@ -17,8 +17,6 @@ plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { @@ -29,7 +27,7 @@ android { proguardFiles getDefaultProguardFile("proguard-android-optimize.txt") } } - compileSdk = 35 + compileSdk { version = release(35) } namespace = "androidx.benchmark.integration.macrobenchmark.target" } diff --git a/benchmark/integration-tests/macrobenchmark/build.gradle b/benchmark/integration-tests/macrobenchmark/build.gradle index 161518856cfbd..6928e830b483d 100644 --- a/benchmark/integration-tests/macrobenchmark/build.gradle +++ b/benchmark/integration-tests/macrobenchmark/build.gradle @@ -26,8 +26,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id("AndroidXPlugin") id("com.android.test") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { diff --git a/benchmark/integration-tests/startup-benchmark/build.gradle b/benchmark/integration-tests/startup-benchmark/build.gradle index 5dd49d9c787ed..762cd4817bc08 100644 --- a/benchmark/integration-tests/startup-benchmark/build.gradle +++ b/benchmark/integration-tests/startup-benchmark/build.gradle @@ -19,8 +19,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("androidx.benchmark") } diff --git a/benchmark/samples/build.gradle b/benchmark/samples/build.gradle index 6dcdecd89de1d..9baa5ba11778a 100644 --- a/benchmark/samples/build.gradle +++ b/benchmark/samples/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { diff --git a/biometric/biometric-compose/build.gradle b/biometric/biometric-compose/build.gradle index dae6759d0c400..d7282e75edbd8 100644 --- a/biometric/biometric-compose/build.gradle +++ b/biometric/biometric-compose/build.gradle @@ -28,8 +28,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { implementation("androidx.activity:activity-compose:1.9.1") @@ -52,6 +50,6 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(36) { minorApiLevel = 1 }} namespace = "androidx.biometric.compose" } diff --git a/biometric/biometric-compose/samples/build.gradle b/biometric/biometric-compose/samples/build.gradle index 20a36e084c920..0d45e694b17a6 100644 --- a/biometric/biometric-compose/samples/build.gradle +++ b/biometric/biometric-compose/samples/build.gradle @@ -24,8 +24,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -45,6 +43,6 @@ androidx { description = "Contains the sample code for the AndroidX Biometric Compose library" } android { - compileSdk = 35 + compileSdk { version = release(36) { minorApiLevel = 1 }} namespace = "androidx.biometric.compose.samples" } diff --git a/biometric/biometric/build.gradle b/biometric/biometric/build.gradle index a97989d3dfa24..cbf8c046f78bf 100644 --- a/biometric/biometric/build.gradle +++ b/biometric/biometric/build.gradle @@ -27,16 +27,6 @@ import com.android.build.api.variant.HasUnitTest plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") -} - -android { - compileSdk = 35 -} - -android { - compileSdk = 35 } dependencies { @@ -92,7 +82,7 @@ android { noCompress "ttf" } namespace = "androidx.biometric" - compileSdk = 35 + compileSdk { version = release(36) { minorApiLevel = 1 }} } androidComponents { diff --git a/biometric/biometric/samples/build.gradle b/biometric/biometric/samples/build.gradle index 860085dd6457d..e35451f833059 100644 --- a/biometric/biometric/samples/build.gradle +++ b/biometric/biometric/samples/build.gradle @@ -23,8 +23,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { api 'androidx.fragment:fragment:1.2.5' @@ -40,6 +38,6 @@ androidx { description = "Contains the sample code for the AndroidX Biometric library" } android { - compileSdk = 35 + compileSdk { version = release(36) { minorApiLevel = 1 }} namespace = "androidx.biometric.samples" } diff --git a/biometric/integration-tests/testapp-compose/build.gradle b/biometric/integration-tests/testapp-compose/build.gradle index d9d38bb01c382..d3b7f9421f5f3 100644 --- a/biometric/integration-tests/testapp-compose/build.gradle +++ b/biometric/integration-tests/testapp-compose/build.gradle @@ -25,8 +25,6 @@ plugins { id("AndroidXPlugin") id("AndroidXComposePlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -50,7 +48,7 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(36) { minorApiLevel = 1 }} namespace = "androidx.biometric.integration.testappcompose" defaultConfig { applicationId = "androidx.biometric.integration.testappcompose" diff --git a/biometric/integration-tests/testapp/build.gradle b/biometric/integration-tests/testapp/build.gradle index 5905fccc60166..d7c247c2c3703 100644 --- a/biometric/integration-tests/testapp/build.gradle +++ b/biometric/integration-tests/testapp/build.gradle @@ -17,12 +17,10 @@ plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { - compileSdk = 35 + compileSdk { version = release(36) { minorApiLevel = 1 }} defaultConfig { applicationId = "androidx.biometric.integration.testapp" } diff --git a/browser/browser/build.gradle b/browser/browser/build.gradle index ff78b1b14835b..8f2b5195ec109 100644 --- a/browser/browser/build.gradle +++ b/browser/browser/build.gradle @@ -25,7 +25,7 @@ android { } android { - compileSdk = 36 + compileSdk { version = release(36) } } dependencies { diff --git a/buildSrc/private/build.gradle b/buildSrc/private/build.gradle index 881c8e3765dcb..7fa22d1ee0a24 100644 --- a/buildSrc/private/build.gradle +++ b/buildSrc/private/build.gradle @@ -10,15 +10,3 @@ dependencies { } -/* JB FORK ONLY SECTION */ -// We disable these files since the code there is not used in the fork, -// but it complicates merges (until we update to the same AGP and dackka versions as in the androidx-main) -sourceSets { - main { - kotlin { - exclude '**/DackkaTask.kt' - exclude '**/AndroidXDocsImplPlugin.kt' - } - } -} -/* END SECTION */ \ No newline at end of file diff --git a/buildSrc/private/src/main/kotlin/androidx/build/AndroidXImplPlugin.kt b/buildSrc/private/src/main/kotlin/androidx/build/AndroidXImplPlugin.kt index b885ddc7117fc..a2261cec78ef5 100644 --- a/buildSrc/private/src/main/kotlin/androidx/build/AndroidXImplPlugin.kt +++ b/buildSrc/private/src/main/kotlin/androidx/build/AndroidXImplPlugin.kt @@ -50,7 +50,6 @@ import androidx.build.uptodatedness.TaskUpToDateValidator import androidx.build.uptodatedness.cacheEvenIfNoOutputs import com.android.build.api.artifact.SingleArtifact import com.android.build.api.attributes.BuildTypeAttr -import com.android.build.api.dsl.AarMetadata import com.android.build.api.dsl.ApplicationExtension import com.android.build.api.dsl.KotlinMultiplatformAndroidDeviceTestCompilation import com.android.build.api.dsl.KotlinMultiplatformAndroidHostTestCompilation @@ -58,6 +57,7 @@ import com.android.build.api.dsl.KotlinMultiplatformAndroidLibraryTarget import com.android.build.api.dsl.LibraryExtension import com.android.build.api.dsl.TestBuildType import com.android.build.api.dsl.TestExtension +import com.android.build.api.variant.AarMetadata import com.android.build.api.variant.AndroidComponentsExtension import com.android.build.api.variant.ApplicationAndroidComponentsExtension import com.android.build.api.variant.HasDeviceTests @@ -450,10 +450,6 @@ abstract class AndroidXImplPlugin @Inject constructor() : Plugin { project.extensions.getByType().apply { targets.withType().configureEach { t -> t.compilations.configureEach { compilation -> - // Replace with compilation.compileJavaTaskProvider?.configure {} - // when b/438995010 is fixed - @Suppress("DEPRECATION") - compilation.compilerOptions.configure { jvmTarget.set(defaultJvmTarget) } compilation.compileTaskProvider.configure { it.compilerOptions.jvmTarget.set(defaultJvmTarget) } @@ -693,30 +689,23 @@ abstract class AndroidXImplPlugin @Inject constructor() : Plugin { private fun KotlinSourceSet.includesSourceSet(otherName: String): Boolean = name == otherName || dependsOn.any { it.includesSourceSet(otherName) } - private fun AarMetadata.configure(compileSdk: Int?) { - // Taken from - // https://developer.android.com/build/releases/gradle-plugin#api-level-support - fun mapToMinAgpVersion(compileSdk: Int): String { - return when (compileSdk) { - 33 -> "7.2.0" - 34 -> "8.1.1" - 35 -> "8.6.0" - 36 -> "8.9.1" - 37 -> "9.1.0" - else -> throw Exception("Unknown compileSdk to minAgpVersion mapping") + private fun AarMetadata.configureMinAgpVersion() { + @Suppress("UnstableApiUsage") // usage of minAgpVersion + minAgpVersion.set( + minCompileSdkVersion.map { value -> + // Taken from + // https://developer.android.com/build/releases/about-agp#api-level-support + when (value.apiLevel) { + 1 -> "7.2.0" + 33 -> "7.2.0" + 34 -> "8.1.1" + 35 -> "8.6.0" + 36 -> "8.9.1" + 37 -> "9.1.0" + else -> throw Exception("Unknown compileSdk to minAgpVersion mapping") + } } - } - - // Propagate the compileSdk value into minCompileSdk. Don't propagate - // compileSdkExtension, since only one library actually depends on the extension - // APIs and they can explicitly declare that in their build.gradle. Note that when - // we're using a preview SDK, the value for compileSdk will be null and the - // resulting AAR metadata won't have a minCompileSdk -- - // this is okay because AGP automatically embeds forceCompileSdkPreview in the AAR - // metadata and uses it instead of minCompileSdk. - if (compileSdk == null) return - minCompileSdk = compileSdk - minAgpVersion = mapToMinAgpVersion(compileSdk) + ) } private fun configureWithKotlinMultiplatformAndroidPlugin( @@ -752,6 +741,7 @@ abstract class AndroidXImplPlugin @Inject constructor() : Plugin { project.configurePublicResourcesStub(variant) project.configureMultiplatformSourcesForAndroid(androidXExtension.samplesProjects) project.configureVerifyELFRegionAlignment(variant) + variant.aarMetadata.configureMinAgpVersion() } project.configureVersionFileWriter(project.multiplatformExtension!!, androidXExtension) @@ -912,6 +902,7 @@ abstract class AndroidXImplPlugin @Inject constructor() : Plugin { } } project.configureVerifyELFRegionAlignment(variant) + variant.aarMetadata.configureMinAgpVersion() } project.buildOnServerDependsOnAssembleRelease() } @@ -1031,12 +1022,12 @@ abstract class AndroidXImplPlugin @Inject constructor() : Plugin { // Suppress output of android:compileSdkVersion and related attributes (b/277836549). androidResources.additionalParameters += "--no-compile-sdk-metadata" - compileSdk = project.defaultAndroidConfig.compileSdk + compileSdk { version = release(project.defaultAndroidConfig.compileSdk) } buildToolsVersion = project.defaultAndroidConfig.buildToolsVersion defaultConfig.ndk.abiFilters.addAll(SUPPORTED_BUILD_ABIS) - defaultConfig.minSdk = defaultMinSdk + defaultConfig.minSdk { version = release(defaultMinSdk) } defaultConfig.testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testOptions.animationsDisabled = !project.isMacrobenchmark() @@ -1101,12 +1092,9 @@ abstract class AndroidXImplPlugin @Inject constructor() : Plugin { androidXExtension: AndroidXExtension, ) { val defaultMinSdkVersion = project.defaultAndroidConfig.minSdk - val defaultCompileSdk = project.defaultAndroidConfig.compileSdk - - compileSdk = defaultCompileSdk + compileSdk { version = release(project.defaultAndroidConfig.compileSdk) } buildToolsVersion = project.defaultAndroidConfig.buildToolsVersion - - minSdk = defaultMinSdkVersion + minSdk { version = release(defaultMinSdkVersion) } lint.targetSdk = project.defaultAndroidConfig.targetSdk compilations diff --git a/buildSrc/private/src/main/kotlin/androidx/build/AndroidXMultiplatformExtension.kt b/buildSrc/private/src/main/kotlin/androidx/build/AndroidXMultiplatformExtension.kt index ad2ec2181827a..4f9696303a07b 100644 --- a/buildSrc/private/src/main/kotlin/androidx/build/AndroidXMultiplatformExtension.kt +++ b/buildSrc/private/src/main/kotlin/androidx/build/AndroidXMultiplatformExtension.kt @@ -35,10 +35,8 @@ import org.gradle.api.Project import org.gradle.api.artifacts.Configuration import org.gradle.api.configuration.BuildFeatures import org.gradle.api.plugins.ExtensionAware -import org.gradle.api.tasks.Copy import org.gradle.api.tasks.PathSensitivity import org.gradle.api.tasks.testing.Test -import org.gradle.kotlin.dsl.dependencies import org.gradle.kotlin.dsl.the import org.gradle.kotlin.dsl.withType import org.jetbrains.androidx.build.configureForkWebTarget @@ -70,7 +68,6 @@ import org.jetbrains.kotlin.gradle.targets.wasm.yarn.WasmYarnPlugin import org.jetbrains.kotlin.gradle.targets.wasm.yarn.WasmYarnRootEnvSpec import org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile import org.jetbrains.kotlin.konan.target.LinkerOutputKind -import org.tomlj.Toml /** * [AndroidXMultiplatformExtension] is an extension that wraps specific functionality of the Kotlin diff --git a/buildSrc/private/src/main/kotlin/androidx/build/dackka/DackkaTask.kt b/buildSrc/private/src/main/kotlin/androidx/build/dackka/DackkaTask.kt index 406ad200b4637..72b9cf5248445 100644 --- a/buildSrc/private/src/main/kotlin/androidx/build/dackka/DackkaTask.kt +++ b/buildSrc/private/src/main/kotlin/androidx/build/dackka/DackkaTask.kt @@ -27,7 +27,9 @@ import org.gradle.api.file.FileCollection import org.gradle.api.file.RegularFileProperty import org.gradle.api.model.ObjectFactory import org.gradle.api.provider.ListProperty +import org.gradle.api.provider.MapProperty import org.gradle.api.provider.Property +import org.gradle.api.provider.Provider import org.gradle.api.provider.SetProperty import org.gradle.api.tasks.CacheableTask import org.gradle.api.tasks.Classpath @@ -60,9 +62,35 @@ constructor(private val workerExecutor: WorkerExecutor, private val objects: Obj // Classpath containing Dackka @get:Classpath abstract val dackkaClasspath: ConfigurableFileCollection - // Classpath containing dependencies of libraries needed to resolve types in docs + // Classpath containing dependencies needed to resolve types for the non-KMP source set @get:[InputFiles Classpath] - abstract val dependenciesClasspath: ConfigurableFileCollection + abstract val nonKmpDependenciesClasspath: ConfigurableFileCollection + + /** + * A mapping from KMP target name to classpath containing dependencies needed to resolve types + * for that target. + * + * This is [Internal] but [getAllKmpDependencies] lists the dependencies as [InputFiles]. + */ + @get:Internal abstract val kmpDependenciesClasspathMap: MapProperty + + /** + * The Android jars to be used in the classpath of the non-KMP source set as well as any + * android/jvm KMP source sets. + */ + @get:[InputFiles Classpath] + abstract val androidJars: ConfigurableFileCollection + + /** Lists all classpath files (jars and klibs) from [kmpDependenciesClasspathMap]. */ + @InputFiles + @PathSensitive(PathSensitivity.NONE) + fun getAllKmpDependencies(): Provider { + return kmpDependenciesClasspathMap.map { + it.values.reduce { allDependencies, sourceSetClasspath -> + sourceSetClasspath + allDependencies + } + } + } // Directory containing the code samples from framework @get:[InputFiles PathSensitive(PathSensitivity.RELATIVE)] @@ -170,13 +198,32 @@ constructor(private val workerExecutor: WorkerExecutor, private val objects: Obj metadata.sourceSets .sortedWith(compareBy({ it.dependencies.size }, { it.name })) .mapNotNull { sourceSet -> - val sourceDir = - multiplatformSourcesDir.get().asFile.resolve(sourceSet.name) + val sourceDir = sourceDirForSourceSet(sourceSet.name) + // The source set metadata includes source sets with no source files, + // skip these ones. if (!sourceDir.exists()) return@mapNotNull null val analysisPlatform = DokkaAnalysisPlatform.valueOf( sourceSet.analysisPlatform.uppercase() ) + + val dependentSourceSets = buildList { + // Only include dependent source sets which have source files (the + // source set metadata includes all possible source sets, and the + // ones without source files are not created as dackka source sets) + addAll( + sourceSet.dependencies.filter { + sourceDirForSourceSet(it).exists() + } + ) + // Include a dependency on the main non-KMP source set for jvm + // source sets to make references from these source sets to non + // KMP projects resolve (b/484050995). + if (analysisPlatform.androidOrJvm()) { + add("main") + } + } + DokkaInputModels.SourceSet( id = sourceSetIdForSourceSet(sourceSet.name), displayName = sourceSet.name, @@ -198,7 +245,7 @@ constructor(private val workerExecutor: WorkerExecutor, private val objects: Obj ), externalDocumentationLinks = externalDocs, dependentSourceSets = - sourceSet.dependencies.map { sourceSetIdForSourceSet(it) }, + dependentSourceSets.map { sourceSetIdForSourceSet(it) }, noJdkLink = !analysisPlatform.androidOrJvm(), noAndroidSdkLink = analysisPlatform != DokkaAnalysisPlatform.ANDROID, @@ -222,7 +269,7 @@ constructor(private val workerExecutor: WorkerExecutor, private val objects: Obj getSampleSourceFileCollection() }, includes = objects.fileCollection().from(includesFiles(jvmSourcesDir.get().asFile)), - classpath = dependenciesClasspath, + classpath = nonKmpDependenciesClasspath + androidJars, externalDocumentationLinks = externalDocs, dependentSourceSets = emptyList(), noJdkLink = false, diff --git a/buildSrc/private/src/main/kotlin/androidx/build/docs/AndroidXDocsImplPlugin.kt b/buildSrc/private/src/main/kotlin/androidx/build/docs/AndroidXDocsImplPlugin.kt index 893048ffc1729..5207ec4ee510b 100644 --- a/buildSrc/private/src/main/kotlin/androidx/build/docs/AndroidXDocsImplPlugin.kt +++ b/buildSrc/private/src/main/kotlin/androidx/build/docs/AndroidXDocsImplPlugin.kt @@ -16,25 +16,25 @@ package androidx.build.docs +import androidx.build.KonanPrebuiltsSetup +import androidx.build.clang.KonanBuildService import androidx.build.configureTaskTimeouts import androidx.build.dackka.DackkaTask import androidx.build.dackka.GenerateMetadataTask import androidx.build.defaultAndroidConfig import androidx.build.getAndroidJar -import androidx.build.getCheckoutRoot import androidx.build.getDistributionDirectory -import androidx.build.getKeystore import androidx.build.getLibraryClasspath import androidx.build.getSupportRootFolder import androidx.build.isIsolatedProjectsEnabled import androidx.build.metalava.versionMetadataUsage +import androidx.build.multiplatformExtension import androidx.build.sources.PROJECT_STRUCTURE_METADATA_FILENAME import androidx.build.sources.multiplatformUsage import androidx.build.versionCatalog import androidx.build.workaroundAndroidXDependencyResolutions import com.android.build.api.attributes.BuildTypeAttr -import com.android.build.api.dsl.LibraryExtension -import com.android.build.gradle.LibraryPlugin +import com.android.build.api.dsl.KotlinMultiplatformAndroidLibraryTarget import com.google.gson.GsonBuilder import java.io.File import java.io.FileNotFoundException @@ -58,6 +58,7 @@ import org.gradle.api.attributes.LibraryElements import org.gradle.api.attributes.Usage import org.gradle.api.configuration.BuildFeatures import org.gradle.api.file.ArchiveOperations +import org.gradle.api.file.CopySpec import org.gradle.api.file.Directory import org.gradle.api.file.DirectoryProperty import org.gradle.api.file.DuplicatesStrategy @@ -67,6 +68,7 @@ import org.gradle.api.file.RegularFile import org.gradle.api.file.RegularFileProperty import org.gradle.api.model.ObjectFactory import org.gradle.api.plugins.JavaBasePlugin +import org.gradle.api.provider.MapProperty import org.gradle.api.provider.Property import org.gradle.api.provider.Provider import org.gradle.api.tasks.CacheableTask @@ -81,47 +83,35 @@ import org.gradle.api.tasks.Sync import org.gradle.api.tasks.TaskAction import org.gradle.api.tasks.TaskProvider import org.gradle.api.tasks.bundling.Zip -import org.gradle.api.tasks.testing.Test import org.gradle.kotlin.dsl.all import org.gradle.kotlin.dsl.getByType +import org.gradle.kotlin.dsl.mapProperty import org.gradle.kotlin.dsl.named import org.gradle.kotlin.dsl.register import org.gradle.work.DisableCachingByDefault +import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl +import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension +import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType +import org.jetbrains.kotlin.gradle.plugin.KotlinTarget +import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget +import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinUsages +import org.jetbrains.kotlin.gradle.targets.js.KotlinWasmTargetAttribute +import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinWasmTargetDsl +import org.jetbrains.kotlin.gradle.targets.js.toAttribute /** * Plugin that allows to build documentation for a given set of prebuilt and tip of tree projects. */ abstract class AndroidXDocsImplPlugin : Plugin { - lateinit var docsSourcesConfiguration: Configuration - lateinit var multiplatformDocsSourcesConfiguration: Configuration - lateinit var versionMetadataConfiguration: Configuration - lateinit var dependencyClasspath: FileCollection - @get:Inject abstract val archiveOperations: ArchiveOperations @get:Inject abstract val buildFeatures: BuildFeatures override fun apply(project: Project) { val docsType = project.name.removePrefix("docs-") - project.plugins.configureEach { plugin -> - when (plugin) { - is LibraryPlugin -> { - val libraryExtension = project.extensions.getByType() - libraryExtension.compileSdk { - version = release(project.defaultAndroidConfig.latestStableCompileSdk) - } - libraryExtension.buildToolsVersion = - project.defaultAndroidConfig.buildToolsVersion - - // Use a local debug keystore to avoid build server issues. - val debugSigningConfig = libraryExtension.signingConfigs.getByName("debug") - debugSigningConfig.storeFile = project.getKeystore() - libraryExtension.buildTypes.configureEach { buildType -> - // Sign all the builds (including release) with debug key - buildType.signingConfig = debugSigningConfig - } - } - } - } + // Configure this as a KMP project. + KonanPrebuiltsSetup.configureKonanDirectory(project) + configureTargets(project, docsType) + disableUnneededTasks(project) val configurations = Configurations(project) val buildOnServer = @@ -165,7 +155,8 @@ abstract class AndroidXDocsImplPlugin : Plugin { unzippedJvmSamplesSources = unzippedJvmSamplesSourcesDirectory, unzipJvmSamplesTask = unzipJvmSamplesTask, unzippedKmpSamplesSources = unzippedKmpSamplesSourcesDirectory, - dependencyClasspath = dependencyClasspath, + nonKmpDependencyClasspath = configurations.nonKmpDependencyClasspath, + kmpDependencyClasspathMap = configurations.kmpDependencyClasspathMap, buildOnServer = buildOnServer, docsConfiguration = configurations.docsSourcesConfiguration, multiplatformDocsConfiguration = configurations.multiplatformDocsSourcesConfiguration, @@ -204,12 +195,13 @@ abstract class AndroidXDocsImplPlugin : Plugin { task.from( pairProvider .map { it.first } - .map { - it.map { jar -> + .map { jars -> + jars.map { jar -> localVar.zipTree(jar).matching { it.exclude("**/META-INF/MANIFEST.MF") } } } ) + task.rewriteSamplesTags() // Files with the same path in different source jars of the same library will lead to // some classes/methods not appearing in the docs. task.duplicatesStrategy = DuplicatesStrategy.WARN @@ -389,42 +381,202 @@ abstract class AndroidXDocsImplPlugin : Plugin { private val kotlinVersionConstraint = project.versionCatalog.findVersion(kotlinDefaultCatalogVersion).get() - // Build a compile & runtime classpaths for needed for documenting the libraries - // from the configurations above. - val docsCompileClasspath = - project.configurations.create("docs-compile-classpath") { - it.setResolveClasspathForUsage(Usage.JAVA_API) - } - val docsRuntimeClasspath = - project.configurations.create("docs-runtime-classpath") { - it.setResolveClasspathForUsage(Usage.JAVA_RUNTIME) + private val kmpExtension = project.extensions.getByType() + + // Use the android target to resolve the non-KMP classpath, so that for any KMP dependencies + // of non-KMP projects with both android and jvmstubs artifacts the android variant is used. + val nonKmpDependencyClasspath = + createClasspathConfigurationsForTarget( + extendsFromConfigurations = + arrayOf( + docsConfiguration, + stubsConfiguration, + docsWithoutApiSinceConfiguration, + ), + target = kmpExtension.androidLibraryTarget(), + isKmp = false, + ) + + // Create mapping from target name to classpath for that target. + val kmpDependencyClasspathMap = createKmpClasspaths() + + private val stdLibKlibDir = KonanBuildService.obtain(project).map { it.stdlibKlibDir() } + + private fun createKmpClasspaths(): MapProperty { + val map = project.objects.mapProperty() + kmpExtension.targets.configureEach { target -> + val classpath = + createClasspathConfigurationsForTarget( + extendsFromConfigurations = + arrayOf( + multiplatformDocsConfiguration, + multiplatformDocsWithoutApiSinceConfiguration, + stubsConfiguration, + ), + target = target, + isKmp = true, + ) + // Add the classpath for the target to the mapping. + map.put(target.name + "Main", classpath) + // It is an error to configure separate jvm and desktop targets, so treat the jvm + // target as both jvm and desktop. + if (target.name == "jvm") { + map.put("desktopMain", classpath) + } } - val kotlinDefaultCatalogVersion = androidx.build.KotlinTarget.LATEST.catalogVersion - val kotlinLatest = project.versionCatalog.findVersion(kotlinDefaultCatalogVersion).get() - listOf(docsCompileClasspath, docsRuntimeClasspath).forEach { config -> - config.resolutionStrategy { - it.eachDependency { details -> - if (details.requested.group == "org.jetbrains.kotlin") { - details.useVersion(kotlinLatest.requiredVersion) + return map + } + + /** + * Configures the classpath for the given [target] extending from all configurations in + * [extendsFromConfigurations], with both the API and runtime dependencies. + */ + private fun createClasspathConfigurationsForTarget( + extendsFromConfigurations: Array, + target: KotlinTarget, + isKmp: Boolean, + ): Provider { + // Find both the API and runtime dependencies. Technically only the API dependencies + // should be required for docs, but projects don't always use the correct configuration. + val targetApiClasspath = + createClasspathConfigurationForTarget( + extendsFromConfigurations = extendsFromConfigurations, + target = target, + usageDescription = "api", + javaUsage = Usage.JAVA_API, + kotlinUsage = KotlinUsages.KOTLIN_API, + isKmp = isKmp, + ) + val targetRuntimeClasspath = + createClasspathConfigurationForTarget( + extendsFromConfigurations = extendsFromConfigurations, + target = target, + usageDescription = "runtime", + javaUsage = Usage.JAVA_RUNTIME, + kotlinUsage = KotlinUsages.KOTLIN_RUNTIME, + isKmp = isKmp, + ) + return targetApiClasspath.zip(targetRuntimeClasspath) { api, runtime -> + val additionalFiles = + if (target is KotlinNativeTarget) { + project.files(stdLibKlibDir) + } else { + project.files() } - } + api + runtime + additionalFiles } } - dependencyClasspath = - docsCompileClasspath.incoming - .artifactView { - it.attributes.attribute( - Attribute.of("artifactType", String::class.java), - "android-classes", - ) + + /** + * Configures the classpath for the given [target] extending from all configurations in + * [extendsFromConfigurations]. + * + * The [usageDescription] is used in the configuration name. If [target] is JVM or android, + * the [javaUsage] is used as the usage attribute, otherwise [kotlinUsage] is used instead. + */ + private fun createClasspathConfigurationForTarget( + extendsFromConfigurations: Array, + target: KotlinTarget, + usageDescription: String, + javaUsage: String, + kotlinUsage: String, + isKmp: Boolean, + ): Provider { + // Skip the common target, which is associated with the metadata compilation. + if (target.platformType == KotlinPlatformType.common) + return project.provider { project.files() } + val isJvm = + target.platformType == KotlinPlatformType.androidJvm || + target.platformType == KotlinPlatformType.jvm + + val kmpString = if (isKmp) "kmp" else "non-kmp" + val configurationName = + "docs-compile-classpath-${target.name}-$kmpString-$usageDescription" + return project.configurations + .register(configurationName) { config -> + config.extendsFrom(*extendsFromConfigurations) + config.isCanBeConsumed = false + config.attributes { + it.attribute(KotlinPlatformType.attribute, target.platformType) + // Use the appropriate usage based on whether this is a jvm target. + val usage = + if (isJvm) { + javaUsage + } else { + kotlinUsage + } + it.attribute(Usage.USAGE_ATTRIBUTE, project.objects.named(usage)) + it.attribute( + Category.CATEGORY_ATTRIBUTE, + project.objects.named(Category.LIBRARY), + ) + it.attribute( + BuildTypeAttr.ATTRIBUTE, + project.objects.named("release"), + ) + // Add additional attributes based on the target. + target.attributes.keySet().forEach { key -> + if (key.type == String::class.java) { + val attributeValue = target.attributes.getAttribute(key) + @Suppress("UNCHECKED_CAST") + it.attribute(key as Attribute, attributeValue as String) + } + } + // For wasm targets add an extra required attribute which isn't part of the + // target attribute set already. + if (target.platformType == KotlinPlatformType.wasm) { + (target as? KotlinWasmTargetDsl)?.wasmTargetType?.let { wasmTargetType + -> + it.attribute( + KotlinWasmTargetAttribute.wasmTargetAttribute, + wasmTargetType.toAttribute(), + ) + } + } + } + config.resolutionStrategy { + it.eachDependency { details -> + if (details.requested.group == "org.jetbrains.kotlin") { + details.useVersion(kotlinVersionConstraint.requiredVersion) + } + } + } + } + .map { configuration -> + classpathArtifactsFromConfiguration(configuration, isJvm = isJvm, isKmp = isKmp) } - .files + - docsRuntimeClasspath.incoming + } + + /** + * Creates a file collection with jar and klib dependencies resolved from the + * [configuration]. + * + * When [isJvm] is true, this transforms aar dependencies into jars which dackka can + * process. + * + * When [isKmp] is true, classpath resolution is lenient because not every KMP dependency + * exists for every target. + */ + private fun classpathArtifactsFromConfiguration( + configuration: Configuration, + isJvm: Boolean, + isKmp: Boolean, + ): FileCollection { + fun getArtifacts(androidArtifactType: String? = null): FileCollection { + return configuration.incoming .artifactView { - it.attributes.attribute( - Attribute.of("artifactType", String::class.java), - "android-classes", - ) + // Set the configuration to lenient because not every KMP project will have + // all targets configured. + if (isKmp) { + it.isLenient = true + } + // Set the aar transformation as needed. + androidArtifactType?.let { androidArtifactType -> + it.attributes.attribute( + ArtifactTypeDefinition.ARTIFACT_TYPE_ATTRIBUTE, + androidArtifactType, + ) + } } .files } @@ -449,7 +601,8 @@ abstract class AndroidXDocsImplPlugin : Plugin { unzippedJvmSamplesSources: Provider, unzipJvmSamplesTask: TaskProvider, unzippedKmpSamplesSources: Provider, - dependencyClasspath: FileCollection, + nonKmpDependencyClasspath: Provider, + kmpDependencyClasspathMap: Provider>, buildOnServer: TaskProvider<*>, docsConfiguration: Configuration, multiplatformDocsConfiguration: Configuration, @@ -506,13 +659,14 @@ abstract class AndroidXDocsImplPlugin : Plugin { projectListsDirectory.set( File(project.getSupportRootFolder(), "docs-public/package-lists") ) - dependenciesClasspath.from( - dependencyClasspath + - project.getAndroidJar( - project.defaultAndroidConfig.latestStableCompileSdk - ) + - project.getExtraCommonDependencies() + androidJars.setFrom( + project.getAndroidJar( + project.defaultAndroidConfig.latestStableCompileSdk, + project.defaultAndroidConfig.latestCompileSdkExtension, + ) ) + nonKmpDependenciesClasspath.from(nonKmpDependencyClasspath) + kmpDependenciesClasspathMap.set(kmpDependencyClasspathMap) excludedPackages.set(hiddenPackages.toSet()) excludedPackagesForJava.set(hiddenPackagesJava) excludedPackagesForKotlin.set(emptySet()) @@ -578,33 +732,83 @@ abstract class AndroidXDocsImplPlugin : Plugin { } /** - * Replace all tests etc with empty task, so we don't run anything it is more effective then - * task.enabled = false, because we avoid executing deps as well + * Replace all unneeded tasks with an empty task and disables them, to avoid executing deps as + * well */ private fun disableUnneededTasks(project: Project) { var reentrance = false - project.tasks.whenTaskAdded { task -> + project.tasks.configureEach { task -> if ( - task is Test || - task.name.startsWith("assemble") || + task.name.startsWith("assemble") || + task.name == "jsTest" || task.name == "lint" || task.name == "lintDebug" || task.name == "lintAnalyzeDebug" || task.name == "transformDexArchiveWithExternalLibsDexMergerForPublicDebug" || task.name == "transformResourcesWithMergeJavaResForPublicDebug" || - task.name == "checkPublicDebugDuplicateClasses" + task.name == "checkPublicDebugDuplicateClasses" || + task.name == "wasmJsTestTestProductionExecutableCompileSync" || + task.name == "wasmJsTestTestDevelopmentExecutableCompileSync" ) { if (!reentrance) { reentrance = true - project.tasks.named(task.name) { - it.actions = emptyList() - it.dependsOn(emptyList()) - } + task.actions = emptyList() + task.dependsOn(emptyList()) + task.enabled = false reentrance = false } } } } + + /** Configures all possible targets, so that all necessary classpaths will be generated. */ + @OptIn(ExperimentalWasmDsl::class) + private fun configureTargets(project: Project, docsType: String) { + val multiplatformExtension = project.multiplatformExtension!! + + val androidLibraryTarget = multiplatformExtension.androidLibraryTarget() + androidLibraryTarget.compileSdk { + version = release(project.defaultAndroidConfig.latestStableCompileSdk) + } + androidLibraryTarget.buildToolsVersion = project.defaultAndroidConfig.buildToolsVersion + androidLibraryTarget.namespace = "androidx.docs.$docsType" + + multiplatformExtension.jvm() + + multiplatformExtension.androidNativeX64() + multiplatformExtension.androidNativeX86() + multiplatformExtension.androidNativeArm32() + multiplatformExtension.androidNativeArm64() + + multiplatformExtension.mingwX64() + multiplatformExtension.macosArm64() + + multiplatformExtension.iosArm64() + multiplatformExtension.iosSimulatorArm64() + + multiplatformExtension.watchosArm32() + multiplatformExtension.watchosArm64() + multiplatformExtension.watchosDeviceArm64() + multiplatformExtension.watchosSimulatorArm64() + + multiplatformExtension.tvosArm64() + multiplatformExtension.tvosSimulatorArm64() + + multiplatformExtension.linuxArm64() + multiplatformExtension.linuxX64() + + if (!buildFeatures.isIsolatedProjectsEnabled()) { // KT-80311 + multiplatformExtension.js { browser() } + multiplatformExtension.wasmJs { browser() } + } + } + + companion object { + private fun KotlinMultiplatformExtension.androidLibraryTarget(): + KotlinMultiplatformAndroidLibraryTarget { + return extensions.getByType(KotlinMultiplatformAndroidLibraryTarget::class.java) + } + } } @DisableCachingByDefault(because = "Doesn't benefit from caching") @@ -806,6 +1010,7 @@ abstract class UnzipMultiplatformSourcesTask() : DefaultTask() { seenPath = true } } + it.rewriteSamplesTags() } fileSystemOperations.sync { @@ -827,6 +1032,16 @@ abstract class UnzipMultiplatformSourcesTask() : DefaultTask() { } } +/** + * To work around a parser issue with `@sample` where when the tag is used in the middle of a kdoc + * any links after the sample do not resolve (see b/427708573), rewrite `@sample` tags to + * `@author #@sample`. The `@author` tag is not supported by dackka, so as a workaround for the + * samples issue it replaces any author tags with samples. + */ +internal fun CopySpec.rewriteSamplesTags() { + filter { line -> line.replace(" * @sample ", " * @author #@sample ") } +} + private fun Map.partition(condition: (K) -> Boolean): Pair, Map> = this.toList().partition { (k, _) -> condition(k) }.let { it.first.toMap() to it.second.toMap() } @@ -879,36 +1094,3 @@ abstract class MergeMultiplatformMetadataTask : DefaultTask() { } } } - -private fun Project.getPrebuiltsExternalPath() = - File(project.getCheckoutRoot(), "prebuilts/androidx/external/") - -private val PLATFORMS = - listOf("linuxx64", "macosarm64", "macosx64", "iosx64", "iossimulatorarm64", "iosarm64") - -private fun Project.getExtraCommonDependencies(): FileCollection = - files( - arrayOf( - File( - getPrebuiltsExternalPath(), - "org/jetbrains/kotlinx/kotlinx-coroutines-core/1.6.4/" + - "kotlinx-coroutines-core-1.6.4.jar", - ), - File( - getPrebuiltsExternalPath(), - "org/jetbrains/kotlinx/atomicfu/0.17.0/atomicfu-0.17.0.jar", - ), - File(getPrebuiltsExternalPath(), "com/squareup/okio/okio-jvm/3.1.0/okio-jvm-3.1.0.jar"), - // TODO(b/409256436): Remove when KMP classes (.knm) in Kotlin 2.1 can be loaded - File( - getPrebuiltsExternalPath(), - "org/jetbrains/kotlin/kotlin-stdlib/2.0.20/kotlin-stdlib-2.0.20-common.jar", - ), - ) + - PLATFORMS.map { - File( - getPrebuiltsExternalPath(), - "com/squareup/okio/okio-$it/3.1.0/okio-$it-3.1.0.klib", - ) - } - ) diff --git a/buildSrc/private/src/main/kotlin/androidx/build/sources/SourceJarTaskHelper.kt b/buildSrc/private/src/main/kotlin/androidx/build/sources/SourceJarTaskHelper.kt index 11d0fc9b7cf7a..1c324d8f97599 100644 --- a/buildSrc/private/src/main/kotlin/androidx/build/sources/SourceJarTaskHelper.kt +++ b/buildSrc/private/src/main/kotlin/androidx/build/sources/SourceJarTaskHelper.kt @@ -17,7 +17,6 @@ package androidx.build.sources import androidx.build.LazyInputsCopyTask -import androidx.build.ProjectLayoutType import androidx.build.ProjectLayoutType.Companion.isJetBrainsFork import androidx.build.capitalize import androidx.build.dackka.DokkaAnalysisPlatform diff --git a/buildSrc/public/src/main/kotlin/androidx/build/AndroidXConfiguration.kt b/buildSrc/public/src/main/kotlin/androidx/build/AndroidXConfiguration.kt index e86f6d1aad2f0..de7d599155cd8 100644 --- a/buildSrc/public/src/main/kotlin/androidx/build/AndroidXConfiguration.kt +++ b/buildSrc/public/src/main/kotlin/androidx/build/AndroidXConfiguration.kt @@ -42,7 +42,7 @@ enum class KotlinTarget(val apiVersion: KotlinVersion, val catalogVersion: Strin KOTLIN_2_1(KotlinVersion.KOTLIN_2_1, "kotlin21"), KOTLIN_2_2(KotlinVersion.KOTLIN_2_2, "kotlin22"), KOTLIN_2_3(KotlinVersion.KOTLIN_2_3, "kotlin23"), - DEFAULT(KOTLIN_2_3), + DEFAULT(JETBRAINS_COMPILE_KOTLIN_VERSION), LATEST(KOTLIN_2_3); constructor( diff --git a/buildSrc/shared-dependencies.gradle b/buildSrc/shared-dependencies.gradle index f39efd0cb106c..6970399856ea4 100644 --- a/buildSrc/shared-dependencies.gradle +++ b/buildSrc/shared-dependencies.gradle @@ -22,7 +22,6 @@ dependencies { implementation(libs.androidToolsRepository) // com.android.repository for Stable AIDL plugin implementation(libs.androidToolsSdkCommon) // com.android.ide.common for Stable AIDL plugin implementation(libs.spdxGradlePluginz) - runtimeOnly(libs.androidExperimentalBuiltInKotlinPlugin) runtimeOnly(libs.androidKotlinMultiplatform) runtimeOnly(libs.androidLegacyKaptPlugin) compileOnly(libs.kotlinAbiTools) diff --git a/camera/camera-camera2-pipe-testing/build.gradle b/camera/camera-camera2-pipe-testing/build.gradle index 3c91df9172c19..37011357e0e82 100644 --- a/camera/camera-camera2-pipe-testing/build.gradle +++ b/camera/camera-camera2-pipe-testing/build.gradle @@ -26,8 +26,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -49,7 +47,7 @@ dependencies { } android { - compileSdk = 36 + compileSdk { version = release(36) } lint { enable.add("CameraXQuirksClassDetector") diff --git a/camera/camera-camera2-pipe/build.gradle b/camera/camera-camera2-pipe/build.gradle index 26f0a52dde894..4913a5e6ee139 100644 --- a/camera/camera-camera2-pipe/build.gradle +++ b/camera/camera-camera2-pipe/build.gradle @@ -26,8 +26,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("com.google.devtools.ksp") } @@ -63,7 +61,7 @@ dependencies { } android { - compileSdk = 36 + compileSdk { version = release(36) } lint { enable.add("CameraXQuirksClassDetector") diff --git a/camera/camera-camera2/build.gradle b/camera/camera-camera2/build.gradle index af49c2f09f9b6..fc2f12bebe449 100644 --- a/camera/camera-camera2/build.gradle +++ b/camera/camera-camera2/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("com.google.devtools.ksp") } @@ -95,7 +93,7 @@ dependencies { } android { - compileSdk = 36 + compileSdk { version = release(36) } lint { enable.add("CameraXQuirksClassDetector") diff --git a/camera/camera-compose/build.gradle b/camera/camera-compose/build.gradle index 272dcc87caa79..57448ecbdee72 100644 --- a/camera/camera-compose/build.gradle +++ b/camera/camera-compose/build.gradle @@ -26,8 +26,6 @@ plugins { id("AndroidXPlugin") id("AndroidXComposePlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -74,7 +72,7 @@ dependencies { } android { - compileSdk = 36 + compileSdk { version = release(37) } namespace = "androidx.camera.compose" } diff --git a/camera/camera-compose/samples/build.gradle b/camera/camera-compose/samples/build.gradle index 717fdb5fa9bb0..f3fbaa244dfcc 100644 --- a/camera/camera-compose/samples/build.gradle +++ b/camera/camera-compose/samples/build.gradle @@ -26,8 +26,6 @@ plugins { id("AndroidXPlugin") id("AndroidXComposePlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -46,7 +44,7 @@ dependencies { } android { - compileSdk = 36 + compileSdk { version = release(37) } namespace = "androidx.camera.compose.samples" } diff --git a/camera/camera-core/build.gradle b/camera/camera-core/build.gradle index 4efc5f938f743..11c290152e8cc 100644 --- a/camera/camera-core/build.gradle +++ b/camera/camera-core/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -91,7 +89,7 @@ dependencies { } android { - compileSdk = 36 + compileSdk { version = release(36) } defaultConfig { externalNativeBuild { diff --git a/camera/camera-core/samples/build.gradle b/camera/camera-core/samples/build.gradle index 553e1fe1668e8..c09cb4a89370b 100644 --- a/camera/camera-core/samples/build.gradle +++ b/camera/camera-core/samples/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -39,7 +37,7 @@ dependencies { } android { - compileSdk = 36 + compileSdk { version = release(36) } namespace = "androidx.camera.core.samples" } diff --git a/camera/camera-effects/build.gradle b/camera/camera-effects/build.gradle index f83d148bcb396..0c39f8d1b796f 100644 --- a/camera/camera-effects/build.gradle +++ b/camera/camera-effects/build.gradle @@ -18,8 +18,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { api(libs.jspecify) @@ -58,7 +56,7 @@ dependencies { androidTestImplementation(libs.testMonitor) } android { - compileSdk = 36 + compileSdk { version = release(36) } namespace = "androidx.camera.effects" } androidx { diff --git a/camera/camera-extensions/build.gradle b/camera/camera-extensions/build.gradle index 36445e3e19c95..e661b68ba187b 100644 --- a/camera/camera-extensions/build.gradle +++ b/camera/camera-extensions/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -78,7 +76,7 @@ dependencies { } android { - compileSdk = 36 + compileSdk { version = release(36) } lint { enable.add("CameraXQuirksClassDetector") } diff --git a/camera/camera-extensions/samples/build.gradle b/camera/camera-extensions/samples/build.gradle index f47dbc4682986..0152085fa1aa1 100644 --- a/camera/camera-extensions/samples/build.gradle +++ b/camera/camera-extensions/samples/build.gradle @@ -30,7 +30,7 @@ dependencies { } android { - compileSdk = 36 + compileSdk { version = release(36) } namespace = "androidx.camera.extensions.samples" } diff --git a/camera/camera-lifecycle/build.gradle b/camera/camera-lifecycle/build.gradle index 07ae21cfd2072..988300833f880 100644 --- a/camera/camera-lifecycle/build.gradle +++ b/camera/camera-lifecycle/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -92,7 +90,7 @@ dependencies { } android { - compileSdk = 36 + compileSdk { version = release(36) } lint { enable.add("CameraXQuirksClassDetector") diff --git a/camera/camera-lifecycle/samples/build.gradle b/camera/camera-lifecycle/samples/build.gradle index 42820d213b72f..3d3bad5e9b57f 100644 --- a/camera/camera-lifecycle/samples/build.gradle +++ b/camera/camera-lifecycle/samples/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -39,7 +37,7 @@ dependencies { } android { - compileSdk = 36 + compileSdk { version = release(36) } namespace = "androidx.camera.lifecycle.samples" } diff --git a/camera/camera-mlkit-vision/build.gradle b/camera/camera-mlkit-vision/build.gradle index e23adbf7c12c0..1ae2ea876f1a3 100644 --- a/camera/camera-mlkit-vision/build.gradle +++ b/camera/camera-mlkit-vision/build.gradle @@ -18,8 +18,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -49,7 +47,7 @@ dependencies { } android { - compileSdk = 36 + compileSdk { version = release(36) } lint { enable.add("CameraXQuirksClassDetector") diff --git a/camera/camera-testing/build.gradle b/camera/camera-testing/build.gradle index d839e8b8c40b2..385ee032bf67c 100644 --- a/camera/camera-testing/build.gradle +++ b/camera/camera-testing/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -71,7 +69,7 @@ dependencies { } android { - compileSdk = 36 + compileSdk { version = release(36) } defaultConfig { externalNativeBuild { diff --git a/camera/camera-testlib-extensions/build.gradle b/camera/camera-testlib-extensions/build.gradle index 546facf2da864..a1394223d5add 100644 --- a/camera/camera-testlib-extensions/build.gradle +++ b/camera/camera-testlib-extensions/build.gradle @@ -34,7 +34,7 @@ dependencies { } android { - compileSdk = 36 + compileSdk { version = release(36) } lint { enable.add("CameraXQuirksClassDetector") diff --git a/camera/camera-video/build.gradle b/camera/camera-video/build.gradle index d1ccd6f420536..25d7de84dea37 100644 --- a/camera/camera-video/build.gradle +++ b/camera/camera-video/build.gradle @@ -20,8 +20,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -81,7 +79,7 @@ dependencies { } android { - compileSdk = 36 + compileSdk { version = release(36) } lint { enable.add("CameraXQuirksClassDetector") diff --git a/camera/camera-video/samples/build.gradle b/camera/camera-video/samples/build.gradle index dfc597b03432f..e5e21bb0691c0 100644 --- a/camera/camera-video/samples/build.gradle +++ b/camera/camera-video/samples/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -39,7 +37,7 @@ dependencies { } android { - compileSdk = 36 + compileSdk { version = release(36) } namespace = "androidx.camera.video.samples" } diff --git a/camera/camera-view/build.gradle b/camera/camera-view/build.gradle index b05e130ec67da..8dcbdbed6fbef 100644 --- a/camera/camera-view/build.gradle +++ b/camera/camera-view/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -82,7 +80,7 @@ dependencies { androidTestImplementation(project(":camera:camera-extensions")) } android { - compileSdk = 36 + compileSdk { version = release(36) } lint { enable.add("CameraXQuirksClassDetector") diff --git a/camera/featurecombinationquery/featurecombinationquery-play-services/build.gradle b/camera/featurecombinationquery/featurecombinationquery-play-services/build.gradle index 09676a9bfcfc8..8b23f41e88eb1 100644 --- a/camera/featurecombinationquery/featurecombinationquery-play-services/build.gradle +++ b/camera/featurecombinationquery/featurecombinationquery-play-services/build.gradle @@ -20,8 +20,6 @@ import androidx.build.KotlinTarget plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -40,7 +38,7 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(35) } lint { enable.add("CameraXQuirksClassDetector") } diff --git a/camera/featurecombinationquery/featurecombinationquery/build.gradle b/camera/featurecombinationquery/featurecombinationquery/build.gradle index f52e2967b9416..e5487d5bf3dd7 100644 --- a/camera/featurecombinationquery/featurecombinationquery/build.gradle +++ b/camera/featurecombinationquery/featurecombinationquery/build.gradle @@ -19,8 +19,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -35,7 +33,7 @@ android { enable.add("CameraXQuirksClassDetector") } - compileSdk = 35 + compileSdk { version = release(35) } namespace = "androidx.camera.featurecombinationquery" } diff --git a/camera/integration-tests/avsynctestapp/build.gradle b/camera/integration-tests/avsynctestapp/build.gradle index 3e92adb069558..1cc4d429d80d7 100644 --- a/camera/integration-tests/avsynctestapp/build.gradle +++ b/camera/integration-tests/avsynctestapp/build.gradle @@ -17,14 +17,12 @@ plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("AndroidXComposePlugin") } android { namespace = "androidx.camera.integration.avsync" - compileSdk = 36 + compileSdk { version = release(36) } defaultConfig { applicationId = "androidx.camera.integration.avsync" } diff --git a/camera/integration-tests/camera-benchmark/build.gradle b/camera/integration-tests/camera-benchmark/build.gradle index 7202690883a7b..aa27c255e5da1 100644 --- a/camera/integration-tests/camera-benchmark/build.gradle +++ b/camera/integration-tests/camera-benchmark/build.gradle @@ -26,8 +26,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("androidx.benchmark") } @@ -53,6 +51,6 @@ androidx { } android { - compileSdk = 36 + compileSdk { version = release(36) } namespace = "androidx.camera.integration.benchmark" } diff --git a/camera/integration-tests/camera-macrobenchmark-target/build.gradle b/camera/integration-tests/camera-macrobenchmark-target/build.gradle index d00c384b3661c..9849d8d910df1 100644 --- a/camera/integration-tests/camera-macrobenchmark-target/build.gradle +++ b/camera/integration-tests/camera-macrobenchmark-target/build.gradle @@ -18,12 +18,10 @@ plugins { id("AndroidXPlugin") id("AndroidXComposePlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { - compileSdk = 36 + compileSdk { version = release(36) } namespace = "androidx.camera.integration.macrobenchmark.target" buildTypes { release { @@ -50,4 +48,4 @@ dependencies { implementation(project(":camera:camera-lifecycle")) implementation(project(":camera:camera-view")) implementation(project(":camera:camera-video")) -} \ No newline at end of file +} diff --git a/camera/integration-tests/camera-macrobenchmark/build.gradle b/camera/integration-tests/camera-macrobenchmark/build.gradle index b978f545dc74a..42a334ac86dfb 100644 --- a/camera/integration-tests/camera-macrobenchmark/build.gradle +++ b/camera/integration-tests/camera-macrobenchmark/build.gradle @@ -17,12 +17,10 @@ plugins { id("AndroidXPlugin") id("com.android.test") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { - compileSdk = 36 + compileSdk { version = release(36) } namespace = "androidx.camera.integration.macrobenchmark" targetProjectPath = ":camera:integration-tests:camera-macrobenchmark-target" experimentalProperties["android.experimental.self-instrumenting"] = true diff --git a/camera/integration-tests/camerapipetestapp/build.gradle b/camera/integration-tests/camerapipetestapp/build.gradle index 00ca488f79733..122dd80e95008 100644 --- a/camera/integration-tests/camerapipetestapp/build.gradle +++ b/camera/integration-tests/camerapipetestapp/build.gradle @@ -18,12 +18,10 @@ plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { - compileSdk = 36 + compileSdk { version = release(36) } defaultConfig { applicationId = "androidx.camera.integration.camera2.pipe" } diff --git a/camera/integration-tests/coretestapp/build.gradle b/camera/integration-tests/coretestapp/build.gradle index de4ef5d47ed27..aaed766ef3547 100644 --- a/camera/integration-tests/coretestapp/build.gradle +++ b/camera/integration-tests/coretestapp/build.gradle @@ -19,12 +19,10 @@ import androidx.build.ApkCopyHelperKt plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { - compileSdk = 36 + compileSdk { version = release(36) } defaultConfig { applicationId = "androidx.camera.integration.core" diff --git a/camera/integration-tests/diagnosetestapp/build.gradle b/camera/integration-tests/diagnosetestapp/build.gradle index 688a8ec41485a..6dcf1f84ab0d6 100644 --- a/camera/integration-tests/diagnosetestapp/build.gradle +++ b/camera/integration-tests/diagnosetestapp/build.gradle @@ -17,12 +17,10 @@ plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { - compileSdk = 36 + compileSdk { version = release(36) } defaultConfig { applicationId = "androidx.camera.integration.diagnose" diff --git a/camera/integration-tests/extensionstestapp/build.gradle b/camera/integration-tests/extensionstestapp/build.gradle index 04df5d3f90398..51537629d41f1 100644 --- a/camera/integration-tests/extensionstestapp/build.gradle +++ b/camera/integration-tests/extensionstestapp/build.gradle @@ -26,12 +26,10 @@ import androidx.build.ApkCopyHelperKt plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { - compileSdk = 36 + compileSdk { version = release(36) } defaultConfig { applicationId = "androidx.camera.integration.extensions" diff --git a/camera/integration-tests/featurecombotestapp/build.gradle b/camera/integration-tests/featurecombotestapp/build.gradle index 96c8c33446f7d..02f37d6a46e2d 100644 --- a/camera/integration-tests/featurecombotestapp/build.gradle +++ b/camera/integration-tests/featurecombotestapp/build.gradle @@ -25,8 +25,6 @@ plugins { id("AndroidXPlugin") id("AndroidXComposePlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -63,6 +61,6 @@ dependencies { } android { - compileSdk = 36 + compileSdk { version = release(36) } namespace = "androidx.camera.integration.featurecombotestapp" } diff --git a/camera/integration-tests/testingtestapp/build.gradle b/camera/integration-tests/testingtestapp/build.gradle index a76c941bb9220..016ffb3ab9354 100644 --- a/camera/integration-tests/testingtestapp/build.gradle +++ b/camera/integration-tests/testingtestapp/build.gradle @@ -18,14 +18,12 @@ plugins { id("AndroidXPlugin") id("AndroidXComposePlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("com.google.dagger.hilt.android") id("com.google.devtools.ksp") } android { - compileSdk = 36 + compileSdk { version = release(37) } namespace = "androidx.camera.integration.testingtestapp" diff --git a/camera/integration-tests/timingtestapp/build.gradle b/camera/integration-tests/timingtestapp/build.gradle index 67d8a969c03bc..ac3660aa27ae4 100644 --- a/camera/integration-tests/timingtestapp/build.gradle +++ b/camera/integration-tests/timingtestapp/build.gradle @@ -17,12 +17,10 @@ plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { - compileSdk = 36 + compileSdk { version = release(36) } defaultConfig { applicationId = "androidx.camera.integration.antelope" versionCode 35 diff --git a/camera/integration-tests/uiwidgetstestapp/build.gradle b/camera/integration-tests/uiwidgetstestapp/build.gradle index a41612747798f..01c6c27c87e8c 100644 --- a/camera/integration-tests/uiwidgetstestapp/build.gradle +++ b/camera/integration-tests/uiwidgetstestapp/build.gradle @@ -17,12 +17,10 @@ plugins { id("AndroidXPlugin") id("AndroidXComposePlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { - compileSdk = 36 + compileSdk { version = release(37) } defaultConfig { applicationId = "androidx.camera.integration.uiwidgets" diff --git a/camera/integration-tests/viewfindertestapp/build.gradle b/camera/integration-tests/viewfindertestapp/build.gradle index ee4acf31f07c6..2c42574a96944 100644 --- a/camera/integration-tests/viewfindertestapp/build.gradle +++ b/camera/integration-tests/viewfindertestapp/build.gradle @@ -18,12 +18,10 @@ plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { - compileSdk = 36 + compileSdk { version = release(36) } defaultConfig { applicationId = "androidx.camera.integration.viewfinder" } diff --git a/camera/integration-tests/viewtestapp/build.gradle b/camera/integration-tests/viewtestapp/build.gradle index 12dbfe7ad9e0e..e9e750d4e3c9b 100644 --- a/camera/integration-tests/viewtestapp/build.gradle +++ b/camera/integration-tests/viewtestapp/build.gradle @@ -19,13 +19,11 @@ import androidx.build.ApkCopyHelperKt plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("AndroidXComposePlugin") } android { - compileSdk = 36 + compileSdk { version = release(37) } defaultConfig { applicationId = "androidx.camera.integration.view" } diff --git a/camera/media3/media3-effect/build.gradle b/camera/media3/media3-effect/build.gradle index 94bc0fc19b198..ab2a9962ef3ac 100644 --- a/camera/media3/media3-effect/build.gradle +++ b/camera/media3/media3-effect/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -53,7 +51,7 @@ dependencies { } android { - compileSdk = 36 + compileSdk { version = release(36) } namespace = "androidx.camera.media3.effect" } diff --git a/camera/viewfinder/viewfinder-compose/build.gradle b/camera/viewfinder/viewfinder-compose/build.gradle index cd42735430142..1cef677e626db 100644 --- a/camera/viewfinder/viewfinder-compose/build.gradle +++ b/camera/viewfinder/viewfinder-compose/build.gradle @@ -26,8 +26,6 @@ plugins { id("AndroidXPlugin") id("AndroidXComposePlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -66,7 +64,7 @@ dependencies { } android { - compileSdk = 36 + compileSdk { version = release(37) } namespace = "androidx.camera.viewfinder.compose" } diff --git a/camera/viewfinder/viewfinder-core/build.gradle b/camera/viewfinder/viewfinder-core/build.gradle index 5a36bfce8c639..af358231b8fb4 100644 --- a/camera/viewfinder/viewfinder-core/build.gradle +++ b/camera/viewfinder/viewfinder-core/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/camera/viewfinder/viewfinder-core/samples/build.gradle b/camera/viewfinder/viewfinder-core/samples/build.gradle index a6073dabb540d..a67b8a73dcc72 100644 --- a/camera/viewfinder/viewfinder-core/samples/build.gradle +++ b/camera/viewfinder/viewfinder-core/samples/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -39,7 +37,7 @@ dependencies { } android { - compileSdk = 36 + compileSdk { version = release(36) } namespace = "androidx.camera.viewfinder.core.samples" } diff --git a/camera/viewfinder/viewfinder-view/build.gradle b/camera/viewfinder/viewfinder-view/build.gradle index 2bf89ca0de37f..3860f1af8d083 100644 --- a/camera/viewfinder/viewfinder-view/build.gradle +++ b/camera/viewfinder/viewfinder-view/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -58,7 +56,7 @@ dependencies { } android { - compileSdk = 36 + compileSdk { version = release(36) } namespace = "androidx.camera.viewfinder.view" lint { enable.add("CameraXQuirksClassDetector") diff --git a/car/app/app-automotive/build.gradle b/car/app/app-automotive/build.gradle index 3ff5b3a23d881..708e98128b9c5 100644 --- a/car/app/app-automotive/build.gradle +++ b/car/app/app-automotive/build.gradle @@ -56,7 +56,7 @@ dependencies { android { defaultConfig { - minSdk = 29 + minSdk { version = release(29) } } buildFeatures { aidl = true diff --git a/car/app/app-samples/navigation/automotive/build.gradle b/car/app/app-samples/navigation/automotive/build.gradle index ea0e7ca107adb..154a31675325b 100644 --- a/car/app/app-samples/navigation/automotive/build.gradle +++ b/car/app/app-samples/navigation/automotive/build.gradle @@ -30,7 +30,7 @@ plugins { android { defaultConfig { applicationId = "androidx.car.app.sample.navigation" - minSdk = 29 + minSdk { version = release(29) } } buildTypes { diff --git a/car/app/app-samples/showcase/automotive/build.gradle b/car/app/app-samples/showcase/automotive/build.gradle index 9e9eea3fa8f7b..7de347ceb39f7 100644 --- a/car/app/app-samples/showcase/automotive/build.gradle +++ b/car/app/app-samples/showcase/automotive/build.gradle @@ -22,7 +22,7 @@ plugins { android { defaultConfig { applicationId = "androidx.car.app.sample.showcase" - minSdk = 29 + minSdk { version = release(29) } // Increment this to generate signed builds for uploading to Playstore // Make sure this is different from the showcase-mobile version versionCode = 107 diff --git a/car/app/app-samples/showcase/common/build.gradle b/car/app/app-samples/showcase/common/build.gradle index 846034b745ef4..6c1a2329b1a8d 100644 --- a/car/app/app-samples/showcase/common/build.gradle +++ b/car/app/app-samples/showcase/common/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { diff --git a/car/app/app-testing/build.gradle b/car/app/app-testing/build.gradle index cde7b203b0295..b9ff82eabce95 100644 --- a/car/app/app-testing/build.gradle +++ b/car/app/app-testing/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/car/app/app/build.gradle b/car/app/app/build.gradle index 77d6a402ae413..b769db8b8ec6d 100644 --- a/car/app/app/build.gradle +++ b/car/app/app/build.gradle @@ -46,8 +46,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("androidx.stableaidl") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/collection/collection-benchmark-android/build.gradle b/collection/collection-benchmark-android/build.gradle index bb27e33f6a0fe..5ddba39da2cb9 100644 --- a/collection/collection-benchmark-android/build.gradle +++ b/collection/collection-benchmark-android/build.gradle @@ -26,8 +26,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("androidx.benchmark") } diff --git a/compose/animation/animation-benchmark/build.gradle b/compose/animation/animation-benchmark/build.gradle index 39af941d83706..cf2c99440d973 100644 --- a/compose/animation/animation-benchmark/build.gradle +++ b/compose/animation/animation-benchmark/build.gradle @@ -20,7 +20,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") id("androidx.benchmark") } @@ -39,7 +38,7 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.animation.benchmark" } diff --git a/compose/animation/animation-benchmark/integration-tests/macrobenchmark-target/build.gradle b/compose/animation/animation-benchmark/integration-tests/macrobenchmark-target/build.gradle index 8cac8e00028d0..476158d235c2a 100644 --- a/compose/animation/animation-benchmark/integration-tests/macrobenchmark-target/build.gradle +++ b/compose/animation/animation-benchmark/integration-tests/macrobenchmark-target/build.gradle @@ -22,7 +22,7 @@ plugins { android { namespace = "androidx.compose.animation.benchmark.target" - compileSdk { version = release(36) } + compileSdk { version = release(37) } buildTypes { release { minifyEnabled true diff --git a/compose/animation/animation-benchmark/macrobenchmark/build.gradle b/compose/animation/animation-benchmark/macrobenchmark/build.gradle index 5dd51bb2c84ee..bc01189edb423 100644 --- a/compose/animation/animation-benchmark/macrobenchmark/build.gradle +++ b/compose/animation/animation-benchmark/macrobenchmark/build.gradle @@ -22,7 +22,7 @@ plugins { android { namespace = "androidx.compose.animation.macrobenchmark" compileSdk { - version = release(36) + version = release(37) } buildTypes { diff --git a/compose/animation/animation-core/build.gradle b/compose/animation/animation-core/build.gradle index a5054f8a109d4..d3dcd71062d36 100644 --- a/compose/animation/animation-core/build.gradle +++ b/compose/animation/animation-core/build.gradle @@ -34,7 +34,7 @@ plugins { androidXMultiplatform { androidLibrary { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.animation.core" optimization { it.consumerKeepRules.publish = true diff --git a/compose/animation/animation-core/samples/build.gradle b/compose/animation/animation-core/samples/build.gradle index 1dd12ddca4e73..3336942c4c44d 100644 --- a/compose/animation/animation-core/samples/build.gradle +++ b/compose/animation/animation-core/samples/build.gradle @@ -27,7 +27,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -51,6 +50,6 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.animation.core.samples" } diff --git a/compose/animation/animation-graphics/build.gradle b/compose/animation/animation-graphics/build.gradle index 3f269e4dd424a..3dadc60b1ca57 100644 --- a/compose/animation/animation-graphics/build.gradle +++ b/compose/animation/animation-graphics/build.gradle @@ -32,7 +32,7 @@ plugins { androidXMultiplatform { androidLibrary { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.animation.graphics" androidResources.enable = true } diff --git a/compose/animation/animation-graphics/samples/build.gradle b/compose/animation/animation-graphics/samples/build.gradle index 560f4033e7b46..6af9e5ea3284d 100644 --- a/compose/animation/animation-graphics/samples/build.gradle +++ b/compose/animation/animation-graphics/samples/build.gradle @@ -27,7 +27,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -51,6 +50,6 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.animation.graphics.samples" } diff --git a/compose/animation/animation/build.gradle b/compose/animation/animation/build.gradle index ec53baf71da1e..5b039bc146498 100644 --- a/compose/animation/animation/build.gradle +++ b/compose/animation/animation/build.gradle @@ -35,7 +35,7 @@ plugins { androidXMultiplatform { androidLibrary { namespace = "androidx.compose.animation" - compileSdk = 35 + compileSdk { version = release(37) } // Define rules for R8 to strip out AnimationVisualDebug classes and methods in release builds optimization { it.consumerKeepRules.publish = true diff --git a/compose/animation/animation/integration-tests/animation-demos/build.gradle b/compose/animation/animation/integration-tests/animation-demos/build.gradle index 24b32d2f49487..dba5fa6fff0cd 100644 --- a/compose/animation/animation/integration-tests/animation-demos/build.gradle +++ b/compose/animation/animation/integration-tests/animation-demos/build.gradle @@ -10,7 +10,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -35,6 +34,6 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.animation.demos" } diff --git a/compose/animation/animation/samples/build.gradle b/compose/animation/animation/samples/build.gradle index dec92c00266e8..52981c9976db1 100644 --- a/compose/animation/animation/samples/build.gradle +++ b/compose/animation/animation/samples/build.gradle @@ -27,7 +27,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -50,6 +49,6 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.animation.samples" } diff --git a/compose/benchmark-utils/benchmark/build.gradle b/compose/benchmark-utils/benchmark/build.gradle index 88613da79c81d..8ef9a149fab6c 100644 --- a/compose/benchmark-utils/benchmark/build.gradle +++ b/compose/benchmark-utils/benchmark/build.gradle @@ -20,7 +20,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") id("androidx.benchmark") } @@ -35,7 +34,7 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.benchmarkutils.benchmark" } diff --git a/compose/benchmark-utils/build.gradle b/compose/benchmark-utils/build.gradle index 65f10cb523517..5459b0e67f41c 100644 --- a/compose/benchmark-utils/build.gradle +++ b/compose/benchmark-utils/build.gradle @@ -26,7 +26,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -54,6 +53,6 @@ tasks.withType(KotlinCompile).configureEach { task -> } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.benchmarkutils" } diff --git a/compose/foundation/foundation-layout/benchmark/build.gradle b/compose/foundation/foundation-layout/benchmark/build.gradle index aa93473077be8..574d7baf2a7ef 100644 --- a/compose/foundation/foundation-layout/benchmark/build.gradle +++ b/compose/foundation/foundation-layout/benchmark/build.gradle @@ -20,7 +20,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") id("androidx.benchmark") } @@ -40,7 +39,7 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.foundation.layout.benchmark" } diff --git a/compose/foundation/foundation-layout/build.gradle b/compose/foundation/foundation-layout/build.gradle index 5b3590e610771..3670753b216b8 100644 --- a/compose/foundation/foundation-layout/build.gradle +++ b/compose/foundation/foundation-layout/build.gradle @@ -34,7 +34,7 @@ plugins { androidXMultiplatform { androidLibrary { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.foundation.layout" optimization { it.consumerKeepRules.publish = true diff --git a/compose/foundation/foundation-layout/integration-tests/layout-demos/build.gradle b/compose/foundation/foundation-layout/integration-tests/layout-demos/build.gradle index 24accece5a452..482b78b135709 100644 --- a/compose/foundation/foundation-layout/integration-tests/layout-demos/build.gradle +++ b/compose/foundation/foundation-layout/integration-tests/layout-demos/build.gradle @@ -18,7 +18,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -36,6 +35,6 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.foundation.layout.demos" } diff --git a/compose/foundation/foundation-layout/samples/build.gradle b/compose/foundation/foundation-layout/samples/build.gradle index 62670763f0a73..226d936269417 100644 --- a/compose/foundation/foundation-layout/samples/build.gradle +++ b/compose/foundation/foundation-layout/samples/build.gradle @@ -27,7 +27,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -52,6 +51,6 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.foundation.layout.samples" } diff --git a/compose/foundation/foundation/benchmark/build.gradle b/compose/foundation/foundation/benchmark/build.gradle index 8de4e2831cff9..0f250a98fa6a6 100644 --- a/compose/foundation/foundation/benchmark/build.gradle +++ b/compose/foundation/foundation/benchmark/build.gradle @@ -27,7 +27,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") id("androidx.benchmark") } @@ -57,7 +56,7 @@ tasks.withType(KotlinCompile).configureEach { task -> } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.foundation.benchmark" // DO NOT CHECK IN! Enable experimental benchmarking with R8 - for local runs only diff --git a/compose/foundation/foundation/build.gradle b/compose/foundation/foundation/build.gradle index 82e8da9e172fb..34c33141c8fdd 100644 --- a/compose/foundation/foundation/build.gradle +++ b/compose/foundation/foundation/build.gradle @@ -35,7 +35,7 @@ plugins { androidXMultiplatform { androidLibrary { - compileSdk = 37 + compileSdk { version = release(37) } namespace = "androidx.compose.foundation" optimization { it.consumerKeepRules.publish = true diff --git a/compose/foundation/foundation/integration-tests/foundation-demos/build.gradle b/compose/foundation/foundation/integration-tests/foundation-demos/build.gradle index 48f9f0c07490f..481a31c0bbeba 100644 --- a/compose/foundation/foundation/integration-tests/foundation-demos/build.gradle +++ b/compose/foundation/foundation/integration-tests/foundation-demos/build.gradle @@ -18,7 +18,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -47,6 +46,6 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.foundation.demos" } diff --git a/compose/foundation/foundation/integration-tests/lazy-tests/build.gradle b/compose/foundation/foundation/integration-tests/lazy-tests/build.gradle index c0a679a763bcb..f6d583240d1c8 100644 --- a/compose/foundation/foundation/integration-tests/lazy-tests/build.gradle +++ b/compose/foundation/foundation/integration-tests/lazy-tests/build.gradle @@ -25,11 +25,10 @@ plugins { id("AndroidXPlugin") id("AndroidXComposePlugin") id("com.android.library") - id("org.jetbrains.kotlin.android") } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.foundation.lazytests" } diff --git a/compose/foundation/foundation/samples/build.gradle b/compose/foundation/foundation/samples/build.gradle index 35e2f25a0d00c..ea503132e1a9e 100644 --- a/compose/foundation/foundation/samples/build.gradle +++ b/compose/foundation/foundation/samples/build.gradle @@ -27,7 +27,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -55,6 +54,6 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.foundation.samples" } diff --git a/compose/integration-tests/demos/build.gradle b/compose/integration-tests/demos/build.gradle index b4efe1de73eba..320b570666bd0 100644 --- a/compose/integration-tests/demos/build.gradle +++ b/compose/integration-tests/demos/build.gradle @@ -10,7 +10,6 @@ plugins { id("AndroidXPlugin") id("AndroidXComposePlugin") id("com.android.application") - id("org.jetbrains.kotlin.android") } dependencies { @@ -47,7 +46,7 @@ dependencies { ApkCopyHelperKt.setupAppApkCopy(project, "release") android { - compileSdk = 36 + compileSdk { version = release(37) } namespace = "androidx.compose.integration.demos" buildTypes { release { diff --git a/compose/integration-tests/demos/common/build.gradle b/compose/integration-tests/demos/common/build.gradle index 2adc27ef9c79c..bdc63d8a97225 100644 --- a/compose/integration-tests/demos/common/build.gradle +++ b/compose/integration-tests/demos/common/build.gradle @@ -18,7 +18,6 @@ plugins { id("AndroidXPlugin") id("AndroidXComposePlugin") id("com.android.library") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/compose/integration-tests/docs-snippets/build.gradle b/compose/integration-tests/docs-snippets/build.gradle index 8c8c96acaa2f3..5c003cd0cbcc7 100644 --- a/compose/integration-tests/docs-snippets/build.gradle +++ b/compose/integration-tests/docs-snippets/build.gradle @@ -27,7 +27,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -68,7 +67,7 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.integration.docs" } diff --git a/compose/integration-tests/hero/hero-common/hero-common-macrobenchmark/build.gradle b/compose/integration-tests/hero/hero-common/hero-common-macrobenchmark/build.gradle index 93de6104d97af..b40e89930b45b 100644 --- a/compose/integration-tests/hero/hero-common/hero-common-macrobenchmark/build.gradle +++ b/compose/integration-tests/hero/hero-common/hero-common-macrobenchmark/build.gradle @@ -27,7 +27,6 @@ import androidx.build.PlatformIdentifier plugins { id("AndroidXPlugin") id("com.android.library") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/compose/integration-tests/hero/jetsnack/jetsnack-implementation/build.gradle b/compose/integration-tests/hero/jetsnack/jetsnack-implementation/build.gradle index 25a36147dd209..65e03d9bf1fb8 100644 --- a/compose/integration-tests/hero/jetsnack/jetsnack-implementation/build.gradle +++ b/compose/integration-tests/hero/jetsnack/jetsnack-implementation/build.gradle @@ -18,11 +18,10 @@ plugins { id("AndroidXPlugin") id("AndroidXComposePlugin") id("com.android.library") - id("org.jetbrains.kotlin.android") } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.integration.hero.jetsnack.implementation" lint { diff --git a/compose/integration-tests/hero/jetsnack/jetsnack-macrobenchmark-target/build.gradle b/compose/integration-tests/hero/jetsnack/jetsnack-macrobenchmark-target/build.gradle index c9dbd06f5fa33..2e5499601f713 100644 --- a/compose/integration-tests/hero/jetsnack/jetsnack-macrobenchmark-target/build.gradle +++ b/compose/integration-tests/hero/jetsnack/jetsnack-macrobenchmark-target/build.gradle @@ -18,11 +18,10 @@ plugins { id("AndroidXPlugin") id("AndroidXComposePlugin") id("com.android.application") - id("org.jetbrains.kotlin.android") } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.integration.hero.jetsnack.macrobenchmark.target" buildTypes { diff --git a/compose/integration-tests/hero/jetsnack/jetsnack-macrobenchmark/build.gradle b/compose/integration-tests/hero/jetsnack/jetsnack-macrobenchmark/build.gradle index a9fe0f1c77aff..ef2e4f69199ce 100644 --- a/compose/integration-tests/hero/jetsnack/jetsnack-macrobenchmark/build.gradle +++ b/compose/integration-tests/hero/jetsnack/jetsnack-macrobenchmark/build.gradle @@ -17,7 +17,6 @@ plugins { id("AndroidXPlugin") id("com.android.test") - id("org.jetbrains.kotlin.android") } android { diff --git a/compose/integration-tests/hero/jetsnack/jetsnack-microbenchmark/build.gradle b/compose/integration-tests/hero/jetsnack/jetsnack-microbenchmark/build.gradle index 84ff4a65ed145..91afd4d708eec 100644 --- a/compose/integration-tests/hero/jetsnack/jetsnack-microbenchmark/build.gradle +++ b/compose/integration-tests/hero/jetsnack/jetsnack-microbenchmark/build.gradle @@ -27,7 +27,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") id("androidx.benchmark") } @@ -54,7 +53,7 @@ tasks.withType(KotlinCompile).configureEach { task -> } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.integration.hero.jetsnack.microbenchmark" } diff --git a/compose/integration-tests/hero/pokedex/pokedex-macrobenchmark-target/build.gradle b/compose/integration-tests/hero/pokedex/pokedex-macrobenchmark-target/build.gradle index c5fb3ead2803b..23d419b300794 100644 --- a/compose/integration-tests/hero/pokedex/pokedex-macrobenchmark-target/build.gradle +++ b/compose/integration-tests/hero/pokedex/pokedex-macrobenchmark-target/build.gradle @@ -18,12 +18,11 @@ plugins { id("AndroidXPlugin") id("AndroidXComposePlugin") id("com.android.application") - id("org.jetbrains.kotlin.android") id("com.google.devtools.ksp") } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.integration.hero.pokedex.macrobenchmark.target" buildTypes { diff --git a/compose/integration-tests/hero/pokedex/pokedex-macrobenchmark/build.gradle b/compose/integration-tests/hero/pokedex/pokedex-macrobenchmark/build.gradle index ea2caa39f50a2..8e5c81977d8ca 100644 --- a/compose/integration-tests/hero/pokedex/pokedex-macrobenchmark/build.gradle +++ b/compose/integration-tests/hero/pokedex/pokedex-macrobenchmark/build.gradle @@ -18,7 +18,6 @@ plugins { id("AndroidXPlugin") id("com.android.test") alias(libs.plugins.kotlinSerialization) - id("org.jetbrains.kotlin.android") } android { diff --git a/compose/integration-tests/hero/sysui/sysui-macrobenchmark-implementation/build.gradle b/compose/integration-tests/hero/sysui/sysui-macrobenchmark-implementation/build.gradle index aa7915198d9c8..361d4aaebec77 100644 --- a/compose/integration-tests/hero/sysui/sysui-macrobenchmark-implementation/build.gradle +++ b/compose/integration-tests/hero/sysui/sysui-macrobenchmark-implementation/build.gradle @@ -29,9 +29,9 @@ plugins { android { namespace = "androidx.compose.integration.hero.sysui.macrobenchmark.implementation" - compileSdk = 36 + compileSdk { version = release(37) } defaultConfig { - minSdk = 31 // This benchmark does not run below API 31 + minSdk { version = release(31) } // This benchmark does not run below API 31 } lint { baseline = file("lint-baseline.xml") diff --git a/compose/integration-tests/hero/sysui/sysui-macrobenchmark-target/build.gradle b/compose/integration-tests/hero/sysui/sysui-macrobenchmark-target/build.gradle index 5323f4b1cf8aa..deee79152e286 100644 --- a/compose/integration-tests/hero/sysui/sysui-macrobenchmark-target/build.gradle +++ b/compose/integration-tests/hero/sysui/sysui-macrobenchmark-target/build.gradle @@ -34,9 +34,9 @@ androidComponents { beforeVariants(selector().all()) { enabled = buildType == 'r android { namespace = "androidx.compose.integration.hero.sysui.macrobenchmark.target" - compileSdk = 36 + compileSdk { version = release(37) } defaultConfig { - minSdk = 31 // This benchmark does not run below API 31 + minSdk { version = release(31) } // This benchmark does not run below API 31 } buildTypes { diff --git a/compose/integration-tests/hero/sysui/sysui-macrobenchmark/build.gradle b/compose/integration-tests/hero/sysui/sysui-macrobenchmark/build.gradle index 7210416657b51..d66bc2ba6bf0f 100644 --- a/compose/integration-tests/hero/sysui/sysui-macrobenchmark/build.gradle +++ b/compose/integration-tests/hero/sysui/sysui-macrobenchmark/build.gradle @@ -27,9 +27,9 @@ plugins { } android { - compileSdk = 36 + compileSdk { version = release(37) } defaultConfig { - minSdk = 31 // These benchmarks do not run below API 31 as they use newer APIs + minSdk { version = release(31) } // These benchmarks do not run below API 31 as they use newer APIs } namespace = "androidx.compose.integration.hero.sysui.macrobenchmark" targetProjectPath = ":compose:integration-tests:hero:sysui:sysui-macrobenchmark-target" diff --git a/compose/integration-tests/macrobenchmark-target/build.gradle b/compose/integration-tests/macrobenchmark-target/build.gradle index 4637f527e8d1d..972a24d9b3dcf 100644 --- a/compose/integration-tests/macrobenchmark-target/build.gradle +++ b/compose/integration-tests/macrobenchmark-target/build.gradle @@ -8,11 +8,10 @@ plugins { id("AndroidXPlugin") id("AndroidXComposePlugin") id("com.android.application") - id("org.jetbrains.kotlin.android") } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.integration.macrobenchmark.target" buildTypes { release { diff --git a/compose/integration-tests/macrobenchmark/build.gradle b/compose/integration-tests/macrobenchmark/build.gradle index 74dbd20299279..af36914f8aaf7 100644 --- a/compose/integration-tests/macrobenchmark/build.gradle +++ b/compose/integration-tests/macrobenchmark/build.gradle @@ -17,7 +17,6 @@ plugins { id("AndroidXPlugin") id("com.android.test") - id("org.jetbrains.kotlin.android") } android { diff --git a/compose/integration-tests/material-catalog/build.gradle b/compose/integration-tests/material-catalog/build.gradle index 0533408b35265..0afa517222fc0 100644 --- a/compose/integration-tests/material-catalog/build.gradle +++ b/compose/integration-tests/material-catalog/build.gradle @@ -27,11 +27,10 @@ plugins { id("AndroidXPlugin") id("com.android.application") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") } android { - compileSdk = 36 + compileSdk { version = release(37) } defaultConfig { applicationId = "androidx.compose.material.catalog" versionCode 2500 diff --git a/compose/material/material-navigation/build.gradle b/compose/material/material-navigation/build.gradle index fc2e5489652c7..1c2d2159afcbf 100644 --- a/compose/material/material-navigation/build.gradle +++ b/compose/material/material-navigation/build.gradle @@ -14,6 +14,7 @@ * limitations under the License. */ + import androidx.build.PlatformIdentifier import androidx.build.SoftwareType import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType @@ -22,14 +23,13 @@ plugins { id("AndroidXPlugin") id("AndroidXComposePlugin") id("JetBrainsAndroidXPlugin") - id("com.android.experimental.built-in-kotlin") alias(libs.plugins.kotlinSerialization) } androidXMultiplatform { androidLibrary { - compileSdk = 35 namespace = "androidx.compose.material.navigation" + compileSdk { version = release(37) } } desktop() mac() @@ -40,45 +40,33 @@ androidXMultiplatform { defaultPlatform(PlatformIdentifier.ANDROID) sourceSets { - commonMain { - dependencies { - api("org.jetbrains.androidx.navigation:navigation-compose:2.9.2") - implementation(project(":compose:material:material")) - implementation(libs.kotlinSerializationCore) - } + commonMain.dependencies { + api("org.jetbrains.androidx.navigation:navigation-compose:2.9.2") + implementation(project(":compose:material:material")) + implementation(libs.kotlinSerializationCore) } - commonTest { - dependencies { - implementation(libs.kotlinTest) - } + androidDeviceTest.dependencies { + implementation(project(":compose:test-utils")) + implementation("androidx.navigation:navigation-testing:2.9.6") + implementation(project(":compose:ui:ui-test-junit4")) + implementation(libs.testRunner) + implementation(libs.junit) + implementation(libs.truth) + implementation(libs.testRules) } - androidDeviceTest { - dependencies { - implementation(project(":compose:test-utils")) - implementation("androidx.navigation:navigation-testing:2.7.7") - implementation(project(":compose:ui:ui-test-junit4")) - implementation(libs.testRunner) - implementation(libs.junit) - implementation(libs.truth) - implementation(libs.testRules) - } + commonTest.dependencies { + implementation(libs.kotlinTest) } - nonAndroidMain { - dependsOn(commonMain) - dependencies { - implementation(project(":compose:ui:ui-backhandler")) - } - } + create("nonAndroidMain").dependsOn(commonMain) + create("nonAndroidTest").dependsOn(commonTest) + nonJvmMain.dependsOn(nonAndroidMain) + nonJvmTest.dependsOn(nonAndroidTest) - nonAndroidTest { - dependsOn(commonTest) - } - - desktopMain { - dependsOn(nonAndroidMain) + nonAndroidMain.dependencies { + implementation(project(":compose:ui:ui-backhandler")) } desktopTest { diff --git a/compose/material/material-navigation/samples/build.gradle b/compose/material/material-navigation/samples/build.gradle index bfd239052982f..ddb82cb08a196 100644 --- a/compose/material/material-navigation/samples/build.gradle +++ b/compose/material/material-navigation/samples/build.gradle @@ -27,7 +27,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -47,6 +46,6 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.material.navigation.samples" } diff --git a/compose/material/material-ripple/benchmark/build.gradle b/compose/material/material-ripple/benchmark/build.gradle index fca81ac437380..db75e45aa3eec 100644 --- a/compose/material/material-ripple/benchmark/build.gradle +++ b/compose/material/material-ripple/benchmark/build.gradle @@ -26,7 +26,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") id("androidx.benchmark") } @@ -44,7 +43,7 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.material.ripple.benchmark" } diff --git a/compose/material/material-ripple/build.gradle b/compose/material/material-ripple/build.gradle index 5aa596583443a..4ec268535624c 100644 --- a/compose/material/material-ripple/build.gradle +++ b/compose/material/material-ripple/build.gradle @@ -34,7 +34,7 @@ plugins { androidXMultiplatform { androidLibrary { namespace = "androidx.compose.material.ripple" - compileSdk = 35 + compileSdk { version = release(37) } } desktop() mac() diff --git a/compose/material/material/benchmark/build.gradle b/compose/material/material/benchmark/build.gradle index 8dab9461f8b21..665bc3c81eaf4 100644 --- a/compose/material/material/benchmark/build.gradle +++ b/compose/material/material/benchmark/build.gradle @@ -26,7 +26,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") id("androidx.benchmark") } @@ -47,7 +46,7 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.material.benchmark" } diff --git a/compose/material/material/build.gradle b/compose/material/material/build.gradle index 01571a681917a..93be7794186d0 100644 --- a/compose/material/material/build.gradle +++ b/compose/material/material/build.gradle @@ -34,7 +34,7 @@ plugins { androidXMultiplatform { androidLibrary { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.material" androidResources.enable = true } diff --git a/compose/material/material/integration-tests/material-catalog/build.gradle b/compose/material/material/integration-tests/material-catalog/build.gradle index 878a2994e6739..e9d609bc00281 100644 --- a/compose/material/material/integration-tests/material-catalog/build.gradle +++ b/compose/material/material/integration-tests/material-catalog/build.gradle @@ -26,7 +26,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -47,6 +46,6 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.material.catalog.library" } diff --git a/compose/material/material/integration-tests/material-demos/build.gradle b/compose/material/material/integration-tests/material-demos/build.gradle index aa8956901ba71..c384aa0187f93 100644 --- a/compose/material/material/integration-tests/material-demos/build.gradle +++ b/compose/material/material/integration-tests/material-demos/build.gradle @@ -10,7 +10,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -35,6 +34,6 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.material.demos" } diff --git a/compose/material/material/samples/build.gradle b/compose/material/material/samples/build.gradle index 1ab1b351bd439..91a31e9b9bf06 100644 --- a/compose/material/material/samples/build.gradle +++ b/compose/material/material/samples/build.gradle @@ -27,7 +27,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -54,6 +53,6 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.material.samples" } diff --git a/compose/material3/adaptive/adaptive-layout/build.gradle b/compose/material3/adaptive/adaptive-layout/build.gradle index 0599ae3f685ce..e6a8f156194d4 100644 --- a/compose/material3/adaptive/adaptive-layout/build.gradle +++ b/compose/material3/adaptive/adaptive-layout/build.gradle @@ -21,6 +21,7 @@ * modifying its settings. */ +import androidx.build.KotlinTarget import androidx.build.SoftwareType import androidx.build.PlatformIdentifier import org.jetbrains.androidx.build.UpdateTranslationsTask @@ -34,7 +35,7 @@ plugins { androidXMultiplatform { androidLibrary { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.material3.adaptive.layout" androidResources.enable = true } diff --git a/compose/material3/adaptive/adaptive-navigation/build.gradle b/compose/material3/adaptive/adaptive-navigation/build.gradle index 9b6b92f2e69b7..0656e2bf9971b 100644 --- a/compose/material3/adaptive/adaptive-navigation/build.gradle +++ b/compose/material3/adaptive/adaptive-navigation/build.gradle @@ -33,7 +33,7 @@ plugins { androidXMultiplatform { androidLibrary { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.material3.adaptive.navigation" } desktop() diff --git a/compose/material3/adaptive/adaptive-navigation3/build.gradle b/compose/material3/adaptive/adaptive-navigation3/build.gradle index 05ec2952fc292..c2c867ad3f2a5 100644 --- a/compose/material3/adaptive/adaptive-navigation3/build.gradle +++ b/compose/material3/adaptive/adaptive-navigation3/build.gradle @@ -33,7 +33,7 @@ plugins { androidXMultiplatform { androidLibrary { - compileSdk = 36 + compileSdk { version = release(37) } namespace = "androidx.compose.material3.adaptive.navigation3" androidResources.enable = true } diff --git a/compose/material3/adaptive/adaptive/build.gradle b/compose/material3/adaptive/adaptive/build.gradle index d92a09a92c8cf..32721a38b6527 100644 --- a/compose/material3/adaptive/adaptive/build.gradle +++ b/compose/material3/adaptive/adaptive/build.gradle @@ -34,7 +34,7 @@ plugins { androidXMultiplatform { androidLibrary { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.material3.adaptive" } desktop() diff --git a/compose/material3/adaptive/benchmark/build.gradle b/compose/material3/adaptive/benchmark/build.gradle index 42ed8334fd9d5..238aa18599d06 100644 --- a/compose/material3/adaptive/benchmark/build.gradle +++ b/compose/material3/adaptive/benchmark/build.gradle @@ -20,7 +20,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") id("androidx.benchmark") } @@ -38,7 +37,7 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.material3.adaptive.benchmark" } diff --git a/compose/material3/adaptive/samples/build.gradle b/compose/material3/adaptive/samples/build.gradle index a205f681a3ec0..2a8910e47aebd 100644 --- a/compose/material3/adaptive/samples/build.gradle +++ b/compose/material3/adaptive/samples/build.gradle @@ -27,7 +27,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") alias(libs.plugins.kotlinSerialization) } @@ -61,7 +60,7 @@ androidx { } android { - compileSdk = 36 + compileSdk { version = release(37) } namespace = "androidx.compose.material3.adaptive.samples" } diff --git a/compose/material3/benchmark/build.gradle b/compose/material3/benchmark/build.gradle index edb4de74087be..e0be52fa7520b 100644 --- a/compose/material3/benchmark/build.gradle +++ b/compose/material3/benchmark/build.gradle @@ -20,7 +20,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") id("androidx.benchmark") } @@ -43,7 +42,7 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.material3.benchmark" } diff --git a/compose/material3/integration-tests/macrobenchmark-target/build.gradle b/compose/material3/integration-tests/macrobenchmark-target/build.gradle index dbe01dbdf54af..97d46a7669afb 100644 --- a/compose/material3/integration-tests/macrobenchmark-target/build.gradle +++ b/compose/material3/integration-tests/macrobenchmark-target/build.gradle @@ -2,7 +2,6 @@ plugins { id("AndroidXPlugin") id("AndroidXComposePlugin") id("com.android.application") - id("org.jetbrains.kotlin.android") } android { @@ -14,7 +13,7 @@ android { proguardFiles getDefaultProguardFile("proguard-android-optimize.txt") } } - compileSdk = 35 + compileSdk { version = release(37) } } dependencies { diff --git a/compose/material3/integration-tests/macrobenchmark/build.gradle b/compose/material3/integration-tests/macrobenchmark/build.gradle index 796914e830f8e..ac2b0dba91738 100644 --- a/compose/material3/integration-tests/macrobenchmark/build.gradle +++ b/compose/material3/integration-tests/macrobenchmark/build.gradle @@ -1,7 +1,6 @@ plugins { id("AndroidXPlugin") id("com.android.test") - id("org.jetbrains.kotlin.android") } android { diff --git a/compose/material3/material3-adaptive-navigation-suite/build.gradle b/compose/material3/material3-adaptive-navigation-suite/build.gradle index ea407c3f0c615..426cf38a5724c 100644 --- a/compose/material3/material3-adaptive-navigation-suite/build.gradle +++ b/compose/material3/material3-adaptive-navigation-suite/build.gradle @@ -24,7 +24,6 @@ import androidx.build.SoftwareType import androidx.build.PlatformIdentifier -import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType plugins { id("AndroidXPlugin") @@ -35,7 +34,7 @@ plugins { androidXMultiplatform { androidLibrary { namespace = "androidx.compose.material3.adaptive.navigationsuite" - compileSdk = 35 + compileSdk { version = release(37) } } desktop() mac() @@ -54,16 +53,13 @@ androidXMultiplatform { } } - commonTest.dependencies { - implementation(libs.kotlinTest) - } - - androidMain { + commonTest { dependencies { - api("androidx.annotation:annotation:1.8.1") - api("androidx.annotation:annotation-experimental:1.4.1") + implementation(libs.kotlinTest) + implementation(project(":kruth:kruth")) } } + androidMain.dependencies { api("androidx.annotation:annotation:1.8.1") api("androidx.annotation:annotation-experimental:1.4.1") diff --git a/compose/material3/material3-adaptive-navigation-suite/samples/build.gradle b/compose/material3/material3-adaptive-navigation-suite/samples/build.gradle index bd2dc2da550e1..201647e50316e 100644 --- a/compose/material3/material3-adaptive-navigation-suite/samples/build.gradle +++ b/compose/material3/material3-adaptive-navigation-suite/samples/build.gradle @@ -27,7 +27,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -56,6 +55,6 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.material3.adaptive.navigationsuite.samples" } diff --git a/compose/material3/material3-window-size-class/build.gradle b/compose/material3/material3-window-size-class/build.gradle index b615c66312b21..07ceba5e37206 100644 --- a/compose/material3/material3-window-size-class/build.gradle +++ b/compose/material3/material3-window-size-class/build.gradle @@ -34,7 +34,7 @@ plugins { androidXMultiplatform { androidLibrary { namespace = "androidx.compose.material3.windowsizeclass" - compileSdk = 35 + compileSdk { version = release(37) } } desktop() mac() @@ -120,4 +120,3 @@ androidx { legacyDisableKotlinStrictApiMode = true samples(project(":compose:material3:material3-window-size-class:material3-window-size-class-samples")) } - diff --git a/compose/material3/material3-window-size-class/samples/build.gradle b/compose/material3/material3-window-size-class/samples/build.gradle index 2f171e5e93812..5f8d87cbbb4e9 100644 --- a/compose/material3/material3-window-size-class/samples/build.gradle +++ b/compose/material3/material3-window-size-class/samples/build.gradle @@ -27,7 +27,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -48,6 +47,6 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.material3.windowsizeclass.samples" } diff --git a/compose/material3/material3/build.gradle b/compose/material3/material3/build.gradle index c665fbc2a5e28..b80896d0c2e70 100644 --- a/compose/material3/material3/build.gradle +++ b/compose/material3/material3/build.gradle @@ -36,7 +36,7 @@ plugins { androidXMultiplatform { androidLibrary { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.material3" androidResources.enable = true } diff --git a/compose/material3/material3/integration-tests/material3-catalog/build.gradle b/compose/material3/material3/integration-tests/material3-catalog/build.gradle index 3c516df2df8ec..8ad13129cccdc 100644 --- a/compose/material3/material3/integration-tests/material3-catalog/build.gradle +++ b/compose/material3/material3/integration-tests/material3-catalog/build.gradle @@ -27,7 +27,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -53,6 +52,6 @@ androidx { } android { - compileSdk = 36 + compileSdk { version = release(37) } namespace = "androidx.compose.material3.catalog.library" } diff --git a/compose/material3/material3/integration-tests/material3-demos/build.gradle b/compose/material3/material3/integration-tests/material3-demos/build.gradle index 7bba3ca80cf95..bb25a206d9d4c 100644 --- a/compose/material3/material3/integration-tests/material3-demos/build.gradle +++ b/compose/material3/material3/integration-tests/material3-demos/build.gradle @@ -26,7 +26,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -55,6 +54,6 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.material3.demos" } diff --git a/compose/material3/material3/samples/build.gradle b/compose/material3/material3/samples/build.gradle index 70aa2d0d9dea9..8f38c7eb36408 100644 --- a/compose/material3/material3/samples/build.gradle +++ b/compose/material3/material3/samples/build.gradle @@ -28,7 +28,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -60,7 +59,7 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.material3.samples" } diff --git a/compose/material3/xr/xr-adaptive/build.gradle b/compose/material3/xr/xr-adaptive/build.gradle index c73c505e2cf37..60d69ef920b49 100644 --- a/compose/material3/xr/xr-adaptive/build.gradle +++ b/compose/material3/xr/xr-adaptive/build.gradle @@ -31,7 +31,7 @@ plugins { androidXMultiplatform { androidLibrary { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.material3.xr.adaptive" } jvmStubs() diff --git a/compose/material3/xr/xr/build.gradle b/compose/material3/xr/xr/build.gradle index e9927dfeba474..b639ddf11b3d6 100644 --- a/compose/material3/xr/xr/build.gradle +++ b/compose/material3/xr/xr/build.gradle @@ -31,7 +31,7 @@ plugins { androidXMultiplatform { androidLibrary { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.material3.xr" } jvmStubs() diff --git a/compose/remote/integration-tests/benchmark/build.gradle b/compose/remote/integration-tests/benchmark/build.gradle index 7f590483fdbfb..6c51e9b1193fc 100644 --- a/compose/remote/integration-tests/benchmark/build.gradle +++ b/compose/remote/integration-tests/benchmark/build.gradle @@ -46,7 +46,7 @@ dependencies { androidTestImplementation(libs.truth) } android { - compileSdk { version = release(36) } + compileSdk { version = release(37) } namespace = "androidx.compose.remote.integration.benchmark" } diff --git a/compose/remote/integration-tests/demos/build.gradle b/compose/remote/integration-tests/demos/build.gradle index 460c2091639d6..d7b51586094f0 100644 --- a/compose/remote/integration-tests/demos/build.gradle +++ b/compose/remote/integration-tests/demos/build.gradle @@ -17,15 +17,14 @@ plugins { id("AndroidXPlugin") id("com.android.application") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") alias(libs.plugins.kotlinSerialization) } android { - compileSdk = 36 + compileSdk { version = release(37) } namespace = "androidx.compose.remote.integration.demos" defaultConfig { - minSdk = 29 + minSdk { version = release(29) } } } diff --git a/compose/remote/integration-tests/macrobenchmark-target/build.gradle b/compose/remote/integration-tests/macrobenchmark-target/build.gradle index 36240f345986f..f863ddd3ce9a6 100644 --- a/compose/remote/integration-tests/macrobenchmark-target/build.gradle +++ b/compose/remote/integration-tests/macrobenchmark-target/build.gradle @@ -23,7 +23,7 @@ plugins { group="androidx.compose.remote" android { - compileSdk { version = release(36) } + compileSdk { version = release(37) } namespace = "androidx.compose.remote.integration.macrobenchmark.target" defaultConfig.minSdk { version = release(29) } diff --git a/compose/remote/integration-tests/player-view-demos/build.gradle b/compose/remote/integration-tests/player-view-demos/build.gradle index 93c14afe5b0e2..93832df578a74 100644 --- a/compose/remote/integration-tests/player-view-demos/build.gradle +++ b/compose/remote/integration-tests/player-view-demos/build.gradle @@ -17,14 +17,13 @@ plugins { id("AndroidXPlugin") id("com.android.application") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") } android { - compileSdk = 36 + compileSdk { version = release(37) } namespace = "androidx.compose.remote.integration.view.demos" defaultConfig { - minSdk = 29 + minSdk { version = release(29) } } } diff --git a/compose/remote/remote-creation-compose/build.gradle b/compose/remote/remote-creation-compose/build.gradle index 4d04205ca036a..32518d6d7a65f 100644 --- a/compose/remote/remote-creation-compose/build.gradle +++ b/compose/remote/remote-creation-compose/build.gradle @@ -19,7 +19,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - id("org.jetbrains.kotlin.android") id("AndroidXComposePlugin") } @@ -34,9 +33,9 @@ androidx { android { namespace = "androidx.compose.remote.creation.compose" - compileSdk = 35 + compileSdk { version = release(37) } defaultConfig { - minSdk = 29 + minSdk { version = release(29) } } } diff --git a/compose/remote/remote-creation/build.gradle b/compose/remote/remote-creation/build.gradle index a33da7d0c8202..3e156cdc688a5 100644 --- a/compose/remote/remote-creation/build.gradle +++ b/compose/remote/remote-creation/build.gradle @@ -33,8 +33,8 @@ androidXMultiplatform { androidLibrary { withJava() namespace = "androidx.compose.remote.creation" - compileSdk = 35 - minSdk = 23 + compileSdk { version = release(37) } + minSdk { version = release(23) } } jvm() diff --git a/compose/remote/remote-player-compose-testutils/build.gradle b/compose/remote/remote-player-compose-testutils/build.gradle index 3d77bf8bdffc2..8d302e30aa1c6 100644 --- a/compose/remote/remote-player-compose-testutils/build.gradle +++ b/compose/remote/remote-player-compose-testutils/build.gradle @@ -19,7 +19,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - id("org.jetbrains.kotlin.android") id("AndroidXComposePlugin") } @@ -32,9 +31,9 @@ androidx { android { namespace = "androidx.compose.remote.player.compose.test.utils" - compileSdk = 35 + compileSdk { version = release(37) } defaultConfig { - minSdk = 26 + minSdk { version = release(26) } } } diff --git a/compose/remote/remote-player-compose/build.gradle b/compose/remote/remote-player-compose/build.gradle index 32af57cf41701..45d890af5c5e7 100644 --- a/compose/remote/remote-player-compose/build.gradle +++ b/compose/remote/remote-player-compose/build.gradle @@ -19,7 +19,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - id("org.jetbrains.kotlin.android") id("AndroidXComposePlugin") } @@ -33,9 +32,9 @@ androidx { android { namespace = "androidx.compose.remote.player.compose" - compileSdk = 35 + compileSdk { version = release(37) } defaultConfig { - minSdk = 29 + minSdk { version = release(29) } } } diff --git a/compose/remote/remote-player-core/build.gradle b/compose/remote/remote-player-core/build.gradle index ebee93ab1a17f..601663cbae783 100644 --- a/compose/remote/remote-player-core/build.gradle +++ b/compose/remote/remote-player-core/build.gradle @@ -19,7 +19,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - id("org.jetbrains.kotlin.android") } androidx { @@ -31,9 +30,9 @@ androidx { android { namespace = "androidx.compose.remote.player.core" - compileSdk = 35 + compileSdk { version = release(37) } defaultConfig { - minSdk = 29 + minSdk { version = release(29) } } } diff --git a/compose/remote/remote-player-view/build.gradle b/compose/remote/remote-player-view/build.gradle index 2fecf83055c42..611e24c98c41f 100644 --- a/compose/remote/remote-player-view/build.gradle +++ b/compose/remote/remote-player-view/build.gradle @@ -19,7 +19,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - id("org.jetbrains.kotlin.android") } androidx { @@ -32,9 +31,9 @@ androidx { android { namespace = "androidx.compose.remote.player.view" - compileSdk = 35 + compileSdk { version = release(37) } defaultConfig { - minSdk = 26 + minSdk { version = release(26) } } } diff --git a/compose/remote/remote-tooling-preview/build.gradle b/compose/remote/remote-tooling-preview/build.gradle index 4b0db990f22a4..34bbcc79dc17e 100644 --- a/compose/remote/remote-tooling-preview/build.gradle +++ b/compose/remote/remote-tooling-preview/build.gradle @@ -19,7 +19,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - id("org.jetbrains.kotlin.android") id("AndroidXComposePlugin") } @@ -32,9 +31,9 @@ androidx { android { namespace = "androidx.compose.remote.tooling.preview" - compileSdk = 35 + compileSdk { version = release(37) } defaultConfig { - minSdk = 26 + minSdk { version = release(26) } } } diff --git a/compose/runtime/runtime-annotation/samples/build.gradle b/compose/runtime/runtime-annotation/samples/build.gradle index de96ca71cf962..967665ab9ccf8 100644 --- a/compose/runtime/runtime-annotation/samples/build.gradle +++ b/compose/runtime/runtime-annotation/samples/build.gradle @@ -28,7 +28,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -50,6 +49,6 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.runtime.annotation.samples" } diff --git a/compose/runtime/runtime-livedata/build.gradle b/compose/runtime/runtime-livedata/build.gradle index f6c68a69ad84c..1983b641b0c3b 100644 --- a/compose/runtime/runtime-livedata/build.gradle +++ b/compose/runtime/runtime-livedata/build.gradle @@ -27,7 +27,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -54,6 +53,6 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.runtime.livedata" } diff --git a/compose/runtime/runtime-livedata/samples/build.gradle b/compose/runtime/runtime-livedata/samples/build.gradle index d5072ddefcb83..13aced9864b7a 100644 --- a/compose/runtime/runtime-livedata/samples/build.gradle +++ b/compose/runtime/runtime-livedata/samples/build.gradle @@ -27,7 +27,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -46,6 +45,6 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.runtime.livedata.samples" } diff --git a/compose/runtime/runtime-retain/samples/build.gradle b/compose/runtime/runtime-retain/samples/build.gradle index d5bf73f434438..91c2199cff04e 100644 --- a/compose/runtime/runtime-retain/samples/build.gradle +++ b/compose/runtime/runtime-retain/samples/build.gradle @@ -27,7 +27,6 @@ plugins { id("AndroidXPlugin") id("AndroidXComposePlugin") id("com.android.library") - id("org.jetbrains.kotlin.android") } dependencies { @@ -46,6 +45,6 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.runtime.retain.samples" } \ No newline at end of file diff --git a/compose/runtime/runtime-rxjava2/build.gradle b/compose/runtime/runtime-rxjava2/build.gradle index 528310f99b28a..3d63896a4de73 100644 --- a/compose/runtime/runtime-rxjava2/build.gradle +++ b/compose/runtime/runtime-rxjava2/build.gradle @@ -31,7 +31,7 @@ plugins { androidXMultiplatform { androidLibrary { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.runtime.rxjava2" } desktop() diff --git a/compose/runtime/runtime-rxjava2/samples/build.gradle b/compose/runtime/runtime-rxjava2/samples/build.gradle index f35a0dc18f53c..23bb8ca5ac230 100644 --- a/compose/runtime/runtime-rxjava2/samples/build.gradle +++ b/compose/runtime/runtime-rxjava2/samples/build.gradle @@ -27,7 +27,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -46,6 +45,6 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.runtime.rxjava2.samples" } diff --git a/compose/runtime/runtime-rxjava3/build.gradle b/compose/runtime/runtime-rxjava3/build.gradle index 4baa2def592cc..9786b0a391bf7 100644 --- a/compose/runtime/runtime-rxjava3/build.gradle +++ b/compose/runtime/runtime-rxjava3/build.gradle @@ -31,7 +31,7 @@ plugins { androidXMultiplatform { androidLibrary { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.runtime.rxjava2" } desktop() diff --git a/compose/runtime/runtime-rxjava3/samples/build.gradle b/compose/runtime/runtime-rxjava3/samples/build.gradle index f5a9e6a89d074..b1419f2b57fe6 100644 --- a/compose/runtime/runtime-rxjava3/samples/build.gradle +++ b/compose/runtime/runtime-rxjava3/samples/build.gradle @@ -27,7 +27,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -46,6 +45,6 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.runtime.rxjava3.samples" } diff --git a/compose/runtime/runtime-saveable/build.gradle b/compose/runtime/runtime-saveable/build.gradle index 98be9f65a0a56..f06f6f4424a37 100644 --- a/compose/runtime/runtime-saveable/build.gradle +++ b/compose/runtime/runtime-saveable/build.gradle @@ -33,7 +33,7 @@ plugins { androidXMultiplatform { androidLibrary { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.runtime.saveable" androidResources.enable = true } diff --git a/compose/runtime/runtime-saveable/samples/build.gradle b/compose/runtime/runtime-saveable/samples/build.gradle index d098b39bbef50..1a7556cfc24fb 100644 --- a/compose/runtime/runtime-saveable/samples/build.gradle +++ b/compose/runtime/runtime-saveable/samples/build.gradle @@ -27,7 +27,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -49,6 +48,6 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.runtime.saveable.samples" } diff --git a/compose/runtime/runtime-tracing/build.gradle b/compose/runtime/runtime-tracing/build.gradle index dd496e790d669..0ade4de61123b 100644 --- a/compose/runtime/runtime-tracing/build.gradle +++ b/compose/runtime/runtime-tracing/build.gradle @@ -26,7 +26,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - id("org.jetbrains.kotlin.android") } android { diff --git a/compose/runtime/runtime/compose-runtime-benchmark/build.gradle b/compose/runtime/runtime/compose-runtime-benchmark/build.gradle index abd60597f9382..554fd700b7dc2 100644 --- a/compose/runtime/runtime/compose-runtime-benchmark/build.gradle +++ b/compose/runtime/runtime/compose-runtime-benchmark/build.gradle @@ -20,12 +20,11 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") id("androidx.benchmark") } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.runtime.benchmark" buildTypes.release { diff --git a/compose/runtime/runtime/integration-tests/build.gradle b/compose/runtime/runtime/integration-tests/build.gradle index 649b17f935392..29da043d0fac5 100644 --- a/compose/runtime/runtime/integration-tests/build.gradle +++ b/compose/runtime/runtime/integration-tests/build.gradle @@ -26,11 +26,10 @@ plugins { id("AndroidXPlugin") id("AndroidXComposePlugin") id("com.android.library") - id("org.jetbrains.kotlin.android") } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.runtime.integrationtests" } diff --git a/compose/runtime/runtime/samples/build.gradle b/compose/runtime/runtime/samples/build.gradle index ad0853ee1acdf..6e5049f283366 100644 --- a/compose/runtime/runtime/samples/build.gradle +++ b/compose/runtime/runtime/samples/build.gradle @@ -27,7 +27,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -48,6 +47,6 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.runtime.samples" } diff --git a/compose/test-utils/build.gradle b/compose/test-utils/build.gradle index 30627948dcbfd..fccb80db21148 100644 --- a/compose/test-utils/build.gradle +++ b/compose/test-utils/build.gradle @@ -30,7 +30,7 @@ plugins { androidXMultiplatform { androidLibrary { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.testutils" androidResources.enable = true } diff --git a/compose/ui/ui-graphics/benchmark/build.gradle b/compose/ui/ui-graphics/benchmark/build.gradle index 22c986152d51c..f302b274b4bdc 100644 --- a/compose/ui/ui-graphics/benchmark/build.gradle +++ b/compose/ui/ui-graphics/benchmark/build.gradle @@ -20,7 +20,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") id("androidx.benchmark") } @@ -36,7 +35,7 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.ui.graphics.benchmark" } diff --git a/compose/ui/ui-graphics/benchmark/test/build.gradle b/compose/ui/ui-graphics/benchmark/test/build.gradle index 68deed4987804..d3c3e784358b5 100644 --- a/compose/ui/ui-graphics/benchmark/test/build.gradle +++ b/compose/ui/ui-graphics/benchmark/test/build.gradle @@ -18,7 +18,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -34,6 +33,6 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.ui.graphics.benchmark.test" } diff --git a/compose/ui/ui-graphics/build.gradle b/compose/ui/ui-graphics/build.gradle index 7c024438097e8..ed64e1fc4f5d3 100644 --- a/compose/ui/ui-graphics/build.gradle +++ b/compose/ui/ui-graphics/build.gradle @@ -35,7 +35,7 @@ plugins { androidXMultiplatform { androidLibrary { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.ui.graphics" androidResources.enable = true optimization { diff --git a/compose/ui/ui-graphics/samples/build.gradle b/compose/ui/ui-graphics/samples/build.gradle index 2f3e5ffc8dee9..3d1d61c4b8b09 100644 --- a/compose/ui/ui-graphics/samples/build.gradle +++ b/compose/ui/ui-graphics/samples/build.gradle @@ -27,7 +27,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -49,6 +48,6 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.ui.graphics.samples" } diff --git a/compose/ui/ui-inspection/build.gradle b/compose/ui/ui-inspection/build.gradle index f5d36176ce552..f7b19b6cbb924 100644 --- a/compose/ui/ui-inspection/build.gradle +++ b/compose/ui/ui-inspection/build.gradle @@ -28,7 +28,6 @@ plugins { id("AndroidXPlugin") id("AndroidXComposePlugin") id("com.android.library") - id("org.jetbrains.kotlin.android") id("androidx.inspection") } @@ -81,10 +80,10 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(37) } defaultConfig { // layout inspection supported starting on Android Q - minSdk = 29 + minSdk { version = release(29) } } externalNativeBuild { diff --git a/compose/ui/ui-test-accessibility/build.gradle b/compose/ui/ui-test-accessibility/build.gradle index a64d2a5088f31..ccb14f9eba7f4 100644 --- a/compose/ui/ui-test-accessibility/build.gradle +++ b/compose/ui/ui-test-accessibility/build.gradle @@ -32,7 +32,7 @@ plugins { androidXMultiplatform { androidLibrary { namespace = "androidx.compose.ui.test.accessibility" - compileSdk = 35 + compileSdk { version = release(37) } } defaultPlatform(PlatformIdentifier.ANDROID) diff --git a/compose/ui/ui-test-accessibility/samples/build.gradle b/compose/ui/ui-test-accessibility/samples/build.gradle index 27ba3b27101c3..9ff240f30a716 100644 --- a/compose/ui/ui-test-accessibility/samples/build.gradle +++ b/compose/ui/ui-test-accessibility/samples/build.gradle @@ -28,7 +28,6 @@ plugins { id("AndroidXPlugin") id("AndroidXComposePlugin") id("com.android.library") - id("org.jetbrains.kotlin.android") } dependencies { @@ -40,7 +39,7 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.ui.test.accessibility.samples" } diff --git a/compose/ui/ui-test-junit4-accessibility/build.gradle b/compose/ui/ui-test-junit4-accessibility/build.gradle index e170a90413409..b2c23da54c72c 100644 --- a/compose/ui/ui-test-junit4-accessibility/build.gradle +++ b/compose/ui/ui-test-junit4-accessibility/build.gradle @@ -33,7 +33,7 @@ plugins { androidXMultiplatform { androidLibrary { namespace = "androidx.compose.ui.test.junit4.accessibility" - compileSdk = 35 + compileSdk { version = release(37) } } defaultPlatform(PlatformIdentifier.ANDROID) diff --git a/compose/ui/ui-test-junit4-accessibility/samples/build.gradle b/compose/ui/ui-test-junit4-accessibility/samples/build.gradle index ec96e9b9bdd04..a7928212d4d0b 100644 --- a/compose/ui/ui-test-junit4-accessibility/samples/build.gradle +++ b/compose/ui/ui-test-junit4-accessibility/samples/build.gradle @@ -27,7 +27,6 @@ plugins { id("AndroidXPlugin") id("AndroidXComposePlugin") id("com.android.library") - id("org.jetbrains.kotlin.android") } dependencies { @@ -41,7 +40,7 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.ui.test.junit4.accessibility.samples" } diff --git a/compose/ui/ui-test-junit4/build.gradle b/compose/ui/ui-test-junit4/build.gradle index be6e2a843008f..b20ee8022a56e 100644 --- a/compose/ui/ui-test-junit4/build.gradle +++ b/compose/ui/ui-test-junit4/build.gradle @@ -32,7 +32,7 @@ plugins { androidXMultiplatform { androidLibrary { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.ui.test.junit4" } desktop() diff --git a/compose/ui/ui-test-manifest/integration-tests/testapp/build.gradle b/compose/ui/ui-test-manifest/integration-tests/testapp/build.gradle index fed1095adbc35..989e76b61e098 100644 --- a/compose/ui/ui-test-manifest/integration-tests/testapp/build.gradle +++ b/compose/ui/ui-test-manifest/integration-tests/testapp/build.gradle @@ -18,7 +18,6 @@ plugins { id("AndroidXPlugin") id("AndroidXComposePlugin") id("com.android.application") - id("org.jetbrains.kotlin.android") } dependencies { @@ -31,13 +30,9 @@ dependencies { androidTestImplementation(libs.testRunner) androidTestImplementation(libs.testCore) androidTestImplementation(libs.espressoCore) - - // Align dependencies in debugRuntimeClasspath and debugAndroidTestRuntimeClasspath. - - androidTestImplementation(project(":savedstate:savedstate")) } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.ui.test.manifest.integration.testapp" } diff --git a/compose/ui/ui-test/build.gradle b/compose/ui/ui-test/build.gradle index c08ca1a1d45d3..d914c0acf05ad 100644 --- a/compose/ui/ui-test/build.gradle +++ b/compose/ui/ui-test/build.gradle @@ -34,7 +34,7 @@ plugins { androidXMultiplatform { androidLibrary { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.ui.test" androidResources.enable = true } diff --git a/compose/ui/ui-test/samples/build.gradle b/compose/ui/ui-test/samples/build.gradle index 42f303156a4f7..47cac91805fa0 100644 --- a/compose/ui/ui-test/samples/build.gradle +++ b/compose/ui/ui-test/samples/build.gradle @@ -27,7 +27,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -54,6 +53,6 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.ui.test.samples" } diff --git a/compose/ui/ui-text-google-fonts/build.gradle b/compose/ui/ui-text-google-fonts/build.gradle index 583ebe6456e7f..c350d3b14c310 100644 --- a/compose/ui/ui-text-google-fonts/build.gradle +++ b/compose/ui/ui-text-google-fonts/build.gradle @@ -28,7 +28,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -56,6 +55,6 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.ui.text.googlefonts" } diff --git a/compose/ui/ui-text-google-fonts/samples/build.gradle b/compose/ui/ui-text-google-fonts/samples/build.gradle index 03d93f8884d7d..fe4d625482471 100644 --- a/compose/ui/ui-text-google-fonts/samples/build.gradle +++ b/compose/ui/ui-text-google-fonts/samples/build.gradle @@ -38,6 +38,6 @@ androidx { } android { - compileSdk { version = release(36) } + compileSdk { version = release(37) } namespace = "androidx.compose.ui.text.googlefonts.samples" } diff --git a/compose/ui/ui-text/benchmark/build.gradle b/compose/ui/ui-text/benchmark/build.gradle index b16447ee22cfd..94c9f20782909 100644 --- a/compose/ui/ui-text/benchmark/build.gradle +++ b/compose/ui/ui-text/benchmark/build.gradle @@ -39,11 +39,7 @@ dependencies { } android { - compileSdk = 35 - defaultConfig { - // Using blocked private API b/425739542 - targetSdk = 34 - } + compileSdk { version = release(37) } namespace = "androidx.compose.ui.text.benchmark" } diff --git a/compose/ui/ui-text/build.gradle b/compose/ui/ui-text/build.gradle index 75a94e715d338..69fea3c19b64e 100644 --- a/compose/ui/ui-text/build.gradle +++ b/compose/ui/ui-text/build.gradle @@ -35,7 +35,7 @@ plugins { androidXMultiplatform { androidLibrary { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.ui.text" androidResources.enable = true optimization { diff --git a/compose/ui/ui-text/samples/build.gradle b/compose/ui/ui-text/samples/build.gradle index bcf7e482f0bc9..14ac0b9cce572 100644 --- a/compose/ui/ui-text/samples/build.gradle +++ b/compose/ui/ui-text/samples/build.gradle @@ -27,7 +27,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -50,6 +49,6 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.ui.text.samples" } diff --git a/compose/ui/ui-tooling-data/build.gradle b/compose/ui/ui-tooling-data/build.gradle index 2345a7fc3f8f7..2e97a3e72bd5a 100644 --- a/compose/ui/ui-tooling-data/build.gradle +++ b/compose/ui/ui-tooling-data/build.gradle @@ -33,7 +33,7 @@ plugins { androidXMultiplatform { androidLibrary { namespace = "androidx.compose.ui.tooling.data" - compileSdk = 35 + compileSdk { version = release(37) } } desktop() diff --git a/compose/ui/ui-tooling-preview/samples/build.gradle b/compose/ui/ui-tooling-preview/samples/build.gradle index 1ef5e86b20b05..0a567346061ce 100644 --- a/compose/ui/ui-tooling-preview/samples/build.gradle +++ b/compose/ui/ui-tooling-preview/samples/build.gradle @@ -46,6 +46,6 @@ androidx { } android { - compileSdk { version = release(36) } + compileSdk { version = release(37) } namespace = "androidx.compose.ui.tooling.preview.samples" } \ No newline at end of file diff --git a/compose/ui/ui-tooling/build.gradle b/compose/ui/ui-tooling/build.gradle index 4cc05ae31a712..cb91d0dbd1d48 100644 --- a/compose/ui/ui-tooling/build.gradle +++ b/compose/ui/ui-tooling/build.gradle @@ -32,7 +32,7 @@ plugins { androidXMultiplatform { androidLibrary { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.ui.tooling" androidResources.enable = true } diff --git a/compose/ui/ui-unit/samples/build.gradle b/compose/ui/ui-unit/samples/build.gradle index d16f2cc747fea..4b78acb8bcb88 100644 --- a/compose/ui/ui-unit/samples/build.gradle +++ b/compose/ui/ui-unit/samples/build.gradle @@ -27,7 +27,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -50,6 +49,6 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.ui.unit.samples" } diff --git a/compose/ui/ui-viewbinding/build.gradle b/compose/ui/ui-viewbinding/build.gradle index 22312884250cf..021025290d969 100644 --- a/compose/ui/ui-viewbinding/build.gradle +++ b/compose/ui/ui-viewbinding/build.gradle @@ -28,7 +28,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -57,6 +56,6 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.ui.viewbinding" } diff --git a/compose/ui/ui-viewbinding/samples/build.gradle b/compose/ui/ui-viewbinding/samples/build.gradle index d67763975830d..29d4a82217aff 100644 --- a/compose/ui/ui-viewbinding/samples/build.gradle +++ b/compose/ui/ui-viewbinding/samples/build.gradle @@ -28,7 +28,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -59,7 +58,7 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(37) } buildFeatures { viewBinding = true } diff --git a/compose/ui/ui/benchmark/build.gradle b/compose/ui/ui/benchmark/build.gradle index fe0cbf79bcc87..57d85dd51adf3 100644 --- a/compose/ui/ui/benchmark/build.gradle +++ b/compose/ui/ui/benchmark/build.gradle @@ -26,7 +26,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") id("androidx.benchmark") } @@ -48,7 +47,7 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.ui.benchmark" } diff --git a/compose/ui/ui/build.gradle b/compose/ui/ui/build.gradle index faf1755c495e2..a2a71ac64fd4f 100644 --- a/compose/ui/ui/build.gradle +++ b/compose/ui/ui/build.gradle @@ -41,7 +41,7 @@ plugins { androidXMultiplatform { androidLibrary { withJava() - compileSdk = 37 + compileSdk { version = release(37) } androidResources.enable = true optimization { it.consumerKeepRules.publish = true @@ -100,6 +100,7 @@ androidXMultiplatform { } jvmAndAndroidMain.dependencies { + api(libs.jspecify) } androidMain.dependencies { @@ -109,7 +110,6 @@ androidXMultiplatform { compileOnly(project(":compose:ui:ui-android-stubs")) implementation("androidx.autofill:autofill:1.0.0") implementation(libs.kotlinCoroutinesAndroid) - api(libs.jspecify) implementation("androidx.activity:activity-ktx:1.7.0") implementation("androidx.core:core:1.16.0") diff --git a/compose/ui/ui/integration-tests/ui-demos/build.gradle b/compose/ui/ui/integration-tests/ui-demos/build.gradle index 94976c2f446f3..87aad93517a8a 100644 --- a/compose/ui/ui/integration-tests/ui-demos/build.gradle +++ b/compose/ui/ui/integration-tests/ui-demos/build.gradle @@ -8,7 +8,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -34,8 +33,8 @@ dependencies { implementation("androidx.activity:activity-compose:1.8.1") implementation("androidx.fragment:fragment-ktx:1.2.5") - implementation("androidx.recyclerview:recyclerview:1.4.0") - implementation("androidx.customview:customview-poolingcontainer:1.0.0") + implementation(project(":recyclerview:recyclerview")) + implementation(project(":customview:customview-poolingcontainer")) implementation("androidx.viewpager2:viewpager2:1.0.0") implementation("androidx.coordinatorlayout:coordinatorlayout:1.1.0") implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0") @@ -44,7 +43,7 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(37) } buildFeatures { viewBinding = true } diff --git a/compose/ui/ui/samples/build.gradle b/compose/ui/ui/samples/build.gradle index 905d64e0d3972..fe757d4802069 100644 --- a/compose/ui/ui/samples/build.gradle +++ b/compose/ui/ui/samples/build.gradle @@ -27,7 +27,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -53,6 +52,6 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.compose.ui.samples" } diff --git a/constraintlayout/constraintlayout-compose/build.gradle b/constraintlayout/constraintlayout-compose/build.gradle index fcaccb6243c44..4570ea9a04b20 100644 --- a/constraintlayout/constraintlayout-compose/build.gradle +++ b/constraintlayout/constraintlayout-compose/build.gradle @@ -29,7 +29,7 @@ plugins { androidXMultiplatform { androidLibrary { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.constraintlayout.compose" androidResources.enable = true } diff --git a/constraintlayout/constraintlayout-compose/integration-tests/compose-benchmark/build.gradle b/constraintlayout/constraintlayout-compose/integration-tests/compose-benchmark/build.gradle index f05ab75a02f7a..5e2c3b559f441 100644 --- a/constraintlayout/constraintlayout-compose/integration-tests/compose-benchmark/build.gradle +++ b/constraintlayout/constraintlayout-compose/integration-tests/compose-benchmark/build.gradle @@ -20,8 +20,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("androidx.benchmark") } @@ -38,7 +36,7 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.constraintlayout.compose.benchmark" } diff --git a/constraintlayout/constraintlayout-compose/integration-tests/demos/build.gradle b/constraintlayout/constraintlayout-compose/integration-tests/demos/build.gradle index 0ed56388cf19f..5380458126950 100644 --- a/constraintlayout/constraintlayout-compose/integration-tests/demos/build.gradle +++ b/constraintlayout/constraintlayout-compose/integration-tests/demos/build.gradle @@ -18,8 +18,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -37,7 +35,7 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.constraintlayout.compose.demos" } diff --git a/constraintlayout/constraintlayout-compose/integration-tests/macrobenchmark-target/build.gradle b/constraintlayout/constraintlayout-compose/integration-tests/macrobenchmark-target/build.gradle index d880e040d96d7..23e20efeddeeb 100644 --- a/constraintlayout/constraintlayout-compose/integration-tests/macrobenchmark-target/build.gradle +++ b/constraintlayout/constraintlayout-compose/integration-tests/macrobenchmark-target/build.gradle @@ -18,14 +18,12 @@ plugins { id("AndroidXPlugin") id("AndroidXComposePlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { - compileSdk = 35 + compileSdk { version = release(37) } defaultConfig { - minSdk = 26 + minSdk { version = release(26) } } namespace = "androidx.constraintlayout.compose.integration.macrobenchmark.target" diff --git a/constraintlayout/constraintlayout-compose/integration-tests/macrobenchmark/build.gradle b/constraintlayout/constraintlayout-compose/integration-tests/macrobenchmark/build.gradle index 4baa0a12a8bde..180a59512a601 100644 --- a/constraintlayout/constraintlayout-compose/integration-tests/macrobenchmark/build.gradle +++ b/constraintlayout/constraintlayout-compose/integration-tests/macrobenchmark/build.gradle @@ -17,13 +17,11 @@ plugins { id("AndroidXPlugin") id("com.android.test") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { defaultConfig { - minSdk = 26 + minSdk { version = release(26) } } namespace = "androidx.constraintlayout.compose.integration.macrobenchmark" diff --git a/constraintlayout/constraintlayout-compose/samples/build.gradle b/constraintlayout/constraintlayout-compose/samples/build.gradle index cbdcbea8aaee8..31bad4cdeff92 100644 --- a/constraintlayout/constraintlayout-compose/samples/build.gradle +++ b/constraintlayout/constraintlayout-compose/samples/build.gradle @@ -20,8 +20,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -42,6 +40,6 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.constraintlayout.compose.samples" } diff --git a/core/core-appdigest/build.gradle b/core/core-appdigest/build.gradle index 6a05bf737f701..05095d0a7f65c 100644 --- a/core/core-appdigest/build.gradle +++ b/core/core-appdigest/build.gradle @@ -53,6 +53,6 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(35) } namespace = "androidx.core.appdigest" } diff --git a/core/core-backported-fixes/build.gradle b/core/core-backported-fixes/build.gradle index 182ba9fd8eb66..0a1e7fcf9973f 100644 --- a/core/core-backported-fixes/build.gradle +++ b/core/core-backported-fixes/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/core/core-backported-fixes/integration-tests/testapp/build.gradle b/core/core-backported-fixes/integration-tests/testapp/build.gradle index 0f2ea978ad9c6..6077e88566001 100644 --- a/core/core-backported-fixes/integration-tests/testapp/build.gradle +++ b/core/core-backported-fixes/integration-tests/testapp/build.gradle @@ -18,8 +18,6 @@ plugins { id("AndroidXPlugin") id("AndroidXComposePlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -47,5 +45,5 @@ dependencies { android { namespace = "androidx.core.backported.fixes.testapp" - compileSdk = 35 + compileSdk { version = release(37) } } \ No newline at end of file diff --git a/core/core-backported-fixes/samples/build.gradle b/core/core-backported-fixes/samples/build.gradle index 53aaf60f52b7b..1a872d049dcbb 100644 --- a/core/core-backported-fixes/samples/build.gradle +++ b/core/core-backported-fixes/samples/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -35,7 +33,7 @@ dependencies { } android { - compileSdk = 35 // ki452390376 requires VANILLA_ICE_CREAM + compileSdk { version = release(35) } // ki452390376 requires VANILLA_ICE_CREAM namespace = "androidx.core.backported.fixes.samples" } diff --git a/core/core-google-shortcuts/build.gradle b/core/core-google-shortcuts/build.gradle index e86f41315488b..61e223f6bd9f6 100644 --- a/core/core-google-shortcuts/build.gradle +++ b/core/core-google-shortcuts/build.gradle @@ -18,8 +18,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { diff --git a/core/core-graphics-integration-tests/testapp/build.gradle b/core/core-graphics-integration-tests/testapp/build.gradle index 375c82dd0cf97..317edfdfb95a9 100644 --- a/core/core-graphics-integration-tests/testapp/build.gradle +++ b/core/core-graphics-integration-tests/testapp/build.gradle @@ -17,12 +17,10 @@ plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { - compileSdk = 35 + compileSdk { version = release(35) } defaultConfig { applicationId = "androidx.core.graphics.sample" } diff --git a/core/core-i18n/build.gradle b/core/core-i18n/build.gradle index 5e6bd4604aafa..5162889aa81f5 100644 --- a/core/core-i18n/build.gradle +++ b/core/core-i18n/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -49,7 +47,7 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(35) } namespace = "androidx.core.i18n" defaultConfig { } diff --git a/core/core-ktx/build.gradle b/core/core-ktx/build.gradle index 9fb6826a8f524..f9b3f6f8e6ec6 100644 --- a/core/core-ktx/build.gradle +++ b/core/core-ktx/build.gradle @@ -9,8 +9,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -32,6 +30,6 @@ androidx { } android { - compileSdk = 36 + compileSdk { version = release(37) } namespace = "androidx.core.ktx" } diff --git a/core/core-location-altitude/build.gradle b/core/core-location-altitude/build.gradle index ec3a8f2e1389a..8c71f718fbc5c 100644 --- a/core/core-location-altitude/build.gradle +++ b/core/core-location-altitude/build.gradle @@ -27,8 +27,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { diff --git a/core/core-performance-play-services/build.gradle b/core/core-performance-play-services/build.gradle index 90a31a12fb4ba..7a11fb1ebe26a 100644 --- a/core/core-performance-play-services/build.gradle +++ b/core/core-performance-play-services/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -50,7 +48,7 @@ dependencies { android { defaultConfig { - minSdk = 24 + minSdk { version = release(24) } } namespace = "androidx.core.performance.play.services" } diff --git a/core/core-performance-play-services/integration-tests/testapp/build.gradle b/core/core-performance-play-services/integration-tests/testapp/build.gradle index dd347717580e2..11cd84371bc40 100644 --- a/core/core-performance-play-services/integration-tests/testapp/build.gradle +++ b/core/core-performance-play-services/integration-tests/testapp/build.gradle @@ -17,8 +17,6 @@ plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -30,7 +28,7 @@ dependencies { android { defaultConfig { applicationId = "androidx.core.performance.play.services.testapp" - minSdk = 24 + minSdk { version = release(24) } } namespace = "androidx.core.performance.play.services.testapp" diff --git a/core/core-performance-testing/build.gradle b/core/core-performance-testing/build.gradle index 95202bda864d9..56eee1a859ba3 100644 --- a/core/core-performance-testing/build.gradle +++ b/core/core-performance-testing/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/core/core-performance/build.gradle b/core/core-performance/build.gradle index a9ef4610aa230..24838c9ca0197 100644 --- a/core/core-performance/build.gradle +++ b/core/core-performance/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/core/core-performance/integration-tests/testapp/build.gradle b/core/core-performance/integration-tests/testapp/build.gradle index 6846245a585f7..cf55c2e5d0f2e 100644 --- a/core/core-performance/integration-tests/testapp/build.gradle +++ b/core/core-performance/integration-tests/testapp/build.gradle @@ -17,8 +17,6 @@ plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -29,7 +27,7 @@ dependencies { android { defaultConfig { applicationId = "androidx.core.performance.testapp" - minSdk = 24 + minSdk { version = release(24) } } namespace = "androidx.core.performance.testapp" diff --git a/core/core-performance/integration-tests/testlib/build.gradle b/core/core-performance/integration-tests/testlib/build.gradle index 6b033de4629c9..026d12f86baba 100644 --- a/core/core-performance/integration-tests/testlib/build.gradle +++ b/core/core-performance/integration-tests/testlib/build.gradle @@ -17,8 +17,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -28,7 +26,7 @@ dependencies { android { defaultConfig { - minSdk = 24 + minSdk { version = release(24) } } namespace = "androidx.core.performance.testlib" diff --git a/core/core-performance/samples/build.gradle b/core/core-performance/samples/build.gradle index 61bac29dd930c..980d30fd0f99d 100644 --- a/core/core-performance/samples/build.gradle +++ b/core/core-performance/samples/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -45,7 +43,7 @@ androidx { android { defaultConfig { - minSdk = 24 + minSdk { version = release(24) } } namespace = "androidx.core.performance.samples" } diff --git a/core/core-pip/build.gradle b/core/core-pip/build.gradle index 0df6e8b424265..74c46b43a0f3d 100644 --- a/core/core-pip/build.gradle +++ b/core/core-pip/build.gradle @@ -37,7 +37,7 @@ dependencies { } android { - compileSdk = 36 + compileSdk { version = release(37) } namespace = "androidx.core.pip" } diff --git a/core/core-remoteviews/build.gradle b/core/core-remoteviews/build.gradle index 97451271acc76..7732be4625f78 100644 --- a/core/core-remoteviews/build.gradle +++ b/core/core-remoteviews/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/core/core-remoteviews/integration-tests/demos/build.gradle b/core/core-remoteviews/integration-tests/demos/build.gradle index c9861d354f449..3344b85058128 100644 --- a/core/core-remoteviews/integration-tests/demos/build.gradle +++ b/core/core-remoteviews/integration-tests/demos/build.gradle @@ -18,8 +18,6 @@ plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/core/core-splashscreen/build.gradle b/core/core-splashscreen/build.gradle index a1f43a02c378f..b252aab60c63f 100644 --- a/core/core-splashscreen/build.gradle +++ b/core/core-splashscreen/build.gradle @@ -25,12 +25,10 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { - compileSdk = 35 + compileSdk { version = release(35) } namespace = "androidx.core.splashscreen" } diff --git a/core/core-splashscreen/samples/build.gradle b/core/core-splashscreen/samples/build.gradle index cb34e2458da95..b2c1a0e044681 100644 --- a/core/core-splashscreen/samples/build.gradle +++ b/core/core-splashscreen/samples/build.gradle @@ -25,12 +25,10 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { - compileSdk = 35 + compileSdk { version = release(35) } defaultConfig { applicationId = "androidx.core.splashscreen.samples" } diff --git a/core/core-telecom/build.gradle b/core/core-telecom/build.gradle index 8ea22a45fe9d7..a13ed84f7fb9f 100644 --- a/core/core-telecom/build.gradle +++ b/core/core-telecom/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -50,11 +48,8 @@ dependencies { } android { - compileSdk = 36 - compileSdkMinor = 1 + compileSdk { version = release(36) { minorApiLevel = 1 }} namespace = "androidx.core.telecom" - compileSdk = 36 - compileSdkMinor = 1 buildFeatures { aidl = true } diff --git a/core/core-telecom/integration-tests/referenceapp/build.gradle b/core/core-telecom/integration-tests/referenceapp/build.gradle index b959c04149065..e91037322077a 100644 --- a/core/core-telecom/integration-tests/referenceapp/build.gradle +++ b/core/core-telecom/integration-tests/referenceapp/build.gradle @@ -18,17 +18,14 @@ plugins { id("AndroidXPlugin") id("com.android.application") id("AndroidXComposePlugin") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { namespace = "androidx.core.telecom.reference" - compileSdk = 36 - compileSdkMinor = 1 + compileSdk { version = release(36) { minorApiLevel = 1 }} defaultConfig { applicationId = "androidx.core.telecom.reference" - minSdk = 26 + minSdk { version = release(26) } } buildTypes { diff --git a/core/core-telecom/integration-tests/testapp/build.gradle b/core/core-telecom/integration-tests/testapp/build.gradle index ae6ec27efe22b..552025e93e685 100644 --- a/core/core-telecom/integration-tests/testapp/build.gradle +++ b/core/core-telecom/integration-tests/testapp/build.gradle @@ -17,17 +17,14 @@ plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { namespace = "androidx.core.telecom.test" - compileSdk = 36 - compileSdkMinor = 1 + compileSdk { version = release(36) { minorApiLevel = 1 }} defaultConfig { applicationId = "androidx.core.telecom.test" - minSdk = 26 + minSdk { version = release(26) } } buildTypes { @@ -53,4 +50,3 @@ dependencies { androidTestImplementation(libs.testExtJunit) androidTestImplementation(libs.testRunner) } - diff --git a/core/core-telecom/integration-tests/testdialerapp/build.gradle b/core/core-telecom/integration-tests/testdialerapp/build.gradle index f462331352ca3..ec5e57e2527f5 100644 --- a/core/core-telecom/integration-tests/testdialerapp/build.gradle +++ b/core/core-telecom/integration-tests/testdialerapp/build.gradle @@ -17,18 +17,15 @@ plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("AndroidXComposePlugin") } android { namespace = "androidx.core.telecom.testdialerapp" - compileSdk = 36 - compileSdkMinor = 1 + compileSdk { version = release(36) { minorApiLevel = 1 }} defaultConfig { applicationId = "androidx.core.telecom.testdialerapp" - minSdk = 29 + minSdk { version = release(29) } } buildTypes { diff --git a/core/core-telecom/integration-tests/testicsapp/build.gradle b/core/core-telecom/integration-tests/testicsapp/build.gradle index 421e631cdd082..850571306ab9e 100644 --- a/core/core-telecom/integration-tests/testicsapp/build.gradle +++ b/core/core-telecom/integration-tests/testicsapp/build.gradle @@ -18,17 +18,14 @@ plugins { id("AndroidXPlugin") id("com.android.application") id("AndroidXComposePlugin") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { namespace = "androidx.core.telecom.test" - compileSdk = 36 - compileSdkMinor = 1 + compileSdk { version = release(36) { minorApiLevel = 1 }} defaultConfig { applicationId = "androidx.core.telecom.icstest" - minSdk = 29 // Move down to 23 if we support CallingApp:checkDialerRole for < Q + minSdk { version = release(29) } // Move down to 23 if we support CallingApp:checkDialerRole for < Q } buildTypes { diff --git a/core/core-testing/build.gradle b/core/core-testing/build.gradle index 7a6f77d56aab0..902840762185b 100644 --- a/core/core-testing/build.gradle +++ b/core/core-testing/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -43,7 +41,7 @@ dependencies { } android { - compileSdk = 36 + compileSdk { version = release(37) } namespace = "androidx.core.testing" } diff --git a/core/core-viewtree/build.gradle b/core/core-viewtree/build.gradle index 83cacac70a57f..99f4f9bfe8e65 100644 --- a/core/core-viewtree/build.gradle +++ b/core/core-viewtree/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/core/core/build.gradle b/core/core/build.gradle index e06c41ebcd35b..d56910e4406f1 100644 --- a/core/core/build.gradle +++ b/core/core/build.gradle @@ -10,8 +10,6 @@ import androidx.stableaidl.StableAidlBuildTypeDslExtension plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("androidx.stableaidl") } diff --git a/core/core/samples/build.gradle b/core/core/samples/build.gradle index 63113e428e1b8..ea47aad8ada1e 100644 --- a/core/core/samples/build.gradle +++ b/core/core/samples/build.gradle @@ -19,8 +19,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -31,7 +29,7 @@ dependencies { } android { - compileSdk = 36 + compileSdk { version = release(37) } namespace = "androidx.core.samples" } diff --git a/core/haptics/haptics/build.gradle b/core/haptics/haptics/build.gradle index 78d8f695ceee5..67910bfc87160 100644 --- a/core/haptics/haptics/build.gradle +++ b/core/haptics/haptics/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -41,7 +39,7 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(35) } namespace = "androidx.core.haptics" } diff --git a/core/haptics/haptics/integration-tests/demos/build.gradle b/core/haptics/haptics/integration-tests/demos/build.gradle index a612164ca9b65..b387a46dbf033 100644 --- a/core/haptics/haptics/integration-tests/demos/build.gradle +++ b/core/haptics/haptics/integration-tests/demos/build.gradle @@ -17,8 +17,6 @@ plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -28,7 +26,7 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(35) } defaultConfig { applicationId = "androidx.core.haptics.demos" } diff --git a/core/haptics/haptics/samples/build.gradle b/core/haptics/haptics/samples/build.gradle index 13c6c7ffac6b0..a634ed6edf9ae 100644 --- a/core/haptics/haptics/samples/build.gradle +++ b/core/haptics/haptics/samples/build.gradle @@ -17,15 +17,13 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { compileOnly(project(":annotation:annotation-sampled")) implementation(project(":core:haptics:haptics")) } android { - compileSdk = 35 + compileSdk { version = release(35) } namespace = "androidx.core.haptics.samples" } androidx { diff --git a/core/uwb/uwb-rxjava3/build.gradle b/core/uwb/uwb-rxjava3/build.gradle index 765996792b0d6..f18504f9efae5 100644 --- a/core/uwb/uwb-rxjava3/build.gradle +++ b/core/uwb/uwb-rxjava3/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -46,11 +44,11 @@ dependencies { android { defaultConfig { - minSdk = 31 + minSdk { version = release(31) } } namespace = "androidx.core.uwb.rxjava3" - compileSdk = 36 + compileSdk { version = release(36) } } androidx { diff --git a/core/uwb/uwb/build.gradle b/core/uwb/uwb/build.gradle index db1ec9ef816a2..99cc48944e157 100644 --- a/core/uwb/uwb/build.gradle +++ b/core/uwb/uwb/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("androidx.stableaidl") } @@ -59,7 +57,7 @@ androidx { android { namespace = "androidx.core.uwb" - compileSdk = 36 + compileSdk { version = release(36) } buildFeatures { aidl = true } diff --git a/credentials/credentials-play-services-auth/build.gradle b/credentials/credentials-play-services-auth/build.gradle index 9a6fb1314c331..21e61baaf8e3f 100644 --- a/credentials/credentials-play-services-auth/build.gradle +++ b/credentials/credentials-play-services-auth/build.gradle @@ -27,8 +27,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -58,7 +56,7 @@ dependencies { android { - compileSdk = 35 + compileSdk { version = release(35) } namespace = "androidx.credentials.play.services.auth" } diff --git a/credentials/credentials/build.gradle b/credentials/credentials/build.gradle index 78e768d579dc4..c9d088c3f7e1c 100644 --- a/credentials/credentials/build.gradle +++ b/credentials/credentials/build.gradle @@ -26,8 +26,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -49,7 +47,7 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(35) } namespace = "androidx.credentials" defaultConfig { diff --git a/credentials/credentials/samples/build.gradle b/credentials/credentials/samples/build.gradle index b3a7b5e25d12b..10644eea5105d 100644 --- a/credentials/credentials/samples/build.gradle +++ b/credentials/credentials/samples/build.gradle @@ -27,12 +27,10 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { - compileSdk = 35 + compileSdk { version = release(35) } namespace = "androidx.credentials.samples" defaultConfig { diff --git a/credentials/providerevents/providerevents-play-services/build.gradle b/credentials/providerevents/providerevents-play-services/build.gradle index 4ab21685ba1fa..0940bdc15c675 100644 --- a/credentials/providerevents/providerevents-play-services/build.gradle +++ b/credentials/providerevents/providerevents-play-services/build.gradle @@ -27,8 +27,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -47,7 +45,7 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(35) } namespace = "androidx.credentials.providerevents.playservices" } diff --git a/credentials/providerevents/providerevents/build.gradle b/credentials/providerevents/providerevents/build.gradle index fe896bdb768b1..42c347f6979a9 100644 --- a/credentials/providerevents/providerevents/build.gradle +++ b/credentials/providerevents/providerevents/build.gradle @@ -29,8 +29,6 @@ import androidx.build.AndroidXConfig plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -52,7 +50,7 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(35) } namespace = "androidx.credentials.providerevents" } diff --git a/credentials/registry/registry-digitalcredentials-mdoc/build.gradle b/credentials/registry/registry-digitalcredentials-mdoc/build.gradle index 428e08a2cd725..aa31e61cd365e 100644 --- a/credentials/registry/registry-digitalcredentials-mdoc/build.gradle +++ b/credentials/registry/registry-digitalcredentials-mdoc/build.gradle @@ -27,8 +27,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -42,7 +40,7 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(35) } namespace = "androidx.credentials.registry.digitalcredentials.mdoc" } diff --git a/credentials/registry/registry-digitalcredentials-openid/build.gradle b/credentials/registry/registry-digitalcredentials-openid/build.gradle index 0461d937cfc81..86a91e28693d9 100644 --- a/credentials/registry/registry-digitalcredentials-openid/build.gradle +++ b/credentials/registry/registry-digitalcredentials-openid/build.gradle @@ -27,8 +27,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -44,7 +42,7 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(35) } namespace = "androidx.credentials.registry.digitalcredentials.openid" } diff --git a/credentials/registry/registry-digitalcredentials-sdjwtvc/build.gradle b/credentials/registry/registry-digitalcredentials-sdjwtvc/build.gradle index feb024f7aaf1c..f3a1cb39e2df7 100644 --- a/credentials/registry/registry-digitalcredentials-sdjwtvc/build.gradle +++ b/credentials/registry/registry-digitalcredentials-sdjwtvc/build.gradle @@ -27,8 +27,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -42,7 +40,7 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(35) } namespace = "androidx.credentials.registry.digitalcredentials.sdjwtvc" } diff --git a/credentials/registry/registry-provider-play-services/build.gradle b/credentials/registry/registry-provider-play-services/build.gradle index 4264d4b37c3ae..182d338a5d1da 100644 --- a/credentials/registry/registry-provider-play-services/build.gradle +++ b/credentials/registry/registry-provider-play-services/build.gradle @@ -28,8 +28,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -46,7 +44,7 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(35) } namespace = "androidx.credentials.registry.provider.playservices" } diff --git a/credentials/registry/registry-provider/build.gradle b/credentials/registry/registry-provider/build.gradle index 132d738467cc9..75bac042d2ba1 100644 --- a/credentials/registry/registry-provider/build.gradle +++ b/credentials/registry/registry-provider/build.gradle @@ -26,8 +26,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -46,7 +44,7 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(35) } namespace = "androidx.credentials.registry.provider" } diff --git a/customview/customview-poolingcontainer/build.gradle b/customview/customview-poolingcontainer/build.gradle index 60a88ed1bb505..7c1550e9ff05d 100644 --- a/customview/customview-poolingcontainer/build.gradle +++ b/customview/customview-poolingcontainer/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/customview/customview/build.gradle b/customview/customview/build.gradle index 3ba1b754463b3..b518b02d4cc01 100644 --- a/customview/customview/build.gradle +++ b/customview/customview/build.gradle @@ -9,8 +9,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/datastore/datastore-benchmark/build.gradle b/datastore/datastore-benchmark/build.gradle index 0975f3b9857ff..fb8c4d0dd7510 100644 --- a/datastore/datastore-benchmark/build.gradle +++ b/datastore/datastore-benchmark/build.gradle @@ -26,8 +26,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("androidx.benchmark") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/datastore/datastore-compose-samples/build.gradle b/datastore/datastore-compose-samples/build.gradle index 478516d3cf323..9485226c42cc9 100644 --- a/datastore/datastore-compose-samples/build.gradle +++ b/datastore/datastore-compose-samples/build.gradle @@ -26,8 +26,6 @@ plugins { id("AndroidXPlugin") id("com.android.application") id("AndroidXComposePlugin") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("com.google.protobuf") alias(libs.plugins.kotlinSerialization) } @@ -53,9 +51,9 @@ dependencies { implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.0.1") } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "com.example.datastorecomposesamples" defaultConfig { - minSdk = 28 + minSdk { version = release(28) } } } diff --git a/datastore/datastore-guava/build.gradle b/datastore/datastore-guava/build.gradle index 03f79571a5f2d..4acb081b6e860 100644 --- a/datastore/datastore-guava/build.gradle +++ b/datastore/datastore-guava/build.gradle @@ -27,8 +27,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { diff --git a/datastore/datastore-preferences-rxjava2/build.gradle b/datastore/datastore-preferences-rxjava2/build.gradle index 0f076af04b2df..85018790e6362 100644 --- a/datastore/datastore-preferences-rxjava2/build.gradle +++ b/datastore/datastore-preferences-rxjava2/build.gradle @@ -30,8 +30,6 @@ import com.android.build.api.variant.HasUnitTest plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { diff --git a/datastore/datastore-preferences-rxjava3/build.gradle b/datastore/datastore-preferences-rxjava3/build.gradle index 8d8e1982654d1..037f0c8cfb6cf 100644 --- a/datastore/datastore-preferences-rxjava3/build.gradle +++ b/datastore/datastore-preferences-rxjava3/build.gradle @@ -30,8 +30,6 @@ import com.android.build.api.variant.HasUnitTest plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { diff --git a/datastore/datastore-proto/build.gradle b/datastore/datastore-proto/build.gradle index 504dca5282beb..5e6f4fd4f2b75 100644 --- a/datastore/datastore-proto/build.gradle +++ b/datastore/datastore-proto/build.gradle @@ -24,8 +24,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("com.google.protobuf") } diff --git a/datastore/datastore-rxjava2/build.gradle b/datastore/datastore-rxjava2/build.gradle index 43aea827b8e75..a2bf7ffff4703 100644 --- a/datastore/datastore-rxjava2/build.gradle +++ b/datastore/datastore-rxjava2/build.gradle @@ -28,8 +28,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { diff --git a/datastore/datastore-rxjava3/build.gradle b/datastore/datastore-rxjava3/build.gradle index 7290cd339f93e..e0a4944febfd0 100644 --- a/datastore/datastore-rxjava3/build.gradle +++ b/datastore/datastore-rxjava3/build.gradle @@ -28,8 +28,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { diff --git a/datastore/datastore-sampleapp/build.gradle b/datastore/datastore-sampleapp/build.gradle index 10b107b12b3ff..aab37258ddfd4 100644 --- a/datastore/datastore-sampleapp/build.gradle +++ b/datastore/datastore-sampleapp/build.gradle @@ -25,8 +25,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("com.google.protobuf") alias(libs.plugins.kotlinSerialization) } diff --git a/datastore/integration-tests/macrobenchmark-target/build.gradle b/datastore/integration-tests/macrobenchmark-target/build.gradle index 36040543e0454..8d365a3860bcc 100644 --- a/datastore/integration-tests/macrobenchmark-target/build.gradle +++ b/datastore/integration-tests/macrobenchmark-target/build.gradle @@ -23,7 +23,7 @@ plugins { } android { - compileSdk = 36 + compileSdk { version = release(37) } namespace = "androidx.datastore.macrobenchmark.target" } diff --git a/datastore/integration-tests/testapp/build.gradle b/datastore/integration-tests/testapp/build.gradle index 86b5f68ecba9a..fa3e671bbbdda 100644 --- a/datastore/integration-tests/testapp/build.gradle +++ b/datastore/integration-tests/testapp/build.gradle @@ -20,8 +20,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("com.google.protobuf") id("kotlin-parcelize") } diff --git a/docs-public/build.gradle b/docs-public/build.gradle index b71af6be20cfe..2f9823511eabb 100644 --- a/docs-public/build.gradle +++ b/docs-public/build.gradle @@ -5,14 +5,11 @@ * modifying its settings. */ plugins { -id("com.android.library") + id("org.jetbrains.kotlin.multiplatform") + id("com.android.kotlin.multiplatform.library") id("AndroidXDocsPlugin") } -android { - namespace = "androidx.docs.publicdocs" -} - dependencies { docs("androidx.activity:activity:1.13.0") docs("androidx.activity:activity-compose:1.13.0") diff --git a/docs-tip-of-tree/build.gradle b/docs-tip-of-tree/build.gradle index b9d4102b5e1af..2b364faf76d4b 100644 --- a/docs-tip-of-tree/build.gradle +++ b/docs-tip-of-tree/build.gradle @@ -1,12 +1,9 @@ plugins { - id("com.android.library") + id("org.jetbrains.kotlin.multiplatform") + id("com.android.kotlin.multiplatform.library") id("AndroidXDocsPlugin") } -android { - namespace = "androidx.docs.tipoftree" -} - // The dependency list should only be changed when a new project is registered or a project's source is removed. Samples should never be added. dependencies { diff --git a/draganddrop/draganddrop/build.gradle b/draganddrop/draganddrop/build.gradle index 5a7e8f463eb10..dd3bf494ecb67 100644 --- a/draganddrop/draganddrop/build.gradle +++ b/draganddrop/draganddrop/build.gradle @@ -43,7 +43,7 @@ dependencies { android { defaultConfig { - minSdk = 24 + minSdk { version = release(24) } } namespace = "androidx.draganddrop" } diff --git a/draganddrop/integration-tests/sampleapp/build.gradle b/draganddrop/integration-tests/sampleapp/build.gradle index 579b4ad75cfc4..fcc29781aaef8 100644 --- a/draganddrop/integration-tests/sampleapp/build.gradle +++ b/draganddrop/integration-tests/sampleapp/build.gradle @@ -27,7 +27,7 @@ dependencies { android { defaultConfig { - minSdk = 24 + minSdk { version = release(24) } } namespace = "androidx.draganddrop.sampleapp" } diff --git a/drawerlayout/drawerlayout/build.gradle b/drawerlayout/drawerlayout/build.gradle index 82a824602c64e..94a2160ca5631 100644 --- a/drawerlayout/drawerlayout/build.gradle +++ b/drawerlayout/drawerlayout/build.gradle @@ -9,8 +9,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/dynamicanimation/dynamicanimation-ktx/build.gradle b/dynamicanimation/dynamicanimation-ktx/build.gradle index 5197a363f079f..75b35a4b618a8 100644 --- a/dynamicanimation/dynamicanimation-ktx/build.gradle +++ b/dynamicanimation/dynamicanimation-ktx/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/emoji2/emoji2-benchmark/build.gradle b/emoji2/emoji2-benchmark/build.gradle index b47ee83775159..f41d47ab31357 100644 --- a/emoji2/emoji2-benchmark/build.gradle +++ b/emoji2/emoji2-benchmark/build.gradle @@ -26,8 +26,6 @@ import com.android.build.api.variant.HasAndroidTest plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("androidx.benchmark") } diff --git a/emoji2/emoji2-emojipicker/build.gradle b/emoji2/emoji2-emojipicker/build.gradle index 6ef3dbc43888c..c89b94a118829 100644 --- a/emoji2/emoji2-emojipicker/build.gradle +++ b/emoji2/emoji2-emojipicker/build.gradle @@ -26,8 +26,6 @@ import com.android.build.gradle.internal.tasks.MergeJavaResourceTask plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/emoji2/emoji2-emojipicker/samples/build.gradle b/emoji2/emoji2-emojipicker/samples/build.gradle index 5aeff9b33ce71..5c09c70fd1c36 100644 --- a/emoji2/emoji2-emojipicker/samples/build.gradle +++ b/emoji2/emoji2-emojipicker/samples/build.gradle @@ -19,8 +19,6 @@ plugins { id("AndroidXPlugin") id("AndroidXComposePlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { // You might need to import this to resolve duplicate class in kotlin-stdlib. @@ -35,7 +33,7 @@ dependencies { implementation(project(":compose:foundation:foundation")) } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.emoji2.emojipicker.samples" } diff --git a/emoji2/integration-tests/init-disabled-macrobenchmark-target/build.gradle b/emoji2/integration-tests/init-disabled-macrobenchmark-target/build.gradle index cd0412d909d36..7366b1965c7f2 100644 --- a/emoji2/integration-tests/init-disabled-macrobenchmark-target/build.gradle +++ b/emoji2/integration-tests/init-disabled-macrobenchmark-target/build.gradle @@ -17,12 +17,10 @@ plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { - compileSdk = 35 + compileSdk { version = release(35) } buildTypes { release { minifyEnabled = true diff --git a/emoji2/integration-tests/init-disabled-macrobenchmark/build.gradle b/emoji2/integration-tests/init-disabled-macrobenchmark/build.gradle index 9ec91a63699b5..3c05e90d9ac37 100644 --- a/emoji2/integration-tests/init-disabled-macrobenchmark/build.gradle +++ b/emoji2/integration-tests/init-disabled-macrobenchmark/build.gradle @@ -17,8 +17,6 @@ plugins { id("AndroidXPlugin") id("com.android.test") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { diff --git a/emoji2/integration-tests/init-enabled-macrobenchmark-target/build.gradle b/emoji2/integration-tests/init-enabled-macrobenchmark-target/build.gradle index c3362f62a3430..a84d725e18f6a 100644 --- a/emoji2/integration-tests/init-enabled-macrobenchmark-target/build.gradle +++ b/emoji2/integration-tests/init-enabled-macrobenchmark-target/build.gradle @@ -17,12 +17,10 @@ plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { - compileSdk = 35 + compileSdk { version = release(35) } buildTypes { release { minifyEnabled = true diff --git a/emoji2/integration-tests/init-enabled-macrobenchmark/build.gradle b/emoji2/integration-tests/init-enabled-macrobenchmark/build.gradle index ab33e9abce230..221fe926bab9c 100644 --- a/emoji2/integration-tests/init-enabled-macrobenchmark/build.gradle +++ b/emoji2/integration-tests/init-enabled-macrobenchmark/build.gradle @@ -17,8 +17,6 @@ plugins { id("AndroidXPlugin") id("com.android.test") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { diff --git a/fragment/fragment-compose/build.gradle b/fragment/fragment-compose/build.gradle index 23d7f87645901..d45fb62659618 100644 --- a/fragment/fragment-compose/build.gradle +++ b/fragment/fragment-compose/build.gradle @@ -27,8 +27,6 @@ plugins { id("AndroidXPlugin") id("AndroidXComposePlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -63,7 +61,7 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.fragment.compose" } diff --git a/fragment/fragment-compose/samples/build.gradle b/fragment/fragment-compose/samples/build.gradle index eb2aff4264f48..24c690c671202 100644 --- a/fragment/fragment-compose/samples/build.gradle +++ b/fragment/fragment-compose/samples/build.gradle @@ -20,8 +20,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -43,6 +41,6 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.fragment.compose.samples" } diff --git a/fragment/fragment-ktx/build.gradle b/fragment/fragment-ktx/build.gradle index 237f725bd2be2..208b28fad8fcc 100644 --- a/fragment/fragment-ktx/build.gradle +++ b/fragment/fragment-ktx/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/fragment/fragment-testing-manifest/build.gradle b/fragment/fragment-testing-manifest/build.gradle index 136ecffc36499..3373c9558608c 100644 --- a/fragment/fragment-testing-manifest/build.gradle +++ b/fragment/fragment-testing-manifest/build.gradle @@ -26,8 +26,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/fragment/fragment-testing/build.gradle b/fragment/fragment-testing/build.gradle index 3ac974060a579..7fe48add279f9 100644 --- a/fragment/fragment-testing/build.gradle +++ b/fragment/fragment-testing/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/fragment/fragment-truth/build.gradle b/fragment/fragment-truth/build.gradle index a0d1634044afe..04ca0eed1ef63 100644 --- a/fragment/fragment-truth/build.gradle +++ b/fragment/fragment-truth/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/fragment/fragment/build.gradle b/fragment/fragment/build.gradle index 0d3c33cd8d182..e4adf7b93abb4 100644 --- a/fragment/fragment/build.gradle +++ b/fragment/fragment/build.gradle @@ -11,8 +11,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { diff --git a/fragment/integration-tests/testapp/build.gradle b/fragment/integration-tests/testapp/build.gradle index b64f1f3be493d..387d2abf985a4 100644 --- a/fragment/integration-tests/testapp/build.gradle +++ b/fragment/integration-tests/testapp/build.gradle @@ -17,13 +17,11 @@ plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { namespace = "androidx.fragment.testapp" - compileSdk = 35 + compileSdk { version = release(35) } } dependencies { diff --git a/glance/glance-appwidget-multiprocess/build.gradle b/glance/glance-appwidget-multiprocess/build.gradle index 57ff36bb7802e..f66a678bfbc51 100644 --- a/glance/glance-appwidget-multiprocess/build.gradle +++ b/glance/glance-appwidget-multiprocess/build.gradle @@ -25,7 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - id("org.jetbrains.kotlin.android") id("AndroidXComposePlugin") } @@ -60,7 +59,7 @@ dependencies { android { namespace = "androidx.glance.appwidget.multiprocess" - compileSdk = 35 + compileSdk { version = release(37) } defaultConfig { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/glance/glance-appwidget-multiprocess/integration-tests/testapp/build.gradle b/glance/glance-appwidget-multiprocess/integration-tests/testapp/build.gradle index 5a5ec51c1bf81..7d7370e40bc76 100644 --- a/glance/glance-appwidget-multiprocess/integration-tests/testapp/build.gradle +++ b/glance/glance-appwidget-multiprocess/integration-tests/testapp/build.gradle @@ -19,7 +19,6 @@ plugins { id("AndroidXPlugin") id("AndroidXComposePlugin") id("com.android.application") - id("org.jetbrains.kotlin.android") } dependencies { @@ -31,5 +30,5 @@ dependencies { android { namespace = "androidx.glance.appwidget.multiprocess.testapp" - compileSdk = 35 + compileSdk { version = release(37) } } diff --git a/glance/glance-appwidget-preview/build.gradle b/glance/glance-appwidget-preview/build.gradle index e84c0c7b95b29..a4e3887ac27da 100644 --- a/glance/glance-appwidget-preview/build.gradle +++ b/glance/glance-appwidget-preview/build.gradle @@ -25,7 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXComposePlugin") id("AndroidXPlugin") - id("org.jetbrains.kotlin.android") id("com.android.library") } @@ -48,7 +47,7 @@ dependencies { android { namespace = "androidx.glance.appwidget.preview" - compileSdk = 35 + compileSdk { version = release(37) } } androidx { diff --git a/glance/glance-appwidget-testing/build.gradle b/glance/glance-appwidget-testing/build.gradle index e6057a87733eb..e04ee1da69514 100644 --- a/glance/glance-appwidget-testing/build.gradle +++ b/glance/glance-appwidget-testing/build.gradle @@ -26,7 +26,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -46,7 +45,7 @@ dependencies { android { defaultConfig { - compileSdk = 35 + compileSdk { version = release(37) } } namespace = "androidx.glance.appwidget.testing" } diff --git a/glance/glance-appwidget-testing/samples/build.gradle b/glance/glance-appwidget-testing/samples/build.gradle index 6965bd04d34a2..d93a81b1d98c0 100644 --- a/glance/glance-appwidget-testing/samples/build.gradle +++ b/glance/glance-appwidget-testing/samples/build.gradle @@ -26,7 +26,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -51,7 +50,7 @@ androidx { android { defaultConfig { - compileSdk = 35 + compileSdk { version = release(37) } } namespace = "androidx.glance.appwidget.testing.samples" } diff --git a/glance/glance-appwidget/build.gradle b/glance/glance-appwidget/build.gradle index 0bf759fbe12d6..6d37422621b67 100644 --- a/glance/glance-appwidget/build.gradle +++ b/glance/glance-appwidget/build.gradle @@ -25,7 +25,6 @@ import androidx.glance.appwidget.layoutgenerator.gradle.LayoutGeneratorTask plugins { id("AndroidXPlugin") - id("org.jetbrains.kotlin.android") id("com.android.library") id("AndroidXComposePlugin") } @@ -95,7 +94,7 @@ android { } } namespace = "androidx.glance.appwidget" - compileSdk = 35 + compileSdk { version = release(37) } } androidx { diff --git a/glance/glance-appwidget/integration-tests/demos/build.gradle b/glance/glance-appwidget/integration-tests/demos/build.gradle index 773f1938be0f0..7e4f904fdff30 100644 --- a/glance/glance-appwidget/integration-tests/demos/build.gradle +++ b/glance/glance-appwidget/integration-tests/demos/build.gradle @@ -19,7 +19,6 @@ plugins { id("AndroidXPlugin") id("AndroidXComposePlugin") id("com.android.application") - id("org.jetbrains.kotlin.android") } android { @@ -49,5 +48,5 @@ dependencies { android { namespace = "androidx.glance.appwidget.demos" - compileSdk = 35 + compileSdk { version = release(37) } } diff --git a/glance/glance-appwidget/integration-tests/macrobenchmark-target/build.gradle b/glance/glance-appwidget/integration-tests/macrobenchmark-target/build.gradle index 5b344e73f02b7..3c349847fa914 100644 --- a/glance/glance-appwidget/integration-tests/macrobenchmark-target/build.gradle +++ b/glance/glance-appwidget/integration-tests/macrobenchmark-target/build.gradle @@ -18,7 +18,6 @@ plugins { id("AndroidXPlugin") id("AndroidXComposePlugin") id("com.android.application") - id("org.jetbrains.kotlin.android") } dependencies { @@ -29,7 +28,7 @@ dependencies { android { namespace = "androidx.glance.appwidget.macrobenchmark.target" - compileSdk = 35 + compileSdk { version = release(37) } buildTypes { release { minifyEnabled = true diff --git a/glance/glance-appwidget/integration-tests/macrobenchmark/build.gradle b/glance/glance-appwidget/integration-tests/macrobenchmark/build.gradle index 2f4df0053abb5..16804b5480561 100644 --- a/glance/glance-appwidget/integration-tests/macrobenchmark/build.gradle +++ b/glance/glance-appwidget/integration-tests/macrobenchmark/build.gradle @@ -17,12 +17,11 @@ plugins { id("AndroidXPlugin") id("com.android.test") - id("org.jetbrains.kotlin.android") } android { defaultConfig { - compileSdk = 35 + compileSdk { version = release(37) } } namespace = "androidx.glance.appwidget.macrobenchmark" targetProjectPath = ":glance:glance-appwidget:integration-tests:macrobenchmark-target" diff --git a/glance/glance-appwidget/samples/build.gradle b/glance/glance-appwidget/samples/build.gradle index fe963681a86ba..7e6868a6bb24d 100644 --- a/glance/glance-appwidget/samples/build.gradle +++ b/glance/glance-appwidget/samples/build.gradle @@ -27,7 +27,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -50,5 +49,5 @@ androidx { android { namespace = "androidx.glance.appwidget.samples" - compileSdk = 35 + compileSdk { version = release(37) } } diff --git a/glance/glance-material/build.gradle b/glance/glance-material/build.gradle index 17b41fda36282..31c50f683dfea 100644 --- a/glance/glance-material/build.gradle +++ b/glance/glance-material/build.gradle @@ -9,8 +9,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXComposePlugin") id("AndroidXPlugin") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("com.android.library") } diff --git a/glance/glance-material3/build.gradle b/glance/glance-material3/build.gradle index e3469d6b4f8f2..dceb82187f37c 100644 --- a/glance/glance-material3/build.gradle +++ b/glance/glance-material3/build.gradle @@ -9,8 +9,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXComposePlugin") id("AndroidXPlugin") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("com.android.library") } diff --git a/glance/glance-preview/build.gradle b/glance/glance-preview/build.gradle index 022ec28249efd..fee1fc210ef6a 100644 --- a/glance/glance-preview/build.gradle +++ b/glance/glance-preview/build.gradle @@ -9,8 +9,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXComposePlugin") id("AndroidXPlugin") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("com.android.library") } diff --git a/glance/glance-testing/build.gradle b/glance/glance-testing/build.gradle index f0c39f1640128..c976f3bed994b 100644 --- a/glance/glance-testing/build.gradle +++ b/glance/glance-testing/build.gradle @@ -26,8 +26,6 @@ plugins { id("AndroidXPlugin") id("AndroidXComposePlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/glance/glance/build.gradle b/glance/glance/build.gradle index f1510fbcd8dd3..fce956f31741c 100644 --- a/glance/glance/build.gradle +++ b/glance/glance/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("AndroidXComposePlugin") } diff --git a/glance/wear/wear-core/build.gradle b/glance/wear/wear-core/build.gradle index 676c951c29662..cf96dbfdb8862 100644 --- a/glance/wear/wear-core/build.gradle +++ b/glance/wear/wear-core/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("com.squareup.wire") id("androidx.stableaidl") } @@ -57,7 +55,7 @@ wire { android { namespace = "androidx.glance.wear.core" defaultConfig { - minSdk = 28 + minSdk { version = release(28) } } buildFeatures { aidl = true diff --git a/glance/wear/wear-samples/build.gradle b/glance/wear/wear-samples/build.gradle index 6b231bb9514fb..256f329ebea00 100644 --- a/glance/wear/wear-samples/build.gradle +++ b/glance/wear/wear-samples/build.gradle @@ -25,8 +25,7 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") + id("com.android.experimental.built-in-kotlin") id("AndroidXComposePlugin") } @@ -40,11 +39,11 @@ dependencies { android { namespace = "androidx.glance.wear.samples" - compileSdk = 36 + compileSdk { version = release(37) } defaultConfig { applicationId = "androidx.glance.wear.samples" - minSdk = 29 + minSdk { version = release(29) } } buildTypes { diff --git a/glance/wear/wear/build.gradle b/glance/wear/wear/build.gradle index 291e177c9ff8a..02a2edccaf369 100644 --- a/glance/wear/wear/build.gradle +++ b/glance/wear/wear/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("com.squareup.wire") id("AndroidXComposePlugin") } @@ -82,9 +80,10 @@ wire { android { namespace = "androidx.glance.wear" + compileSdk { version = release(37) } defaultConfig { - minSdk = 29 - compileSdk = 36 + minSdk { version = release(29) } + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2359daf207e26..d587d57151e84 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,10 +2,10 @@ # ----------------------------------------------------------------------------- # All of the following should be updated in sync. # ----------------------------------------------------------------------------- -androidGradlePlugin = "8.12.0" +androidGradlePlugin = "9.3.0-alpha01" # NOTE: When updating the lint version we also need to update the `api` version # supported by `IssueRegistry`'s.' For e.g. r.android.com/1331903 -androidLint = "31.12.0" +androidLint = "32.3.0-alpha01" # Once you have a chosen version of AGP to upgrade to, go to # https://developer.android.com/studio/archive and find the matching version of Studio. androidStudioIj = "2026.1.1.1" @@ -37,7 +37,7 @@ byteBuddy = "1.14.9" asm = "9.7" cmake = "3.22.1" composeCompilerPlugin = "2.3.20" -dagger = "2.57.1" +dagger = "2.59" datetime = "0.7.1" dependencyAnalysisGradlePlugin = "2.11.0" dexmaker = "2.28.6" @@ -47,7 +47,7 @@ grpc = "1.52.0" gson = "2.9.0" guavaJre = "33.2.1-jre" hamcrestCore = "1.3" -hilt = "2.57.1" +hilt = "2.59" incap = "0.2" javaxInject = "1" jbrApi = "1.9.0" @@ -67,7 +67,7 @@ kotlinCoroutines = "1.9.0" kotlinNativeUtils = "2.3.10" kotlinSerialization = "1.8.0" kotlinToolingCore = "2.3.10" -ksp = "2.3.4" +ksp = "2.3.6" ktfmt = "0.61" # Version format is: 1.KOTLIN_MAJOR_VERSION.0.KTFMT_VERSION # When updated, the id and checksum in StudioTask needs to be updated too @@ -143,7 +143,7 @@ byteBuddyAgent = { module = "net.bytebuddy:byte-buddy-agent", version.ref = "byt checkerframework = { module = "org.checkerframework:checker-qual", version = "2.5.3" } checkmark = { module = "net.saff.checkmark:checkmark", version = "0.1.6" } constraintLayout = { module = "androidx.constraintlayout:constraintlayout", version = "2.0.1"} -dackka = { module = "com.google.devsite:dackka", version = "1.7.1" } +dackka = { module = "com.google.devsite:dackka", version = "1.9.0" } dagger = { module = "com.google.dagger:dagger", version.ref = "dagger" } datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "datetime" } daggerCompiler = { module = "com.google.dagger:dagger-compiler", version.ref = "dagger" } diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 8848f8bad8187..9f0c04379afed 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -165,7 +165,7 @@ - + diff --git a/graphics/filters/filters/build.gradle b/graphics/filters/filters/build.gradle index c88749af96b37..fe1cf29503caa 100644 --- a/graphics/filters/filters/build.gradle +++ b/graphics/filters/filters/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/graphics/graphics-core/build.gradle b/graphics/graphics-core/build.gradle index fe353c90541f2..d207b0c393d4f 100644 --- a/graphics/graphics-core/build.gradle +++ b/graphics/graphics-core/build.gradle @@ -27,8 +27,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -44,7 +42,7 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(35) } namespace = "androidx.graphics.core" defaultConfig { diff --git a/graphics/graphics-core/samples/build.gradle b/graphics/graphics-core/samples/build.gradle index b4eab124e9ea2..40b3618fc7658 100644 --- a/graphics/graphics-core/samples/build.gradle +++ b/graphics/graphics-core/samples/build.gradle @@ -19,8 +19,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -31,7 +29,7 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(35) } namespace = "androidx.graphics.core.samples" } diff --git a/graphics/graphics-path/build.gradle b/graphics/graphics-path/build.gradle index dbcb6533dc1e7..ce4fdce0ef96a 100644 --- a/graphics/graphics-path/build.gradle +++ b/graphics/graphics-path/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/graphics/integration-tests/testapp-compose/build.gradle b/graphics/integration-tests/testapp-compose/build.gradle index 999bc82638c88..4758242598b94 100644 --- a/graphics/integration-tests/testapp-compose/build.gradle +++ b/graphics/integration-tests/testapp-compose/build.gradle @@ -26,8 +26,6 @@ plugins { id("AndroidXPlugin") id("AndroidXComposePlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -49,6 +47,6 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.graphics.shapes.testcompose" } diff --git a/graphics/integration-tests/testapp/build.gradle b/graphics/integration-tests/testapp/build.gradle index 986c5cda29651..551dce407d14a 100644 --- a/graphics/integration-tests/testapp/build.gradle +++ b/graphics/integration-tests/testapp/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/health/connect/connect-client/build.gradle b/health/connect/connect-client/build.gradle index 7e778ce5ee46f..df34e463518db 100644 --- a/health/connect/connect-client/build.gradle +++ b/health/connect/connect-client/build.gradle @@ -27,7 +27,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id("AndroidXPlugin") id("com.android.library") - id("org.jetbrains.kotlin.android") } dependencies { @@ -65,13 +64,13 @@ dependencies { android { defaultConfig { - minSdk = 26 + minSdk { version = release(26) } } buildFeatures { aidl = true } namespace = "androidx.health.connect.client" - compileSdk = 36 + compileSdk { version = release(37) } } androidx { diff --git a/health/connect/connect-client/samples/build.gradle b/health/connect/connect-client/samples/build.gradle index 5936fcb3ac116..8e2acedabb238 100644 --- a/health/connect/connect-client/samples/build.gradle +++ b/health/connect/connect-client/samples/build.gradle @@ -25,7 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - id("org.jetbrains.kotlin.android") } dependencies { @@ -46,7 +45,7 @@ androidx { android { namespace = "androidx.health.connect.client.samples" defaultConfig { - minSdk = 26 + minSdk { version = release(26) } } - compileSdk = 36 + compileSdk { version = release(37) } } diff --git a/health/connect/connect-testing/build.gradle b/health/connect/connect-testing/build.gradle index b1036ae000b64..f986e30c68849 100644 --- a/health/connect/connect-testing/build.gradle +++ b/health/connect/connect-testing/build.gradle @@ -26,7 +26,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - id("org.jetbrains.kotlin.android") } dependencies { @@ -41,11 +40,11 @@ dependencies { android { defaultConfig { - minSdk = 26 + minSdk { version = release(26) } } namespace = "androidx.health.connect.testing" testOptions.unitTests.includeAndroidResources = true - compileSdk = 36 + compileSdk { version = release(37)} } androidx { diff --git a/health/connect/connect-testing/samples/build.gradle b/health/connect/connect-testing/samples/build.gradle index 6e83123057b1d..2aaa6591015e0 100644 --- a/health/connect/connect-testing/samples/build.gradle +++ b/health/connect/connect-testing/samples/build.gradle @@ -27,7 +27,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id("AndroidXPlugin") id("com.android.library") - id("org.jetbrains.kotlin.android") } dependencies { @@ -47,7 +46,7 @@ androidx { android { namespace = "androidx.health.connect.testing.samples" defaultConfig { - minSdk = 26 + minSdk { version = release(26) } } - compileSdk = 36 + compileSdk { version = release(37) } } diff --git a/health/health-services-client/build.gradle b/health/health-services-client/build.gradle index bc36ab7bb7660..c5799a0e0ad52 100644 --- a/health/health-services-client/build.gradle +++ b/health/health-services-client/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("androidx.stableaidl") } @@ -51,7 +49,7 @@ dependencies { android { defaultConfig { - minSdk = 30 + minSdk { version = release(30) } } buildFeatures { aidl = true diff --git a/heifwriter/heifwriter/build.gradle b/heifwriter/heifwriter/build.gradle index 0183838e00e42..d40e39017ef35 100644 --- a/heifwriter/heifwriter/build.gradle +++ b/heifwriter/heifwriter/build.gradle @@ -13,7 +13,7 @@ plugins { android { defaultConfig { - minSdk = 29 + minSdk { version = release(29) } } namespace = "androidx.heifwriter" } diff --git a/hilt/hilt-lifecycle-viewmodel-compose/build.gradle b/hilt/hilt-lifecycle-viewmodel-compose/build.gradle index f67c4308907ae..eb39061f290bd 100644 --- a/hilt/hilt-lifecycle-viewmodel-compose/build.gradle +++ b/hilt/hilt-lifecycle-viewmodel-compose/build.gradle @@ -27,8 +27,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("AndroidXComposePlugin") id("com.google.devtools.ksp") id("com.google.dagger.hilt.android") @@ -62,7 +60,7 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(37) } defaultConfig { testInstrumentationRunner "androidx.hilt.lifecycle.viewmodel.compose.TestRunner" } diff --git a/hilt/hilt-lifecycle-viewmodel/build.gradle b/hilt/hilt-lifecycle-viewmodel/build.gradle index 50f390de20d83..1b5ece1fa8ddc 100644 --- a/hilt/hilt-lifecycle-viewmodel/build.gradle +++ b/hilt/hilt-lifecycle-viewmodel/build.gradle @@ -27,8 +27,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/hilt/hilt-navigation-compose/build.gradle b/hilt/hilt-navigation-compose/build.gradle index 50d555207106b..80f70b1f9762c 100644 --- a/hilt/hilt-navigation-compose/build.gradle +++ b/hilt/hilt-navigation-compose/build.gradle @@ -27,15 +27,13 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("com.google.devtools.ksp") id("AndroidXComposePlugin") id("com.google.dagger.hilt.android") } android { - compileSdk = 35 + compileSdk { version = release(37) } defaultConfig { testInstrumentationRunner "androidx.hilt.navigation.compose.TestRunner" } diff --git a/hilt/hilt-navigation-compose/samples/build.gradle b/hilt/hilt-navigation-compose/samples/build.gradle index 40cc4779c470e..e6fa5dc1ec5ba 100644 --- a/hilt/hilt-navigation-compose/samples/build.gradle +++ b/hilt/hilt-navigation-compose/samples/build.gradle @@ -28,8 +28,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -48,6 +46,6 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.hilt.navigation.compose.samples" } diff --git a/hilt/hilt-navigation-fragment/build.gradle b/hilt/hilt-navigation-fragment/build.gradle index e99f69c753e8d..7eecb52be8273 100644 --- a/hilt/hilt-navigation-fragment/build.gradle +++ b/hilt/hilt-navigation-fragment/build.gradle @@ -27,14 +27,12 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("com.google.devtools.ksp") id("com.google.dagger.hilt.android") } android { - compileSdk = 35 + compileSdk { version = release(35) } defaultConfig { testInstrumentationRunner "androidx.hilt.navigation.fragment.TestRunner" } diff --git a/hilt/hilt-navigation/build.gradle b/hilt/hilt-navigation/build.gradle index c74e8801848f1..7897514e40a01 100644 --- a/hilt/hilt-navigation/build.gradle +++ b/hilt/hilt-navigation/build.gradle @@ -27,8 +27,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/hilt/integration-tests/viewmodelapp/build.gradle b/hilt/integration-tests/viewmodelapp/build.gradle index 823c7f481d99f..4d207a3515989 100644 --- a/hilt/integration-tests/viewmodelapp/build.gradle +++ b/hilt/integration-tests/viewmodelapp/build.gradle @@ -17,14 +17,12 @@ plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("com.google.devtools.ksp") id("com.google.dagger.hilt.android") } android { - compileSdk = 35 + compileSdk { version = release(35) } defaultConfig { testInstrumentationRunner "androidx.hilt.integration.viewmodelapp.TestRunner" } diff --git a/hilt/integration-tests/workerapp/build.gradle b/hilt/integration-tests/workerapp/build.gradle index fb6f05a90dea7..3ffbc48fccd6d 100644 --- a/hilt/integration-tests/workerapp/build.gradle +++ b/hilt/integration-tests/workerapp/build.gradle @@ -17,14 +17,12 @@ plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("com.google.devtools.ksp") id("com.google.dagger.hilt.android") } android { - compileSdk = 35 + compileSdk { version = release(35) } defaultConfig { testInstrumentationRunner "androidx.hilt.integration.workerapp.TestRunner" } diff --git a/ink/ink-authoring-compose/build.gradle b/ink/ink-authoring-compose/build.gradle index 839c73ce1b3c1..af1288dc2520d 100644 --- a/ink/ink-authoring-compose/build.gradle +++ b/ink/ink-authoring-compose/build.gradle @@ -25,7 +25,7 @@ plugins { androidXMultiplatform { androidLibrary { namespace = "androidx.ink.authoring.compose" - compileSdk = 35 + compileSdk { version = release(35) } androidResources.enable = true } diff --git a/ink/ink-authoring/build.gradle b/ink/ink-authoring/build.gradle index 5f1d07d333a99..98fe3183b8ada 100644 --- a/ink/ink-authoring/build.gradle +++ b/ink/ink-authoring/build.gradle @@ -24,7 +24,7 @@ plugins { androidXMultiplatform { androidLibrary{ namespace = "androidx.ink.authoring" - compileSdk = 35 + compileSdk { version = release(35) } androidResources.enable = true } diff --git a/ink/ink-brush-compose/build.gradle b/ink/ink-brush-compose/build.gradle index 963cf04e7a917..f953d016c54d8 100644 --- a/ink/ink-brush-compose/build.gradle +++ b/ink/ink-brush-compose/build.gradle @@ -24,7 +24,7 @@ plugins { androidXMultiplatform { androidLibrary { namespace = "androidx.ink.brush.compose" - compileSdk = 35 + compileSdk { version = release(35) } } defaultPlatform(PlatformIdentifier.ANDROID) diff --git a/ink/ink-geometry-compose/build.gradle b/ink/ink-geometry-compose/build.gradle index a0fe0ad68cc56..c2d87546b210f 100644 --- a/ink/ink-geometry-compose/build.gradle +++ b/ink/ink-geometry-compose/build.gradle @@ -24,7 +24,7 @@ plugins { androidXMultiplatform { androidLibrary { namespace = "androidx.ink.geometry.compose" - compileSdk = 35 + compileSdk { version = release(35) } } defaultPlatform(PlatformIdentifier.ANDROID) diff --git a/ink/ink-rendering/build.gradle b/ink/ink-rendering/build.gradle index e8cb06c0c26ae..8b7ca0e0cad8b 100644 --- a/ink/ink-rendering/build.gradle +++ b/ink/ink-rendering/build.gradle @@ -24,7 +24,7 @@ plugins { androidXMultiplatform { androidLibrary { namespace = "androidx.ink.rendering" - compileSdk = 35 + compileSdk { version = release(35) } androidResources.enable = true } diff --git a/ink/ink-storage/build.gradle b/ink/ink-storage/build.gradle index 98b49d6ce8002..1e785e6c5207f 100644 --- a/ink/ink-storage/build.gradle +++ b/ink/ink-storage/build.gradle @@ -27,7 +27,7 @@ androidXMultiplatform { androidLibrary { namespace = "androidx.ink.storage" - compileSdk = 35 + compileSdk { version = release(35) } } defaultPlatform(PlatformIdentifier.JVM) diff --git a/input/input-motionprediction/build.gradle b/input/input-motionprediction/build.gradle index 2ff28b20b5573..763021b52fcf1 100644 --- a/input/input-motionprediction/build.gradle +++ b/input/input-motionprediction/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/inspection/inspection-testing/build.gradle b/inspection/inspection-testing/build.gradle index ee96e08e49f01..a13e80c1b4886 100644 --- a/inspection/inspection-testing/build.gradle +++ b/inspection/inspection-testing/build.gradle @@ -26,8 +26,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -51,7 +49,7 @@ androidx { android { defaultConfig { // studio pipeline works only starting with Android O - minSdk = 26 + minSdk { version = release(26) } } namespace = "androidx.inspection.testing" } diff --git a/inspection/inspection/build.gradle b/inspection/inspection/build.gradle index d2f6b4f99cfe9..1cc51ac42db23 100644 --- a/inspection/inspection/build.gradle +++ b/inspection/inspection/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -51,7 +49,7 @@ androidx { android { defaultConfig { // studio pipeline works only starting with Android O - minSdk = 26 + minSdk { version = release(26) } } externalNativeBuild { diff --git a/javascriptengine/integration-tests/testapp/build.gradle b/javascriptengine/integration-tests/testapp/build.gradle index ca912d596bb3a..93abc721e613b 100644 --- a/javascriptengine/integration-tests/testapp/build.gradle +++ b/javascriptengine/integration-tests/testapp/build.gradle @@ -41,7 +41,7 @@ dependencies { android { defaultConfig { - minSdk = 28 + minSdk { version = release(28) } } lint { disable.add("UnusedResources") diff --git a/javascriptengine/javascriptengine/build.gradle b/javascriptengine/javascriptengine/build.gradle index 0979b4777fc79..ce4c7a9f8ff82 100644 --- a/javascriptengine/javascriptengine/build.gradle +++ b/javascriptengine/javascriptengine/build.gradle @@ -46,7 +46,7 @@ dependencies { android { defaultConfig { - minSdk = 26 + minSdk { version = release(26) } } buildFeatures { aidl = true diff --git a/leanback/leanback-grid/build.gradle b/leanback/leanback-grid/build.gradle index 3870cb0d019db..2cb48f14fd154 100644 --- a/leanback/leanback-grid/build.gradle +++ b/leanback/leanback-grid/build.gradle @@ -52,7 +52,7 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(35) } namespace = "androidx.leanback.widget" } diff --git a/leanback/leanback-paging/build.gradle b/leanback/leanback-paging/build.gradle index 273b256ad88d5..f74337fa0ec93 100644 --- a/leanback/leanback-paging/build.gradle +++ b/leanback/leanback-paging/build.gradle @@ -9,8 +9,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -47,7 +45,7 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(35) } lint { // Bug in Android Lint 7.0.0-alpha15 b/187419330 disable.add("MissingLeanbackLauncher") diff --git a/leanback/leanback-preference/build.gradle b/leanback/leanback-preference/build.gradle index 5b1c96127cfc8..20b780e2cbb92 100644 --- a/leanback/leanback-preference/build.gradle +++ b/leanback/leanback-preference/build.gradle @@ -22,12 +22,7 @@ dependencies { } android { - compileSdk = 35 - sourceSets { - main.java.srcDirs += [ - "api21" - ] - } + compileSdk { version = release(35) } namespace = "androidx.leanback.preference" } diff --git a/leanback/leanback-tab/build.gradle b/leanback/leanback-tab/build.gradle index b31afba2d7181..4e1b689303790 100644 --- a/leanback/leanback-tab/build.gradle +++ b/leanback/leanback-tab/build.gradle @@ -36,7 +36,7 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(35) } namespace = "androidx.leanback.tab" } diff --git a/leanback/leanback/build.gradle b/leanback/leanback/build.gradle index cd6b2ba02724f..3883a244547ac 100644 --- a/leanback/leanback/build.gradle +++ b/leanback/leanback/build.gradle @@ -39,14 +39,7 @@ dependencies { } android { - compileSdk = 35 - sourceSets { - main.java.srcDirs += [ - "common", - "kitkat", - "api21", - ] - } + compileSdk { version = release(35) } namespace = "androidx.leanback" } diff --git a/lifecycle/integration-tests/kotlintestapp/build.gradle b/lifecycle/integration-tests/kotlintestapp/build.gradle index 3a040b9fb6090..07760a9601204 100644 --- a/lifecycle/integration-tests/kotlintestapp/build.gradle +++ b/lifecycle/integration-tests/kotlintestapp/build.gradle @@ -21,7 +21,6 @@ plugins { id("AndroidXPlugin") id("com.android.application") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/lifecycle/integration-tests/testapp/build.gradle b/lifecycle/integration-tests/testapp/build.gradle index 48f64ac8af6d8..257e632a73e5a 100644 --- a/lifecycle/integration-tests/testapp/build.gradle +++ b/lifecycle/integration-tests/testapp/build.gradle @@ -17,7 +17,6 @@ plugins { id("AndroidXPlugin") id("com.android.application") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/lifecycle/lifecycle-common/build.gradle b/lifecycle/lifecycle-common/build.gradle index d9da1cc9ce1a8..2a61921561afb 100644 --- a/lifecycle/lifecycle-common/build.gradle +++ b/lifecycle/lifecycle-common/build.gradle @@ -20,7 +20,6 @@ * Please use the task when creating a new project, rather than copying an existing project and * modifying its settings. */ - import androidx.build.SoftwareType import androidx.build.PlatformIdentifier import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType diff --git a/lifecycle/lifecycle-livedata-core-ktx/build.gradle b/lifecycle/lifecycle-livedata-core-ktx/build.gradle index 29dee22ab9f2c..f7b15f8a13981 100644 --- a/lifecycle/lifecycle-livedata-core-ktx/build.gradle +++ b/lifecycle/lifecycle-livedata-core-ktx/build.gradle @@ -25,7 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/lifecycle/lifecycle-livedata-core-truth/build.gradle b/lifecycle/lifecycle-livedata-core-truth/build.gradle index c806f1aa33eb6..e5bf70dc3a009 100644 --- a/lifecycle/lifecycle-livedata-core-truth/build.gradle +++ b/lifecycle/lifecycle-livedata-core-truth/build.gradle @@ -25,7 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/lifecycle/lifecycle-livedata-core/build.gradle b/lifecycle/lifecycle-livedata-core/build.gradle index d9eb4ed37e254..d093f2f430c03 100644 --- a/lifecycle/lifecycle-livedata-core/build.gradle +++ b/lifecycle/lifecycle-livedata-core/build.gradle @@ -25,7 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/lifecycle/lifecycle-livedata-ktx/build.gradle b/lifecycle/lifecycle-livedata-ktx/build.gradle index 927badbd41e74..552ad18ba99c6 100644 --- a/lifecycle/lifecycle-livedata-ktx/build.gradle +++ b/lifecycle/lifecycle-livedata-ktx/build.gradle @@ -25,7 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/lifecycle/lifecycle-livedata/build.gradle b/lifecycle/lifecycle-livedata/build.gradle index 04c152a3e8d8e..e8c25ee989613 100644 --- a/lifecycle/lifecycle-livedata/build.gradle +++ b/lifecycle/lifecycle-livedata/build.gradle @@ -25,7 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/lifecycle/lifecycle-process/build.gradle b/lifecycle/lifecycle-process/build.gradle index 9ff6f8162e8e3..507df9a75420d 100644 --- a/lifecycle/lifecycle-process/build.gradle +++ b/lifecycle/lifecycle-process/build.gradle @@ -25,7 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - id("org.jetbrains.kotlin.android") } android { diff --git a/lifecycle/lifecycle-reactivestreams-ktx/build.gradle b/lifecycle/lifecycle-reactivestreams-ktx/build.gradle index e1bdd3502441f..122058e3ca4fb 100644 --- a/lifecycle/lifecycle-reactivestreams-ktx/build.gradle +++ b/lifecycle/lifecycle-reactivestreams-ktx/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/lifecycle/lifecycle-reactivestreams/build.gradle b/lifecycle/lifecycle-reactivestreams/build.gradle index 58d2b1cd16164..e902367cb3fd9 100644 --- a/lifecycle/lifecycle-reactivestreams/build.gradle +++ b/lifecycle/lifecycle-reactivestreams/build.gradle @@ -25,7 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/lifecycle/lifecycle-runtime-compose/build.gradle b/lifecycle/lifecycle-runtime-compose/build.gradle index 894a5a56974b2..7336cc3b5f604 100644 --- a/lifecycle/lifecycle-runtime-compose/build.gradle +++ b/lifecycle/lifecycle-runtime-compose/build.gradle @@ -32,7 +32,7 @@ plugins { androidXMultiplatform { androidLibrary { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.lifecycle.runtime.compose" optimization { it.consumerKeepRules.publish = true diff --git a/lifecycle/lifecycle-runtime-compose/integration-tests/lifecycle-runtime-compose-demos/build.gradle b/lifecycle/lifecycle-runtime-compose/integration-tests/lifecycle-runtime-compose-demos/build.gradle index 7953ae4e0eb91..b2fa5695ccd6d 100644 --- a/lifecycle/lifecycle-runtime-compose/integration-tests/lifecycle-runtime-compose-demos/build.gradle +++ b/lifecycle/lifecycle-runtime-compose/integration-tests/lifecycle-runtime-compose-demos/build.gradle @@ -26,7 +26,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/lifecycle/lifecycle-runtime-compose/samples/build.gradle b/lifecycle/lifecycle-runtime-compose/samples/build.gradle index 1bebea5b87e16..1e76e9e595f79 100644 --- a/lifecycle/lifecycle-runtime-compose/samples/build.gradle +++ b/lifecycle/lifecycle-runtime-compose/samples/build.gradle @@ -27,7 +27,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -45,6 +44,6 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.lifecycle.runtime.compose.samples" } \ No newline at end of file diff --git a/lifecycle/lifecycle-service/build.gradle b/lifecycle/lifecycle-service/build.gradle index a8281135d9395..d7611c8575a4d 100644 --- a/lifecycle/lifecycle-service/build.gradle +++ b/lifecycle/lifecycle-service/build.gradle @@ -25,7 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/lifecycle/lifecycle-viewmodel-compose/build.gradle b/lifecycle/lifecycle-viewmodel-compose/build.gradle index f83c438ef5178..825ebe83d0220 100644 --- a/lifecycle/lifecycle-viewmodel-compose/build.gradle +++ b/lifecycle/lifecycle-viewmodel-compose/build.gradle @@ -34,7 +34,7 @@ plugins { androidXMultiplatform { androidLibrary { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.lifecycle.viewmodel.compose" } desktop() diff --git a/lifecycle/lifecycle-viewmodel-compose/integration-tests/lifecycle-viewmodel-demos/build.gradle b/lifecycle/lifecycle-viewmodel-compose/integration-tests/lifecycle-viewmodel-demos/build.gradle index 3dce1c10138d4..b90602ddb8b07 100644 --- a/lifecycle/lifecycle-viewmodel-compose/integration-tests/lifecycle-viewmodel-demos/build.gradle +++ b/lifecycle/lifecycle-viewmodel-compose/integration-tests/lifecycle-viewmodel-demos/build.gradle @@ -26,7 +26,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/lifecycle/lifecycle-viewmodel-compose/samples/build.gradle b/lifecycle/lifecycle-viewmodel-compose/samples/build.gradle index 1af64f6b39688..a16ff6410c1fe 100644 --- a/lifecycle/lifecycle-viewmodel-compose/samples/build.gradle +++ b/lifecycle/lifecycle-viewmodel-compose/samples/build.gradle @@ -28,7 +28,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -46,6 +45,6 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.lifecycle.viewmodel.compose.samples" } \ No newline at end of file diff --git a/lifecycle/lifecycle-viewmodel-ktx/build.gradle b/lifecycle/lifecycle-viewmodel-ktx/build.gradle index a14474034c09a..79bd0a14e1485 100644 --- a/lifecycle/lifecycle-viewmodel-ktx/build.gradle +++ b/lifecycle/lifecycle-viewmodel-ktx/build.gradle @@ -25,7 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/lifecycle/lifecycle-viewmodel-navigation3/build.gradle b/lifecycle/lifecycle-viewmodel-navigation3/build.gradle index 932081c4d868b..d55a5cf6750cb 100644 --- a/lifecycle/lifecycle-viewmodel-navigation3/build.gradle +++ b/lifecycle/lifecycle-viewmodel-navigation3/build.gradle @@ -33,7 +33,7 @@ plugins { androidXMultiplatform { androidLibrary { - compileSdk = 36 + compileSdk { version = release(37) } namespace = "androidx.lifecycle.viewmodel.navigation3" } desktop() diff --git a/lifecycle/lifecycle-viewmodel-savedstate-samples/build.gradle b/lifecycle/lifecycle-viewmodel-savedstate-samples/build.gradle index 03d61c2577b07..546dd6eb5ea24 100644 --- a/lifecycle/lifecycle-viewmodel-savedstate-samples/build.gradle +++ b/lifecycle/lifecycle-viewmodel-savedstate-samples/build.gradle @@ -26,7 +26,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - id("org.jetbrains.kotlin.android") alias(libs.plugins.kotlinSerialization) } diff --git a/lint-checks/integration-tests/build.gradle b/lint-checks/integration-tests/build.gradle index e6d604864e786..418eeb9e3eefb 100644 --- a/lint-checks/integration-tests/build.gradle +++ b/lint-checks/integration-tests/build.gradle @@ -26,8 +26,6 @@ import androidx.build.Version plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -48,7 +46,7 @@ android { abortOnError = false } namespace = "androidx.lint.integration.tests" - compileSdk = 36 + compileSdk { version = release(36) { minorApiLevel = 1 }} } diff --git a/loader/loader-ktx/build.gradle b/loader/loader-ktx/build.gradle index c81d83bc17094..a169ad08b393b 100644 --- a/loader/loader-ktx/build.gradle +++ b/loader/loader-ktx/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -41,6 +39,6 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(35) } namespace = "androidx.loader.ktx" } diff --git a/loader/loader/build.gradle b/loader/loader/build.gradle index 8917a62fe844f..fc6e0b4592e1e 100644 --- a/loader/loader/build.gradle +++ b/loader/loader/build.gradle @@ -38,6 +38,6 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(35) } namespace = "androidx.loader" } diff --git a/metrics/integration-tests/janktest/build.gradle b/metrics/integration-tests/janktest/build.gradle index 5776383e37963..fd952e41c5d52 100644 --- a/metrics/integration-tests/janktest/build.gradle +++ b/metrics/integration-tests/janktest/build.gradle @@ -17,15 +17,13 @@ plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { buildFeatures { viewBinding = true } - compileSdk = 35 + compileSdk { version = release(35) } namespace = "androidx.metrics.performance.janktest" } diff --git a/metrics/metrics-benchmark/build.gradle b/metrics/metrics-benchmark/build.gradle index 007997ab78613..029e54d3ff6be 100644 --- a/metrics/metrics-benchmark/build.gradle +++ b/metrics/metrics-benchmark/build.gradle @@ -19,8 +19,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("androidx.benchmark") } @@ -36,7 +34,7 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(35) } namespace = "androidx.metrics.performance.benchmark" defaultConfig { // Enable measuring on an emulator, devices with low battery, and eng builds diff --git a/metrics/metrics-performance/build.gradle b/metrics/metrics-performance/build.gradle index 962239aaf9cea..433b954456c7b 100644 --- a/metrics/metrics-performance/build.gradle +++ b/metrics/metrics-performance/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -54,7 +52,7 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(35) } namespace = "androidx.metrics.performance" } diff --git a/navigation/integration-tests/testapp/build.gradle b/navigation/integration-tests/testapp/build.gradle index 01c95edd38591..a0fd97ed05b3d 100644 --- a/navigation/integration-tests/testapp/build.gradle +++ b/navigation/integration-tests/testapp/build.gradle @@ -17,7 +17,6 @@ plugins { id("AndroidXPlugin") id("com.android.application") - id("org.jetbrains.kotlin.android") } dependencies { @@ -43,7 +42,7 @@ dependencies { android { namespace = "androidx.navigation.testapp" - compileSdk = 36 + compileSdk { version = release(36) } } tasks["check"].dependsOn(tasks["connectedCheck"]) diff --git a/navigation/navigation-benchmark/build.gradle b/navigation/navigation-benchmark/build.gradle index af005cc3ade40..d0c8e56ad6c80 100644 --- a/navigation/navigation-benchmark/build.gradle +++ b/navigation/navigation-benchmark/build.gradle @@ -26,7 +26,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") id("androidx.benchmark") } @@ -55,6 +54,6 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.navigation.benchmark" } diff --git a/navigation/navigation-common-ktx/build.gradle b/navigation/navigation-common-ktx/build.gradle index 080ca98f34092..b8e725bdb4f01 100644 --- a/navigation/navigation-common-ktx/build.gradle +++ b/navigation/navigation-common-ktx/build.gradle @@ -25,7 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/navigation/navigation-common/build.gradle b/navigation/navigation-common/build.gradle index 561eab623d59f..4f6985dd52739 100644 --- a/navigation/navigation-common/build.gradle +++ b/navigation/navigation-common/build.gradle @@ -23,6 +23,7 @@ import androidx.build.SoftwareType import androidx.build.PlatformIdentifier +import com.android.build.api.dsl.KotlinMultiplatformAndroidHostTestCompilation import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType import org.jetbrains.kotlin.konan.target.Family import com.android.build.api.dsl.KotlinMultiplatformAndroidHostTestCompilation diff --git a/navigation/navigation-compose/build.gradle b/navigation/navigation-compose/build.gradle index 17bdb42367f84..0d2c4907c78e4 100644 --- a/navigation/navigation-compose/build.gradle +++ b/navigation/navigation-compose/build.gradle @@ -14,6 +14,7 @@ * limitations under the License. */ + import androidx.build.SoftwareType import androidx.build.PlatformIdentifier import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType @@ -28,7 +29,7 @@ plugins { androidXMultiplatform { androidLibrary { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.navigation.compose" androidResources.enable = true } diff --git a/navigation/navigation-compose/integration-tests/navigation-demos/build.gradle b/navigation/navigation-compose/integration-tests/navigation-demos/build.gradle index 6ddc0472ed06a..5222e32aadba8 100644 --- a/navigation/navigation-compose/integration-tests/navigation-demos/build.gradle +++ b/navigation/navigation-compose/integration-tests/navigation-demos/build.gradle @@ -26,7 +26,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") alias(libs.plugins.kotlinSerialization) } @@ -59,6 +58,6 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.navigation.compose.demos" } diff --git a/navigation/navigation-compose/samples/build.gradle b/navigation/navigation-compose/samples/build.gradle index 71a73b37ddf21..f11cbaa0a36a1 100644 --- a/navigation/navigation-compose/samples/build.gradle +++ b/navigation/navigation-compose/samples/build.gradle @@ -29,7 +29,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") id ("kotlin-parcelize") alias(libs.plugins.kotlinSerialization) } @@ -67,6 +66,6 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.navigation.compose.samples" } diff --git a/navigation/navigation-dynamic-features-fragment/build.gradle b/navigation/navigation-dynamic-features-fragment/build.gradle index dcdea8ccc3a5a..7101956ee42bb 100644 --- a/navigation/navigation-dynamic-features-fragment/build.gradle +++ b/navigation/navigation-dynamic-features-fragment/build.gradle @@ -27,7 +27,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id("AndroidXPlugin") id("com.android.library") - id("org.jetbrains.kotlin.android") alias(libs.plugins.kotlinSerialization) } diff --git a/navigation/navigation-dynamic-features-runtime/build.gradle b/navigation/navigation-dynamic-features-runtime/build.gradle index a37891c4ed24d..583fa1e84ef46 100644 --- a/navigation/navigation-dynamic-features-runtime/build.gradle +++ b/navigation/navigation-dynamic-features-runtime/build.gradle @@ -25,7 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - id("org.jetbrains.kotlin.android") alias(libs.plugins.kotlinSerialization) } diff --git a/navigation/navigation-fragment-compose/build.gradle b/navigation/navigation-fragment-compose/build.gradle index d12445b78f4d1..2955ce019b8f9 100644 --- a/navigation/navigation-fragment-compose/build.gradle +++ b/navigation/navigation-fragment-compose/build.gradle @@ -27,7 +27,6 @@ plugins { id("AndroidXPlugin") id("AndroidXComposePlugin") id("com.android.library") - id("org.jetbrains.kotlin.android") } dependencies { @@ -60,7 +59,7 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.navigation.fragment.compose" } diff --git a/navigation/navigation-fragment-ktx/build.gradle b/navigation/navigation-fragment-ktx/build.gradle index 0d8d08091c922..959df502ad545 100644 --- a/navigation/navigation-fragment-ktx/build.gradle +++ b/navigation/navigation-fragment-ktx/build.gradle @@ -25,7 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/navigation/navigation-fragment/build.gradle b/navigation/navigation-fragment/build.gradle index 8ca51a2394b17..eafba781f0b69 100644 --- a/navigation/navigation-fragment/build.gradle +++ b/navigation/navigation-fragment/build.gradle @@ -26,7 +26,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - id("org.jetbrains.kotlin.android") alias(libs.plugins.kotlinSerialization) } diff --git a/navigation/navigation-runtime-ktx/build.gradle b/navigation/navigation-runtime-ktx/build.gradle index a8ab5f14aa50b..e2d3d13ac8732 100644 --- a/navigation/navigation-runtime-ktx/build.gradle +++ b/navigation/navigation-runtime-ktx/build.gradle @@ -25,7 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/navigation/navigation-ui-ktx/build.gradle b/navigation/navigation-ui-ktx/build.gradle index 86350187eb076..e4919019b58aa 100644 --- a/navigation/navigation-ui-ktx/build.gradle +++ b/navigation/navigation-ui-ktx/build.gradle @@ -25,7 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/navigation/navigation-ui/build.gradle b/navigation/navigation-ui/build.gradle index 9bcc19e8688a7..bdabaf9695ca4 100644 --- a/navigation/navigation-ui/build.gradle +++ b/navigation/navigation-ui/build.gradle @@ -25,7 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - id("org.jetbrains.kotlin.android") } android { diff --git a/navigation3/navigation3-benchmark/build.gradle b/navigation3/navigation3-benchmark/build.gradle index 20ebe07a06f73..faadca0f0e030 100644 --- a/navigation3/navigation3-benchmark/build.gradle +++ b/navigation3/navigation3-benchmark/build.gradle @@ -27,7 +27,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") id("androidx.benchmark") } @@ -45,7 +44,7 @@ dependencies { } android { - compileSdk = 36 + compileSdk { version = release(37) } namespace = "androidx.navigation3.benchmark" } diff --git a/navigation3/navigation3-runtime/build.gradle b/navigation3/navigation3-runtime/build.gradle index ec01852d0fad9..b78a5d8af37a7 100644 --- a/navigation3/navigation3-runtime/build.gradle +++ b/navigation3/navigation3-runtime/build.gradle @@ -32,7 +32,7 @@ plugins { androidXMultiplatform { androidLibrary { - compileSdk = 36 + compileSdk { version = release(37) } namespace = "androidx.navigation3.runtime" androidResources.enable = true } diff --git a/navigation3/navigation3-runtime/samples/build.gradle b/navigation3/navigation3-runtime/samples/build.gradle index b68c78cad99f0..1dc399d8720b4 100644 --- a/navigation3/navigation3-runtime/samples/build.gradle +++ b/navigation3/navigation3-runtime/samples/build.gradle @@ -28,7 +28,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") alias(libs.plugins.kotlinSerialization) } @@ -60,6 +59,6 @@ androidx { } android { - compileSdk = 36 + compileSdk { version = release(37) } namespace = "androidx.navigation3.runtime.samples" } diff --git a/navigation3/navigation3-ui/build.gradle b/navigation3/navigation3-ui/build.gradle index cc44ab98cc7b4..177d754342e03 100644 --- a/navigation3/navigation3-ui/build.gradle +++ b/navigation3/navigation3-ui/build.gradle @@ -20,7 +20,6 @@ * Please use the task when creating a new project, rather than copying an existing project and * modifying its settings. */ - import androidx.build.SoftwareType import androidx.build.PlatformIdentifier import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType @@ -35,7 +34,7 @@ plugins { androidXMultiplatform { androidLibrary { - compileSdk = 36 + compileSdk { version = release(37) } namespace = "androidx.navigation3.ui" androidResources.enable = true } diff --git a/navigation3/navigation3-ui/integration-tests/navigation3-demos/build.gradle b/navigation3/navigation3-ui/integration-tests/navigation3-demos/build.gradle index 7a99457f1231c..5d1d755a08680 100644 --- a/navigation3/navigation3-ui/integration-tests/navigation3-demos/build.gradle +++ b/navigation3/navigation3-ui/integration-tests/navigation3-demos/build.gradle @@ -26,8 +26,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") alias(libs.plugins.kotlinSerialization) } @@ -49,6 +47,6 @@ androidx { } android { - compileSdk = 36 + compileSdk { version = release(37) } namespace = "androidx.navigation3.demos" } diff --git a/navigation3/navigation3-ui/samples/build.gradle b/navigation3/navigation3-ui/samples/build.gradle index 408aae6d34f4e..1c6d0a525a3e9 100644 --- a/navigation3/navigation3-ui/samples/build.gradle +++ b/navigation3/navigation3-ui/samples/build.gradle @@ -28,7 +28,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") alias(libs.plugins.kotlinSerialization) } @@ -63,6 +62,6 @@ androidx { } android { - compileSdk = 36 + compileSdk { version = release(37) } namespace = "androidx.navigation3.ui.samples" } diff --git a/navigationevent/navigationevent-benchmark/build.gradle b/navigationevent/navigationevent-benchmark/build.gradle index ff2c38cb9a3d7..7f4cbbec89f44 100644 --- a/navigationevent/navigationevent-benchmark/build.gradle +++ b/navigationevent/navigationevent-benchmark/build.gradle @@ -48,7 +48,7 @@ dependencies { } android { - compileSdk { version = release(36) } + compileSdk { version = release(37) } namespace = "androidx.navigationevent.benchmark" } diff --git a/navigationevent/navigationevent-compose/build.gradle b/navigationevent/navigationevent-compose/build.gradle index 4f1b272c4add5..974ff992dea0f 100644 --- a/navigationevent/navigationevent-compose/build.gradle +++ b/navigationevent/navigationevent-compose/build.gradle @@ -34,7 +34,7 @@ plugins { androidXMultiplatform { androidLibrary { - compileSdk = 36 + compileSdk { version = release(36) } namespace = "androidx.navigationevent.compose" } desktop() diff --git a/navigationevent/navigationevent-samples/build.gradle b/navigationevent/navigationevent-samples/build.gradle index 570c20a1d2a6d..448fc3027ae81 100644 --- a/navigationevent/navigationevent-samples/build.gradle +++ b/navigationevent/navigationevent-samples/build.gradle @@ -27,7 +27,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -38,7 +37,7 @@ dependencies { } android { - compileSdk = 36 + compileSdk { version = release(36) } namespace = "androidx.navigationevent.samples" } diff --git a/navigationevent/navigationevent-testing/build.gradle b/navigationevent/navigationevent-testing/build.gradle index 49b0beb271cf3..b83255400d811 100644 --- a/navigationevent/navigationevent-testing/build.gradle +++ b/navigationevent/navigationevent-testing/build.gradle @@ -30,7 +30,7 @@ plugins { androidXMultiplatform { androidLibrary { - compileSdk = 36 + compileSdk { version = release(36) } namespace = "androidx.navigationevent.testing" } jvm() diff --git a/navigationevent/navigationevent/build.gradle b/navigationevent/navigationevent/build.gradle index ebd23e9650011..b0feda511cb93 100644 --- a/navigationevent/navigationevent/build.gradle +++ b/navigationevent/navigationevent/build.gradle @@ -32,7 +32,7 @@ plugins { androidXMultiplatform { androidLibrary { - compileSdk = 36 + compileSdk { version = release(36) } namespace = "androidx.navigationevent" androidResources.enable = true } diff --git a/paging/integration-tests/testapp/build.gradle b/paging/integration-tests/testapp/build.gradle index d0307dc8ab936..1a424b2d11b59 100644 --- a/paging/integration-tests/testapp/build.gradle +++ b/paging/integration-tests/testapp/build.gradle @@ -17,8 +17,6 @@ plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("com.google.devtools.ksp") } @@ -54,7 +52,7 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(35) } namespace = "androidx.paging.integration.testapp" } diff --git a/paging/paging-compose/build.gradle b/paging/paging-compose/build.gradle index 51f3890f4544b..75f4a627858d2 100644 --- a/paging/paging-compose/build.gradle +++ b/paging/paging-compose/build.gradle @@ -42,7 +42,7 @@ androidXMultiplatform { mingwX64() desktop() androidLibrary { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.paging.compose" } diff --git a/paging/paging-compose/integration-tests/paging-demos/build.gradle b/paging/paging-compose/integration-tests/paging-demos/build.gradle index 19cf16136a3e9..63308cc7972f0 100644 --- a/paging/paging-compose/integration-tests/paging-demos/build.gradle +++ b/paging/paging-compose/integration-tests/paging-demos/build.gradle @@ -26,8 +26,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("com.google.devtools.ksp") } @@ -62,6 +60,6 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.paging.compose.demos" } diff --git a/paging/paging-compose/samples/build.gradle b/paging/paging-compose/samples/build.gradle index 2997420c832a0..326ba973ac848 100644 --- a/paging/paging-compose/samples/build.gradle +++ b/paging/paging-compose/samples/build.gradle @@ -27,8 +27,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -48,6 +46,6 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.paging.compose.samples" } diff --git a/paging/paging-guava/build.gradle b/paging/paging-guava/build.gradle index 57136d5793f73..7c1c7897a4623 100644 --- a/paging/paging-guava/build.gradle +++ b/paging/paging-guava/build.gradle @@ -26,8 +26,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/paging/paging-runtime-ktx/build.gradle b/paging/paging-runtime-ktx/build.gradle index f6ef4e7090b96..2e257283a854b 100644 --- a/paging/paging-runtime-ktx/build.gradle +++ b/paging/paging-runtime-ktx/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/paging/paging-runtime/build.gradle b/paging/paging-runtime/build.gradle index 4023657270f3f..d9bacc03728c7 100644 --- a/paging/paging-runtime/build.gradle +++ b/paging/paging-runtime/build.gradle @@ -26,8 +26,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { diff --git a/paging/paging-rxjava2-ktx/build.gradle b/paging/paging-rxjava2-ktx/build.gradle index d67f05d33c50e..1f2e61fdf0ca1 100644 --- a/paging/paging-rxjava2-ktx/build.gradle +++ b/paging/paging-rxjava2-ktx/build.gradle @@ -26,8 +26,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/paging/paging-rxjava2/build.gradle b/paging/paging-rxjava2/build.gradle index ae2f8c9b652ac..36cec8f8cab32 100644 --- a/paging/paging-rxjava2/build.gradle +++ b/paging/paging-rxjava2/build.gradle @@ -26,8 +26,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/paging/paging-rxjava3/build.gradle b/paging/paging-rxjava3/build.gradle index 432678dcbf431..a183082f8d5ab 100644 --- a/paging/paging-rxjava3/build.gradle +++ b/paging/paging-rxjava3/build.gradle @@ -27,8 +27,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/paging/samples/build.gradle b/paging/samples/build.gradle index a92021ee68f55..51a0bc525cc50 100644 --- a/paging/samples/build.gradle +++ b/paging/samples/build.gradle @@ -27,7 +27,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") } android { diff --git a/palette/palette-ktx/build.gradle b/palette/palette-ktx/build.gradle index 2208eea12b619..b6f5fc546cd97 100644 --- a/palette/palette-ktx/build.gradle +++ b/palette/palette-ktx/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/pdf/integration-tests/testapp/build.gradle b/pdf/integration-tests/testapp/build.gradle index 6e99efa42ed22..9a2c188106995 100644 --- a/pdf/integration-tests/testapp/build.gradle +++ b/pdf/integration-tests/testapp/build.gradle @@ -2,16 +2,15 @@ plugins { id("AndroidXPlugin") id("AndroidXComposePlugin") id("com.android.application") - id("org.jetbrains.kotlin.android") } android { namespace = "androidx.pdf.testapp" group = "androidx.pdf" + compileSdk { version = release(37) } defaultConfig { applicationId = "androidx.pdf.testapp" - minSdk = 31 - compileSdk = 36 + minSdk { version = release(28) } } viewBinding { diff --git a/pdf/pdf-compose/build.gradle b/pdf/pdf-compose/build.gradle index 9fd65115d621a..462c82859ab99 100644 --- a/pdf/pdf-compose/build.gradle +++ b/pdf/pdf-compose/build.gradle @@ -26,7 +26,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -54,11 +53,9 @@ dependencies { android { namespace = "androidx.pdf.compose" + compileSdk { version = release(37) } defaultConfig { - // TODO(b/403022712) Remove minSdk once pdf-viewer and pdf-document-service drop their - // minSdk requirements - minSdk = 31 - compileSdk = 36 + minSdk { version = release(28) } } } diff --git a/pdf/pdf-document-service/build.gradle b/pdf/pdf-document-service/build.gradle index 0948cdb8b513d..d28a662ab9e69 100644 --- a/pdf/pdf-document-service/build.gradle +++ b/pdf/pdf-document-service/build.gradle @@ -26,7 +26,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("androidx.stableaidl") - id("org.jetbrains.kotlin.android") } dependencies { @@ -60,10 +59,9 @@ dependencies { android { namespace = "androidx.pdf.document.service" - + compileSdk { version = release(36) { sdkExtension = 19 }} defaultConfig { - minSdk = 31 - compileSdk = 36 + minSdk { version = release(28) } } buildFeatures.aidl = true diff --git a/pdf/pdf-ink/build.gradle b/pdf/pdf-ink/build.gradle index 2235b50cdb64e..a73174ecf8441 100644 --- a/pdf/pdf-ink/build.gradle +++ b/pdf/pdf-ink/build.gradle @@ -25,14 +25,13 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - id("org.jetbrains.kotlin.android") } android { namespace = "androidx.pdf.ink" + compileSdk { version = release(36) { sdkExtension = 19 } } defaultConfig { - minSdk = 31 - compileSdk = 36 + minSdk { version = release(28) } testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/pdf/pdf-viewer-fragment/build.gradle b/pdf/pdf-viewer-fragment/build.gradle index bfe824decf768..9ce260be0d1bb 100644 --- a/pdf/pdf-viewer-fragment/build.gradle +++ b/pdf/pdf-viewer-fragment/build.gradle @@ -25,7 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - id("org.jetbrains.kotlin.android") } dependencies { @@ -56,10 +55,9 @@ dependencies { android { namespace = "androidx.pdf.viewer.fragment" - + compileSdk { version = release(36) { sdkExtension = 19 }} defaultConfig { - minSdk = 31 - compileSdk = 36 + minSdk { version = release(28) } } } diff --git a/pdf/pdf-viewer/build.gradle b/pdf/pdf-viewer/build.gradle index 52c40c0532760..b16b9b20958fb 100644 --- a/pdf/pdf-viewer/build.gradle +++ b/pdf/pdf-viewer/build.gradle @@ -21,7 +21,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("androidx.stableaidl") - id("org.jetbrains.kotlin.android") } dependencies { @@ -65,10 +64,9 @@ dependencies { android { namespace = "androidx.pdf" - + compileSdk { version = release(36) { sdkExtension = 19 }} defaultConfig { - minSdk = 31 - compileSdk = 36 + minSdk { version = release(28) } } buildFeatures { diff --git a/photopicker/photopicker-compose/build.gradle b/photopicker/photopicker-compose/build.gradle index 2fb67c9c533d5..38cee000705a3 100644 --- a/photopicker/photopicker-compose/build.gradle +++ b/photopicker/photopicker-compose/build.gradle @@ -21,8 +21,6 @@ plugins { id("AndroidXPlugin") id("AndroidXComposePlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -50,10 +48,9 @@ dependencies { android { namespace = "androidx.photopicker.compose" - compileSdk = 36 - compileSdkExtension = 19 + compileSdk { version = release(37) } defaultConfig { - minSdk = 34 + minSdk { version = release(34) } } } diff --git a/photopicker/photopicker-testing/build.gradle b/photopicker/photopicker-testing/build.gradle index b61a5dfef9a53..d3cc04a14ee2c 100644 --- a/photopicker/photopicker-testing/build.gradle +++ b/photopicker/photopicker-testing/build.gradle @@ -20,8 +20,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -34,9 +32,9 @@ dependencies { android { namespace = "androidx.photopicker.testing" - compileSdk = 36 + compileSdk { version = release(36) } defaultConfig { - minSdk = 34 + minSdk { version = release(34) } } } diff --git a/photopicker/photopicker/build.gradle b/photopicker/photopicker/build.gradle index 6c3ec805dc452..d1c5c05640061 100644 --- a/photopicker/photopicker/build.gradle +++ b/photopicker/photopicker/build.gradle @@ -20,8 +20,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -39,9 +37,9 @@ dependencies { android { namespace = "androidx.photopicker" - compileSdk = 36 + compileSdk { version = release(36) } defaultConfig { - minSdk = 34 + minSdk { version = release(34) } } } diff --git a/preference/preference-ktx/build.gradle b/preference/preference-ktx/build.gradle index 905d423687427..82e4ef205aaa4 100644 --- a/preference/preference-ktx/build.gradle +++ b/preference/preference-ktx/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/preference/preference/build.gradle b/preference/preference/build.gradle index 8aa504150ca9f..c198fd19656e3 100644 --- a/preference/preference/build.gradle +++ b/preference/preference/build.gradle @@ -19,8 +19,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/privacysandbox/activity/activity-client/build.gradle b/privacysandbox/activity/activity-client/build.gradle deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/privacysandbox/activity/activity-core/build.gradle b/privacysandbox/activity/activity-core/build.gradle deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/privacysandbox/activity/activity-provider/build.gradle b/privacysandbox/activity/activity-provider/build.gradle deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/privacysandbox/ads/ads-adservices-java/build.gradle b/privacysandbox/ads/ads-adservices-java/build.gradle index be5edce8c3621..1050615a61585 100644 --- a/privacysandbox/ads/ads-adservices-java/build.gradle +++ b/privacysandbox/ads/ads-adservices-java/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -58,7 +56,7 @@ dependencies { } android { - compileSdk = 36 + compileSdk { version = release(36) } namespace = "androidx.privacysandbox.ads.adservices.java" } diff --git a/privacysandbox/ads/ads-adservices/build.gradle b/privacysandbox/ads/ads-adservices/build.gradle index f75c5a8e252d2..a9248860c2bb9 100644 --- a/privacysandbox/ads/ads-adservices/build.gradle +++ b/privacysandbox/ads/ads-adservices/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -50,7 +48,7 @@ dependencies { } android { - compileSdk = 36 + compileSdk { version = release(36) } namespace = "androidx.privacysandbox.ads.adservices" } diff --git a/profileinstaller/integration-tests/init-macrobenchmark-target/build.gradle b/profileinstaller/integration-tests/init-macrobenchmark-target/build.gradle index 9e5358fd95b5a..ecfd6258ca106 100644 --- a/profileinstaller/integration-tests/init-macrobenchmark-target/build.gradle +++ b/profileinstaller/integration-tests/init-macrobenchmark-target/build.gradle @@ -17,8 +17,6 @@ plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { diff --git a/profileinstaller/integration-tests/init-macrobenchmark/build.gradle b/profileinstaller/integration-tests/init-macrobenchmark/build.gradle index 97df5338fede1..d19a63996f470 100644 --- a/profileinstaller/integration-tests/init-macrobenchmark/build.gradle +++ b/profileinstaller/integration-tests/init-macrobenchmark/build.gradle @@ -17,8 +17,6 @@ plugins { id("AndroidXPlugin") id("com.android.test") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { diff --git a/profileinstaller/integration-tests/profile-verification-sample-no-initializer/build.gradle b/profileinstaller/integration-tests/profile-verification-sample-no-initializer/build.gradle index d8ff551d9a13b..2e39d830e909d 100644 --- a/profileinstaller/integration-tests/profile-verification-sample-no-initializer/build.gradle +++ b/profileinstaller/integration-tests/profile-verification-sample-no-initializer/build.gradle @@ -25,14 +25,12 @@ import com.android.build.api.artifact.SingleArtifact plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } // This project can be removed once b/239659205 has landed and use only the // profile-verification-sample project. android { - compileSdk = 35 + compileSdk { version = release(35) } buildTypes { release { diff --git a/profileinstaller/integration-tests/profile-verification-sample/build.gradle b/profileinstaller/integration-tests/profile-verification-sample/build.gradle index a672356f9cc46..800819fb8bca6 100644 --- a/profileinstaller/integration-tests/profile-verification-sample/build.gradle +++ b/profileinstaller/integration-tests/profile-verification-sample/build.gradle @@ -25,11 +25,9 @@ import com.android.build.api.artifact.SingleArtifact plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { - compileSdk = 35 + compileSdk { version = release(35) } buildTypes { release { diff --git a/profileinstaller/integration-tests/profile-verification/build.gradle b/profileinstaller/integration-tests/profile-verification/build.gradle index bdc97dc55b358..d03abb866e369 100644 --- a/profileinstaller/integration-tests/profile-verification/build.gradle +++ b/profileinstaller/integration-tests/profile-verification/build.gradle @@ -29,8 +29,6 @@ import java.util.zip.ZipFile plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } // This task copies the apks provided by the `apkAssets` configuration and places them in the @@ -90,7 +88,7 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(35) } namespace = "androidx.profileinstaller.integration.profileverification" } diff --git a/profileinstaller/profileinstaller-benchmark/build.gradle b/profileinstaller/profileinstaller-benchmark/build.gradle index 15e9034186c3b..5aae057f634a7 100644 --- a/profileinstaller/profileinstaller-benchmark/build.gradle +++ b/profileinstaller/profileinstaller-benchmark/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("androidx.benchmark") } diff --git a/recyclerview/recyclerview-benchmark/build.gradle b/recyclerview/recyclerview-benchmark/build.gradle index 1b395ee77a8d0..10d63344610de 100644 --- a/recyclerview/recyclerview-benchmark/build.gradle +++ b/recyclerview/recyclerview-benchmark/build.gradle @@ -19,8 +19,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("androidx.benchmark") } @@ -36,7 +34,7 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(35) } namespace = "androidx.recyclerview.benchmark" } diff --git a/recyclerview/recyclerview/build.gradle b/recyclerview/recyclerview/build.gradle index d622ecf236e7f..8bf4b82d60702 100644 --- a/recyclerview/recyclerview/build.gradle +++ b/recyclerview/recyclerview/build.gradle @@ -9,8 +9,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -53,7 +51,7 @@ dependencies { android { defaultConfig { - compileSdk = 35 + compileSdk { version = release(35) } testInstrumentationRunner "androidx.recyclerview.test.TestRunner" } testOptions.unitTests.returnDefaultValues = true diff --git a/room3/benchmark/build.gradle b/room3/benchmark/build.gradle index a6638a5cb0f63..d35c3faa0b777 100644 --- a/room3/benchmark/build.gradle +++ b/room3/benchmark/build.gradle @@ -30,8 +30,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("com.google.devtools.ksp") id("androidx.benchmark") } diff --git a/room3/integration-tests/autovaluetestapp/build.gradle b/room3/integration-tests/autovaluetestapp/build.gradle index 1a2ef89eca9aa..9df886c973f47 100644 --- a/room3/integration-tests/autovaluetestapp/build.gradle +++ b/room3/integration-tests/autovaluetestapp/build.gradle @@ -21,8 +21,6 @@ import com.android.build.api.variant.HasAndroidTestBuilder plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("com.google.devtools.ksp") } diff --git a/room3/integration-tests/kotlintestapp/build.gradle b/room3/integration-tests/kotlintestapp/build.gradle index 4935bd9aa7a80..ed735e6d78e74 100644 --- a/room3/integration-tests/kotlintestapp/build.gradle +++ b/room3/integration-tests/kotlintestapp/build.gradle @@ -27,8 +27,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("com.google.devtools.ksp") id("androidx.room3") } diff --git a/room3/room3-guava/build.gradle b/room3/room3-guava/build.gradle index 0ee4ea976b5c5..b1d27fdbae6e4 100644 --- a/room3/room3-guava/build.gradle +++ b/room3/room3-guava/build.gradle @@ -27,8 +27,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/room3/room3-paging-guava/build.gradle b/room3/room3-paging-guava/build.gradle index 53d02bb04351d..f1657ca0629bb 100644 --- a/room3/room3-paging-guava/build.gradle +++ b/room3/room3-paging-guava/build.gradle @@ -30,8 +30,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("com.google.devtools.ksp") } diff --git a/room3/room3-paging-rxjava3/build.gradle b/room3/room3-paging-rxjava3/build.gradle index 42d7964dc3876..225cc098a040e 100644 --- a/room3/room3-paging-rxjava3/build.gradle +++ b/room3/room3-paging-rxjava3/build.gradle @@ -30,8 +30,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("com.google.devtools.ksp") } diff --git a/room3/room3-rxjava3/build.gradle b/room3/room3-rxjava3/build.gradle index 85a1354dd6a0a..160ae65efb37f 100644 --- a/room3/room3-rxjava3/build.gradle +++ b/room3/room3-rxjava3/build.gradle @@ -28,8 +28,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/room3/room3-sqlite-wrapper/build.gradle b/room3/room3-sqlite-wrapper/build.gradle index 92fcc5b716227..d2e38e1ab7446 100644 --- a/room3/room3-sqlite-wrapper/build.gradle +++ b/room3/room3-sqlite-wrapper/build.gradle @@ -29,8 +29,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("com.google.devtools.ksp") } diff --git a/samples/AndroidXDemos/build.gradle b/samples/AndroidXDemos/build.gradle index 010bc82478108..700de2678084e 100644 --- a/samples/AndroidXDemos/build.gradle +++ b/samples/AndroidXDemos/build.gradle @@ -7,8 +7,6 @@ plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -42,7 +40,7 @@ android { proguardFiles getDefaultProguardFile("proguard-android-optimize.txt") } } - compileSdk = 36 + compileSdk { version = release(36) { minorApiLevel = 1 }} defaultConfig { vectorDrawables.useSupportLibrary = true } diff --git a/samples/Support4Demos/build.gradle b/samples/Support4Demos/build.gradle index 1b672aceed6ec..abc5dfaecfcc0 100644 --- a/samples/Support4Demos/build.gradle +++ b/samples/Support4Demos/build.gradle @@ -7,8 +7,6 @@ plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -32,6 +30,6 @@ dependencies { } android { - compileSdk = 36 + compileSdk { version = release(36) { minorApiLevel = 1 }} namespace = "com.example.android.supportv4" } diff --git a/samples/SupportAnimationDemos/build.gradle b/samples/SupportAnimationDemos/build.gradle index 6ca6b5f109af8..82980543c3bf4 100644 --- a/samples/SupportAnimationDemos/build.gradle +++ b/samples/SupportAnimationDemos/build.gradle @@ -15,6 +15,6 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(35) } namespace = "com.example.android.support.animation" } diff --git a/samples/SupportEmojiDemos/build.gradle b/samples/SupportEmojiDemos/build.gradle index 4118820725aac..6f0da011b1f5e 100644 --- a/samples/SupportEmojiDemos/build.gradle +++ b/samples/SupportEmojiDemos/build.gradle @@ -33,10 +33,7 @@ dependencies { } android { - compileSdk = 35 - sourceSets { - main.assets.srcDirs = [new File(fontDir, "supported-emojis").getAbsolutePath()] - } + compileSdk { version = release(35) } namespace = "com.example.android.support.text.emoji" } diff --git a/samples/SupportLeanbackDemos/build.gradle b/samples/SupportLeanbackDemos/build.gradle index f1d585930ba6d..6f51909e1f503 100644 --- a/samples/SupportLeanbackDemos/build.gradle +++ b/samples/SupportLeanbackDemos/build.gradle @@ -25,6 +25,6 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(35) } namespace = "com.example.android.leanback" } diff --git a/samples/SupportPreferenceDemos/build.gradle b/samples/SupportPreferenceDemos/build.gradle index f558e5e1da1dd..3406ecf51daf2 100644 --- a/samples/SupportPreferenceDemos/build.gradle +++ b/samples/SupportPreferenceDemos/build.gradle @@ -7,8 +7,6 @@ plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -26,6 +24,6 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(35) } namespace = "com.example.androidx.preference" } diff --git a/samples/SupportTransitionDemos/build.gradle b/samples/SupportTransitionDemos/build.gradle index 8d5eec206e70e..fe194dc2d039d 100644 --- a/samples/SupportTransitionDemos/build.gradle +++ b/samples/SupportTransitionDemos/build.gradle @@ -21,7 +21,7 @@ android { aaptOptions { additionalParameters "--no-version-transitions" } - compileSdk = 36 + compileSdk { version = release(36) } namespace = "com.example.android.support.transition" } diff --git a/samples/SupportWearDemos/build.gradle b/samples/SupportWearDemos/build.gradle index cc994776396b5..52df54e8b03a4 100644 --- a/samples/SupportWearDemos/build.gradle +++ b/samples/SupportWearDemos/build.gradle @@ -28,9 +28,9 @@ dependencies { } android { - compileSdk = 36 + compileSdk { version = release(36) { minorApiLevel = 1 }} defaultConfig { - minSdk = 24 + minSdk { version = release(24) } } namespace = "com.example.android.support.wear" } diff --git a/savedstate/savedstate-benchmark/build.gradle b/savedstate/savedstate-benchmark/build.gradle index 8ca920453cce6..7a8d85ec658f2 100644 --- a/savedstate/savedstate-benchmark/build.gradle +++ b/savedstate/savedstate-benchmark/build.gradle @@ -27,7 +27,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - id("org.jetbrains.kotlin.android") id("androidx.benchmark") alias(libs.plugins.kotlinSerialization) } diff --git a/savedstate/savedstate-ktx/build.gradle b/savedstate/savedstate-ktx/build.gradle index 6edc48444ab62..b21c08eea6da2 100644 --- a/savedstate/savedstate-ktx/build.gradle +++ b/savedstate/savedstate-ktx/build.gradle @@ -26,7 +26,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/savedstate/savedstate-samples/build.gradle b/savedstate/savedstate-samples/build.gradle index 534fc9f44e0f3..1d4e2377aa6dd 100644 --- a/savedstate/savedstate-samples/build.gradle +++ b/savedstate/savedstate-samples/build.gradle @@ -26,7 +26,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - id("org.jetbrains.kotlin.android") alias(libs.plugins.kotlinSerialization) } @@ -38,7 +37,7 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(35) } namespace = "androidx.savedstate.samples" } diff --git a/savedstate/savedstate-testing/build.gradle b/savedstate/savedstate-testing/build.gradle index 96f149109604d..72a88b12e0642 100644 --- a/savedstate/savedstate-testing/build.gradle +++ b/savedstate/savedstate-testing/build.gradle @@ -32,7 +32,7 @@ plugins { androidXMultiplatform { androidLibrary { - compileSdk = 36 + compileSdk { version = release(36) } namespace = "androidx.savedstate.testing" } desktop() diff --git a/savedstate/savedstate/build.gradle b/savedstate/savedstate/build.gradle index 4720a251f033b..df20abb1dc404 100644 --- a/savedstate/savedstate/build.gradle +++ b/savedstate/savedstate/build.gradle @@ -5,6 +5,7 @@ * modifying its settings. */ + import androidx.build.SoftwareType import androidx.build.PlatformIdentifier import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType diff --git a/security/security-crypto-ktx/build.gradle b/security/security-crypto-ktx/build.gradle index addef0edc7216..e706ff398c651 100644 --- a/security/security-crypto-ktx/build.gradle +++ b/security/security-crypto-ktx/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/security/security-crypto/build.gradle b/security/security-crypto/build.gradle index da75be3e69536..989d92347a6f7 100644 --- a/security/security-crypto/build.gradle +++ b/security/security-crypto/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/security/security-mls/build.gradle b/security/security-mls/build.gradle index a950d294fcb6b..e3e1a7772cb19 100644 --- a/security/security-mls/build.gradle +++ b/security/security-mls/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/security/security-state-provider/build.gradle b/security/security-state-provider/build.gradle index 3f4aa38b1badb..187ed2ed808b2 100644 --- a/security/security-state-provider/build.gradle +++ b/security/security-state-provider/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") alias(libs.plugins.kotlinSerialization) } @@ -49,7 +47,7 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(36) } namespace = "androidx.security.state.provider" } diff --git a/security/security-state/build.gradle b/security/security-state/build.gradle index c296c61c4f391..71f49b124a355 100644 --- a/security/security-state/build.gradle +++ b/security/security-state/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") alias(libs.plugins.kotlinSerialization) } @@ -56,7 +54,7 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(36) } namespace = "androidx.security.state" buildFeatures { aidl = true diff --git a/settings.gradle b/settings.gradle index 588a3718280db..74c6dd3f18d20 100644 --- a/settings.gradle +++ b/settings.gradle @@ -38,7 +38,7 @@ buildscript { if (agpOverride != null) { classpath("com.android.settings:com.android.settings.gradle.plugin:$agpOverride") } else { - classpath("com.android.settings:com.android.settings.gradle.plugin:8.12.0") + classpath("com.android.settings:com.android.settings.gradle.plugin:9.3.0-alpha01") } // set guava version to be compatible with Depdendency analysis gradle plugin classpath("com.google.guava:guava:33.3.1-jre") @@ -891,17 +891,16 @@ includeProject(":hilt:hilt-navigation-fragment", [BuildType.MAIN]) includeProject(":hilt:hilt-work", [BuildType.MAIN]) includeProject(":hilt:integration-tests:hilt-testapp-viewmodel", "hilt/integration-tests/viewmodelapp", [BuildType.MAIN]) includeProject(":hilt:integration-tests:hilt-testapp-worker", "hilt/integration-tests/workerapp", [BuildType.MAIN]) -// NOTE: commented for JB fork to not bother with gradle sync issues in the projects which we don't use -//includeProject(":ink:ink-authoring", [BuildType.MAIN]) -//includeProject(":ink:ink-authoring-compose", [BuildType.MAIN, BuildType.COMPOSE]) -//includeProject(":ink:ink-brush", [BuildType.MAIN]) -//includeProject(":ink:ink-brush-compose", [BuildType.MAIN, BuildType.COMPOSE]) -//includeProject(":ink:ink-geometry", [BuildType.MAIN]) -//includeProject(":ink:ink-geometry-compose", [BuildType.MAIN, BuildType.COMPOSE]) -//includeProject(":ink:ink-nativeloader", [BuildType.MAIN]) -//includeProject(":ink:ink-storage", [BuildType.MAIN]) -//includeProject(":ink:ink-strokes", [BuildType.MAIN]) -//includeProject(":ink:ink-rendering", [BuildType.MAIN]) +includeProject(":ink:ink-authoring", [BuildType.MAIN]) +includeProject(":ink:ink-authoring-compose", [BuildType.MAIN, BuildType.COMPOSE]) +includeProject(":ink:ink-brush", [BuildType.MAIN]) +includeProject(":ink:ink-brush-compose", [BuildType.MAIN, BuildType.COMPOSE]) +includeProject(":ink:ink-geometry", [BuildType.MAIN]) +includeProject(":ink:ink-geometry-compose", [BuildType.MAIN, BuildType.COMPOSE]) +includeProject(":ink:ink-nativeloader", [BuildType.MAIN]) +includeProject(":ink:ink-storage", [BuildType.MAIN]) +includeProject(":ink:ink-strokes", [BuildType.MAIN]) +includeProject(":ink:ink-rendering", [BuildType.MAIN]) includeProject(":input:input-motionprediction", [BuildType.MAIN]) includeProject(":inspection:inspection", [BuildType.MAIN, BuildType.COMPOSE]) includeProject(":inspection:inspection-gradle-plugin", [BuildType.MAIN]) diff --git a/slidingpanelayout/slidingpanelayout-testapp/build.gradle b/slidingpanelayout/slidingpanelayout-testapp/build.gradle index 459a8d7ed3460..3f7aff0640f58 100644 --- a/slidingpanelayout/slidingpanelayout-testapp/build.gradle +++ b/slidingpanelayout/slidingpanelayout-testapp/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/slidingpanelayout/slidingpanelayout/build.gradle b/slidingpanelayout/slidingpanelayout/build.gradle index 596c449720e05..f64a4372205a6 100644 --- a/slidingpanelayout/slidingpanelayout/build.gradle +++ b/slidingpanelayout/slidingpanelayout/build.gradle @@ -9,8 +9,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/sqlite/integration-tests/inspection-room-testapp/build.gradle b/sqlite/integration-tests/inspection-room-testapp/build.gradle index ddbbd62a36da2..d11b829ade51a 100644 --- a/sqlite/integration-tests/inspection-room-testapp/build.gradle +++ b/sqlite/integration-tests/inspection-room-testapp/build.gradle @@ -17,8 +17,6 @@ plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("com.google.devtools.ksp") } @@ -39,7 +37,7 @@ dependencies { android { defaultConfig { // studio pipeline works only starting with Android O - minSdk = 26 + minSdk { version = release(26) } } namespace = "androidx.sqlite.inspection.roomtestapp" } diff --git a/sqlite/integration-tests/inspection-sqldelight-testapp/build.gradle b/sqlite/integration-tests/inspection-sqldelight-testapp/build.gradle index 51249d765def0..bad71cf55c4a2 100644 --- a/sqlite/integration-tests/inspection-sqldelight-testapp/build.gradle +++ b/sqlite/integration-tests/inspection-sqldelight-testapp/build.gradle @@ -18,8 +18,6 @@ plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -38,7 +36,7 @@ dependencies { android { defaultConfig { // studio pipeline works only starting with Android O - minSdk = 26 + minSdk { version = release(26) } } namespace = "androidx.sqlite.inspection.sqldeligttestapp" } diff --git a/sqlite/sqlite-inspection/build.gradle b/sqlite/sqlite-inspection/build.gradle index ccb63c8e7ad64..ae7f2e23718a6 100644 --- a/sqlite/sqlite-inspection/build.gradle +++ b/sqlite/sqlite-inspection/build.gradle @@ -26,8 +26,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("androidx.inspection") } @@ -56,7 +54,7 @@ androidx { android { defaultConfig { // studio pipeline works only starting with Android O - minSdk = 26 + minSdk { version = release(26) } } namespace = "androidx.sqlite.inspection" } diff --git a/sqlite/sqlite-ktx/build.gradle b/sqlite/sqlite-ktx/build.gradle index 57694d253f8e6..75dbdfd06e01d 100644 --- a/sqlite/sqlite-ktx/build.gradle +++ b/sqlite/sqlite-ktx/build.gradle @@ -28,8 +28,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/startup/integration-tests/first-library/build.gradle b/startup/integration-tests/first-library/build.gradle index 5b1268a691b35..c8afd9e93fc44 100644 --- a/startup/integration-tests/first-library/build.gradle +++ b/startup/integration-tests/first-library/build.gradle @@ -17,8 +17,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -35,6 +33,6 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(35) } namespace = "androidx.startup.first_library" } diff --git a/startup/integration-tests/second-library/build.gradle b/startup/integration-tests/second-library/build.gradle index 4b353cd42b857..7fd6d0c63f087 100644 --- a/startup/integration-tests/second-library/build.gradle +++ b/startup/integration-tests/second-library/build.gradle @@ -17,8 +17,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -34,6 +32,6 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(35) } namespace = "androidx.startup.second_library" } diff --git a/startup/integration-tests/test-app/build.gradle b/startup/integration-tests/test-app/build.gradle index b648d31aea2df..f13bda56e8b70 100644 --- a/startup/integration-tests/test-app/build.gradle +++ b/startup/integration-tests/test-app/build.gradle @@ -17,12 +17,10 @@ plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { - compileSdk = 35 + compileSdk { version = release(35) } buildTypes { getByName("release") { minifyEnabled = true diff --git a/startup/startup-runtime/build.gradle b/startup/startup-runtime/build.gradle index 7d2747d09d934..1d7b657f4908b 100644 --- a/startup/startup-runtime/build.gradle +++ b/startup/startup-runtime/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { diff --git a/swiperefreshlayout/swiperefreshlayout/build.gradle b/swiperefreshlayout/swiperefreshlayout/build.gradle index 6cf7820b10a64..f4ed2b3da23a2 100644 --- a/swiperefreshlayout/swiperefreshlayout/build.gradle +++ b/swiperefreshlayout/swiperefreshlayout/build.gradle @@ -39,6 +39,6 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(35) } namespace = "androidx.swiperefreshlayout" } diff --git a/test/ext/junit-gtest/build.gradle b/test/ext/junit-gtest/build.gradle index 98ccd3d3e5295..422b112f5c828 100644 --- a/test/ext/junit-gtest/build.gradle +++ b/test/ext/junit-gtest/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/test/integration-tests/junit-gtest-test/build.gradle b/test/integration-tests/junit-gtest-test/build.gradle index 6d8f0d0c3a77e..b0d57d9debe01 100644 --- a/test/integration-tests/junit-gtest-test/build.gradle +++ b/test/integration-tests/junit-gtest-test/build.gradle @@ -26,8 +26,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/test/screenshot/screenshot/build.gradle b/test/screenshot/screenshot/build.gradle index 886e6c5f045f2..5f6436c83c8de 100644 --- a/test/screenshot/screenshot/build.gradle +++ b/test/screenshot/screenshot/build.gradle @@ -26,8 +26,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } BundleInsideHelper.forInsideAar( diff --git a/test/uiautomator/integration-tests/testapp/build.gradle b/test/uiautomator/integration-tests/testapp/build.gradle index 46ad589b2090f..22eb0586316de 100644 --- a/test/uiautomator/integration-tests/testapp/build.gradle +++ b/test/uiautomator/integration-tests/testapp/build.gradle @@ -17,8 +17,6 @@ plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("AndroidXComposePlugin") } @@ -47,12 +45,12 @@ dependencies { // Align dependencies in debugRuntimeClasspath and debugAndroidTestRuntimeClasspath. - androidTestImplementation(project(":lifecycle:lifecycle-common")) + androidTestImplementation("androidx.lifecycle:lifecycle-common:2.9.4") androidTestImplementation(libs.junit) androidTestImplementation(libs.testMonitor) } android { - compileSdk = 36 + compileSdk { version = release(37) } namespace = "androidx.test.uiautomator.testapp" } diff --git a/test/uiautomator/uiautomator/build.gradle b/test/uiautomator/uiautomator/build.gradle index eb414fa71279b..8c056fcb8f486 100644 --- a/test/uiautomator/uiautomator/build.gradle +++ b/test/uiautomator/uiautomator/build.gradle @@ -24,8 +24,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("com.android.library") } diff --git a/testutils/testutils-appcompat/build.gradle b/testutils/testutils-appcompat/build.gradle index b91a0ae85a39f..5fa313770f60e 100644 --- a/testutils/testutils-appcompat/build.gradle +++ b/testutils/testutils-appcompat/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/testutils/testutils-appfunctions/build.gradle b/testutils/testutils-appfunctions/build.gradle index 4a25718c02049..4aa7cd7caba23 100644 --- a/testutils/testutils-appfunctions/build.gradle +++ b/testutils/testutils-appfunctions/build.gradle @@ -26,8 +26,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("com.android.legacy-kapt") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -39,7 +37,7 @@ dependencies { android { namespace = "androidx.testutils.appfunctions" - compileSdk = 36 + compileSdk { version = release(36) } } androidx { diff --git a/testutils/testutils-benchmark-macro/build.gradle b/testutils/testutils-benchmark-macro/build.gradle index 93bc0a0f78729..eb35355d1472b 100644 --- a/testutils/testutils-benchmark-macro/build.gradle +++ b/testutils/testutils-benchmark-macro/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/testutils/testutils-espresso/build.gradle b/testutils/testutils-espresso/build.gradle index 2f93ed7994043..3c1dc17d7c22c 100644 --- a/testutils/testutils-espresso/build.gradle +++ b/testutils/testutils-espresso/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/testutils/testutils-mockito/build.gradle b/testutils/testutils-mockito/build.gradle index 4ef88e3aa227c..31f9b02fd3a41 100644 --- a/testutils/testutils-mockito/build.gradle +++ b/testutils/testutils-mockito/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/testutils/testutils-runtime/build.gradle b/testutils/testutils-runtime/build.gradle index 5dfca0c447b01..8ff27dbca9db1 100644 --- a/testutils/testutils-runtime/build.gradle +++ b/testutils/testutils-runtime/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/text/text-vertical/build.gradle b/text/text-vertical/build.gradle index 6fb7bda60e3e7..415f98da771fe 100644 --- a/text/text-vertical/build.gradle +++ b/text/text-vertical/build.gradle @@ -26,8 +26,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -49,11 +47,7 @@ dependencies { android { namespace = "androidx.text.vertical" - - defaultConfig { - minSdk = 23 - } - compileSdk = 36 + compileSdk { version = release(36) } } androidx { diff --git a/text/text-vertical/testapp/build.gradle b/text/text-vertical/testapp/build.gradle index c116d6756b796..13719c472bd6f 100644 --- a/text/text-vertical/testapp/build.gradle +++ b/text/text-vertical/testapp/build.gradle @@ -42,5 +42,5 @@ androidx { android { namespace = "androidx.text.vertical.testapp" - compileSdk = 37 + compileSdk { version = release(37) } } \ No newline at end of file diff --git a/tracing/benchmark/build.gradle b/tracing/benchmark/build.gradle index c5a8f9eb99d07..458117628042a 100644 --- a/tracing/benchmark/build.gradle +++ b/tracing/benchmark/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("androidx.benchmark") } diff --git a/tracing/tracing-ktx/build.gradle b/tracing/tracing-ktx/build.gradle index f8b0ddeadff4b..8c7cb25f77e18 100644 --- a/tracing/tracing-ktx/build.gradle +++ b/tracing/tracing-ktx/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/tracing/tracing-perfetto-binary/build.gradle b/tracing/tracing-perfetto-binary/build.gradle index 30b9948fb4d5c..f435166d1c374 100644 --- a/tracing/tracing-perfetto-binary/build.gradle +++ b/tracing/tracing-perfetto-binary/build.gradle @@ -26,8 +26,6 @@ import androidx.build.AndroidXConfig plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } /** diff --git a/tracing/tracing-perfetto/build.gradle b/tracing/tracing-perfetto/build.gradle index bc9a6db2333cc..9b21db0f10d02 100644 --- a/tracing/tracing-perfetto/build.gradle +++ b/tracing/tracing-perfetto/build.gradle @@ -27,8 +27,6 @@ import com.android.build.api.variant.HasUnitTest plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } androidComponents { diff --git a/transition/transition-ktx/build.gradle b/transition/transition-ktx/build.gradle index 370a9a3b8ddb9..690d039adb4f9 100644 --- a/transition/transition-ktx/build.gradle +++ b/transition/transition-ktx/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -42,5 +40,5 @@ androidx { android { namespace = "androidx.transition.ktx" - compileSdk = 35 + compileSdk { version = release(35) } } diff --git a/transition/transition/build.gradle b/transition/transition/build.gradle index 9503ca83a5817..b746d42e7dd19 100644 --- a/transition/transition/build.gradle +++ b/transition/transition/build.gradle @@ -9,8 +9,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -37,7 +35,7 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(35) } aaptOptions { additionalParameters "--no-version-transitions" } diff --git a/tv/integration-tests/macrobenchmark-target/build.gradle b/tv/integration-tests/macrobenchmark-target/build.gradle index 7c8ad385ed940..8f903c05648b1 100644 --- a/tv/integration-tests/macrobenchmark-target/build.gradle +++ b/tv/integration-tests/macrobenchmark-target/build.gradle @@ -18,17 +18,15 @@ plugins { id("AndroidXPlugin") id("com.android.application") id("AndroidXComposePlugin") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.tv.integration.macrobenchmark.target" defaultConfig { - minSdk = 28 + minSdk { version = release(28) } } buildTypes { diff --git a/tv/integration-tests/macrobenchmark/build.gradle b/tv/integration-tests/macrobenchmark/build.gradle index e27d6a617aa5d..921e0901b0159 100644 --- a/tv/integration-tests/macrobenchmark/build.gradle +++ b/tv/integration-tests/macrobenchmark/build.gradle @@ -17,15 +17,13 @@ plugins { id("AndroidXPlugin") id("com.android.test") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { namespace = "androidx.tv.integration.macrobenchmark" defaultConfig { - minSdk = 24 + minSdk { version = release(24) } } buildTypes { diff --git a/tv/integration-tests/playground/build.gradle b/tv/integration-tests/playground/build.gradle index 737e5048ca053..28275515363e8 100644 --- a/tv/integration-tests/playground/build.gradle +++ b/tv/integration-tests/playground/build.gradle @@ -26,8 +26,6 @@ plugins { id("AndroidXPlugin") id("com.android.application") id("AndroidXComposePlugin") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -47,9 +45,9 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(37) } defaultConfig { - minSdk = 28 + minSdk { version = release(28) } } buildTypes { diff --git a/tv/tv-foundation/build.gradle b/tv/tv-foundation/build.gradle index c96ec89af31d0..9cc9fb2705e6b 100644 --- a/tv/tv-foundation/build.gradle +++ b/tv/tv-foundation/build.gradle @@ -28,8 +28,6 @@ plugins { id("AndroidXPlugin") id("AndroidXComposePlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -52,7 +50,7 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.tv.foundation" } diff --git a/tv/tv-material/build.gradle b/tv/tv-material/build.gradle index 18d4c21aea549..6c9befdb4b45e 100644 --- a/tv/tv-material/build.gradle +++ b/tv/tv-material/build.gradle @@ -28,8 +28,6 @@ plugins { id("AndroidXPlugin") id("AndroidXComposePlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -59,7 +57,7 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.tv.material" } diff --git a/tv/tv-material/samples/build.gradle b/tv/tv-material/samples/build.gradle index d571c971a0d7e..d0738a5d58118 100644 --- a/tv/tv-material/samples/build.gradle +++ b/tv/tv-material/samples/build.gradle @@ -27,8 +27,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -47,9 +45,9 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(37) } defaultConfig { - minSdk = 28 + minSdk { version = release(28) } } namespace = "androidx.tv.material3.samples" } diff --git a/vectordrawable/integration-tests/testapp/build.gradle b/vectordrawable/integration-tests/testapp/build.gradle index 1725a8e77e3ea..db2b37138c4b8 100644 --- a/vectordrawable/integration-tests/testapp/build.gradle +++ b/vectordrawable/integration-tests/testapp/build.gradle @@ -29,7 +29,7 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(35) } defaultConfig { vectorDrawables.useSupportLibrary = true } diff --git a/viewpager2/integration-tests/targetsdk-tests/build.gradle b/viewpager2/integration-tests/targetsdk-tests/build.gradle deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/viewpager2/integration-tests/testapp/build.gradle b/viewpager2/integration-tests/testapp/build.gradle index 3783885cc302e..5a502e1525443 100644 --- a/viewpager2/integration-tests/testapp/build.gradle +++ b/viewpager2/integration-tests/testapp/build.gradle @@ -17,8 +17,6 @@ plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -40,6 +38,6 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(35) } namespace = "androidx.viewpager2.integration.testapp" } diff --git a/viewpager2/viewpager2/build.gradle b/viewpager2/viewpager2/build.gradle index cbe10fb8272a8..7689ddda5ce13 100644 --- a/viewpager2/viewpager2/build.gradle +++ b/viewpager2/viewpager2/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/wear/benchmark/integration-tests/macrobenchmark-target/build.gradle b/wear/benchmark/integration-tests/macrobenchmark-target/build.gradle index 0e8a069366a98..b5a7f6c7a11bf 100644 --- a/wear/benchmark/integration-tests/macrobenchmark-target/build.gradle +++ b/wear/benchmark/integration-tests/macrobenchmark-target/build.gradle @@ -17,14 +17,12 @@ plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { - compileSdk = 35 + compileSdk { version = release(35) } defaultConfig { - minSdk = 28 + minSdk { version = release(28) } } buildTypes { diff --git a/wear/benchmark/integration-tests/macrobenchmark/build.gradle b/wear/benchmark/integration-tests/macrobenchmark/build.gradle index 2ea59d9a967aa..54ffe9be5f6a8 100644 --- a/wear/benchmark/integration-tests/macrobenchmark/build.gradle +++ b/wear/benchmark/integration-tests/macrobenchmark/build.gradle @@ -17,13 +17,11 @@ plugins { id("AndroidXPlugin") id("com.android.test") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { defaultConfig { - minSdk = 29 + minSdk { version = release(29) } } namespace = "androidx.wear.benchmark.integration.macrobenchmark" targetProjectPath = ":wear:benchmark:integration-tests:macrobenchmark-target" diff --git a/wear/compose/compose-foundation/benchmark/build.gradle b/wear/compose/compose-foundation/benchmark/build.gradle index 2bc5337ee4bc2..b6d182b5e77f7 100644 --- a/wear/compose/compose-foundation/benchmark/build.gradle +++ b/wear/compose/compose-foundation/benchmark/build.gradle @@ -27,16 +27,14 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("androidx.benchmark") } android { - compileSdk = 35 + compileSdk { version = release(37) } defaultConfig { - minSdk = 25 + minSdk { version = release(25) } } namespace = "androidx.wear.compose.foundation.benchmark" } diff --git a/wear/compose/compose-foundation/build.gradle b/wear/compose/compose-foundation/build.gradle index 62b08902611a7..5f19f5d8629bc 100644 --- a/wear/compose/compose-foundation/build.gradle +++ b/wear/compose/compose-foundation/build.gradle @@ -28,8 +28,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -73,9 +71,9 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(37) } defaultConfig { - minSdk = 25 + minSdk { version = release(25) } } namespace = "androidx.wear.compose.foundation" } diff --git a/wear/compose/compose-foundation/samples/build.gradle b/wear/compose/compose-foundation/samples/build.gradle index f12b64e08859f..b8389ec8bb3ab 100644 --- a/wear/compose/compose-foundation/samples/build.gradle +++ b/wear/compose/compose-foundation/samples/build.gradle @@ -27,8 +27,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -49,10 +47,10 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(37) } defaultConfig { - minSdk = 25 + minSdk { version = release(25) } } namespace = "androidx.wear.compose.foundation.samples" } diff --git a/wear/compose/compose-material-core/build.gradle b/wear/compose/compose-material-core/build.gradle index 8676cc95b6cdb..cc29e2d96616d 100644 --- a/wear/compose/compose-material-core/build.gradle +++ b/wear/compose/compose-material-core/build.gradle @@ -29,8 +29,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -58,10 +56,10 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(37) } defaultConfig { - minSdk = 25 + minSdk { version = release(25) } } namespace = "androidx.wear.compose.material.core" } diff --git a/wear/compose/compose-material/benchmark/build.gradle b/wear/compose/compose-material/benchmark/build.gradle index e156a19760c1d..4879e82822023 100644 --- a/wear/compose/compose-material/benchmark/build.gradle +++ b/wear/compose/compose-material/benchmark/build.gradle @@ -27,16 +27,14 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("androidx.benchmark") } android { - compileSdk = 35 + compileSdk { version = release(37) } defaultConfig { - minSdk = 25 + minSdk { version = release(25) } } namespace = "androidx.wear.compose.material.benchmark" } diff --git a/wear/compose/compose-material/build.gradle b/wear/compose/compose-material/build.gradle index 8336305ad52f0..3c38704b756e3 100644 --- a/wear/compose/compose-material/build.gradle +++ b/wear/compose/compose-material/build.gradle @@ -27,8 +27,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -62,10 +60,10 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(37) } defaultConfig { - minSdk = 25 + minSdk { version = release(25) } } namespace = "androidx.wear.compose.material" } diff --git a/wear/compose/compose-material/samples/build.gradle b/wear/compose/compose-material/samples/build.gradle index 88e980a7344c6..cd8ab94ed214c 100644 --- a/wear/compose/compose-material/samples/build.gradle +++ b/wear/compose/compose-material/samples/build.gradle @@ -27,8 +27,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -57,10 +55,10 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(37) } defaultConfig { - minSdk = 25 + minSdk { version = release(25) } } namespace = "androidx.wear.compose.material.samples" } diff --git a/wear/compose/compose-material3/benchmark/build.gradle b/wear/compose/compose-material3/benchmark/build.gradle index 16ebf76b06c02..a73d18828e5bb 100644 --- a/wear/compose/compose-material3/benchmark/build.gradle +++ b/wear/compose/compose-material3/benchmark/build.gradle @@ -27,16 +27,14 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("androidx.benchmark") } android { - compileSdk = 35 + compileSdk { version = release(37) } defaultConfig { - minSdk = 25 + minSdk { version = release(25) } } namespace = "androidx.wear.compose.material3.benchmark" } diff --git a/wear/compose/compose-material3/build.gradle b/wear/compose/compose-material3/build.gradle index a7025db90b3a3..c29a8cf6f7f4e 100644 --- a/wear/compose/compose-material3/build.gradle +++ b/wear/compose/compose-material3/build.gradle @@ -28,8 +28,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -74,9 +72,9 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(37) } defaultConfig { - minSdk = 25 + minSdk { version = release(25) } } testOptions.unitTests.returnDefaultValues = true namespace = "androidx.wear.compose.material3" diff --git a/wear/compose/compose-material3/integration-tests/build.gradle b/wear/compose/compose-material3/integration-tests/build.gradle index 0b7f66a9879ac..095b2fe6872c4 100644 --- a/wear/compose/compose-material3/integration-tests/build.gradle +++ b/wear/compose/compose-material3/integration-tests/build.gradle @@ -27,8 +27,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -55,9 +53,9 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(37) } defaultConfig { - minSdk = 25 + minSdk { version = release(25) } } aaptOptions { noCompress "ttf" diff --git a/wear/compose/compose-material3/macrobenchmark-common/build.gradle b/wear/compose/compose-material3/macrobenchmark-common/build.gradle index 3781854e95fa2..217b8e6dca89d 100644 --- a/wear/compose/compose-material3/macrobenchmark-common/build.gradle +++ b/wear/compose/compose-material3/macrobenchmark-common/build.gradle @@ -3,16 +3,14 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { namespace = "androidx.wear.compose.material3.macrobenchmark.common" - compileSdk = 35 + compileSdk { version = release(37) } defaultConfig { - minSdk = 25 + minSdk { version = release(25) } } } diff --git a/wear/compose/compose-material3/macrobenchmark-target/build.gradle b/wear/compose/compose-material3/macrobenchmark-target/build.gradle index e64a1362bc683..5bb9440eb7be7 100644 --- a/wear/compose/compose-material3/macrobenchmark-target/build.gradle +++ b/wear/compose/compose-material3/macrobenchmark-target/build.gradle @@ -19,15 +19,13 @@ plugins { id("AndroidXPlugin") id("AndroidXComposePlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.wear.compose.material3.macrobenchmark.target" - defaultConfig.minSdk = 25 + defaultConfig.minSdk { version = release(25) } buildTypes { release { minifyEnabled = true diff --git a/wear/compose/compose-material3/macrobenchmark/build.gradle b/wear/compose/compose-material3/macrobenchmark/build.gradle index 44da4f30c13e8..63c8edc05fe7e 100644 --- a/wear/compose/compose-material3/macrobenchmark/build.gradle +++ b/wear/compose/compose-material3/macrobenchmark/build.gradle @@ -18,14 +18,12 @@ plugins { id("AndroidXPlugin") id("com.android.test") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { - compileSdk = 35 + compileSdk { version = release(37) } defaultConfig { - minSdk = 29 + minSdk { version = release(29) } } namespace = "androidx.wear.compose.material3.macrobenchmark" targetProjectPath = ":wear:compose:compose-material3-macrobenchmark-target" diff --git a/wear/compose/compose-material3/samples/build.gradle b/wear/compose/compose-material3/samples/build.gradle index ab82128afd8e6..800eb9ba4c3db 100644 --- a/wear/compose/compose-material3/samples/build.gradle +++ b/wear/compose/compose-material3/samples/build.gradle @@ -27,8 +27,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -51,9 +49,9 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(37) } defaultConfig { - minSdk = 25 + minSdk { version = release(25) } } namespace = "androidx.wear.compose.material3.samples" } diff --git a/wear/compose/compose-navigation/build.gradle b/wear/compose/compose-navigation/build.gradle index 04cbcc59e6edc..61217756b7223 100644 --- a/wear/compose/compose-navigation/build.gradle +++ b/wear/compose/compose-navigation/build.gradle @@ -27,8 +27,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -55,10 +53,10 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(37) } defaultConfig { - minSdk = 25 + minSdk { version = release(25) } } namespace = "androidx.wear.compose.navigation" } diff --git a/wear/compose/compose-navigation/samples/build.gradle b/wear/compose/compose-navigation/samples/build.gradle index 6dc759ff1b7f0..1598e038c8698 100644 --- a/wear/compose/compose-navigation/samples/build.gradle +++ b/wear/compose/compose-navigation/samples/build.gradle @@ -27,8 +27,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -49,10 +47,10 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(37) } defaultConfig { - minSdk = 25 + minSdk { version = release(25) } } namespace = "androidx.wear.compose.navigation.samples" } diff --git a/wear/compose/compose-navigation3/build.gradle b/wear/compose/compose-navigation3/build.gradle index c02194d13e9d2..d75630716e429 100644 --- a/wear/compose/compose-navigation3/build.gradle +++ b/wear/compose/compose-navigation3/build.gradle @@ -50,10 +50,10 @@ dependencies { } android { - compileSdk = 36 + compileSdk { version = release(37) } defaultConfig { - minSdk = 25 + minSdk { version = release(25) } } namespace = "androidx.wear.compose.navigation3" } diff --git a/wear/compose/compose-navigation3/integration-tests/build.gradle b/wear/compose/compose-navigation3/integration-tests/build.gradle index 19933b72b717f..92426c553a458 100644 --- a/wear/compose/compose-navigation3/integration-tests/build.gradle +++ b/wear/compose/compose-navigation3/integration-tests/build.gradle @@ -24,9 +24,9 @@ plugins { } android { - compileSdk = 36 + compileSdk { version = release(37) } defaultConfig { - minSdk = 25 + minSdk { version = release(25) } } namespace = "androidx.wear.compose.navigation3.demos" } diff --git a/wear/compose/compose-navigation3/samples/build.gradle b/wear/compose/compose-navigation3/samples/build.gradle index 264c0229df15f..a132d9ce4660d 100644 --- a/wear/compose/compose-navigation3/samples/build.gradle +++ b/wear/compose/compose-navigation3/samples/build.gradle @@ -50,10 +50,10 @@ dependencies { } android { - compileSdk = 36 + compileSdk { version = release(37) } defaultConfig { - minSdk = 25 + minSdk { version = release(25) } } namespace = "androidx.wear.compose.navigation3.samples" } diff --git a/wear/compose/compose-ui-tooling/build.gradle b/wear/compose/compose-ui-tooling/build.gradle index 6c436b7cff04b..693b9f182cc43 100644 --- a/wear/compose/compose-ui-tooling/build.gradle +++ b/wear/compose/compose-ui-tooling/build.gradle @@ -26,8 +26,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("AndroidXComposePlugin") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("com.android.library") } diff --git a/wear/compose/integration-tests/demos/build.gradle b/wear/compose/integration-tests/demos/build.gradle index 2355f422a6246..66ffae07fe7ee 100644 --- a/wear/compose/integration-tests/demos/build.gradle +++ b/wear/compose/integration-tests/demos/build.gradle @@ -19,12 +19,10 @@ plugins { id("AndroidXPlugin") id("AndroidXComposePlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { - compileSdk = 36 + compileSdk { version = release(37) } defaultConfig { applicationId = "androidx.wear.compose.integration.demos" minSdk { version = release(25) } diff --git a/wear/compose/integration-tests/demos/common/build.gradle b/wear/compose/integration-tests/demos/common/build.gradle index 0abc438645361..35747ff48af24 100644 --- a/wear/compose/integration-tests/demos/common/build.gradle +++ b/wear/compose/integration-tests/demos/common/build.gradle @@ -19,8 +19,6 @@ plugins { id("AndroidXPlugin") id("AndroidXComposePlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -31,9 +29,9 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(37) } defaultConfig { - minSdk = 25 + minSdk { version = release(25) } } namespace = "androidx.wear.compose.integration.demos.common" } diff --git a/wear/compose/integration-tests/macrobenchmark-target/build.gradle b/wear/compose/integration-tests/macrobenchmark-target/build.gradle index 2adfe4e9d7e03..9dee9a8b74f68 100644 --- a/wear/compose/integration-tests/macrobenchmark-target/build.gradle +++ b/wear/compose/integration-tests/macrobenchmark-target/build.gradle @@ -19,15 +19,13 @@ plugins { id("AndroidXPlugin") id("AndroidXComposePlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.wear.compose.integration.macrobenchmark.target" - defaultConfig.minSdk = 25 + defaultConfig.minSdk { version = release(25) } buildTypes { release { minifyEnabled = true diff --git a/wear/compose/integration-tests/macrobenchmark/build.gradle b/wear/compose/integration-tests/macrobenchmark/build.gradle index 9bc5d3b8f3b15..1a4b350aa8076 100644 --- a/wear/compose/integration-tests/macrobenchmark/build.gradle +++ b/wear/compose/integration-tests/macrobenchmark/build.gradle @@ -18,14 +18,12 @@ plugins { id("AndroidXPlugin") id("com.android.test") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { - compileSdk = 35 + compileSdk { version = release(37) } defaultConfig { - minSdk = 29 + minSdk { version = release(29) } } namespace = "androidx.wear.compose.integration.macrobenchmark" targetProjectPath = ":wear:compose:integration-tests:macrobenchmark-target" diff --git a/wear/compose/integration-tests/navigation/build.gradle b/wear/compose/integration-tests/navigation/build.gradle index 594f5b17577c9..eed18c959f1d3 100644 --- a/wear/compose/integration-tests/navigation/build.gradle +++ b/wear/compose/integration-tests/navigation/build.gradle @@ -19,15 +19,13 @@ plugins { id("AndroidXPlugin") id("AndroidXComposePlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { - compileSdk = 35 + compileSdk { version = release(37) } defaultConfig { applicationId = "androidx.wear.compose.integration.navigation" - minSdk = 25 + minSdk { version = release(25) } } buildTypes { diff --git a/wear/compose/remote/integration-tests/demos/build.gradle b/wear/compose/remote/integration-tests/demos/build.gradle index 1122030befaba..a68a3944025bf 100644 --- a/wear/compose/remote/integration-tests/demos/build.gradle +++ b/wear/compose/remote/integration-tests/demos/build.gradle @@ -20,10 +20,10 @@ plugins { } android { - compileSdk = 36 + compileSdk { version = release(37) } namespace = "androidx.wear.compose.remote.integration.demos" defaultConfig { - minSdk = 29 + minSdk { version = release(29) } } useLibrary("wear-sdk") } diff --git a/wear/compose/remote/remote-material3/build.gradle b/wear/compose/remote/remote-material3/build.gradle index 44e19016a4597..b84da54f4346b 100644 --- a/wear/compose/remote/remote-material3/build.gradle +++ b/wear/compose/remote/remote-material3/build.gradle @@ -19,8 +19,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("AndroidXComposePlugin") } @@ -35,9 +33,9 @@ androidx { android { namespace = "androidx.wear.compose.remote.material3" - compileSdk = 35 + compileSdk { version = release(37) } defaultConfig { - minSdk = 29 + minSdk { version = release(29) } } } diff --git a/wear/compose/remote/remote-material3/samples/build.gradle b/wear/compose/remote/remote-material3/samples/build.gradle index bb636103340f6..eb26664713a4d 100644 --- a/wear/compose/remote/remote-material3/samples/build.gradle +++ b/wear/compose/remote/remote-material3/samples/build.gradle @@ -41,10 +41,10 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(37) } defaultConfig { - minSdk = 29 + minSdk { version = release(29) } } namespace = "androidx.wear.compose.remote.material3.samples" } diff --git a/wear/protolayout/protolayout-expression-pipeline/build.gradle b/wear/protolayout/protolayout-expression-pipeline/build.gradle index 09efbc4222f60..124b060b66240 100644 --- a/wear/protolayout/protolayout-expression-pipeline/build.gradle +++ b/wear/protolayout/protolayout-expression-pipeline/build.gradle @@ -51,7 +51,7 @@ android { namespace = "androidx.wear.protolayout.expression.pipeline" defaultConfig { - minSdk = 26 + minSdk { version = release(26) } } } diff --git a/wear/protolayout/protolayout-expression/build.gradle b/wear/protolayout/protolayout-expression/build.gradle index 536f706e8f071..b88fa0e31e58b 100644 --- a/wear/protolayout/protolayout-expression/build.gradle +++ b/wear/protolayout/protolayout-expression/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -52,7 +50,7 @@ dependencies { android { namespace = "androidx.wear.protolayout.expression" defaultConfig { - minSdk = 26 + minSdk { version = release(26) } } } diff --git a/wear/protolayout/protolayout-material-core/build.gradle b/wear/protolayout/protolayout-material-core/build.gradle index 181b635ca2490..cb519d6ebef73 100644 --- a/wear/protolayout/protolayout-material-core/build.gradle +++ b/wear/protolayout/protolayout-material-core/build.gradle @@ -25,13 +25,11 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { defaultConfig { - minSdk = 26 + minSdk { version = release(26) } } namespace = "androidx.wear.protolayout.materialcore" } diff --git a/wear/protolayout/protolayout-material/build.gradle b/wear/protolayout/protolayout-material/build.gradle index 835b5ce14373d..0df23ab5c62fa 100644 --- a/wear/protolayout/protolayout-material/build.gradle +++ b/wear/protolayout/protolayout-material/build.gradle @@ -24,8 +24,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("com.android.library") } @@ -62,7 +60,7 @@ dependencies { android { defaultConfig { - minSdk = 26 + minSdk { version = release(26) } } namespace = "androidx.wear.protolayout.material" } diff --git a/wear/protolayout/protolayout-material3/build.gradle b/wear/protolayout/protolayout-material3/build.gradle index 70fec99f13858..936293fe69850 100644 --- a/wear/protolayout/protolayout-material3/build.gradle +++ b/wear/protolayout/protolayout-material3/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -64,10 +62,10 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(35) } defaultConfig { - minSdk = 26 + minSdk { version = release(26) } } namespace = "androidx.wear.protolayout.material3" } diff --git a/wear/protolayout/protolayout-material3/samples/build.gradle b/wear/protolayout/protolayout-material3/samples/build.gradle index 0076b2feb2166..b2d319dcfe4d9 100644 --- a/wear/protolayout/protolayout-material3/samples/build.gradle +++ b/wear/protolayout/protolayout-material3/samples/build.gradle @@ -19,8 +19,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -29,10 +27,10 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(35) } defaultConfig { - minSdk = 26 + minSdk { version = release(26) } } namespace = "androidx.wear.protolayout.material3.samples" diff --git a/wear/protolayout/protolayout-renderer/build.gradle b/wear/protolayout/protolayout-renderer/build.gradle index c6075197a1915..dd193d94c407a 100644 --- a/wear/protolayout/protolayout-renderer/build.gradle +++ b/wear/protolayout/protolayout-renderer/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -63,7 +61,7 @@ android { namespace = "androidx.wear.protolayout.renderer" defaultConfig { - minSdk = 26 + minSdk { version = release(26) } } } diff --git a/wear/protolayout/protolayout-testing/build.gradle b/wear/protolayout/protolayout-testing/build.gradle index 35fde6107cfee..69b231c556fd8 100644 --- a/wear/protolayout/protolayout-testing/build.gradle +++ b/wear/protolayout/protolayout-testing/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -45,7 +43,7 @@ dependencies { android { defaultConfig { - minSdk = 26 + minSdk { version = release(26) } } namespace = "androidx.wear.protolayout.testing" } diff --git a/wear/protolayout/protolayout/build.gradle b/wear/protolayout/protolayout/build.gradle index 134325730e572..3517330c220ea 100644 --- a/wear/protolayout/protolayout/build.gradle +++ b/wear/protolayout/protolayout/build.gradle @@ -24,8 +24,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("com.android.library") } @@ -54,7 +52,7 @@ dependencies { android { namespace = "androidx.wear.protolayout" defaultConfig { - minSdk = 26 + minSdk { version = release(26) } } } diff --git a/wear/tiles/tiles-material/build.gradle b/wear/tiles/tiles-material/build.gradle index d945d956f42bf..2ff3975780af9 100644 --- a/wear/tiles/tiles-material/build.gradle +++ b/wear/tiles/tiles-material/build.gradle @@ -24,8 +24,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("com.android.library") } @@ -47,10 +45,10 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(35) } defaultConfig { - minSdk = 26 + minSdk { version = release(26) } } namespace = "androidx.wear.tiles.material" } diff --git a/wear/tiles/tiles-renderer/build.gradle b/wear/tiles/tiles-renderer/build.gradle index df32a157d33b4..b0ea4a44b30e9 100644 --- a/wear/tiles/tiles-renderer/build.gradle +++ b/wear/tiles/tiles-renderer/build.gradle @@ -26,8 +26,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("com.google.protobuf") } @@ -67,10 +65,10 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(35) } defaultConfig { - minSdk = 26 + minSdk { version = release(26) } } namespace = "androidx.wear.tiles.renderer" } diff --git a/wear/tiles/tiles-samples/build.gradle b/wear/tiles/tiles-samples/build.gradle index aa5996a6b5d2a..cccee598f0720 100644 --- a/wear/tiles/tiles-samples/build.gradle +++ b/wear/tiles/tiles-samples/build.gradle @@ -19,19 +19,17 @@ import androidx.build.SoftwareType plugins { id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("AndroidXComposePlugin") id("AndroidXPlugin") } android { namespace = "androidx.wear.tiles.samples" - compileSdk = 35 + compileSdk { version = release(35) } defaultConfig { applicationId = "androidx.wear.tiles.samples" - minSdk = 30 + minSdk { version = release(30) } } buildTypes { diff --git a/wear/tiles/tiles-testing/build.gradle b/wear/tiles/tiles-testing/build.gradle index 4bbd4eeb41c09..293f3fd820ac0 100644 --- a/wear/tiles/tiles-testing/build.gradle +++ b/wear/tiles/tiles-testing/build.gradle @@ -25,9 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") - id("com.google.protobuf") } dependencies { @@ -50,10 +47,10 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(35) } defaultConfig { - minSdk = 26 + minSdk { version = release(26) } } namespace = "androidx.wear.tiles.testing" diff --git a/wear/tiles/tiles-tooling-preview/build.gradle b/wear/tiles/tiles-tooling-preview/build.gradle index 72f05fc29175d..5eaf7ff525518 100644 --- a/wear/tiles/tiles-tooling-preview/build.gradle +++ b/wear/tiles/tiles-tooling-preview/build.gradle @@ -24,8 +24,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("com.android.library") } @@ -40,10 +38,10 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(35) } defaultConfig { - minSdk = 26 + minSdk { version = release(26) } } namespace = "androidx.wear.tiles.tooling.preview" } diff --git a/wear/tiles/tiles-tooling/build.gradle b/wear/tiles/tiles-tooling/build.gradle index 8f7444d32b6ba..8db6b4548efd9 100644 --- a/wear/tiles/tiles-tooling/build.gradle +++ b/wear/tiles/tiles-tooling/build.gradle @@ -10,8 +10,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -37,10 +35,10 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(35) } defaultConfig { - minSdk = 26 + minSdk { version = release(26) } } namespace = "androidx.wear.tiles.tooling" diff --git a/wear/tiles/tiles/build.gradle b/wear/tiles/tiles/build.gradle index dad0403c70657..77d6f149a1305 100644 --- a/wear/tiles/tiles/build.gradle +++ b/wear/tiles/tiles/build.gradle @@ -56,10 +56,10 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(35) } defaultConfig { - minSdk = 26 + minSdk { version = release(26) } } buildFeatures { aidl = true diff --git a/wear/tiles/tiles/snippet-samples/build.gradle b/wear/tiles/tiles/snippet-samples/build.gradle index 7eb5505344faf..d4c19a3a44ac6 100644 --- a/wear/tiles/tiles/snippet-samples/build.gradle +++ b/wear/tiles/tiles/snippet-samples/build.gradle @@ -28,10 +28,10 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(35) } defaultConfig { - minSdk = 26 + minSdk { version = release(26) } } namespace = "androidx.wear.tiles.snippet_samples" diff --git a/wear/watchface/watchface-complications-data-source-ktx/build.gradle b/wear/watchface/watchface-complications-data-source-ktx/build.gradle index a987249e48ceb..e6ba42c0ae9e9 100644 --- a/wear/watchface/watchface-complications-data-source-ktx/build.gradle +++ b/wear/watchface/watchface-complications-data-source-ktx/build.gradle @@ -18,8 +18,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -34,7 +32,7 @@ dependencies { android { defaultConfig { - minSdk = 26 + minSdk { version = release(26) } } namespace = "androidx.wear.watchface.complications.datasource.ktx" } diff --git a/wear/watchface/watchface-complications-data-source-samples/build.gradle b/wear/watchface/watchface-complications-data-source-samples/build.gradle index f05ca3259dc70..757ee2eae3248 100644 --- a/wear/watchface/watchface-complications-data-source-samples/build.gradle +++ b/wear/watchface/watchface-complications-data-source-samples/build.gradle @@ -17,8 +17,6 @@ plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -30,7 +28,7 @@ dependencies { android { defaultConfig { - minSdk = 29 + minSdk { version = release(29) } } buildTypes { diff --git a/wear/watchface/watchface-complications-data-source/build.gradle b/wear/watchface/watchface-complications-data-source/build.gradle index b17dd8941ec19..c0a1395e9d9e7 100644 --- a/wear/watchface/watchface-complications-data-source/build.gradle +++ b/wear/watchface/watchface-complications-data-source/build.gradle @@ -26,8 +26,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -57,7 +55,7 @@ android { aidl = true } defaultConfig { - minSdk = 26 + minSdk { version = release(26) } } namespace = "androidx.wear.watchface.complications.datasource" } diff --git a/wear/watchface/watchface-complications-data/build.gradle b/wear/watchface/watchface-complications-data/build.gradle index d3c8e47faec8b..143438d67a95a 100644 --- a/wear/watchface/watchface-complications-data/build.gradle +++ b/wear/watchface/watchface-complications-data/build.gradle @@ -26,8 +26,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -62,7 +60,7 @@ android { aidl = true } defaultConfig { - minSdk = 26 + minSdk { version = release(26) } } namespace = "androidx.wear.watchface.complications.data" } diff --git a/wear/watchface/watchface-complications-permission-dialogs-sample/build.gradle b/wear/watchface/watchface-complications-permission-dialogs-sample/build.gradle index 1be47e9d27572..b185885c1f14b 100644 --- a/wear/watchface/watchface-complications-permission-dialogs-sample/build.gradle +++ b/wear/watchface/watchface-complications-permission-dialogs-sample/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -35,7 +33,7 @@ dependencies { android { defaultConfig { - minSdk = 26 + minSdk { version = release(26) } } namespace = "androidx.wear.watchface.complications.permission.dialogs.sample" } diff --git a/wear/watchface/watchface-complications/build.gradle b/wear/watchface/watchface-complications/build.gradle index 623df240a5e7d..10e312638af5a 100644 --- a/wear/watchface/watchface-complications/build.gradle +++ b/wear/watchface/watchface-complications/build.gradle @@ -26,8 +26,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -54,7 +52,7 @@ android { aidl = true } defaultConfig { - minSdk = 26 + minSdk { version = release(26) } } namespace = "androidx.wear.watchface.complications" } diff --git a/wear/watchfacepush/watchfacepush/build.gradle b/wear/watchfacepush/watchfacepush/build.gradle index 0290e8e5050dd..ea06b73ee87e8 100644 --- a/wear/watchfacepush/watchfacepush/build.gradle +++ b/wear/watchfacepush/watchfacepush/build.gradle @@ -19,8 +19,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -39,8 +37,8 @@ dependencies { android { namespace = "androidx.wear.watchfacepush" defaultConfig { - minSdk = 33 - compileSdk = 36 + minSdk { version = release(33) } + compileSdk { version = release(36) } } } diff --git a/wear/wear-core/build.gradle b/wear/wear-core/build.gradle index 884da04a7ef28..b2f9531e58a96 100644 --- a/wear/wear-core/build.gradle +++ b/wear/wear-core/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/wear/wear-input-testing/build.gradle b/wear/wear-input-testing/build.gradle index 9a3efe9784b0e..cbdab07a7b99d 100644 --- a/wear/wear-input-testing/build.gradle +++ b/wear/wear-input-testing/build.gradle @@ -35,7 +35,7 @@ dependencies { android { defaultConfig { - minSdk = 25 + minSdk { version = release(25) } } namespace = "androidx.wear.input.testing" } diff --git a/wear/wear-input/build.gradle b/wear/wear-input/build.gradle index 3cfc52af0972d..06bc357bbd225 100644 --- a/wear/wear-input/build.gradle +++ b/wear/wear-input/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -47,7 +45,7 @@ dependencies { android { defaultConfig { - minSdk = 25 + minSdk { version = release(25) } } namespace = "androidx.wear.input" } diff --git a/wear/wear-input/samples/build.gradle b/wear/wear-input/samples/build.gradle index dacfd9f0fe41a..dd21257c887d6 100644 --- a/wear/wear-input/samples/build.gradle +++ b/wear/wear-input/samples/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -38,7 +36,7 @@ dependencies { android { defaultConfig { - minSdk = 25 + minSdk { version = release(25) } } namespace = "androidx.wear.input.samples" } diff --git a/wear/wear-ongoing/build.gradle b/wear/wear-ongoing/build.gradle index ac6c60b94aaf4..e77dd1c010b46 100644 --- a/wear/wear-ongoing/build.gradle +++ b/wear/wear-ongoing/build.gradle @@ -9,8 +9,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -29,7 +27,7 @@ dependencies { android { defaultConfig { - minSdk = 25 + minSdk { version = release(25) } } namespace = "androidx.wear.ongoing" } diff --git a/wear/wear-phone-interactions/build.gradle b/wear/wear-phone-interactions/build.gradle index cb89b71f013f2..d9b1e467b99cf 100644 --- a/wear/wear-phone-interactions/build.gradle +++ b/wear/wear-phone-interactions/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("androidx.stableaidl") } @@ -52,7 +50,7 @@ dependencies { android { defaultConfig { - minSdk = 25 + minSdk { version = release(25) } } buildFeatures { diff --git a/wear/wear-phone-interactions/samples/build.gradle b/wear/wear-phone-interactions/samples/build.gradle index 67901837791c6..7e3aef124dc4a 100644 --- a/wear/wear-phone-interactions/samples/build.gradle +++ b/wear/wear-phone-interactions/samples/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -37,7 +35,7 @@ dependencies { android { defaultConfig { - minSdk = 25 + minSdk { version = release(25) } } namespace = "androidx.wear.phone.interactions.samples" } diff --git a/wear/wear-remote-interactions/build.gradle b/wear/wear-remote-interactions/build.gradle index befdf59c3d311..dd42c197a1707 100644 --- a/wear/wear-remote-interactions/build.gradle +++ b/wear/wear-remote-interactions/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/wear/wear-remote-interactions/samples/build.gradle b/wear/wear-remote-interactions/samples/build.gradle index 6a8a5eea06c59..d0afd4c5db8ff 100644 --- a/wear/wear-remote-interactions/samples/build.gradle +++ b/wear/wear-remote-interactions/samples/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/wear/wear-samples-ambient/build.gradle b/wear/wear-samples-ambient/build.gradle index cac5565bc00fb..57e3f0587ddf2 100644 --- a/wear/wear-samples-ambient/build.gradle +++ b/wear/wear-samples-ambient/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -44,7 +42,7 @@ androidx { android { defaultConfig { - minSdk = 25 + minSdk { version = release(25) } } buildTypes { diff --git a/wear/wear-tooling-preview/build.gradle b/wear/wear-tooling-preview/build.gradle index edcffa58fa6b3..d5d7f36c9e19b 100644 --- a/wear/wear-tooling-preview/build.gradle +++ b/wear/wear-tooling-preview/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/wear/wear/build.gradle b/wear/wear/build.gradle index 529fa2ec42329..1ac970506deba 100644 --- a/wear/wear/build.gradle +++ b/wear/wear/build.gradle @@ -9,8 +9,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/webgpu/webgpu/build.gradle b/webgpu/webgpu/build.gradle index 456b68a168d77..a38e7764113ba 100644 --- a/webgpu/webgpu/build.gradle +++ b/webgpu/webgpu/build.gradle @@ -26,8 +26,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -64,7 +62,7 @@ androidx { android { namespace = "androidx.webgpu" defaultConfig { - minSdk = 24 + minSdk { version = release(24) } } } diff --git a/webkit/integration-tests/testapp/build.gradle b/webkit/integration-tests/testapp/build.gradle index 2e0429b2d5845..72c07d0d7ba88 100644 --- a/webkit/integration-tests/testapp/build.gradle +++ b/webkit/integration-tests/testapp/build.gradle @@ -57,7 +57,10 @@ dependencies { ApkCopyHelperKt.setupAppApkCopy(project, "release") android { - compileSdk = 35 + defaultConfig { + minSdk { version = release(24) } + } + compileSdk { version = release(35) } lint { disable.add("UnusedResources") } diff --git a/webkit/webkit/build.gradle b/webkit/webkit/build.gradle index e8c4c1b6cfe68..00a107386db74 100644 --- a/webkit/webkit/build.gradle +++ b/webkit/webkit/build.gradle @@ -52,7 +52,7 @@ android { ) } // Don't change this value without contacting the WebKit owners. - compileSdk = 33 + compileSdk { version = release(33) } namespace = "androidx.webkit" } diff --git a/window/extensions/core/core/build.gradle b/window/extensions/core/core/build.gradle index 827f6126c81d4..ee3527c2489ee 100644 --- a/window/extensions/core/core/build.gradle +++ b/window/extensions/core/core/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/window/integration-tests/configuration-change-tests/build.gradle b/window/integration-tests/configuration-change-tests/build.gradle index a942fd330781c..5e0f5af3e698a 100644 --- a/window/integration-tests/configuration-change-tests/build.gradle +++ b/window/integration-tests/configuration-change-tests/build.gradle @@ -25,8 +25,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { diff --git a/window/integration-tests/macrobenchmark-target/build.gradle b/window/integration-tests/macrobenchmark-target/build.gradle index 135bbbba55d3e..9bec73e51af0d 100644 --- a/window/integration-tests/macrobenchmark-target/build.gradle +++ b/window/integration-tests/macrobenchmark-target/build.gradle @@ -17,14 +17,12 @@ plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { - compileSdk = 35 + compileSdk { version = release(35) } defaultConfig { - minSdk = 28 + minSdk { version = release(28) } } buildTypes { diff --git a/window/integration-tests/macrobenchmark/build.gradle b/window/integration-tests/macrobenchmark/build.gradle index bb6d3472e9c9f..8ff17dc5f0ecb 100644 --- a/window/integration-tests/macrobenchmark/build.gradle +++ b/window/integration-tests/macrobenchmark/build.gradle @@ -17,13 +17,11 @@ plugins { id("AndroidXPlugin") id("com.android.test") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { defaultConfig { - minSdk = 29 + minSdk { version = release(29) } } namespace = "androidx.window.integration.macrobenchmark" targetProjectPath = ":window:integration-tests:macrobenchmark-target" diff --git a/window/window-core/samples/build.gradle b/window/window-core/samples/build.gradle index c35a329dd142a..e0b2c67dae3f2 100644 --- a/window/window-core/samples/build.gradle +++ b/window/window-core/samples/build.gradle @@ -26,8 +26,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/window/window-demos/demo-common/build.gradle b/window/window-demos/demo-common/build.gradle index d6a619475c432..b36c64f8f3421 100644 --- a/window/window-demos/demo-common/build.gradle +++ b/window/window-demos/demo-common/build.gradle @@ -18,12 +18,10 @@ plugins { id("AndroidXPlugin") id("AndroidXComposePlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { - compileSdk = 35 + compileSdk { version = release(37) } buildFeatures { viewBinding = true } diff --git a/window/window-demos/demo-second-app/build.gradle b/window/window-demos/demo-second-app/build.gradle index d93d9cd0b992d..43ebe5affcf2b 100644 --- a/window/window-demos/demo-second-app/build.gradle +++ b/window/window-demos/demo-second-app/build.gradle @@ -17,12 +17,10 @@ plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { - compileSdk = 35 + compileSdk { version = release(37) } defaultConfig { applicationId = "androidx.window.demo2" } diff --git a/window/window-demos/demo/build.gradle b/window/window-demos/demo/build.gradle index 2bc97bac14eef..33d834dee36a7 100644 --- a/window/window-demos/demo/build.gradle +++ b/window/window-demos/demo/build.gradle @@ -27,12 +27,10 @@ plugins { id("AndroidXPlugin") id("AndroidXComposePlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { - compileSdk = 35 + compileSdk { version = release(37) } defaultConfig { applicationId = "androidx.window.demo" } @@ -102,7 +100,6 @@ dependencies { androidTestImplementation(libs.espressoCore) androidTestImplementation(project(":window:window-testing")) androidTestImplementation(project(":window:window-demos:demo-common")) - androidTestImplementation(project(":savedstate:savedstate-ktx")) coreLibraryDesugaring(libs.desugarJdkLibs) } diff --git a/window/window-java/build.gradle b/window/window-java/build.gradle index 65ad0b35a08ab..e3946f8637365 100644 --- a/window/window-java/build.gradle +++ b/window/window-java/build.gradle @@ -26,8 +26,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/window/window-rxjava2/build.gradle b/window/window-rxjava2/build.gradle index b88458a6750ab..95be6526ed82a 100644 --- a/window/window-rxjava2/build.gradle +++ b/window/window-rxjava2/build.gradle @@ -26,8 +26,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { diff --git a/window/window-rxjava3/build.gradle b/window/window-rxjava3/build.gradle index 19c9e4246b82f..93ad2fbadb9f7 100644 --- a/window/window-rxjava3/build.gradle +++ b/window/window-rxjava3/build.gradle @@ -26,8 +26,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { diff --git a/window/window-testing/build.gradle b/window/window-testing/build.gradle index 34080c1fd1990..7b3f35e87af67 100644 --- a/window/window-testing/build.gradle +++ b/window/window-testing/build.gradle @@ -26,8 +26,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { diff --git a/window/window/build.gradle b/window/window/build.gradle index aef052d0b820d..6cb62de42f922 100644 --- a/window/window/build.gradle +++ b/window/window/build.gradle @@ -28,8 +28,6 @@ import com.android.build.api.variant.HasUnitTest plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { @@ -59,7 +57,7 @@ dependencies { def extensions_core_version = "androidx.window.extensions.core:core:1.0.0" def extensions_version = project(":window:extensions:extensions") - def sidecar_version = project(":window:sidecar:sidecar") + def sidecar_version = "androidx.window.sidecar:sidecar:1.0.0" // A compile only dependency on extensions.core so that other libraries do not expose it // transitively. compileOnly(extensions_core_version) diff --git a/window/window/samples/build.gradle b/window/window/samples/build.gradle index a6c69f95073b7..b3c52bc31a0bb 100644 --- a/window/window/samples/build.gradle +++ b/window/window/samples/build.gradle @@ -26,8 +26,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/work/integration-tests/testapp/build.gradle b/work/integration-tests/testapp/build.gradle index 856d95eb929d1..c1995c049def5 100644 --- a/work/integration-tests/testapp/build.gradle +++ b/work/integration-tests/testapp/build.gradle @@ -17,8 +17,6 @@ plugins { id("AndroidXPlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { @@ -27,7 +25,7 @@ android { minifyEnabled = true } } - compileSdk = 35 + compileSdk { version = release(35) } defaultConfig { javaCompileOptions { annotationProcessorOptions { diff --git a/work/work-analytics/build.gradle b/work/work-analytics/build.gradle index 9c3c119fe87ca..55419117b6e96 100644 --- a/work/work-analytics/build.gradle +++ b/work/work-analytics/build.gradle @@ -32,7 +32,7 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(35) } namespace = "androidx.work.analytics" } diff --git a/work/work-benchmark/build.gradle b/work/work-benchmark/build.gradle index 7bef28e25adc8..1f9dd1012c480 100644 --- a/work/work-benchmark/build.gradle +++ b/work/work-benchmark/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("androidx.benchmark") } @@ -51,6 +49,6 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(35) } namespace = "androidx.work.benchmark" } diff --git a/work/work-gcm/build.gradle b/work/work-gcm/build.gradle index 6562c5ba83374..09b738739ee7e 100644 --- a/work/work-gcm/build.gradle +++ b/work/work-gcm/build.gradle @@ -26,12 +26,10 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { - compileSdk = 35 + compileSdk { version = release(35) } namespace = "androidx.work.impl.background.gcm" } diff --git a/work/work-inspection/build.gradle b/work/work-inspection/build.gradle index 94a1817f8d547..ab00a8eb0c74a 100644 --- a/work/work-inspection/build.gradle +++ b/work/work-inspection/build.gradle @@ -27,8 +27,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("androidx.inspection") } @@ -57,10 +55,10 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(35) } defaultConfig { // studio pipeline works only starting with Android O - minSdk = 26 + minSdk { version = release(26) } } namespace = "androidx.work.inspection" } diff --git a/work/work-multiprocess/build.gradle b/work/work-multiprocess/build.gradle index 91fe1115e32e7..470a82beb4ff3 100644 --- a/work/work-multiprocess/build.gradle +++ b/work/work-multiprocess/build.gradle @@ -26,12 +26,10 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { - compileSdk = 35 + compileSdk { version = release(35) } namespace = "androidx.work.multiprocess" } diff --git a/work/work-runtime-ktx/build.gradle b/work/work-runtime-ktx/build.gradle index aa4dd4b2d60d0..dd988324d362b 100644 --- a/work/work-runtime-ktx/build.gradle +++ b/work/work-runtime-ktx/build.gradle @@ -27,8 +27,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -43,6 +41,6 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(35) } namespace = "androidx.work.ktx" } diff --git a/work/work-runtime/build.gradle b/work/work-runtime/build.gradle index 52641c56c2471..f838925746be3 100644 --- a/work/work-runtime/build.gradle +++ b/work/work-runtime/build.gradle @@ -30,8 +30,6 @@ import static androidx.inspection.gradle.InspectionPluginKt.packageInspector plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("com.google.devtools.ksp") id("androidx.stableaidl") } @@ -56,10 +54,7 @@ android { } } } - compileSdk = 35 - sourceSets { - androidTest.assets.srcDirs += files("$projectDir/src/schemas".toString()) - } + compileSdk { version = release(35) } namespace = "androidx.work" } diff --git a/work/work-rxjava2/build.gradle b/work/work-rxjava2/build.gradle index 07871db85ae26..6739efc045ff8 100644 --- a/work/work-rxjava2/build.gradle +++ b/work/work-rxjava2/build.gradle @@ -27,8 +27,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -50,6 +48,6 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(35) } namespace = "androidx.work.rxjava2" } diff --git a/work/work-rxjava3/build.gradle b/work/work-rxjava3/build.gradle index c27565c9ba24c..ebdfdd8486f67 100644 --- a/work/work-rxjava3/build.gradle +++ b/work/work-rxjava3/build.gradle @@ -27,8 +27,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -49,6 +47,6 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(35) } namespace = "androidx.work.rxjava3" } diff --git a/work/work-testing/build.gradle b/work/work-testing/build.gradle index ff60b49fed9ac..4954b224c108d 100644 --- a/work/work-testing/build.gradle +++ b/work/work-testing/build.gradle @@ -26,8 +26,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -63,6 +61,6 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(35) } namespace = "androidx.work.testing" } diff --git a/xr/arcore/arcore-openxr/build.gradle b/xr/arcore/arcore-openxr/build.gradle index 34783f2a9b0f7..4fed626fdf0ab 100644 --- a/xr/arcore/arcore-openxr/build.gradle +++ b/xr/arcore/arcore-openxr/build.gradle @@ -27,8 +27,6 @@ import com.android.build.api.variant.HasAndroidTest plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/xr/arcore/arcore-play-services/build.gradle b/xr/arcore/arcore-play-services/build.gradle index 170cf83982b83..8ca5d11d1265a 100644 --- a/xr/arcore/arcore-play-services/build.gradle +++ b/xr/arcore/arcore-play-services/build.gradle @@ -27,8 +27,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -55,7 +53,7 @@ dependencies { android { namespace = "androidx.xr.arcore.playservices" defaultConfig { - minSdk = 24 + minSdk { version = release(24) } } } diff --git a/xr/arcore/arcore-projected/build.gradle b/xr/arcore/arcore-projected/build.gradle index 740b4e3b7792a..ff6d94e758a31 100644 --- a/xr/arcore/arcore-projected/build.gradle +++ b/xr/arcore/arcore-projected/build.gradle @@ -27,8 +27,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("androidx.stableaidl") } @@ -60,7 +58,7 @@ android { } defaultConfig { - minSdk = 24 + minSdk { version = release(24) } } } diff --git a/xr/arcore/arcore-runtime/build.gradle b/xr/arcore/arcore-runtime/build.gradle index 7883e221ed374..fb2a6c2613204 100644 --- a/xr/arcore/arcore-runtime/build.gradle +++ b/xr/arcore/arcore-runtime/build.gradle @@ -19,8 +19,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/xr/arcore/arcore-samples/build.gradle b/xr/arcore/arcore-samples/build.gradle index 395e515d155d3..c82d5c6191a41 100644 --- a/xr/arcore/arcore-samples/build.gradle +++ b/xr/arcore/arcore-samples/build.gradle @@ -27,16 +27,14 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { - compileSdk = 36 + compileSdk { version = release(36) } namespace = "androidx.xr.arcore.samples" defaultConfig { - minSdk = 27 + minSdk { version = release(27) } } } diff --git a/xr/arcore/arcore-testing/build.gradle b/xr/arcore/arcore-testing/build.gradle index 66b03f9460027..202534b8296f2 100644 --- a/xr/arcore/arcore-testing/build.gradle +++ b/xr/arcore/arcore-testing/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/xr/arcore/arcore/build.gradle b/xr/arcore/arcore/build.gradle index dcd6b818d6ec7..9bdf0be97405e 100644 --- a/xr/arcore/arcore/build.gradle +++ b/xr/arcore/arcore/build.gradle @@ -26,8 +26,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/xr/arcore/integration-tests/projected-testapp/build.gradle b/xr/arcore/integration-tests/projected-testapp/build.gradle index a3eb8ca8d2908..8394619cc5a9b 100644 --- a/xr/arcore/integration-tests/projected-testapp/build.gradle +++ b/xr/arcore/integration-tests/projected-testapp/build.gradle @@ -29,7 +29,6 @@ plugins { id("AndroidXPlugin") id("AndroidXComposePlugin") id("com.android.application") - id("org.jetbrains.kotlin.android") } dependencies { @@ -55,11 +54,11 @@ dependencies { } android { - compileSdk = 36 + compileSdk { version = release(37) } namespace = "androidx.xr.arcore.projected.testapp" defaultConfig { - minSdk = 36 + minSdk { version = release(36) } } buildTypes { diff --git a/xr/arcore/integration-tests/testapp/build.gradle b/xr/arcore/integration-tests/testapp/build.gradle index cbde5f0f39669..30da8f86a221b 100644 --- a/xr/arcore/integration-tests/testapp/build.gradle +++ b/xr/arcore/integration-tests/testapp/build.gradle @@ -29,13 +29,12 @@ plugins { id("AndroidXPlugin") id("AndroidXComposePlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { defaultConfig { - minSdk = 31 + minSdk { version = release(31) } + compileSdk { version = release(36) } } buildFeatures { viewBinding = true } namespace = "androidx.xr.arcore.testapp" diff --git a/xr/arcore/integration-tests/whitebox-mobile/build.gradle b/xr/arcore/integration-tests/whitebox-mobile/build.gradle index a8a36dad32715..25b4729b05936 100644 --- a/xr/arcore/integration-tests/whitebox-mobile/build.gradle +++ b/xr/arcore/integration-tests/whitebox-mobile/build.gradle @@ -29,13 +29,11 @@ plugins { id("AndroidXPlugin") id("AndroidXComposePlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { defaultConfig { - minSdk = 27 + minSdk { version = release(27) } } buildFeatures { viewBinding = true } namespace = "androidx.xr.arcore.apps.whitebox.mobile" diff --git a/xr/assets/build.gradle b/xr/assets/build.gradle index ed1a1e51f0f15..0bed34997b175 100644 --- a/xr/assets/build.gradle +++ b/xr/assets/build.gradle @@ -27,8 +27,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { diff --git a/xr/compose/compose-testing/build.gradle b/xr/compose/compose-testing/build.gradle index ae0895e584f9a..7bb376d032c96 100644 --- a/xr/compose/compose-testing/build.gradle +++ b/xr/compose/compose-testing/build.gradle @@ -27,8 +27,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("AndroidXComposePlugin") } @@ -55,7 +53,8 @@ dependencies { android { defaultConfig { - minSdk = 24 + minSdk { version = release(24) } + compileSdk { version = release(36) } } namespace = "androidx.xr.compose.testing" } diff --git a/xr/compose/compose/build.gradle b/xr/compose/compose/build.gradle index 4dda746b17253..4023c391421b3 100644 --- a/xr/compose/compose/build.gradle +++ b/xr/compose/compose/build.gradle @@ -27,8 +27,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") id("AndroidXComposePlugin") } @@ -75,7 +73,8 @@ dependencies { android { defaultConfig { - minSdk = 24 + minSdk { version = release(24) } + compileSdk { version = release(36) } } namespace = "androidx.xr.compose" } diff --git a/xr/compose/compose/samples/build.gradle b/xr/compose/compose/samples/build.gradle index 529989dd14f58..36fc114cd80e2 100644 --- a/xr/compose/compose/samples/build.gradle +++ b/xr/compose/compose/samples/build.gradle @@ -20,8 +20,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -49,9 +47,9 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.xr.compose.samples" defaultConfig { - minSdk = 34 + minSdk { version = release(34) } } } diff --git a/xr/compose/integration-tests/testapp/build.gradle b/xr/compose/integration-tests/testapp/build.gradle index f1d9feab401db..eb1898ecd19c2 100644 --- a/xr/compose/integration-tests/testapp/build.gradle +++ b/xr/compose/integration-tests/testapp/build.gradle @@ -21,15 +21,13 @@ plugins { id("com.android.application") id("AndroidXPlugin") id("AndroidXComposePlugin") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { namespace = "androidx.xr.compose.testapp" - compileSdk = 35 + compileSdk { version = release(37) } defaultConfig { - minSdk = 34 + minSdk { version = release(34) } } buildTypes { release { diff --git a/xr/compose/material3/integration-tests/testapp/build.gradle b/xr/compose/material3/integration-tests/testapp/build.gradle index 55a6c09bf7045..1c48f7ddf0182 100644 --- a/xr/compose/material3/integration-tests/testapp/build.gradle +++ b/xr/compose/material3/integration-tests/testapp/build.gradle @@ -21,8 +21,6 @@ plugins { id("AndroidXPlugin") id("AndroidXComposePlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -55,9 +53,9 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(37) } defaultConfig { - minSdk = 24 + minSdk { version = release(24) } } namespace = "androidx.xr.compose.material3.integration.testapp" buildTypes { diff --git a/xr/compose/material3/material3/build.gradle b/xr/compose/material3/material3/build.gradle index f50cf8e4d7584..fa4c82376f9c0 100644 --- a/xr/compose/material3/material3/build.gradle +++ b/xr/compose/material3/material3/build.gradle @@ -27,8 +27,6 @@ plugins { id("AndroidXPlugin") id("AndroidXComposePlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -53,9 +51,9 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(36) } defaultConfig { - minSdk = 24 + minSdk { version = release(24) } } namespace = "androidx.xr.compose.material3" } diff --git a/xr/glimmer/benchmark/build.gradle b/xr/glimmer/benchmark/build.gradle index 949ff97ffc1a5..0c21f75de5da2 100644 --- a/xr/glimmer/benchmark/build.gradle +++ b/xr/glimmer/benchmark/build.gradle @@ -20,7 +20,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") id("androidx.benchmark") } @@ -35,11 +34,11 @@ dependencies { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.xr.glimmer.benchmark" defaultConfig { // TODO: b/448363874 - Revert to 35 once API 35 devices are available for microbenchmarking. - minSdk = 34 + minSdk { version = release(34) } } } diff --git a/xr/glimmer/glimmer/build.gradle b/xr/glimmer/glimmer/build.gradle index 197872e591412..7ce7ede84e28d 100644 --- a/xr/glimmer/glimmer/build.gradle +++ b/xr/glimmer/glimmer/build.gradle @@ -51,7 +51,10 @@ dependencies { android { namespace = "androidx.xr.glimmer" - compileSdk = 35 + compileSdk { version = release(37) } + defaultConfig { + testInstrumentationRunner "androidx.xr.glimmer.GlimmerTestRunner" + } } androidx { diff --git a/xr/glimmer/glimmer/samples/build.gradle b/xr/glimmer/glimmer/samples/build.gradle index 8296dbb8157b6..74e3bfefb9226 100644 --- a/xr/glimmer/glimmer/samples/build.gradle +++ b/xr/glimmer/glimmer/samples/build.gradle @@ -27,7 +27,6 @@ plugins { id("AndroidXPlugin") id("com.android.library") id("AndroidXComposePlugin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -47,6 +46,6 @@ androidx { } android { - compileSdk = 35 + compileSdk { version = release(37) } namespace = "androidx.xr.glimmer.samples" } diff --git a/xr/glimmer/integration-tests/demos/build.gradle b/xr/glimmer/integration-tests/demos/build.gradle index 7e9744fbb44e4..3b49875865037 100644 --- a/xr/glimmer/integration-tests/demos/build.gradle +++ b/xr/glimmer/integration-tests/demos/build.gradle @@ -26,7 +26,6 @@ plugins { id("AndroidXPlugin") id("AndroidXComposePlugin") id("com.android.application") - id("org.jetbrains.kotlin.android") } dependencies { @@ -51,9 +50,9 @@ dependencies { ApkCopyHelperKt.setupAppApkCopy(project, "release") android { - compileSdk = 36 + compileSdk { version = release(37) } defaultConfig { - minSdk = 35 + minSdk { version = release(35) } } namespace = "androidx.xr.glimmer.demos" } diff --git a/xr/glimmer/test-utils/build.gradle b/xr/glimmer/test-utils/build.gradle index ab130e3193be7..24d404daaef88 100644 --- a/xr/glimmer/test-utils/build.gradle +++ b/xr/glimmer/test-utils/build.gradle @@ -33,7 +33,7 @@ dependencies { } android { - compileSdk { version = release(35) } + compileSdk { version = release(37) } namespace = "androidx.xr.glimmer.testutils" defaultConfig { minSdk { version = release(33) } diff --git a/xr/projected/integration-tests/testapp/build.gradle b/xr/projected/integration-tests/testapp/build.gradle index f32e102280382..6329f470ac85c 100644 --- a/xr/projected/integration-tests/testapp/build.gradle +++ b/xr/projected/integration-tests/testapp/build.gradle @@ -21,8 +21,6 @@ plugins { id("AndroidXPlugin") id("AndroidXComposePlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -44,11 +42,11 @@ dependencies { } android { - compileSdk = 36 + compileSdk { version = release(37) } namespace = "androidx.xr.projected.testapp" defaultConfig { - minSdk = 36 + minSdk { version = release(36) } } buildTypes { diff --git a/xr/projected/projected-testing/build.gradle b/xr/projected/projected-testing/build.gradle index fc516aa0d06a4..6d858f8c5176b 100644 --- a/xr/projected/projected-testing/build.gradle +++ b/xr/projected/projected-testing/build.gradle @@ -25,8 +25,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -41,7 +39,7 @@ dependencies { } android { - compileSdk { version = release(36) } + compileSdk { version = release(37) } namespace = "androidx.xr.projected.testing" } diff --git a/xr/projected/projected/build.gradle b/xr/projected/projected/build.gradle index f0dfa81910b08..0242b7b790bf0 100644 --- a/xr/projected/projected/build.gradle +++ b/xr/projected/projected/build.gradle @@ -51,7 +51,7 @@ dependencies { } android { - compileSdk = 36 + compileSdk { version = release(37) } namespace = "androidx.xr.projected" buildFeatures { diff --git a/xr/runtime/runtime-manifest/build.gradle b/xr/runtime/runtime-manifest/build.gradle index 19cb70e0f3356..b8f0a98c2cb5d 100644 --- a/xr/runtime/runtime-manifest/build.gradle +++ b/xr/runtime/runtime-manifest/build.gradle @@ -27,8 +27,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/xr/runtime/runtime-testing/build.gradle b/xr/runtime/runtime-testing/build.gradle index 5b43b70ec116f..4964bd498cf4f 100644 --- a/xr/runtime/runtime-testing/build.gradle +++ b/xr/runtime/runtime-testing/build.gradle @@ -26,8 +26,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/xr/runtime/runtime/build.gradle b/xr/runtime/runtime/build.gradle index 8542aad1bfbb0..747744a32ec06 100644 --- a/xr/runtime/runtime/build.gradle +++ b/xr/runtime/runtime/build.gradle @@ -26,8 +26,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { diff --git a/xr/scenecore/integration-tests/testapp/build.gradle b/xr/scenecore/integration-tests/testapp/build.gradle index 85e6343cb5bc5..f193fed533e34 100644 --- a/xr/scenecore/integration-tests/testapp/build.gradle +++ b/xr/scenecore/integration-tests/testapp/build.gradle @@ -21,17 +21,15 @@ plugins { id("AndroidXPlugin") id("AndroidXComposePlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { namespace = "androidx.xr.scenecore.testapp" - compileSdk = 35 + compileSdk { version = release(36) } defaultConfig { applicationId = "androidx.xr.scenecore.testapp" - minSdk = 34 + minSdk { version = release(34) } } buildTypes { release { diff --git a/xr/scenecore/integration-tests/videoplayerdrmtest/build.gradle b/xr/scenecore/integration-tests/videoplayerdrmtest/build.gradle index 6cb637b5f6d19..5bd0a8c0bab22 100644 --- a/xr/scenecore/integration-tests/videoplayerdrmtest/build.gradle +++ b/xr/scenecore/integration-tests/videoplayerdrmtest/build.gradle @@ -29,17 +29,15 @@ plugins { id("AndroidXPlugin") id("AndroidXComposePlugin") id("com.android.application") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } android { defaultConfig { // TODO: This should be lower, possibly 21. // Address API calls that require higher versions. - minSdk = 34 + minSdk { version = release(34) } } - compileSdk = 35 + compileSdk { version = release(36) } buildFeatures { viewBinding = true } namespace = "androidx.xr.scenecore.samples.videoplayerdrmtest" diff --git a/xr/scenecore/scenecore-projected/build.gradle b/xr/scenecore/scenecore-projected/build.gradle index 68a69a71fbd31..48cefd9a313c9 100644 --- a/xr/scenecore/scenecore-projected/build.gradle +++ b/xr/scenecore/scenecore-projected/build.gradle @@ -26,8 +26,7 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") + id("com.android.experimental.built-in-kotlin") id("androidx.stableaidl") } diff --git a/xr/scenecore/scenecore-runtime/build.gradle b/xr/scenecore/scenecore-runtime/build.gradle index 48207542dcc78..f61390653c2b8 100644 --- a/xr/scenecore/scenecore-runtime/build.gradle +++ b/xr/scenecore/scenecore-runtime/build.gradle @@ -27,8 +27,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -62,7 +60,8 @@ dependencies { android { defaultConfig { - minSdk = 24 + minSdk { version = release(24) } + compileSdk { version = release(36) } } namespace = "androidx.xr.scenecore.runtime" } diff --git a/xr/scenecore/scenecore-spatial-core/build.gradle b/xr/scenecore/scenecore-spatial-core/build.gradle index cab5df873ba38..e1a073b70752b 100644 --- a/xr/scenecore/scenecore-spatial-core/build.gradle +++ b/xr/scenecore/scenecore-spatial-core/build.gradle @@ -28,8 +28,6 @@ import com.android.build.api.variant.HasAndroidTest plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -74,7 +72,8 @@ dependencies { android { defaultConfig { - minSdk = 24 + minSdk { version = release(24) } + compileSdk { version = release(36) } } namespace = "androidx.xr.scenecore.spatial.core" } diff --git a/xr/scenecore/scenecore-spatial-rendering/build.gradle b/xr/scenecore/scenecore-spatial-rendering/build.gradle index 4459f014e6e4c..e8493b3ee54d8 100644 --- a/xr/scenecore/scenecore-spatial-rendering/build.gradle +++ b/xr/scenecore/scenecore-spatial-rendering/build.gradle @@ -29,8 +29,6 @@ import com.android.build.api.variant.HasUnitTest plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -69,7 +67,8 @@ dependencies { android { defaultConfig { - minSdk = 24 + minSdk { version = release(24) } + compileSdk { version = release(36) } } namespace = "androidx.xr.scenecore.spatial.rendering" } diff --git a/xr/scenecore/scenecore-testing/build.gradle b/xr/scenecore/scenecore-testing/build.gradle index 819e572807cb6..d2289dea22a50 100644 --- a/xr/scenecore/scenecore-testing/build.gradle +++ b/xr/scenecore/scenecore-testing/build.gradle @@ -28,8 +28,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -53,7 +51,8 @@ dependencies { android { defaultConfig { - minSdk = 24 + minSdk { version = release(24) } + compileSdk { version = release(36) } } namespace = "androidx.xr.scenecore.testing" } diff --git a/xr/scenecore/scenecore/build.gradle b/xr/scenecore/scenecore/build.gradle index b915dff2b038d..5b257527dba76 100644 --- a/xr/scenecore/scenecore/build.gradle +++ b/xr/scenecore/scenecore/build.gradle @@ -28,8 +28,6 @@ import androidx.build.SoftwareType plugins { id("AndroidXPlugin") id("com.android.library") - //id("com.android.experimental.built-in-kotlin") - id("org.jetbrains.kotlin.android") } dependencies { @@ -68,7 +66,8 @@ dependencies { android { defaultConfig { - minSdk = 24 + minSdk { version = release(24) } + compileSdk { version = release(36) } } namespace = "androidx.xr.scenecore" }