From 5a8f893059a427e9ef23a1444eac67f49783267d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 8 Jul 2026 03:38:29 +0000 Subject: [PATCH 1/8] Update all dependencies --- .github/workflows/build.yml | 18 +-- .github/workflows/issues-stale.yml | 2 +- app/build.gradle.kts | 2 +- gradle/libs.versions.toml | 126 +++++++++--------- gradle/spotless-init.gradle.kts | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- .../connectivity/UwbRanging/build.gradle.kts | 10 +- samples/media/video/build.gradle.kts | 2 +- settings.gradle.kts | 2 +- 9 files changed, 83 insertions(+), 83 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 662b196d..5fb82c3c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,22 +17,22 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v7 - name: Validate Gradle Wrapper - uses: gradle/actions/wrapper-validation@v4 + uses: gradle/actions/wrapper-validation@v6 - name: Copy CI gradle.properties run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - name: Set up JDK 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v5 with: distribution: 'zulu' java-version: 17 - name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/gradle-build-action@v3 - name: Check spotless run: ./gradlew spotlessCheck --init-script gradle/spotless-init.gradle.kts --no-configuration-cache @@ -48,7 +48,7 @@ jobs: # run: ./gradlew testDebug - name: Upload build outputs (APKs) - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: build-outputs path: app/build/outputs @@ -56,7 +56,7 @@ jobs: - name: Upload build reports if: always() - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: build-reports path: app/build/reports @@ -90,13 +90,13 @@ jobs: ls /dev/kvm - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v7 - name: Copy CI gradle.properties run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - name: Set up JDK 17 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'zulu' java-version: 17 @@ -116,7 +116,7 @@ jobs: - name: Upload test reports if: always() - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: test-reports-${{ matrix.api-level }} path: '*/build/reports/androidTests' diff --git a/.github/workflows/issues-stale.yml b/.github/workflows/issues-stale.yml index b0415272..d707d5dd 100644 --- a/.github/workflows/issues-stale.yml +++ b/.github/workflows/issues-stale.yml @@ -8,7 +8,7 @@ jobs: stale: runs-on: ubuntu-latest steps: - - uses: actions/stale@v3 + - uses: actions/stale@v10 with: stale-issue-message: 'This issue is stale because it has been open 30 days with no activity. Remove stale label or comment or this will be closed in 5 days.' days-before-stale: 30 diff --git a/app/build.gradle.kts b/app/build.gradle.kts index f63d0521..720e46cb 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -18,7 +18,7 @@ plugins { alias(libs.plugins.android.application) alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.compose) - kotlin("plugin.serialization") version "2.1.10" + kotlin("plugin.serialization") version "2.4.0" } android { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 38d754ac..5fb63968 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -14,59 +14,59 @@ # limitations under the License. # [versions] -agp = "9.1.1" -fragmentCompose = "1.8.6" -kotlin = "2.2.10" -coreKtx = "1.17.0" +agp = "9.2.1" +fragmentCompose = "1.8.9" +kotlin = "2.4.0" +coreKtx = "1.19.0" junit = "4.13.2" -junitVersion = "1.2.1" -espressoCore = "3.6.1" -kotlinxSerializationJson = "1.8.0" -lifecycleRuntimeKtx = "2.8.7" -activityCompose = "1.10.0" -composeBom = "2025.02.00" -appcompat = "1.7.0" -material = "1.12.0" -coil = "2.4.0" -navigationCompose = "2.8.7" -coroutines = "1.7.3" -photopickerCompose = "1.0.0-alpha01" -play-services-location = "21.1.0" +junitVersion = "1.3.0" +espressoCore = "3.7.0" +kotlinxSerializationJson = "1.11.0" +lifecycleRuntimeKtx = "2.11.0" +activityCompose = "1.13.0" +composeBom = "2026.06.01" +appcompat = "1.7.1" +material = "1.14.0" +coil = "2.7.0" +navigationCompose = "2.9.8" +coroutines = "1.11.0" +photopickerCompose = "1.0.0-SNAPSHOT" +play-services-location = "21.4.0" -accompanist = "0.32.0" -androidx-datastore = "1.0.0" -androidx-navigation = "2.7.7" -androidx-window = "1.5.0" +accompanist = "0.37.3" +androidx-datastore = "1.2.1" +androidx-navigation = "2.9.8" +androidx-window = "1.5.1" casa = "0.5.1" -gradleDownloadTask = "4.1.2" -ksp = "1.9.22-1.0.17" +gradleDownloadTask = "5.7.0" +ksp = "2.3.9" composeCompiler = "1.5.9" -hilt = "2.48.1" +hilt = "2.60.1" kotlin-serialization = "1.8.0" ktlint = "0.48.1" junit4 = "4.13.2" -androidxEspresso = "3.5.1" -androidxTestCore = "1.5.0" -androidxTestExtJunit = "1.1.5" -androidxTestExtTruth = "1.5.0" -androidxTestRules = "1.5.0" -androidxTestRunner = "1.5.2" -androidxUiAutomator = "2.2.0" -camerax = "1.5.0-beta01" -material3Android = "1.3.2" -media3 = "1.5.0" -constraintlayout = "2.1.4" -glide-compose = "1.0.0-beta01" -glance = "1.3.0-alpha01" -tensorflowLite = "2.9.0" +androidxEspresso = "3.7.0" +androidxTestCore = "1.7.0" +androidxTestExtJunit = "1.3.0" +androidxTestExtTruth = "1.7.0" +androidxTestRules = "1.7.0" +androidxTestRunner = "1.7.0" +androidxUiAutomator = "2.4.0" +camerax = "1.6.1" +material3Android = "1.4.0" +media3 = "1.10.1" +constraintlayout = "2.2.1" +glide-compose = "1.0.0-beta09" +glance = "1.3.0-SNAPSHOT" +tensorflowLite = "2.17.0" tensorflowLiteGpuDelegatePlugin = "0.4.4" -tensorflowLiteSupport = "0.4.2" +tensorflowLiteSupport = "0.5.0" barcodeScanningCommon = "17.0.0" playServicesMlkitBarcodeScanning = "18.3.1" -protobuf = "0.9.4" -firebaseCrashlyticsBuildtools = "3.0.5" -uwb = "1.0.0-alpha10" -telecom = "1.1.0-alpha04" +protobuf = "0.10.0" +firebaseCrashlyticsBuildtools = "3.0.7" +uwb = "1.0.0" +telecom = "1.1.0-SNAPSHOT" [libraries] @@ -105,18 +105,18 @@ androidx-core-telecom = { module = "androidx.core:core-telecom", version.ref = " # Core dependencies android-gradlePlugin = { module = "com.android.tools.build:gradle", version.ref = "agp" } -androidx-activity = "androidx.activity:activity-ktx:1.13.0-alpha01" +androidx-activity = "androidx.activity:activity-ktx:1.13.0" -androidx-core = "androidx.core:core-ktx:1.18.0-alpha01" -androidx-exifinterface = "androidx.exifinterface:exifinterface:1.3.7" +androidx-core = "androidx.core:core-ktx:1.19.0" +androidx-exifinterface = "androidx.exifinterface:exifinterface:1.4.2" # Fragment 1.7.0 alpha and Transition 1.5.0 alpha are required for predictive back to work with Fragments and transitions -androidx-fragment = "androidx.fragment:fragment-ktx:1.7.0-alpha10" -androidx-transition = "androidx.transition:transition-ktx:1.5.0-alpha06" +androidx-fragment = "androidx.fragment:fragment-ktx:1.8.9" +androidx-transition = "androidx.transition:transition-ktx:1.7.0" androidx-navigation-fragment = { module = "androidx.navigation:navigation-fragment", version.ref = "androidx-navigation" } androidx-navigation-testing = { module = "androidx.navigation:navigation-testing", version.ref = "androidx-navigation" } androidx-navigation-ui = { module = "androidx.navigation:navigation-ui", version.ref = "androidx-navigation" } -androidx-lifecycle-viewmodel-compose = "androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0" -androidx-viewpager2 = "androidx.viewpager2:viewpager2:1.0.0" +androidx-lifecycle-viewmodel-compose = "androidx.lifecycle:lifecycle-viewmodel-compose:2.11.0" +androidx-viewpager2 = "androidx.viewpager2:viewpager2:1.1.0" accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" } casa-base = { module = "com.google.android.catalog.framework:casa-base", version.ref = "casa" } casa-processor = { module = "com.google.android.catalog.framework:casa-processor", version.ref = "casa" } @@ -156,26 +156,26 @@ androidx-test-runner = { group = "androidx.test", name = "runner", version.ref = androidx-test-uiautomator = { group = "androidx.test.uiautomator", name = "uiautomator", version.ref = "androidxUiAutomator" } junit4 = { group = "junit", name = "junit", version.ref = "junit4" } # Sample specific dependencies -lottie = "com.airbnb.android:lottie:6.0.0" +lottie = "com.airbnb.android:lottie:6.7.1" rxjava2-android = 'io.reactivex.rxjava2:rxandroid:2.1.1' -androidx-work-runtime-ktx = "androidx.work:work-runtime-ktx:2.9.0" -androidx-core-remoteviews = "androidx.core:core-remoteviews:1.0.0" +androidx-work-runtime-ktx = "androidx.work:work-runtime-ktx:2.11.2" +androidx-core-remoteviews = "androidx.core:core-remoteviews:1.1.0" androidx-glance-appwidget = {group = "androidx.glance", name = "glance-appwidget", version.ref = "glance"} androidx-glance-preview = {group = "androidx.glance", name = "glance-preview", version.ref = "glance"} androidx-glance-appwidget-preview = {group = "androidx.glance", name = "glance-appwidget-preview", version.ref = "glance"} androidx-glance-material3 = {group = "androidx.glance", name = "glance-material3", version.ref = "glance"} -androidx-graphics-core = { group = "androidx.graphics", name = "graphics-core", version = "1.0.0-beta01" } -androidx-startup = 'androidx.startup:startup-runtime:1.1.1' +androidx-graphics-core = { group = "androidx.graphics", name = "graphics-core", version = "1.0.4" } +androidx-startup = 'androidx.startup:startup-runtime:1.2.0' androidx-window = { module = "androidx.window:window", version.ref = "androidx-window" } androidx-window-java = { module = "androidx.window:window-java", version.ref = "androidx-window" } androidx-window-rxjava2 = { module = "androidx.window:window-rxjava2", version.ref = "androidx-window" } androidx-window-core = { module = "androidx.window:window-core", version.ref = "androidx-window" } -androidx-media = "androidx.media:media:1.7.0" -androidx-constraintlayout = "androidx.constraintlayout:constraintlayout:2.1.4" +androidx-media = "androidx.media:media:1.8.0" +androidx-constraintlayout = "androidx.constraintlayout:constraintlayout:2.2.1" androidx-corepip = "androidx.core:core-pip:1.0.0-SNAPSHOT" androidx-datastore-preferences = { module = "androidx.datastore:datastore-preferences", version.ref = "androidx-datastore" } androidx-draganddrop = "androidx.draganddrop:draganddrop:1.0.0" -androidx-dynamicanimation = "androidx.dynamicanimation:dynamicanimation-ktx:1.0.0-alpha03" +androidx-dynamicanimation = "androidx.dynamicanimation:dynamicanimation-ktx:1.1.0" androidx-material3-android = { group = "androidx.compose.material3", name = "material3-android", version.ref = "material3Android" } androidx-media3-common = { module = "androidx.media3:media3-common", version.ref = "media3" } androidx-media3-effect = { module = "androidx.media3:media3-effect", version.ref = "media3" } @@ -193,9 +193,9 @@ androidx-camerax-view = { module = "androidx.camera:camera-view", version.ref = androidx-camerax-mlkit-vision = { module = "androidx.camera:camera-mlkit-vision", version.ref = "camerax" } androidx-camerax-extensions = { module = "androidx.camera:camera-extensions", version.ref = "camerax" } -fresco = "com.facebook.fresco:fresco:3.0.0" +fresco = "com.facebook.fresco:fresco:3.7.0" fresco-nativeimagetranscoder = "com.facebook.fresco:nativeimagetranscoder:2.6.0!!" -glide = "com.github.bumptech.glide:glide:4.15.1" +glide = "com.github.bumptech.glide:glide:5.0.7" glide-compose = { group = "com.github.bumptech.glide", name = "compose", version.ref = "glide-compose" } appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" } constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" } @@ -215,9 +215,9 @@ kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "ko android-library = { id = "com.android.library", version.ref = "agp" } compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } -affectedmoduledetector = { id = "com.dropbox.affectedmoduledetector", version = "0.2.0" } -versionCatalogUpdate = { id = "nl.littlerobots.version-catalog-update", version = "0.7.0" } -benManesVersions = { id = "com.github.ben-manes.versions", version = "0.44.0" } +affectedmoduledetector = { id = "com.dropbox.affectedmoduledetector", version = "0.6.2" } +versionCatalogUpdate = { id = "nl.littlerobots.version-catalog-update", version = "1.1.0" } +benManesVersions = { id = "com.github.ben-manes.versions", version = "0.54.0" } android-test = { id = "com.android.test", version.ref = "agp" } hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" } kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } diff --git a/gradle/spotless-init.gradle.kts b/gradle/spotless-init.gradle.kts index 7462afdb..20c5c46f 100644 --- a/gradle/spotless-init.gradle.kts +++ b/gradle/spotless-init.gradle.kts @@ -17,7 +17,7 @@ val ktlintVersion = "0.48.1" initscript { - val spotlessVersion = "6.13.0" + val spotlessVersion = "8.8.0" repositories { mavenCentral() diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37f78a6a..a351597e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/samples/connectivity/UwbRanging/build.gradle.kts b/samples/connectivity/UwbRanging/build.gradle.kts index a643f2ae..6537e039 100644 --- a/samples/connectivity/UwbRanging/build.gradle.kts +++ b/samples/connectivity/UwbRanging/build.gradle.kts @@ -59,7 +59,7 @@ protobuf { // Configures the protoc compiler protoc { // Automatically download protoc from Maven Central - artifact = "com.google.protobuf:protoc:3.25.3" + artifact = "com.google.protobuf:protoc:4.35.1" } // Configures the code generation tasks @@ -89,10 +89,10 @@ dependencies { implementation(libs.androidx.navigation.compose) implementation(libs.compose.material.iconsext) implementation(libs.kotlin.coroutines.play) - implementation("com.google.android.gms:play-services-nearby:19.2.0") - implementation("com.google.protobuf:protobuf-java:3.25.3") - implementation("com.google.protobuf:protobuf-kotlin:3.25.3") - implementation("androidx.datastore:datastore:1.0.0") + implementation("com.google.android.gms:play-services-nearby:19.3.0") + implementation("com.google.protobuf:protobuf-java:4.35.1") + implementation("com.google.protobuf:protobuf-kotlin:4.35.1") + implementation("androidx.datastore:datastore:1.2.1") implementation(libs.androidx.appcompat) implementation(libs.kotlinx.serialization.json) implementation(libs.firebase.crashlytics.buildtools) diff --git a/samples/media/video/build.gradle.kts b/samples/media/video/build.gradle.kts index f3b3e590..a1bebe45 100644 --- a/samples/media/video/build.gradle.kts +++ b/samples/media/video/build.gradle.kts @@ -18,7 +18,7 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.compose) alias(libs.plugins.kotlin.android) - id("de.undercouch.download") version "5.6.0" + id("de.undercouch.download") version "5.7.0" } android { diff --git a/settings.gradle.kts b/settings.gradle.kts index af8fc634..729136e4 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -28,7 +28,7 @@ pluginManagement { } } plugins { - id("org.gradle.toolchains.foojay-resolver-convention") version "0.10.0" + id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0" } dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) From 16483fa533dd098653040565d41902be9249c8a0 Mon Sep 17 00:00:00 2001 From: Yacine Rezgui Date: Wed, 8 Jul 2026 17:18:20 +0200 Subject: [PATCH 2/8] refactor: remove redundant kotlinOptions jvmTarget from all build.gradle.kts files --- app/build.gradle.kts | 3 --- gradle/spotless-init.gradle.kts | 5 +---- samples/accessibility/build.gradle.kts | 6 +----- samples/camera/camera2/build.gradle.kts | 4 ---- samples/camera/camerax/build.gradle.kts | 4 ---- samples/connectivity/UwbRanging/build.gradle.kts | 4 ---- samples/connectivity/audio/build.gradle.kts | 6 +----- samples/connectivity/bluetooth/ble/build.gradle.kts | 4 ---- samples/connectivity/bluetooth/companion/build.gradle.kts | 4 ---- samples/connectivity/callnotification/build.gradle.kts | 6 +----- samples/connectivity/telecom/build.gradle.kts | 4 ---- samples/graphics/pdf/build.gradle.kts | 6 +----- samples/graphics/ultrahdr/build.gradle.kts | 6 +----- samples/location/build.gradle.kts | 4 ---- samples/media/ultrahdr/build.gradle.kts | 6 +----- samples/media/video/build.gradle.kts | 4 ---- samples/privacy/data/build.gradle.kts | 6 +----- samples/privacy/permissions/build.gradle.kts | 4 ---- samples/privacy/transparency/build.gradle.kts | 5 +---- samples/storage/build.gradle.kts | 6 +----- samples/user-interface/appwidgets/build.gradle.kts | 6 +----- samples/user-interface/constraintlayout/build.gradle.kts | 4 ---- samples/user-interface/draganddrop/build.gradle.kts | 4 ---- samples/user-interface/haptics/build.gradle.kts | 4 ---- samples/user-interface/live-updates/build.gradle.kts | 6 +----- samples/user-interface/picture-in-picture/build.gradle.kts | 4 ---- samples/user-interface/predictiveback/build.gradle.kts | 6 +----- samples/user-interface/quicksettings/build.gradle.kts | 4 ---- samples/user-interface/share/build.gradle.kts | 4 ---- samples/user-interface/text/build.gradle.kts | 4 ---- samples/user-interface/window-insets/build.gradle.kts | 4 ---- samples/user-interface/windowmanager/build.gradle.kts | 4 ---- shared/build.gradle.kts | 5 +---- 33 files changed, 14 insertions(+), 142 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 720e46cb..323affa0 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -48,9 +48,6 @@ android { sourceCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_11 } - kotlinOptions { - jvmTarget = "11" - } buildFeatures { compose = true } diff --git a/gradle/spotless-init.gradle.kts b/gradle/spotless-init.gradle.kts index 20c5c46f..3c17d5f7 100644 --- a/gradle/spotless-init.gradle.kts +++ b/gradle/spotless-init.gradle.kts @@ -34,15 +34,12 @@ rootProject { return@rootProject } apply() - extensions.configure { - predeclareDeps() - } extensions.configure { kotlin { target("**/*.kt") targetExclude("**/build/**/*.kt") - ktlint(ktlintVersion).userData(mapOf("android" to "true")) + ktlint(ktlintVersion).editorConfigOverride(mapOf("android" to "true")) licenseHeaderFile(rootProject.file("spotless/copyright.kt")) } format("kts") { diff --git a/samples/accessibility/build.gradle.kts b/samples/accessibility/build.gradle.kts index 01c8d5f4..ea984172 100644 --- a/samples/accessibility/build.gradle.kts +++ b/samples/accessibility/build.gradle.kts @@ -35,10 +35,6 @@ android { targetCompatibility = JavaVersion.VERSION_11 } - kotlinOptions { - jvmTarget = "11" - } - buildFeatures { viewBinding = true } @@ -57,4 +53,4 @@ dependencies { implementation(libs.androidx.ui.tooling.preview) implementation(libs.androidx.material3) implementation(libs.androidx.fragment) -} \ No newline at end of file +} diff --git a/samples/camera/camera2/build.gradle.kts b/samples/camera/camera2/build.gradle.kts index 8a67fc72..fc413d9c 100644 --- a/samples/camera/camera2/build.gradle.kts +++ b/samples/camera/camera2/build.gradle.kts @@ -33,10 +33,6 @@ android { targetCompatibility = JavaVersion.VERSION_11 } - kotlinOptions { - jvmTarget = "11" - } - buildFeatures { viewBinding = true } diff --git a/samples/camera/camerax/build.gradle.kts b/samples/camera/camerax/build.gradle.kts index 64a9c2fd..ef91697c 100644 --- a/samples/camera/camerax/build.gradle.kts +++ b/samples/camera/camerax/build.gradle.kts @@ -33,10 +33,6 @@ android { sourceCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_11 } - - kotlinOptions { - jvmTarget = "11" - } } dependencies { diff --git a/samples/connectivity/UwbRanging/build.gradle.kts b/samples/connectivity/UwbRanging/build.gradle.kts index 6537e039..c2dbff88 100644 --- a/samples/connectivity/UwbRanging/build.gradle.kts +++ b/samples/connectivity/UwbRanging/build.gradle.kts @@ -38,10 +38,6 @@ android { targetCompatibility = JavaVersion.VERSION_11 } - kotlinOptions { - jvmTarget = "11" - } - sourceSets { getByName("main") { java.srcDirs("src/main/java", "src/main/proto") diff --git a/samples/connectivity/audio/build.gradle.kts b/samples/connectivity/audio/build.gradle.kts index 0b2df217..a73da634 100644 --- a/samples/connectivity/audio/build.gradle.kts +++ b/samples/connectivity/audio/build.gradle.kts @@ -33,10 +33,6 @@ android { sourceCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_11 } - - kotlinOptions { - jvmTarget = "11" - } lint { targetSdk = 35 } @@ -52,4 +48,4 @@ dependencies { implementation(libs.androidx.material3) implementation(project(":shared")) -} \ No newline at end of file +} diff --git a/samples/connectivity/bluetooth/ble/build.gradle.kts b/samples/connectivity/bluetooth/ble/build.gradle.kts index 9941593e..d64027d3 100644 --- a/samples/connectivity/bluetooth/ble/build.gradle.kts +++ b/samples/connectivity/bluetooth/ble/build.gradle.kts @@ -34,10 +34,6 @@ android { targetCompatibility = JavaVersion.VERSION_11 } - kotlinOptions { - jvmTarget = "11" - } - lint { targetSdk = 35 } diff --git a/samples/connectivity/bluetooth/companion/build.gradle.kts b/samples/connectivity/bluetooth/companion/build.gradle.kts index a72b315b..f0dcb1b9 100644 --- a/samples/connectivity/bluetooth/companion/build.gradle.kts +++ b/samples/connectivity/bluetooth/companion/build.gradle.kts @@ -33,10 +33,6 @@ android { sourceCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_11 } - - kotlinOptions { - jvmTarget = "11" - } lint { targetSdk = 35 } diff --git a/samples/connectivity/callnotification/build.gradle.kts b/samples/connectivity/callnotification/build.gradle.kts index a5a7a78c..19f4c109 100644 --- a/samples/connectivity/callnotification/build.gradle.kts +++ b/samples/connectivity/callnotification/build.gradle.kts @@ -34,10 +34,6 @@ android { sourceCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_11 } - - kotlinOptions { - jvmTarget = "11" - } lint { targetSdk = 35 } @@ -56,4 +52,4 @@ dependencies { implementation(libs.androidx.material3) implementation(project(":shared")) -} \ No newline at end of file +} diff --git a/samples/connectivity/telecom/build.gradle.kts b/samples/connectivity/telecom/build.gradle.kts index deffa5e0..358700d3 100644 --- a/samples/connectivity/telecom/build.gradle.kts +++ b/samples/connectivity/telecom/build.gradle.kts @@ -41,10 +41,6 @@ android { sourceCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_11 } - - kotlinOptions { - jvmTarget = "11" - } } dependencies { diff --git a/samples/graphics/pdf/build.gradle.kts b/samples/graphics/pdf/build.gradle.kts index de106541..2f996946 100644 --- a/samples/graphics/pdf/build.gradle.kts +++ b/samples/graphics/pdf/build.gradle.kts @@ -34,10 +34,6 @@ android { targetCompatibility = JavaVersion.VERSION_11 } - kotlinOptions { - jvmTarget = "11" - } - lint { targetSdk = 35 } @@ -52,4 +48,4 @@ dependencies { implementation(libs.androidx.ui) // implementation(libs.androidx.ui.tooling.preview) implementation(libs.androidx.material3) -} \ No newline at end of file +} diff --git a/samples/graphics/ultrahdr/build.gradle.kts b/samples/graphics/ultrahdr/build.gradle.kts index dc80fba1..c762e400 100644 --- a/samples/graphics/ultrahdr/build.gradle.kts +++ b/samples/graphics/ultrahdr/build.gradle.kts @@ -34,10 +34,6 @@ android { targetCompatibility = JavaVersion.VERSION_11 } - kotlinOptions { - jvmTarget = "11" - } - buildFeatures { viewBinding = true } @@ -67,4 +63,4 @@ dependencies { // Graphics Core implementation(libs.androidx.graphics.core) -} \ No newline at end of file +} diff --git a/samples/location/build.gradle.kts b/samples/location/build.gradle.kts index 4c3bc94d..61ef90ab 100644 --- a/samples/location/build.gradle.kts +++ b/samples/location/build.gradle.kts @@ -32,10 +32,6 @@ android { sourceCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_11 } - - kotlinOptions { - jvmTarget = "11" - } lint { targetSdk = 35 } diff --git a/samples/media/ultrahdr/build.gradle.kts b/samples/media/ultrahdr/build.gradle.kts index a841d202..0fbaeaf9 100644 --- a/samples/media/ultrahdr/build.gradle.kts +++ b/samples/media/ultrahdr/build.gradle.kts @@ -34,10 +34,6 @@ android { targetCompatibility = JavaVersion.VERSION_11 } - kotlinOptions { - jvmTarget = "11" - } - buildFeatures { viewBinding = true } @@ -77,4 +73,4 @@ dependencies { // Link to UltraHDR Graphics Samples implementation(project(mapOf("path" to ":samples:graphics:ultrahdr"))) -} \ No newline at end of file +} diff --git a/samples/media/video/build.gradle.kts b/samples/media/video/build.gradle.kts index a1bebe45..dcba8133 100644 --- a/samples/media/video/build.gradle.kts +++ b/samples/media/video/build.gradle.kts @@ -34,10 +34,6 @@ android { targetCompatibility = JavaVersion.VERSION_11 } - kotlinOptions { - jvmTarget = "11" - } - buildFeatures { viewBinding = true } diff --git a/samples/privacy/data/build.gradle.kts b/samples/privacy/data/build.gradle.kts index ae7841e8..906e4116 100644 --- a/samples/privacy/data/build.gradle.kts +++ b/samples/privacy/data/build.gradle.kts @@ -34,10 +34,6 @@ android { targetCompatibility = JavaVersion.VERSION_11 } - kotlinOptions { - jvmTarget = "11" - } - lint { targetSdk = 35 } @@ -51,4 +47,4 @@ dependencies { implementation(libs.androidx.ui) implementation(libs.androidx.ui.tooling.preview) implementation(libs.androidx.material3) -} \ No newline at end of file +} diff --git a/samples/privacy/permissions/build.gradle.kts b/samples/privacy/permissions/build.gradle.kts index a904b2ee..81c97e53 100644 --- a/samples/privacy/permissions/build.gradle.kts +++ b/samples/privacy/permissions/build.gradle.kts @@ -33,10 +33,6 @@ android { targetCompatibility = JavaVersion.VERSION_11 } - kotlinOptions { - jvmTarget = "11" - } - lint { targetSdk = 35 } diff --git a/samples/privacy/transparency/build.gradle.kts b/samples/privacy/transparency/build.gradle.kts index ba94f828..2b867d9a 100644 --- a/samples/privacy/transparency/build.gradle.kts +++ b/samples/privacy/transparency/build.gradle.kts @@ -31,9 +31,6 @@ android { sourceCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_11 } - kotlinOptions { - jvmTarget = "11" - } lint { targetSdk = 35 } @@ -54,4 +51,4 @@ dependencies { // Add samples specific dependencies implementation(libs.play.services.location) implementation(libs.kotlin.coroutines.play) -} \ No newline at end of file +} diff --git a/samples/storage/build.gradle.kts b/samples/storage/build.gradle.kts index 4bff4b92..eb512413 100644 --- a/samples/storage/build.gradle.kts +++ b/samples/storage/build.gradle.kts @@ -34,10 +34,6 @@ android { targetCompatibility = JavaVersion.VERSION_11 } - kotlinOptions { - jvmTarget = "11" - } - lint { targetSdk = 35 } @@ -64,4 +60,4 @@ dependencies { implementation(libs.coil) implementation(libs.coil.video) implementation(libs.coil.compose) -} \ No newline at end of file +} diff --git a/samples/user-interface/appwidgets/build.gradle.kts b/samples/user-interface/appwidgets/build.gradle.kts index b7d7b28f..ab9969da 100644 --- a/samples/user-interface/appwidgets/build.gradle.kts +++ b/samples/user-interface/appwidgets/build.gradle.kts @@ -34,10 +34,6 @@ android { targetCompatibility = JavaVersion.VERSION_11 } - kotlinOptions { - jvmTarget = "11" - } - buildFeatures { viewBinding = true } @@ -72,4 +68,4 @@ dependencies { debugImplementation(libs.androidx.glance.preview) debugImplementation(libs.androidx.glance.appwidget.preview) -} \ No newline at end of file +} diff --git a/samples/user-interface/constraintlayout/build.gradle.kts b/samples/user-interface/constraintlayout/build.gradle.kts index 93deafd6..2b1a756c 100644 --- a/samples/user-interface/constraintlayout/build.gradle.kts +++ b/samples/user-interface/constraintlayout/build.gradle.kts @@ -32,10 +32,6 @@ android { targetCompatibility = JavaVersion.VERSION_11 } - kotlinOptions { - jvmTarget = "11" - } - buildFeatures { viewBinding = true } diff --git a/samples/user-interface/draganddrop/build.gradle.kts b/samples/user-interface/draganddrop/build.gradle.kts index 3829dc12..d07d5ea3 100644 --- a/samples/user-interface/draganddrop/build.gradle.kts +++ b/samples/user-interface/draganddrop/build.gradle.kts @@ -32,10 +32,6 @@ android { targetCompatibility = JavaVersion.VERSION_11 } - kotlinOptions { - jvmTarget = "11" - } - buildFeatures { viewBinding = true } diff --git a/samples/user-interface/haptics/build.gradle.kts b/samples/user-interface/haptics/build.gradle.kts index cd5173af..580602df 100644 --- a/samples/user-interface/haptics/build.gradle.kts +++ b/samples/user-interface/haptics/build.gradle.kts @@ -32,10 +32,6 @@ android { sourceCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_11 } - - kotlinOptions { - jvmTarget = "11" - } lint { targetSdk = 35 } diff --git a/samples/user-interface/live-updates/build.gradle.kts b/samples/user-interface/live-updates/build.gradle.kts index 94095b83..5e9849e3 100644 --- a/samples/user-interface/live-updates/build.gradle.kts +++ b/samples/user-interface/live-updates/build.gradle.kts @@ -17,10 +17,6 @@ android { targetCompatibility = JavaVersion.VERSION_11 } - kotlinOptions { - jvmTarget = "11" - } - buildFeatures { viewBinding = true } @@ -40,4 +36,4 @@ dependencies { implementation(libs.accompanist.permissions) implementation(libs.androidx.constraintlayout) implementation(libs.androidx.material3.android) -} \ No newline at end of file +} diff --git a/samples/user-interface/picture-in-picture/build.gradle.kts b/samples/user-interface/picture-in-picture/build.gradle.kts index 06d8915d..fcbf5182 100644 --- a/samples/user-interface/picture-in-picture/build.gradle.kts +++ b/samples/user-interface/picture-in-picture/build.gradle.kts @@ -36,10 +36,6 @@ android { targetCompatibility = JavaVersion.VERSION_11 } - kotlinOptions { - jvmTarget = "11" - } - buildFeatures { viewBinding = true } diff --git a/samples/user-interface/predictiveback/build.gradle.kts b/samples/user-interface/predictiveback/build.gradle.kts index f8bf8a6f..6395b0b3 100644 --- a/samples/user-interface/predictiveback/build.gradle.kts +++ b/samples/user-interface/predictiveback/build.gradle.kts @@ -34,10 +34,6 @@ android { targetCompatibility = JavaVersion.VERSION_11 } - kotlinOptions { - jvmTarget = "11" - } - buildFeatures { viewBinding = true } @@ -57,4 +53,4 @@ dependencies { implementation(libs.androidx.navigation.ui) implementation(libs.androidx.fragment) implementation(libs.androidx.transition) -} \ No newline at end of file +} diff --git a/samples/user-interface/quicksettings/build.gradle.kts b/samples/user-interface/quicksettings/build.gradle.kts index 6f6f2b7e..c7c5b456 100644 --- a/samples/user-interface/quicksettings/build.gradle.kts +++ b/samples/user-interface/quicksettings/build.gradle.kts @@ -33,10 +33,6 @@ android { targetCompatibility = JavaVersion.VERSION_11 } - kotlinOptions { - jvmTarget = "11" - } - lint { targetSdk = 36 } diff --git a/samples/user-interface/share/build.gradle.kts b/samples/user-interface/share/build.gradle.kts index 0f6392a1..bb32ce8a 100644 --- a/samples/user-interface/share/build.gradle.kts +++ b/samples/user-interface/share/build.gradle.kts @@ -33,10 +33,6 @@ android { targetCompatibility = JavaVersion.VERSION_11 } - kotlinOptions { - jvmTarget = "11" - } - lint { targetSdk = 35 } diff --git a/samples/user-interface/text/build.gradle.kts b/samples/user-interface/text/build.gradle.kts index 08b70487..d480c9ed 100644 --- a/samples/user-interface/text/build.gradle.kts +++ b/samples/user-interface/text/build.gradle.kts @@ -33,10 +33,6 @@ android { targetCompatibility = JavaVersion.VERSION_11 } - kotlinOptions { - jvmTarget = "11" - } - buildFeatures { viewBinding = true } diff --git a/samples/user-interface/window-insets/build.gradle.kts b/samples/user-interface/window-insets/build.gradle.kts index 31ac93ea..f405f569 100644 --- a/samples/user-interface/window-insets/build.gradle.kts +++ b/samples/user-interface/window-insets/build.gradle.kts @@ -33,10 +33,6 @@ android { targetCompatibility = JavaVersion.VERSION_11 } - kotlinOptions { - jvmTarget = "11" - } - buildFeatures { viewBinding = true } diff --git a/samples/user-interface/windowmanager/build.gradle.kts b/samples/user-interface/windowmanager/build.gradle.kts index b1fe5e43..2b187226 100644 --- a/samples/user-interface/windowmanager/build.gradle.kts +++ b/samples/user-interface/windowmanager/build.gradle.kts @@ -33,10 +33,6 @@ android { targetCompatibility = JavaVersion.VERSION_11 } - kotlinOptions { - jvmTarget = "11" - } - buildFeatures { viewBinding = true } diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts index 79fb702c..d889b0a1 100644 --- a/shared/build.gradle.kts +++ b/shared/build.gradle.kts @@ -28,9 +28,6 @@ android { sourceCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_11 } - kotlinOptions { - jvmTarget = "11" - } buildFeatures { compose = true } @@ -48,4 +45,4 @@ dependencies { implementation(libs.androidx.material3) implementation(libs.accompanist.permissions) -} \ No newline at end of file +} From f6c5b3b1b691612a6cb0b0fc563bed2190bfefb5 Mon Sep 17 00:00:00 2001 From: Yacine Rezgui Date: Wed, 8 Jul 2026 17:33:09 +0200 Subject: [PATCH 3/8] chore: bump compileSdk to 37 across all modules --- samples/accessibility/build.gradle.kts | 2 +- samples/camera/camera2/build.gradle.kts | 2 +- samples/camera/camerax/build.gradle.kts | 2 +- samples/connectivity/UwbRanging/build.gradle.kts | 2 +- samples/connectivity/audio/build.gradle.kts | 2 +- samples/connectivity/bluetooth/ble/build.gradle.kts | 2 +- samples/connectivity/bluetooth/companion/build.gradle.kts | 2 +- samples/connectivity/callnotification/build.gradle.kts | 2 +- samples/graphics/pdf/build.gradle.kts | 2 +- samples/graphics/ultrahdr/build.gradle.kts | 2 +- samples/location/build.gradle.kts | 2 +- samples/media/ultrahdr/build.gradle.kts | 2 +- samples/media/video/build.gradle.kts | 2 +- samples/privacy/data/build.gradle.kts | 2 +- samples/privacy/permissions/build.gradle.kts | 2 +- samples/privacy/transparency/build.gradle.kts | 2 +- samples/storage/build.gradle.kts | 2 +- samples/user-interface/constraintlayout/build.gradle.kts | 2 +- samples/user-interface/draganddrop/build.gradle.kts | 2 +- samples/user-interface/haptics/build.gradle.kts | 2 +- samples/user-interface/picture-in-picture/build.gradle.kts | 2 +- samples/user-interface/predictiveback/build.gradle.kts | 2 +- samples/user-interface/quicksettings/build.gradle.kts | 2 +- samples/user-interface/share/build.gradle.kts | 2 +- samples/user-interface/text/build.gradle.kts | 2 +- samples/user-interface/window-insets/build.gradle.kts | 2 +- samples/user-interface/windowmanager/build.gradle.kts | 2 +- shared/build.gradle.kts | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/samples/accessibility/build.gradle.kts b/samples/accessibility/build.gradle.kts index ea984172..f52cc24b 100644 --- a/samples/accessibility/build.gradle.kts +++ b/samples/accessibility/build.gradle.kts @@ -24,7 +24,7 @@ plugins { android { namespace = "com.example.platform.accessibility" - compileSdk = 36 + compileSdk = 37 defaultConfig { minSdk = 21 diff --git a/samples/camera/camera2/build.gradle.kts b/samples/camera/camera2/build.gradle.kts index fc413d9c..59c899d2 100644 --- a/samples/camera/camera2/build.gradle.kts +++ b/samples/camera/camera2/build.gradle.kts @@ -22,7 +22,7 @@ plugins { android { namespace = "com.example.platform.camera" - compileSdk = 36 + compileSdk = 37 defaultConfig { minSdk = 21 diff --git a/samples/camera/camerax/build.gradle.kts b/samples/camera/camerax/build.gradle.kts index ef91697c..cf9037fb 100644 --- a/samples/camera/camerax/build.gradle.kts +++ b/samples/camera/camerax/build.gradle.kts @@ -22,7 +22,7 @@ plugins { android { namespace = "com.example.platform.camerax" - compileSdk = 36 + compileSdk = 37 defaultConfig { minSdk = 21 diff --git a/samples/connectivity/UwbRanging/build.gradle.kts b/samples/connectivity/UwbRanging/build.gradle.kts index c2dbff88..1b7f7d20 100644 --- a/samples/connectivity/UwbRanging/build.gradle.kts +++ b/samples/connectivity/UwbRanging/build.gradle.kts @@ -25,7 +25,7 @@ plugins { android { namespace = "com.example.platform.connectivity.uwb" - compileSdk = 36 + compileSdk = 37 defaultConfig { minSdk = 31 diff --git a/samples/connectivity/audio/build.gradle.kts b/samples/connectivity/audio/build.gradle.kts index a73da634..9c2bf0d4 100644 --- a/samples/connectivity/audio/build.gradle.kts +++ b/samples/connectivity/audio/build.gradle.kts @@ -23,7 +23,7 @@ plugins { android { namespace = "com.example.platform.connectivity.audio" - compileSdk = 36 + compileSdk = 37 defaultConfig { minSdk = 21 diff --git a/samples/connectivity/bluetooth/ble/build.gradle.kts b/samples/connectivity/bluetooth/ble/build.gradle.kts index d64027d3..4e54e360 100644 --- a/samples/connectivity/bluetooth/ble/build.gradle.kts +++ b/samples/connectivity/bluetooth/ble/build.gradle.kts @@ -23,7 +23,7 @@ plugins { android { namespace = "com.example.platform.connectivity.bluetooth.ble" - compileSdk = 36 + compileSdk = 37 defaultConfig { minSdk = 21 diff --git a/samples/connectivity/bluetooth/companion/build.gradle.kts b/samples/connectivity/bluetooth/companion/build.gradle.kts index f0dcb1b9..33e990ac 100644 --- a/samples/connectivity/bluetooth/companion/build.gradle.kts +++ b/samples/connectivity/bluetooth/companion/build.gradle.kts @@ -23,7 +23,7 @@ plugins { android { namespace = "com.example.platform.connectivity.bluetooth.companion" - compileSdk = 36 + compileSdk = 37 defaultConfig { minSdk = 21 diff --git a/samples/connectivity/callnotification/build.gradle.kts b/samples/connectivity/callnotification/build.gradle.kts index 19f4c109..45140a7e 100644 --- a/samples/connectivity/callnotification/build.gradle.kts +++ b/samples/connectivity/callnotification/build.gradle.kts @@ -24,7 +24,7 @@ plugins { android { namespace = "com.example.platform.connectivity.callnotification" - compileSdk = 36 + compileSdk = 37 defaultConfig { minSdk = 21 diff --git a/samples/graphics/pdf/build.gradle.kts b/samples/graphics/pdf/build.gradle.kts index 2f996946..93f42f0b 100644 --- a/samples/graphics/pdf/build.gradle.kts +++ b/samples/graphics/pdf/build.gradle.kts @@ -24,7 +24,7 @@ plugins { android { namespace = "com.example.platform.graphics.pdf" - compileSdk = 36 + compileSdk = 37 defaultConfig { minSdk = 21 diff --git a/samples/graphics/ultrahdr/build.gradle.kts b/samples/graphics/ultrahdr/build.gradle.kts index c762e400..7299e66e 100644 --- a/samples/graphics/ultrahdr/build.gradle.kts +++ b/samples/graphics/ultrahdr/build.gradle.kts @@ -23,7 +23,7 @@ plugins { android { namespace = "com.example.platform.graphics.ultrahdr" - compileSdk = 36 + compileSdk = 37 defaultConfig { minSdk = 21 diff --git a/samples/location/build.gradle.kts b/samples/location/build.gradle.kts index 61ef90ab..94bf752c 100644 --- a/samples/location/build.gradle.kts +++ b/samples/location/build.gradle.kts @@ -22,7 +22,7 @@ plugins { android { namespace = "com.example.platform.location" - compileSdk = 36 + compileSdk = 37 defaultConfig { minSdk = 21 diff --git a/samples/media/ultrahdr/build.gradle.kts b/samples/media/ultrahdr/build.gradle.kts index 0fbaeaf9..e214a7ed 100644 --- a/samples/media/ultrahdr/build.gradle.kts +++ b/samples/media/ultrahdr/build.gradle.kts @@ -23,7 +23,7 @@ plugins { android { namespace = "com.example.platform.media.ultrahdr" - compileSdk = 36 + compileSdk = 37 defaultConfig { minSdk = 21 diff --git a/samples/media/video/build.gradle.kts b/samples/media/video/build.gradle.kts index dcba8133..86695235 100644 --- a/samples/media/video/build.gradle.kts +++ b/samples/media/video/build.gradle.kts @@ -23,7 +23,7 @@ plugins { android { namespace = "com.example.platform.media.video" - compileSdk = 36 + compileSdk = 37 defaultConfig { minSdk = 21 diff --git a/samples/privacy/data/build.gradle.kts b/samples/privacy/data/build.gradle.kts index 906e4116..271a1c63 100644 --- a/samples/privacy/data/build.gradle.kts +++ b/samples/privacy/data/build.gradle.kts @@ -23,7 +23,7 @@ plugins { android { namespace = "com.example.platform.privacy.data" - compileSdk = 36 + compileSdk = 37 defaultConfig { minSdk = 21 diff --git a/samples/privacy/permissions/build.gradle.kts b/samples/privacy/permissions/build.gradle.kts index 81c97e53..9e929b3e 100644 --- a/samples/privacy/permissions/build.gradle.kts +++ b/samples/privacy/permissions/build.gradle.kts @@ -22,7 +22,7 @@ plugins { android { namespace = "com.example.platform.privacy.permissions" - compileSdk = 36 + compileSdk = 37 defaultConfig { minSdk = 21 diff --git a/samples/privacy/transparency/build.gradle.kts b/samples/privacy/transparency/build.gradle.kts index 2b867d9a..338ff3ee 100644 --- a/samples/privacy/transparency/build.gradle.kts +++ b/samples/privacy/transparency/build.gradle.kts @@ -22,7 +22,7 @@ plugins { android { namespace = "com.example.platform.privacy.transparency" - compileSdk = 36 + compileSdk = 37 defaultConfig { minSdk = 21 diff --git a/samples/storage/build.gradle.kts b/samples/storage/build.gradle.kts index eb512413..247a718b 100644 --- a/samples/storage/build.gradle.kts +++ b/samples/storage/build.gradle.kts @@ -24,7 +24,7 @@ plugins { android { namespace = "com.example.platform.storage" - compileSdk = 36 + compileSdk = 37 defaultConfig { minSdk = 34 diff --git a/samples/user-interface/constraintlayout/build.gradle.kts b/samples/user-interface/constraintlayout/build.gradle.kts index 2b1a756c..c9a49f87 100644 --- a/samples/user-interface/constraintlayout/build.gradle.kts +++ b/samples/user-interface/constraintlayout/build.gradle.kts @@ -21,7 +21,7 @@ plugins { android { namespace = "com.example.platform.ui.constraintlayout" - compileSdk = 36 + compileSdk = 37 defaultConfig { minSdk = 21 diff --git a/samples/user-interface/draganddrop/build.gradle.kts b/samples/user-interface/draganddrop/build.gradle.kts index d07d5ea3..0ae19cec 100644 --- a/samples/user-interface/draganddrop/build.gradle.kts +++ b/samples/user-interface/draganddrop/build.gradle.kts @@ -21,7 +21,7 @@ plugins { android { namespace = "com.example.platform.ui.draganddrop" - compileSdk = 36 + compileSdk = 37 defaultConfig { minSdk = 21 diff --git a/samples/user-interface/haptics/build.gradle.kts b/samples/user-interface/haptics/build.gradle.kts index 580602df..0967d3f3 100644 --- a/samples/user-interface/haptics/build.gradle.kts +++ b/samples/user-interface/haptics/build.gradle.kts @@ -22,7 +22,7 @@ plugins { android { namespace = "com.example.platform.ui.haptics" - compileSdk = 36 + compileSdk = 37 defaultConfig { minSdk = 21 diff --git a/samples/user-interface/picture-in-picture/build.gradle.kts b/samples/user-interface/picture-in-picture/build.gradle.kts index fcbf5182..0124d96d 100644 --- a/samples/user-interface/picture-in-picture/build.gradle.kts +++ b/samples/user-interface/picture-in-picture/build.gradle.kts @@ -23,7 +23,7 @@ plugins { android { namespace = "com.example.android.pip" - compileSdk = 36 + compileSdk = 37 defaultConfig { minSdk = 23 diff --git a/samples/user-interface/predictiveback/build.gradle.kts b/samples/user-interface/predictiveback/build.gradle.kts index 6395b0b3..c0d2b082 100644 --- a/samples/user-interface/predictiveback/build.gradle.kts +++ b/samples/user-interface/predictiveback/build.gradle.kts @@ -23,7 +23,7 @@ plugins { android { namespace = "com.example.platform.ui.predictiveback" - compileSdk = 36 + compileSdk = 37 defaultConfig { minSdk = 21 diff --git a/samples/user-interface/quicksettings/build.gradle.kts b/samples/user-interface/quicksettings/build.gradle.kts index c7c5b456..494ea301 100644 --- a/samples/user-interface/quicksettings/build.gradle.kts +++ b/samples/user-interface/quicksettings/build.gradle.kts @@ -22,7 +22,7 @@ plugins { android { namespace = "com.example.platform.ui.quicksettings" - compileSdk = 36 + compileSdk = 37 defaultConfig { minSdk = 21 diff --git a/samples/user-interface/share/build.gradle.kts b/samples/user-interface/share/build.gradle.kts index bb32ce8a..c8e6213c 100644 --- a/samples/user-interface/share/build.gradle.kts +++ b/samples/user-interface/share/build.gradle.kts @@ -22,7 +22,7 @@ plugins { android { namespace = "com.example.platform.ui.share" - compileSdk = 36 + compileSdk = 37 defaultConfig { minSdk = 21 diff --git a/samples/user-interface/text/build.gradle.kts b/samples/user-interface/text/build.gradle.kts index d480c9ed..fffe690a 100644 --- a/samples/user-interface/text/build.gradle.kts +++ b/samples/user-interface/text/build.gradle.kts @@ -22,7 +22,7 @@ plugins { android { namespace = "com.example.platform.ui.text" - compileSdk = 36 + compileSdk = 37 defaultConfig { minSdk = 21 diff --git a/samples/user-interface/window-insets/build.gradle.kts b/samples/user-interface/window-insets/build.gradle.kts index f405f569..29d80ff5 100644 --- a/samples/user-interface/window-insets/build.gradle.kts +++ b/samples/user-interface/window-insets/build.gradle.kts @@ -22,7 +22,7 @@ plugins { android { namespace = "com.example.platform.ui.insets" - compileSdk = 36 + compileSdk = 37 defaultConfig { minSdk = 21 diff --git a/samples/user-interface/windowmanager/build.gradle.kts b/samples/user-interface/windowmanager/build.gradle.kts index 2b187226..07939d6b 100644 --- a/samples/user-interface/windowmanager/build.gradle.kts +++ b/samples/user-interface/windowmanager/build.gradle.kts @@ -21,7 +21,7 @@ plugins { android { namespace = "com.example.platform.ui.windowmanager" - compileSdk = 36 + compileSdk = 37 defaultConfig { minSdk = 24 diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts index d889b0a1..3831fa47 100644 --- a/shared/build.gradle.kts +++ b/shared/build.gradle.kts @@ -6,7 +6,7 @@ plugins { android { namespace = "com.example.platform.shared" - compileSdk = 36 + compileSdk = 37 defaultConfig { minSdk = 21 From 4a2bdc069d5065b96b756cca8a2427c630ac48a8 Mon Sep 17 00:00:00 2001 From: Yacine Rezgui Date: Thu, 9 Jul 2026 15:02:18 +0200 Subject: [PATCH 4/8] chore: bump minSdkVersion to 23 across all modules --- samples/accessibility/build.gradle.kts | 2 +- samples/camera/camera2/build.gradle.kts | 2 +- samples/camera/camerax/build.gradle.kts | 2 +- samples/connectivity/audio/build.gradle.kts | 2 +- samples/connectivity/bluetooth/ble/build.gradle.kts | 2 +- samples/connectivity/bluetooth/companion/build.gradle.kts | 2 +- samples/connectivity/callnotification/build.gradle.kts | 2 +- samples/graphics/pdf/build.gradle.kts | 2 +- samples/graphics/ultrahdr/build.gradle.kts | 2 +- samples/location/build.gradle.kts | 2 +- samples/media/ultrahdr/build.gradle.kts | 2 +- samples/media/video/build.gradle.kts | 2 +- samples/privacy/data/build.gradle.kts | 2 +- samples/privacy/permissions/build.gradle.kts | 2 +- samples/privacy/transparency/build.gradle.kts | 2 +- samples/user-interface/constraintlayout/build.gradle.kts | 2 +- samples/user-interface/draganddrop/build.gradle.kts | 2 +- samples/user-interface/haptics/build.gradle.kts | 2 +- samples/user-interface/live-updates/build.gradle.kts | 2 +- samples/user-interface/predictiveback/build.gradle.kts | 2 +- samples/user-interface/quicksettings/build.gradle.kts | 2 +- samples/user-interface/share/build.gradle.kts | 2 +- samples/user-interface/text/build.gradle.kts | 2 +- samples/user-interface/window-insets/build.gradle.kts | 2 +- shared/build.gradle.kts | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/samples/accessibility/build.gradle.kts b/samples/accessibility/build.gradle.kts index f52cc24b..9d1238b2 100644 --- a/samples/accessibility/build.gradle.kts +++ b/samples/accessibility/build.gradle.kts @@ -27,7 +27,7 @@ android { compileSdk = 37 defaultConfig { - minSdk = 21 + minSdk = 23 } compileOptions { diff --git a/samples/camera/camera2/build.gradle.kts b/samples/camera/camera2/build.gradle.kts index 59c899d2..38c2c723 100644 --- a/samples/camera/camera2/build.gradle.kts +++ b/samples/camera/camera2/build.gradle.kts @@ -25,7 +25,7 @@ android { compileSdk = 37 defaultConfig { - minSdk = 21 + minSdk = 23 } compileOptions { diff --git a/samples/camera/camerax/build.gradle.kts b/samples/camera/camerax/build.gradle.kts index cf9037fb..c2df63b6 100644 --- a/samples/camera/camerax/build.gradle.kts +++ b/samples/camera/camerax/build.gradle.kts @@ -25,7 +25,7 @@ android { compileSdk = 37 defaultConfig { - minSdk = 21 + minSdk = 23 testOptions.targetSdk = 35 } diff --git a/samples/connectivity/audio/build.gradle.kts b/samples/connectivity/audio/build.gradle.kts index 9c2bf0d4..052ee579 100644 --- a/samples/connectivity/audio/build.gradle.kts +++ b/samples/connectivity/audio/build.gradle.kts @@ -26,7 +26,7 @@ android { compileSdk = 37 defaultConfig { - minSdk = 21 + minSdk = 23 } compileOptions { diff --git a/samples/connectivity/bluetooth/ble/build.gradle.kts b/samples/connectivity/bluetooth/ble/build.gradle.kts index 4e54e360..a7c8f12f 100644 --- a/samples/connectivity/bluetooth/ble/build.gradle.kts +++ b/samples/connectivity/bluetooth/ble/build.gradle.kts @@ -26,7 +26,7 @@ android { compileSdk = 37 defaultConfig { - minSdk = 21 + minSdk = 23 } compileOptions { diff --git a/samples/connectivity/bluetooth/companion/build.gradle.kts b/samples/connectivity/bluetooth/companion/build.gradle.kts index 33e990ac..4f7e23f5 100644 --- a/samples/connectivity/bluetooth/companion/build.gradle.kts +++ b/samples/connectivity/bluetooth/companion/build.gradle.kts @@ -26,7 +26,7 @@ android { compileSdk = 37 defaultConfig { - minSdk = 21 + minSdk = 23 } compileOptions { diff --git a/samples/connectivity/callnotification/build.gradle.kts b/samples/connectivity/callnotification/build.gradle.kts index 45140a7e..7ee4d4a6 100644 --- a/samples/connectivity/callnotification/build.gradle.kts +++ b/samples/connectivity/callnotification/build.gradle.kts @@ -27,7 +27,7 @@ android { compileSdk = 37 defaultConfig { - minSdk = 21 + minSdk = 23 } compileOptions { diff --git a/samples/graphics/pdf/build.gradle.kts b/samples/graphics/pdf/build.gradle.kts index 93f42f0b..fde45397 100644 --- a/samples/graphics/pdf/build.gradle.kts +++ b/samples/graphics/pdf/build.gradle.kts @@ -27,7 +27,7 @@ android { compileSdk = 37 defaultConfig { - minSdk = 21 + minSdk = 23 } compileOptions { sourceCompatibility = JavaVersion.VERSION_11 diff --git a/samples/graphics/ultrahdr/build.gradle.kts b/samples/graphics/ultrahdr/build.gradle.kts index 7299e66e..954d0f42 100644 --- a/samples/graphics/ultrahdr/build.gradle.kts +++ b/samples/graphics/ultrahdr/build.gradle.kts @@ -26,7 +26,7 @@ android { compileSdk = 37 defaultConfig { - minSdk = 21 + minSdk = 23 } compileOptions { diff --git a/samples/location/build.gradle.kts b/samples/location/build.gradle.kts index 94bf752c..479f4869 100644 --- a/samples/location/build.gradle.kts +++ b/samples/location/build.gradle.kts @@ -25,7 +25,7 @@ android { compileSdk = 37 defaultConfig { - minSdk = 21 + minSdk = 23 } compileOptions { diff --git a/samples/media/ultrahdr/build.gradle.kts b/samples/media/ultrahdr/build.gradle.kts index e214a7ed..1b0a89e1 100644 --- a/samples/media/ultrahdr/build.gradle.kts +++ b/samples/media/ultrahdr/build.gradle.kts @@ -26,7 +26,7 @@ android { compileSdk = 37 defaultConfig { - minSdk = 21 + minSdk = 23 } compileOptions { diff --git a/samples/media/video/build.gradle.kts b/samples/media/video/build.gradle.kts index 86695235..e7e88758 100644 --- a/samples/media/video/build.gradle.kts +++ b/samples/media/video/build.gradle.kts @@ -26,7 +26,7 @@ android { compileSdk = 37 defaultConfig { - minSdk = 21 + minSdk = 23 } compileOptions { diff --git a/samples/privacy/data/build.gradle.kts b/samples/privacy/data/build.gradle.kts index 271a1c63..d6988056 100644 --- a/samples/privacy/data/build.gradle.kts +++ b/samples/privacy/data/build.gradle.kts @@ -26,7 +26,7 @@ android { compileSdk = 37 defaultConfig { - minSdk = 21 + minSdk = 23 } compileOptions { diff --git a/samples/privacy/permissions/build.gradle.kts b/samples/privacy/permissions/build.gradle.kts index 9e929b3e..7080180e 100644 --- a/samples/privacy/permissions/build.gradle.kts +++ b/samples/privacy/permissions/build.gradle.kts @@ -25,7 +25,7 @@ android { compileSdk = 37 defaultConfig { - minSdk = 21 + minSdk = 23 } compileOptions { diff --git a/samples/privacy/transparency/build.gradle.kts b/samples/privacy/transparency/build.gradle.kts index 338ff3ee..5dc02c65 100644 --- a/samples/privacy/transparency/build.gradle.kts +++ b/samples/privacy/transparency/build.gradle.kts @@ -25,7 +25,7 @@ android { compileSdk = 37 defaultConfig { - minSdk = 21 + minSdk = 23 } compileOptions { sourceCompatibility = JavaVersion.VERSION_11 diff --git a/samples/user-interface/constraintlayout/build.gradle.kts b/samples/user-interface/constraintlayout/build.gradle.kts index c9a49f87..fbf5ce03 100644 --- a/samples/user-interface/constraintlayout/build.gradle.kts +++ b/samples/user-interface/constraintlayout/build.gradle.kts @@ -24,7 +24,7 @@ android { compileSdk = 37 defaultConfig { - minSdk = 21 + minSdk = 23 } compileOptions { diff --git a/samples/user-interface/draganddrop/build.gradle.kts b/samples/user-interface/draganddrop/build.gradle.kts index 0ae19cec..ec84d85b 100644 --- a/samples/user-interface/draganddrop/build.gradle.kts +++ b/samples/user-interface/draganddrop/build.gradle.kts @@ -24,7 +24,7 @@ android { compileSdk = 37 defaultConfig { - minSdk = 21 + minSdk = 23 } compileOptions { diff --git a/samples/user-interface/haptics/build.gradle.kts b/samples/user-interface/haptics/build.gradle.kts index 0967d3f3..318e2de7 100644 --- a/samples/user-interface/haptics/build.gradle.kts +++ b/samples/user-interface/haptics/build.gradle.kts @@ -25,7 +25,7 @@ android { compileSdk = 37 defaultConfig { - minSdk = 21 + minSdk = 23 } compileOptions { diff --git a/samples/user-interface/live-updates/build.gradle.kts b/samples/user-interface/live-updates/build.gradle.kts index 5e9849e3..e3685f86 100644 --- a/samples/user-interface/live-updates/build.gradle.kts +++ b/samples/user-interface/live-updates/build.gradle.kts @@ -9,7 +9,7 @@ android { compileSdk = 37 defaultConfig { - minSdk = 21 + minSdk = 23 } compileOptions { diff --git a/samples/user-interface/predictiveback/build.gradle.kts b/samples/user-interface/predictiveback/build.gradle.kts index c0d2b082..c0301429 100644 --- a/samples/user-interface/predictiveback/build.gradle.kts +++ b/samples/user-interface/predictiveback/build.gradle.kts @@ -26,7 +26,7 @@ android { compileSdk = 37 defaultConfig { - minSdk = 21 + minSdk = 23 } compileOptions { diff --git a/samples/user-interface/quicksettings/build.gradle.kts b/samples/user-interface/quicksettings/build.gradle.kts index 494ea301..c69c1819 100644 --- a/samples/user-interface/quicksettings/build.gradle.kts +++ b/samples/user-interface/quicksettings/build.gradle.kts @@ -25,7 +25,7 @@ android { compileSdk = 37 defaultConfig { - minSdk = 21 + minSdk = 23 } compileOptions { diff --git a/samples/user-interface/share/build.gradle.kts b/samples/user-interface/share/build.gradle.kts index c8e6213c..79794017 100644 --- a/samples/user-interface/share/build.gradle.kts +++ b/samples/user-interface/share/build.gradle.kts @@ -25,7 +25,7 @@ android { compileSdk = 37 defaultConfig { - minSdk = 21 + minSdk = 23 } compileOptions { diff --git a/samples/user-interface/text/build.gradle.kts b/samples/user-interface/text/build.gradle.kts index fffe690a..252d40ec 100644 --- a/samples/user-interface/text/build.gradle.kts +++ b/samples/user-interface/text/build.gradle.kts @@ -25,7 +25,7 @@ android { compileSdk = 37 defaultConfig { - minSdk = 21 + minSdk = 23 } compileOptions { diff --git a/samples/user-interface/window-insets/build.gradle.kts b/samples/user-interface/window-insets/build.gradle.kts index 29d80ff5..21d2cb5b 100644 --- a/samples/user-interface/window-insets/build.gradle.kts +++ b/samples/user-interface/window-insets/build.gradle.kts @@ -25,7 +25,7 @@ android { compileSdk = 37 defaultConfig { - minSdk = 21 + minSdk = 23 } compileOptions { diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts index 3831fa47..899298d2 100644 --- a/shared/build.gradle.kts +++ b/shared/build.gradle.kts @@ -9,7 +9,7 @@ android { compileSdk = 37 defaultConfig { - minSdk = 21 + minSdk = 23 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") From 5c15232dfcbf6d2ec7a4bd13007bd61c402f08ee Mon Sep 17 00:00:00 2001 From: Yacine Rezgui Date: Thu, 9 Jul 2026 15:18:57 +0200 Subject: [PATCH 5/8] refactor: remove redundant kotlin-android plugin from project build configurations --- app/build.gradle.kts | 1 - build.gradle.kts | 1 - gradle/libs.versions.toml | 1 - samples/accessibility/build.gradle.kts | 1 - samples/camera/camera2/build.gradle.kts | 1 - samples/camera/camerax/build.gradle.kts | 1 - samples/connectivity/UwbRanging/build.gradle.kts | 1 - samples/connectivity/audio/build.gradle.kts | 1 - samples/connectivity/bluetooth/ble/build.gradle.kts | 1 - samples/connectivity/bluetooth/companion/build.gradle.kts | 1 - samples/connectivity/callnotification/build.gradle.kts | 1 - samples/connectivity/telecom/build.gradle.kts | 1 - samples/graphics/pdf/build.gradle.kts | 1 - samples/graphics/ultrahdr/build.gradle.kts | 1 - samples/location/build.gradle.kts | 1 - samples/media/ultrahdr/build.gradle.kts | 1 - samples/media/video/build.gradle.kts | 1 - samples/privacy/data/build.gradle.kts | 1 - samples/privacy/permissions/build.gradle.kts | 1 - samples/privacy/transparency/build.gradle.kts | 1 - samples/storage/build.gradle.kts | 1 - samples/user-interface/appwidgets/build.gradle.kts | 1 - samples/user-interface/constraintlayout/build.gradle.kts | 2 +- samples/user-interface/draganddrop/build.gradle.kts | 2 +- samples/user-interface/haptics/build.gradle.kts | 1 - samples/user-interface/live-updates/build.gradle.kts | 1 - samples/user-interface/picture-in-picture/build.gradle.kts | 1 - samples/user-interface/predictiveback/build.gradle.kts | 1 - samples/user-interface/quicksettings/build.gradle.kts | 1 - samples/user-interface/share/build.gradle.kts | 1 - samples/user-interface/text/build.gradle.kts | 1 - samples/user-interface/window-insets/build.gradle.kts | 1 - samples/user-interface/windowmanager/build.gradle.kts | 1 - shared/build.gradle.kts | 1 - 34 files changed, 2 insertions(+), 34 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 323affa0..a4c7540c 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -16,7 +16,6 @@ plugins { alias(libs.plugins.android.application) - alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.compose) kotlin("plugin.serialization") version "2.4.0" } diff --git a/build.gradle.kts b/build.gradle.kts index 19c3c23c..14750c0d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -15,7 +15,6 @@ */ plugins { alias(libs.plugins.android.application) apply false - alias(libs.plugins.kotlin.android) apply false alias(libs.plugins.kotlin.compose) apply false alias(libs.plugins.android.library) apply false alias(libs.plugins.protobuf) apply false diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5fb63968..f66e6c48 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -210,7 +210,6 @@ firebase-crashlytics-buildtools = { group = "com.google.firebase", name = "fireb [plugins] android-application = { id = "com.android.application", version.ref = "agp" } -kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } android-library = { id = "com.android.library", version.ref = "agp" } compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } diff --git a/samples/accessibility/build.gradle.kts b/samples/accessibility/build.gradle.kts index 9d1238b2..2efef7dd 100644 --- a/samples/accessibility/build.gradle.kts +++ b/samples/accessibility/build.gradle.kts @@ -19,7 +19,6 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.compose) - alias(libs.plugins.kotlin.android) } android { diff --git a/samples/camera/camera2/build.gradle.kts b/samples/camera/camera2/build.gradle.kts index 38c2c723..50ac8069 100644 --- a/samples/camera/camera2/build.gradle.kts +++ b/samples/camera/camera2/build.gradle.kts @@ -17,7 +17,6 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.compose) - alias(libs.plugins.kotlin.android) } android { diff --git a/samples/camera/camerax/build.gradle.kts b/samples/camera/camerax/build.gradle.kts index c2df63b6..790dd962 100644 --- a/samples/camera/camerax/build.gradle.kts +++ b/samples/camera/camerax/build.gradle.kts @@ -17,7 +17,6 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.compose) - alias(libs.plugins.kotlin.android) } android { diff --git a/samples/connectivity/UwbRanging/build.gradle.kts b/samples/connectivity/UwbRanging/build.gradle.kts index 1b7f7d20..e56d7393 100644 --- a/samples/connectivity/UwbRanging/build.gradle.kts +++ b/samples/connectivity/UwbRanging/build.gradle.kts @@ -18,7 +18,6 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.compose) - alias(libs.plugins.kotlin.android) id("kotlin-parcelize") alias(libs.plugins.protobuf) } diff --git a/samples/connectivity/audio/build.gradle.kts b/samples/connectivity/audio/build.gradle.kts index 052ee579..64297dfe 100644 --- a/samples/connectivity/audio/build.gradle.kts +++ b/samples/connectivity/audio/build.gradle.kts @@ -17,7 +17,6 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.compose) - alias(libs.plugins.kotlin.android) } diff --git a/samples/connectivity/bluetooth/ble/build.gradle.kts b/samples/connectivity/bluetooth/ble/build.gradle.kts index a7c8f12f..ddfe1a25 100644 --- a/samples/connectivity/bluetooth/ble/build.gradle.kts +++ b/samples/connectivity/bluetooth/ble/build.gradle.kts @@ -17,7 +17,6 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.compose) - alias(libs.plugins.kotlin.android) } diff --git a/samples/connectivity/bluetooth/companion/build.gradle.kts b/samples/connectivity/bluetooth/companion/build.gradle.kts index 4f7e23f5..d8a9d32f 100644 --- a/samples/connectivity/bluetooth/companion/build.gradle.kts +++ b/samples/connectivity/bluetooth/companion/build.gradle.kts @@ -17,7 +17,6 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.compose) - alias(libs.plugins.kotlin.android) } diff --git a/samples/connectivity/callnotification/build.gradle.kts b/samples/connectivity/callnotification/build.gradle.kts index 7ee4d4a6..74931fd6 100644 --- a/samples/connectivity/callnotification/build.gradle.kts +++ b/samples/connectivity/callnotification/build.gradle.kts @@ -19,7 +19,6 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.compose) - alias(libs.plugins.kotlin.android) } android { diff --git a/samples/connectivity/telecom/build.gradle.kts b/samples/connectivity/telecom/build.gradle.kts index 358700d3..6be15f75 100644 --- a/samples/connectivity/telecom/build.gradle.kts +++ b/samples/connectivity/telecom/build.gradle.kts @@ -19,7 +19,6 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.compose) - alias(libs.plugins.kotlin.android) id("kotlin-parcelize") } diff --git a/samples/graphics/pdf/build.gradle.kts b/samples/graphics/pdf/build.gradle.kts index fde45397..40bf76aa 100644 --- a/samples/graphics/pdf/build.gradle.kts +++ b/samples/graphics/pdf/build.gradle.kts @@ -19,7 +19,6 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.compose) - alias(libs.plugins.kotlin.android) } android { diff --git a/samples/graphics/ultrahdr/build.gradle.kts b/samples/graphics/ultrahdr/build.gradle.kts index 954d0f42..e4d16e00 100644 --- a/samples/graphics/ultrahdr/build.gradle.kts +++ b/samples/graphics/ultrahdr/build.gradle.kts @@ -18,7 +18,6 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.compose) - alias(libs.plugins.kotlin.android) } android { diff --git a/samples/location/build.gradle.kts b/samples/location/build.gradle.kts index 479f4869..c067ba3e 100644 --- a/samples/location/build.gradle.kts +++ b/samples/location/build.gradle.kts @@ -17,7 +17,6 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.compose) - alias(libs.plugins.kotlin.android) } android { diff --git a/samples/media/ultrahdr/build.gradle.kts b/samples/media/ultrahdr/build.gradle.kts index 1b0a89e1..46201657 100644 --- a/samples/media/ultrahdr/build.gradle.kts +++ b/samples/media/ultrahdr/build.gradle.kts @@ -18,7 +18,6 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.compose) - alias(libs.plugins.kotlin.android) } android { diff --git a/samples/media/video/build.gradle.kts b/samples/media/video/build.gradle.kts index e7e88758..3d94fca7 100644 --- a/samples/media/video/build.gradle.kts +++ b/samples/media/video/build.gradle.kts @@ -17,7 +17,6 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.compose) - alias(libs.plugins.kotlin.android) id("de.undercouch.download") version "5.7.0" } diff --git a/samples/privacy/data/build.gradle.kts b/samples/privacy/data/build.gradle.kts index d6988056..b6447b25 100644 --- a/samples/privacy/data/build.gradle.kts +++ b/samples/privacy/data/build.gradle.kts @@ -17,7 +17,6 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.compose) - alias(libs.plugins.kotlin.android) } diff --git a/samples/privacy/permissions/build.gradle.kts b/samples/privacy/permissions/build.gradle.kts index 7080180e..6d80dbd6 100644 --- a/samples/privacy/permissions/build.gradle.kts +++ b/samples/privacy/permissions/build.gradle.kts @@ -17,7 +17,6 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.compose) - alias(libs.plugins.kotlin.android) } android { diff --git a/samples/privacy/transparency/build.gradle.kts b/samples/privacy/transparency/build.gradle.kts index 5dc02c65..0327cbb4 100644 --- a/samples/privacy/transparency/build.gradle.kts +++ b/samples/privacy/transparency/build.gradle.kts @@ -17,7 +17,6 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.compose) - alias(libs.plugins.kotlin.android) } android { diff --git a/samples/storage/build.gradle.kts b/samples/storage/build.gradle.kts index 247a718b..7830a7b2 100644 --- a/samples/storage/build.gradle.kts +++ b/samples/storage/build.gradle.kts @@ -19,7 +19,6 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.compose) - alias(libs.plugins.kotlin.android) } android { diff --git a/samples/user-interface/appwidgets/build.gradle.kts b/samples/user-interface/appwidgets/build.gradle.kts index ab9969da..4c9dcd92 100644 --- a/samples/user-interface/appwidgets/build.gradle.kts +++ b/samples/user-interface/appwidgets/build.gradle.kts @@ -17,7 +17,6 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.compose) - alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.serialization) } diff --git a/samples/user-interface/constraintlayout/build.gradle.kts b/samples/user-interface/constraintlayout/build.gradle.kts index fbf5ce03..bffa5348 100644 --- a/samples/user-interface/constraintlayout/build.gradle.kts +++ b/samples/user-interface/constraintlayout/build.gradle.kts @@ -17,7 +17,7 @@ plugins { alias(libs.plugins.android.library) // alias(libs.plugins.kotlin.compose) - alias(libs.plugins.kotlin.android)} + } android { namespace = "com.example.platform.ui.constraintlayout" diff --git a/samples/user-interface/draganddrop/build.gradle.kts b/samples/user-interface/draganddrop/build.gradle.kts index ec84d85b..fd0b3873 100644 --- a/samples/user-interface/draganddrop/build.gradle.kts +++ b/samples/user-interface/draganddrop/build.gradle.kts @@ -17,7 +17,7 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.compose) - alias(libs.plugins.kotlin.android)} + } android { namespace = "com.example.platform.ui.draganddrop" diff --git a/samples/user-interface/haptics/build.gradle.kts b/samples/user-interface/haptics/build.gradle.kts index 318e2de7..def013ac 100644 --- a/samples/user-interface/haptics/build.gradle.kts +++ b/samples/user-interface/haptics/build.gradle.kts @@ -17,7 +17,6 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.compose) - alias(libs.plugins.kotlin.android) } android { diff --git a/samples/user-interface/live-updates/build.gradle.kts b/samples/user-interface/live-updates/build.gradle.kts index e3685f86..3e7e614b 100644 --- a/samples/user-interface/live-updates/build.gradle.kts +++ b/samples/user-interface/live-updates/build.gradle.kts @@ -1,6 +1,5 @@ plugins { alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) alias(libs.plugins.compose) } diff --git a/samples/user-interface/picture-in-picture/build.gradle.kts b/samples/user-interface/picture-in-picture/build.gradle.kts index 0124d96d..e60cde0a 100644 --- a/samples/user-interface/picture-in-picture/build.gradle.kts +++ b/samples/user-interface/picture-in-picture/build.gradle.kts @@ -18,7 +18,6 @@ plugins { alias(libs.plugins.android.library) // alias(libs.plugins.kotlin.compose) - alias(libs.plugins.kotlin.android) } android { diff --git a/samples/user-interface/predictiveback/build.gradle.kts b/samples/user-interface/predictiveback/build.gradle.kts index c0301429..b7034369 100644 --- a/samples/user-interface/predictiveback/build.gradle.kts +++ b/samples/user-interface/predictiveback/build.gradle.kts @@ -18,7 +18,6 @@ plugins { alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) } android { diff --git a/samples/user-interface/quicksettings/build.gradle.kts b/samples/user-interface/quicksettings/build.gradle.kts index c69c1819..9b8b3660 100644 --- a/samples/user-interface/quicksettings/build.gradle.kts +++ b/samples/user-interface/quicksettings/build.gradle.kts @@ -17,7 +17,6 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.compose) - alias(libs.plugins.kotlin.android) } android { diff --git a/samples/user-interface/share/build.gradle.kts b/samples/user-interface/share/build.gradle.kts index 79794017..c4734802 100644 --- a/samples/user-interface/share/build.gradle.kts +++ b/samples/user-interface/share/build.gradle.kts @@ -17,7 +17,6 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.compose) - alias(libs.plugins.kotlin.android) } android { diff --git a/samples/user-interface/text/build.gradle.kts b/samples/user-interface/text/build.gradle.kts index 252d40ec..4be602c9 100644 --- a/samples/user-interface/text/build.gradle.kts +++ b/samples/user-interface/text/build.gradle.kts @@ -16,7 +16,6 @@ plugins { alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) } diff --git a/samples/user-interface/window-insets/build.gradle.kts b/samples/user-interface/window-insets/build.gradle.kts index 21d2cb5b..5ce2644e 100644 --- a/samples/user-interface/window-insets/build.gradle.kts +++ b/samples/user-interface/window-insets/build.gradle.kts @@ -17,7 +17,6 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.compose) - alias(libs.plugins.kotlin.android) } android { diff --git a/samples/user-interface/windowmanager/build.gradle.kts b/samples/user-interface/windowmanager/build.gradle.kts index 07939d6b..0006600b 100644 --- a/samples/user-interface/windowmanager/build.gradle.kts +++ b/samples/user-interface/windowmanager/build.gradle.kts @@ -16,7 +16,6 @@ plugins { alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) } android { diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts index 899298d2..9f7ece5c 100644 --- a/shared/build.gradle.kts +++ b/shared/build.gradle.kts @@ -1,6 +1,5 @@ plugins { alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.compose) } From 746d291f576efa257686d4d190ff985f2c245192 Mon Sep 17 00:00:00 2001 From: Yacine Rezgui Date: Thu, 9 Jul 2026 15:47:12 +0200 Subject: [PATCH 6/8] Revert "refactor: remove redundant kotlin-android plugin from project build configurations" This reverts commit 5c15232dfcbf6d2ec7a4bd13007bd61c402f08ee. --- app/build.gradle.kts | 1 + build.gradle.kts | 1 + gradle/libs.versions.toml | 1 + samples/accessibility/build.gradle.kts | 1 + samples/camera/camera2/build.gradle.kts | 1 + samples/camera/camerax/build.gradle.kts | 1 + samples/connectivity/UwbRanging/build.gradle.kts | 1 + samples/connectivity/audio/build.gradle.kts | 1 + samples/connectivity/bluetooth/ble/build.gradle.kts | 1 + samples/connectivity/bluetooth/companion/build.gradle.kts | 1 + samples/connectivity/callnotification/build.gradle.kts | 1 + samples/connectivity/telecom/build.gradle.kts | 1 + samples/graphics/pdf/build.gradle.kts | 1 + samples/graphics/ultrahdr/build.gradle.kts | 1 + samples/location/build.gradle.kts | 1 + samples/media/ultrahdr/build.gradle.kts | 1 + samples/media/video/build.gradle.kts | 1 + samples/privacy/data/build.gradle.kts | 1 + samples/privacy/permissions/build.gradle.kts | 1 + samples/privacy/transparency/build.gradle.kts | 1 + samples/storage/build.gradle.kts | 1 + samples/user-interface/appwidgets/build.gradle.kts | 1 + samples/user-interface/constraintlayout/build.gradle.kts | 2 +- samples/user-interface/draganddrop/build.gradle.kts | 2 +- samples/user-interface/haptics/build.gradle.kts | 1 + samples/user-interface/live-updates/build.gradle.kts | 1 + samples/user-interface/picture-in-picture/build.gradle.kts | 1 + samples/user-interface/predictiveback/build.gradle.kts | 1 + samples/user-interface/quicksettings/build.gradle.kts | 1 + samples/user-interface/share/build.gradle.kts | 1 + samples/user-interface/text/build.gradle.kts | 1 + samples/user-interface/window-insets/build.gradle.kts | 1 + samples/user-interface/windowmanager/build.gradle.kts | 1 + shared/build.gradle.kts | 1 + 34 files changed, 34 insertions(+), 2 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index a4c7540c..323affa0 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -16,6 +16,7 @@ plugins { alias(libs.plugins.android.application) + alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.compose) kotlin("plugin.serialization") version "2.4.0" } diff --git a/build.gradle.kts b/build.gradle.kts index 14750c0d..19c3c23c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -15,6 +15,7 @@ */ plugins { alias(libs.plugins.android.application) apply false + alias(libs.plugins.kotlin.android) apply false alias(libs.plugins.kotlin.compose) apply false alias(libs.plugins.android.library) apply false alias(libs.plugins.protobuf) apply false diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f66e6c48..5fb63968 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -210,6 +210,7 @@ firebase-crashlytics-buildtools = { group = "com.google.firebase", name = "fireb [plugins] android-application = { id = "com.android.application", version.ref = "agp" } +kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } android-library = { id = "com.android.library", version.ref = "agp" } compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } diff --git a/samples/accessibility/build.gradle.kts b/samples/accessibility/build.gradle.kts index 2efef7dd..9d1238b2 100644 --- a/samples/accessibility/build.gradle.kts +++ b/samples/accessibility/build.gradle.kts @@ -19,6 +19,7 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.compose) + alias(libs.plugins.kotlin.android) } android { diff --git a/samples/camera/camera2/build.gradle.kts b/samples/camera/camera2/build.gradle.kts index 50ac8069..38c2c723 100644 --- a/samples/camera/camera2/build.gradle.kts +++ b/samples/camera/camera2/build.gradle.kts @@ -17,6 +17,7 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.compose) + alias(libs.plugins.kotlin.android) } android { diff --git a/samples/camera/camerax/build.gradle.kts b/samples/camera/camerax/build.gradle.kts index 790dd962..c2df63b6 100644 --- a/samples/camera/camerax/build.gradle.kts +++ b/samples/camera/camerax/build.gradle.kts @@ -17,6 +17,7 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.compose) + alias(libs.plugins.kotlin.android) } android { diff --git a/samples/connectivity/UwbRanging/build.gradle.kts b/samples/connectivity/UwbRanging/build.gradle.kts index e56d7393..1b7f7d20 100644 --- a/samples/connectivity/UwbRanging/build.gradle.kts +++ b/samples/connectivity/UwbRanging/build.gradle.kts @@ -18,6 +18,7 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.compose) + alias(libs.plugins.kotlin.android) id("kotlin-parcelize") alias(libs.plugins.protobuf) } diff --git a/samples/connectivity/audio/build.gradle.kts b/samples/connectivity/audio/build.gradle.kts index 64297dfe..052ee579 100644 --- a/samples/connectivity/audio/build.gradle.kts +++ b/samples/connectivity/audio/build.gradle.kts @@ -17,6 +17,7 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.compose) + alias(libs.plugins.kotlin.android) } diff --git a/samples/connectivity/bluetooth/ble/build.gradle.kts b/samples/connectivity/bluetooth/ble/build.gradle.kts index ddfe1a25..a7c8f12f 100644 --- a/samples/connectivity/bluetooth/ble/build.gradle.kts +++ b/samples/connectivity/bluetooth/ble/build.gradle.kts @@ -17,6 +17,7 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.compose) + alias(libs.plugins.kotlin.android) } diff --git a/samples/connectivity/bluetooth/companion/build.gradle.kts b/samples/connectivity/bluetooth/companion/build.gradle.kts index d8a9d32f..4f7e23f5 100644 --- a/samples/connectivity/bluetooth/companion/build.gradle.kts +++ b/samples/connectivity/bluetooth/companion/build.gradle.kts @@ -17,6 +17,7 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.compose) + alias(libs.plugins.kotlin.android) } diff --git a/samples/connectivity/callnotification/build.gradle.kts b/samples/connectivity/callnotification/build.gradle.kts index 74931fd6..7ee4d4a6 100644 --- a/samples/connectivity/callnotification/build.gradle.kts +++ b/samples/connectivity/callnotification/build.gradle.kts @@ -19,6 +19,7 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.compose) + alias(libs.plugins.kotlin.android) } android { diff --git a/samples/connectivity/telecom/build.gradle.kts b/samples/connectivity/telecom/build.gradle.kts index 6be15f75..358700d3 100644 --- a/samples/connectivity/telecom/build.gradle.kts +++ b/samples/connectivity/telecom/build.gradle.kts @@ -19,6 +19,7 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.compose) + alias(libs.plugins.kotlin.android) id("kotlin-parcelize") } diff --git a/samples/graphics/pdf/build.gradle.kts b/samples/graphics/pdf/build.gradle.kts index 40bf76aa..fde45397 100644 --- a/samples/graphics/pdf/build.gradle.kts +++ b/samples/graphics/pdf/build.gradle.kts @@ -19,6 +19,7 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.compose) + alias(libs.plugins.kotlin.android) } android { diff --git a/samples/graphics/ultrahdr/build.gradle.kts b/samples/graphics/ultrahdr/build.gradle.kts index e4d16e00..954d0f42 100644 --- a/samples/graphics/ultrahdr/build.gradle.kts +++ b/samples/graphics/ultrahdr/build.gradle.kts @@ -18,6 +18,7 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.compose) + alias(libs.plugins.kotlin.android) } android { diff --git a/samples/location/build.gradle.kts b/samples/location/build.gradle.kts index c067ba3e..479f4869 100644 --- a/samples/location/build.gradle.kts +++ b/samples/location/build.gradle.kts @@ -17,6 +17,7 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.compose) + alias(libs.plugins.kotlin.android) } android { diff --git a/samples/media/ultrahdr/build.gradle.kts b/samples/media/ultrahdr/build.gradle.kts index 46201657..1b0a89e1 100644 --- a/samples/media/ultrahdr/build.gradle.kts +++ b/samples/media/ultrahdr/build.gradle.kts @@ -18,6 +18,7 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.compose) + alias(libs.plugins.kotlin.android) } android { diff --git a/samples/media/video/build.gradle.kts b/samples/media/video/build.gradle.kts index 3d94fca7..e7e88758 100644 --- a/samples/media/video/build.gradle.kts +++ b/samples/media/video/build.gradle.kts @@ -17,6 +17,7 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.compose) + alias(libs.plugins.kotlin.android) id("de.undercouch.download") version "5.7.0" } diff --git a/samples/privacy/data/build.gradle.kts b/samples/privacy/data/build.gradle.kts index b6447b25..d6988056 100644 --- a/samples/privacy/data/build.gradle.kts +++ b/samples/privacy/data/build.gradle.kts @@ -17,6 +17,7 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.compose) + alias(libs.plugins.kotlin.android) } diff --git a/samples/privacy/permissions/build.gradle.kts b/samples/privacy/permissions/build.gradle.kts index 6d80dbd6..7080180e 100644 --- a/samples/privacy/permissions/build.gradle.kts +++ b/samples/privacy/permissions/build.gradle.kts @@ -17,6 +17,7 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.compose) + alias(libs.plugins.kotlin.android) } android { diff --git a/samples/privacy/transparency/build.gradle.kts b/samples/privacy/transparency/build.gradle.kts index 0327cbb4..5dc02c65 100644 --- a/samples/privacy/transparency/build.gradle.kts +++ b/samples/privacy/transparency/build.gradle.kts @@ -17,6 +17,7 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.compose) + alias(libs.plugins.kotlin.android) } android { diff --git a/samples/storage/build.gradle.kts b/samples/storage/build.gradle.kts index 7830a7b2..247a718b 100644 --- a/samples/storage/build.gradle.kts +++ b/samples/storage/build.gradle.kts @@ -19,6 +19,7 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.compose) + alias(libs.plugins.kotlin.android) } android { diff --git a/samples/user-interface/appwidgets/build.gradle.kts b/samples/user-interface/appwidgets/build.gradle.kts index 4c9dcd92..ab9969da 100644 --- a/samples/user-interface/appwidgets/build.gradle.kts +++ b/samples/user-interface/appwidgets/build.gradle.kts @@ -17,6 +17,7 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.compose) + alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.serialization) } diff --git a/samples/user-interface/constraintlayout/build.gradle.kts b/samples/user-interface/constraintlayout/build.gradle.kts index bffa5348..fbf5ce03 100644 --- a/samples/user-interface/constraintlayout/build.gradle.kts +++ b/samples/user-interface/constraintlayout/build.gradle.kts @@ -17,7 +17,7 @@ plugins { alias(libs.plugins.android.library) // alias(libs.plugins.kotlin.compose) - } + alias(libs.plugins.kotlin.android)} android { namespace = "com.example.platform.ui.constraintlayout" diff --git a/samples/user-interface/draganddrop/build.gradle.kts b/samples/user-interface/draganddrop/build.gradle.kts index fd0b3873..ec84d85b 100644 --- a/samples/user-interface/draganddrop/build.gradle.kts +++ b/samples/user-interface/draganddrop/build.gradle.kts @@ -17,7 +17,7 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.compose) - } + alias(libs.plugins.kotlin.android)} android { namespace = "com.example.platform.ui.draganddrop" diff --git a/samples/user-interface/haptics/build.gradle.kts b/samples/user-interface/haptics/build.gradle.kts index def013ac..318e2de7 100644 --- a/samples/user-interface/haptics/build.gradle.kts +++ b/samples/user-interface/haptics/build.gradle.kts @@ -17,6 +17,7 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.compose) + alias(libs.plugins.kotlin.android) } android { diff --git a/samples/user-interface/live-updates/build.gradle.kts b/samples/user-interface/live-updates/build.gradle.kts index 3e7e614b..e3685f86 100644 --- a/samples/user-interface/live-updates/build.gradle.kts +++ b/samples/user-interface/live-updates/build.gradle.kts @@ -1,5 +1,6 @@ plugins { alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) alias(libs.plugins.compose) } diff --git a/samples/user-interface/picture-in-picture/build.gradle.kts b/samples/user-interface/picture-in-picture/build.gradle.kts index e60cde0a..0124d96d 100644 --- a/samples/user-interface/picture-in-picture/build.gradle.kts +++ b/samples/user-interface/picture-in-picture/build.gradle.kts @@ -18,6 +18,7 @@ plugins { alias(libs.plugins.android.library) // alias(libs.plugins.kotlin.compose) + alias(libs.plugins.kotlin.android) } android { diff --git a/samples/user-interface/predictiveback/build.gradle.kts b/samples/user-interface/predictiveback/build.gradle.kts index b7034369..c0301429 100644 --- a/samples/user-interface/predictiveback/build.gradle.kts +++ b/samples/user-interface/predictiveback/build.gradle.kts @@ -18,6 +18,7 @@ plugins { alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) } android { diff --git a/samples/user-interface/quicksettings/build.gradle.kts b/samples/user-interface/quicksettings/build.gradle.kts index 9b8b3660..c69c1819 100644 --- a/samples/user-interface/quicksettings/build.gradle.kts +++ b/samples/user-interface/quicksettings/build.gradle.kts @@ -17,6 +17,7 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.compose) + alias(libs.plugins.kotlin.android) } android { diff --git a/samples/user-interface/share/build.gradle.kts b/samples/user-interface/share/build.gradle.kts index c4734802..79794017 100644 --- a/samples/user-interface/share/build.gradle.kts +++ b/samples/user-interface/share/build.gradle.kts @@ -17,6 +17,7 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.compose) + alias(libs.plugins.kotlin.android) } android { diff --git a/samples/user-interface/text/build.gradle.kts b/samples/user-interface/text/build.gradle.kts index 4be602c9..252d40ec 100644 --- a/samples/user-interface/text/build.gradle.kts +++ b/samples/user-interface/text/build.gradle.kts @@ -16,6 +16,7 @@ plugins { alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) } diff --git a/samples/user-interface/window-insets/build.gradle.kts b/samples/user-interface/window-insets/build.gradle.kts index 5ce2644e..21d2cb5b 100644 --- a/samples/user-interface/window-insets/build.gradle.kts +++ b/samples/user-interface/window-insets/build.gradle.kts @@ -17,6 +17,7 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.compose) + alias(libs.plugins.kotlin.android) } android { diff --git a/samples/user-interface/windowmanager/build.gradle.kts b/samples/user-interface/windowmanager/build.gradle.kts index 0006600b..07939d6b 100644 --- a/samples/user-interface/windowmanager/build.gradle.kts +++ b/samples/user-interface/windowmanager/build.gradle.kts @@ -16,6 +16,7 @@ plugins { alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) } android { diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts index 9f7ece5c..899298d2 100644 --- a/shared/build.gradle.kts +++ b/shared/build.gradle.kts @@ -1,5 +1,6 @@ plugins { alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.compose) } From 113dc8f09fdda2bafe374f9ae6472e8436e1b386 Mon Sep 17 00:00:00 2001 From: Yacine Rezgui Date: Thu, 9 Jul 2026 16:09:22 +0200 Subject: [PATCH 7/8] refactor: improve null safety for Bluetooth APIs, update Gradle configurations, and modernize Media3 and TensorFlow Lite dependencies. --- build.gradle.kts | 6 ++++++ gradle/libs.versions.toml | 4 ++-- samples/accessibility/build.gradle.kts | 1 + .../uwb/uwbranging/impl/UwbSessionScopeImpl.kt | 1 + .../bluetooth/ble/FindBLEDevicesSample.kt | 6 +++--- .../ble/server/GATTServerSampleService.kt | 9 +++++---- samples/connectivity/telecom/build.gradle.kts | 6 +----- samples/media/video/build.gradle.kts | 1 + .../media/video/TransformerVideoComposition.kt | 11 ++++++----- .../user-interface/appwidgets/build.gradle.kts | 1 + .../layout/text/layout/FullBleedImageLayout.kt | 15 ++++++--------- .../glance/weather/WeatherGlanceWidget.kt | 2 ++ .../ui/draganddrop/DragAndDropUsingCompose.kt | 16 +++++----------- samples/user-interface/haptics/build.gradle.kts | 1 + shared/build.gradle.kts | 1 + 15 files changed, 42 insertions(+), 39 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 19c3c23c..3395ce53 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -19,4 +19,10 @@ plugins { alias(libs.plugins.kotlin.compose) apply false alias(libs.plugins.android.library) apply false alias(libs.plugins.protobuf) apply false +} + +allprojects { + tasks.withType().configureEach { + compilerOptions.jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11) + } } \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5fb63968..cee96c54 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -58,9 +58,9 @@ media3 = "1.10.1" constraintlayout = "2.2.1" glide-compose = "1.0.0-beta09" glance = "1.3.0-SNAPSHOT" -tensorflowLite = "2.17.0" +tensorflowLite = "2.16.1" tensorflowLiteGpuDelegatePlugin = "0.4.4" -tensorflowLiteSupport = "0.5.0" +tensorflowLiteSupport = "0.4.4" barcodeScanningCommon = "17.0.0" playServicesMlkitBarcodeScanning = "18.3.1" protobuf = "0.10.0" diff --git a/samples/accessibility/build.gradle.kts b/samples/accessibility/build.gradle.kts index 9d1238b2..53cb48ee 100644 --- a/samples/accessibility/build.gradle.kts +++ b/samples/accessibility/build.gradle.kts @@ -52,5 +52,6 @@ dependencies { implementation(libs.androidx.ui.tooling) implementation(libs.androidx.ui.tooling.preview) implementation(libs.androidx.material3) + implementation(libs.compose.material.iconsext) implementation(libs.androidx.fragment) } diff --git a/samples/connectivity/UwbRanging/src/main/java/com/google/uwb/uwbranging/impl/UwbSessionScopeImpl.kt b/samples/connectivity/UwbRanging/src/main/java/com/google/uwb/uwbranging/impl/UwbSessionScopeImpl.kt index 2e6c42f9..abd479b6 100644 --- a/samples/connectivity/UwbRanging/src/main/java/com/google/uwb/uwbranging/impl/UwbSessionScopeImpl.kt +++ b/samples/connectivity/UwbRanging/src/main/java/com/google/uwb/uwbranging/impl/UwbSessionScopeImpl.kt @@ -101,6 +101,7 @@ internal class UwbSessionScopeImpl( trySend(EndpointEvents.PositionUpdated(endpoint, result.position)) is RangingResult.RangingResultPeerDisconnected -> trySend(EndpointEvents.UwbDisconnected(endpoint)) + else -> { /* Ignore other results */ } } } } diff --git a/samples/connectivity/bluetooth/ble/src/main/java/com/example/platform/connectivity/bluetooth/ble/FindBLEDevicesSample.kt b/samples/connectivity/bluetooth/ble/src/main/java/com/example/platform/connectivity/bluetooth/ble/FindBLEDevicesSample.kt index 48ed9ea4..0189f9da 100644 --- a/samples/connectivity/bluetooth/ble/src/main/java/com/example/platform/connectivity/bluetooth/ble/FindBLEDevicesSample.kt +++ b/samples/connectivity/bluetooth/ble/src/main/java/com/example/platform/connectivity/bluetooth/ble/FindBLEDevicesSample.kt @@ -263,9 +263,9 @@ private fun BluetoothScanEffect( val observer = LifecycleEventObserver { _, event -> // Start scanning once the app is in foreground and stop when in background if (event == Lifecycle.Event.ON_START) { - adapter.bluetoothLeScanner.startScan(null, scanSettings, leScanCallback) + adapter.bluetoothLeScanner?.startScan(null, scanSettings, leScanCallback) } else if (event == Lifecycle.Event.ON_STOP) { - adapter.bluetoothLeScanner.stopScan(leScanCallback) + adapter.bluetoothLeScanner?.stopScan(leScanCallback) } } @@ -275,7 +275,7 @@ private fun BluetoothScanEffect( // When the effect leaves the Composition, remove the observer and stop scanning onDispose { lifecycleOwner.lifecycle.removeObserver(observer) - adapter.bluetoothLeScanner.stopScan(leScanCallback) + adapter.bluetoothLeScanner?.stopScan(leScanCallback) } } } diff --git a/samples/connectivity/bluetooth/ble/src/main/java/com/example/platform/connectivity/bluetooth/ble/server/GATTServerSampleService.kt b/samples/connectivity/bluetooth/ble/src/main/java/com/example/platform/connectivity/bluetooth/ble/server/GATTServerSampleService.kt index cb23f225..c5c951ae 100644 --- a/samples/connectivity/bluetooth/ble/src/main/java/com/example/platform/connectivity/bluetooth/ble/server/GATTServerSampleService.kt +++ b/samples/connectivity/bluetooth/ble/src/main/java/com/example/platform/connectivity/bluetooth/ble/server/GATTServerSampleService.kt @@ -81,7 +81,7 @@ class GATTServerSampleService : Service() { private val manager: BluetoothManager by lazy { applicationContext.getSystemService(BluetoothManager::class.java) } - private val advertiser: BluetoothLeAdvertiser + private val advertiser: BluetoothLeAdvertiser? get() = manager.adapter.bluetoothLeAdvertiser private val service = @@ -134,7 +134,7 @@ class GATTServerSampleService : Service() { ACTION_STOP_ADVERTISING -> { serverLogsState.value += "Stop advertising\n" - advertiser.stopAdvertising(SampleAdvertiseCallback) + advertiser?.stopAdvertising(SampleAdvertiseCallback) } else -> throw IllegalArgumentException("Unknown action") @@ -148,7 +148,7 @@ class GATTServerSampleService : Service() { super.onDestroy() isServerRunning.value = false if (hasAdvertisingPermission()) { - advertiser.stopAdvertising(SampleAdvertiseCallback) + advertiser?.stopAdvertising(SampleAdvertiseCallback) } server.close() scope.cancel() @@ -206,7 +206,7 @@ class GATTServerSampleService : Service() { .addServiceUuid(ParcelUuid(SERVICE_UUID)) .build() - advertiser.startAdvertising(settings, data, SampleAdvertiseCallback) + advertiser?.startAdvertising(settings, data, SampleAdvertiseCallback) } @SuppressLint("MissingPermission") @@ -256,6 +256,7 @@ class GATTServerSampleService : Service() { characteristic: BluetoothGattCharacteristic?, ) { super.onCharacteristicReadRequest(device, requestId, offset, characteristic) + if (device == null) return serverLogsState.value += "Characteristic Read request: $requestId (offset $offset)\n" val data = serverLogsState.value.toByteArray() val response = data.copyOfRange(offset, data.size) diff --git a/samples/connectivity/telecom/build.gradle.kts b/samples/connectivity/telecom/build.gradle.kts index 358700d3..b97dd69e 100644 --- a/samples/connectivity/telecom/build.gradle.kts +++ b/samples/connectivity/telecom/build.gradle.kts @@ -25,11 +25,7 @@ plugins { android { namespace = "com.example.platform.connectivity.telecom" - compileSdk { - version = release(version = 36) { - minorApiLevel = 1 - } - } + compileSdk = 37 defaultConfig { minSdk = 23 diff --git a/samples/media/video/build.gradle.kts b/samples/media/video/build.gradle.kts index e7e88758..5e7075df 100644 --- a/samples/media/video/build.gradle.kts +++ b/samples/media/video/build.gradle.kts @@ -82,6 +82,7 @@ dependencies { // Tensorflow lite dependencies implementation(libs.tensorflow.lite) implementation(libs.tensorflow.lite.gpu) + implementation("org.tensorflow:tensorflow-lite-gpu-api:2.16.1") implementation(libs.tensorflow.lite.gpu.delegate.plugin) implementation(libs.tensorflow.lite.support) implementation(libs.tensorflow.lite.select.tf.ops) diff --git a/samples/media/video/src/main/java/com/example/platform/media/video/TransformerVideoComposition.kt b/samples/media/video/src/main/java/com/example/platform/media/video/TransformerVideoComposition.kt index 4b16ccc3..fa4cd80f 100644 --- a/samples/media/video/src/main/java/com/example/platform/media/video/TransformerVideoComposition.kt +++ b/samples/media/video/src/main/java/com/example/platform/media/video/TransformerVideoComposition.kt @@ -178,16 +178,17 @@ class TransformerVideoComposition : Fragment() { videoSequence.addAll(listOf(video1, video2)) - compositionSequences.add(EditedMediaItemSequence(videoSequence)) + compositionSequences.add( + EditedMediaItemSequence.Builder(videoSequence).build() + ) if (binding.backgroundAudioChip.isChecked) { val backgroundAudio = EditedMediaItem.Builder(MediaItem.fromUri(URI_AUDIO)).build() // create an audio sequence that will be looping over the duration of the first video // sequence. - val audioSequence = EditedMediaItemSequence( - ImmutableList.of(backgroundAudio), - /* isLooping*/true, - ) + val audioSequence = EditedMediaItemSequence.Builder(backgroundAudio) + .setIsLooping(true) + .build() compositionSequences.add(audioSequence) } diff --git a/samples/user-interface/appwidgets/build.gradle.kts b/samples/user-interface/appwidgets/build.gradle.kts index ab9969da..59b2bb30 100644 --- a/samples/user-interface/appwidgets/build.gradle.kts +++ b/samples/user-interface/appwidgets/build.gradle.kts @@ -52,6 +52,7 @@ dependencies { implementation(libs.androidx.ui) implementation(libs.androidx.ui.tooling.preview) implementation(libs.androidx.material3) + implementation(libs.compose.material.iconsext) implementation(libs.coil) implementation(libs.coil.compose) diff --git a/samples/user-interface/appwidgets/src/main/java/com/example/platform/ui/appwidgets/glance/layout/text/layout/FullBleedImageLayout.kt b/samples/user-interface/appwidgets/src/main/java/com/example/platform/ui/appwidgets/glance/layout/text/layout/FullBleedImageLayout.kt index f759e9f1..0b6109a1 100644 --- a/samples/user-interface/appwidgets/src/main/java/com/example/platform/ui/appwidgets/glance/layout/text/layout/FullBleedImageLayout.kt +++ b/samples/user-interface/appwidgets/src/main/java/com/example/platform/ui/appwidgets/glance/layout/text/layout/FullBleedImageLayout.kt @@ -29,7 +29,7 @@ import androidx.glance.LocalContext import androidx.glance.LocalSize import androidx.glance.appwidget.cornerRadius import androidx.glance.appwidget.lazy.LazyColumn -import androidx.glance.appwidget.lazy.VerticalScrollMode +// import androidx.glance.appwidget.lazy.VerticalScrollMode import androidx.glance.appwidget.lazy.items import androidx.glance.background import androidx.glance.layout.Alignment @@ -45,7 +45,7 @@ import androidx.glance.layout.width import androidx.glance.text.FontWeight import androidx.glance.text.Text import androidx.glance.text.TextStyle -import androidx.glance.unit.ColorProvider +import androidx.glance.color.ColorProvider import com.example.platform.ui.appwidgets.R import com.example.platform.ui.appwidgets.glance.layout.collections.layout.ImageGridItemData import com.example.platform.ui.appwidgets.glance.layout.collections.layout.NoDataContent @@ -112,8 +112,7 @@ private fun SnapScrollingGallery( data = data, isSmall = isSmall, appName = appName, - size = size, - verticalScrollMode = VerticalScrollMode.SnapScrollMatchHeight(size.height) + size = size ) } @@ -122,8 +121,7 @@ private fun GalleryList( data: List, isSmall: Boolean, appName: String, - size: DpSize, - verticalScrollMode: VerticalScrollMode = VerticalScrollMode.Normal + size: DpSize ) { if (data.size == 1) { // If there's only 1 item (like in the widget preview), render with fillMaxSize to @@ -138,8 +136,7 @@ private fun GalleryList( } else { val limitedData = data.take(5) LazyColumn( - modifier = GlanceModifier.fillMaxSize(), - verticalScrollMode = verticalScrollMode + modifier = GlanceModifier.fillMaxSize() ) { items(limitedData, itemId = { item -> item.key.hashCode().toLong() }) { item -> GalleryItemCard( @@ -202,7 +199,7 @@ private fun GalleryItemCard( Text( text = itemTitle, style = TextStyle( - color = ColorProvider(Color.White), + color = ColorProvider(Color.White, Color.White), fontWeight = FontWeight.Bold, fontSize = titleFontSize ), diff --git a/samples/user-interface/appwidgets/src/main/java/com/example/platform/ui/appwidgets/glance/weather/WeatherGlanceWidget.kt b/samples/user-interface/appwidgets/src/main/java/com/example/platform/ui/appwidgets/glance/weather/WeatherGlanceWidget.kt index 902646db..82213c42 100644 --- a/samples/user-interface/appwidgets/src/main/java/com/example/platform/ui/appwidgets/glance/weather/WeatherGlanceWidget.kt +++ b/samples/user-interface/appwidgets/src/main/java/com/example/platform/ui/appwidgets/glance/weather/WeatherGlanceWidget.kt @@ -16,6 +16,7 @@ package com.example.platform.ui.appwidgets.glance.weather +import android.annotation.SuppressLint import android.content.Context import android.os.Build import androidx.annotation.RequiresApi @@ -391,6 +392,7 @@ suspend fun refreshWeather(context: Context) { WeatherRepo.updateWeatherInfo() } +@SuppressLint("NonObservableLocale") @Composable private fun WeatherData.toDayString() = day.lowercase(Locale.getDefault()).replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() diff --git a/samples/user-interface/draganddrop/src/main/java/com/example/platform/ui/draganddrop/DragAndDropUsingCompose.kt b/samples/user-interface/draganddrop/src/main/java/com/example/platform/ui/draganddrop/DragAndDropUsingCompose.kt index 53c82a89..449bb29c 100644 --- a/samples/user-interface/draganddrop/src/main/java/com/example/platform/ui/draganddrop/DragAndDropUsingCompose.kt +++ b/samples/user-interface/draganddrop/src/main/java/com/example/platform/ui/draganddrop/DragAndDropUsingCompose.kt @@ -159,17 +159,11 @@ fun Photo(urlStr: String) { contentDescription = "demo", modifier = Modifier .size(100.dp) - .dragAndDropSource { - detectTapGestures( - onLongPress = { - startTransfer( - DragAndDropTransferData( - ClipData.newPlainText( - "image Url", url, - ), - ), - ) - }, + .dragAndDropSource { _ -> + DragAndDropTransferData( + ClipData.newPlainText( + "image Url", url, + ) ) }, ) diff --git a/samples/user-interface/haptics/build.gradle.kts b/samples/user-interface/haptics/build.gradle.kts index 318e2de7..a00009db 100644 --- a/samples/user-interface/haptics/build.gradle.kts +++ b/samples/user-interface/haptics/build.gradle.kts @@ -46,5 +46,6 @@ dependencies { implementation(libs.androidx.ui.tooling) implementation(libs.androidx.ui.tooling.preview) implementation(libs.androidx.material3) + implementation(libs.compose.material.iconsext) implementation(libs.androidx.lifecycle.viewmodel.compose) } diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts index 899298d2..531c3501 100644 --- a/shared/build.gradle.kts +++ b/shared/build.gradle.kts @@ -43,6 +43,7 @@ dependencies { implementation(libs.androidx.ui.graphics) implementation(libs.androidx.ui.tooling.preview) implementation(libs.androidx.material3) + api(libs.compose.material.iconsext) implementation(libs.accompanist.permissions) } From 7ed7db4d7926ada9b4a97317325e74085a101f80 Mon Sep 17 00:00:00 2001 From: Yacine Rezgui Date: Thu, 9 Jul 2026 16:38:03 +0200 Subject: [PATCH 8/8] refactor: prune unused dependencies and plugins from version catalog and configure IDE project settings --- gradle/libs.versions.toml | 47 ------------------- samples/graphics/pdf/build.gradle.kts | 2 +- .../constraintlayout/build.gradle.kts | 4 +- .../picture-in-picture/build.gradle.kts | 1 - 4 files changed, 3 insertions(+), 51 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index cee96c54..f64cd0f4 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -37,13 +37,7 @@ accompanist = "0.37.3" androidx-datastore = "1.2.1" androidx-navigation = "2.9.8" androidx-window = "1.5.1" -casa = "0.5.1" -gradleDownloadTask = "5.7.0" -ksp = "2.3.9" -composeCompiler = "1.5.9" hilt = "2.60.1" -kotlin-serialization = "1.8.0" -ktlint = "0.48.1" junit4 = "4.13.2" androidxEspresso = "3.7.0" androidxTestCore = "1.7.0" @@ -51,11 +45,9 @@ androidxTestExtJunit = "1.3.0" androidxTestExtTruth = "1.7.0" androidxTestRules = "1.7.0" androidxTestRunner = "1.7.0" -androidxUiAutomator = "2.4.0" camerax = "1.6.1" material3Android = "1.4.0" media3 = "1.10.1" -constraintlayout = "2.2.1" glide-compose = "1.0.0-beta09" glance = "1.3.0-SNAPSHOT" tensorflowLite = "2.16.1" @@ -79,11 +71,8 @@ junit = { group = "junit", name = "junit", version.ref = "junit" } androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" } androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" } androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" } -androidx-lifecycle-livedata-ktx = { group = "androidx.lifecycle", name = "lifecycle-livedata-ktx", version.ref = "lifecycleRuntimeKtx" } -androidx-lifecycle-runtime-compose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "lifecycleRuntimeKtx" } androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" } androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" } -androidx-ui-runtime = { group = "androidx.compose.runtime", name = "runtime" } androidx-ui = { group = "androidx.compose.ui", name = "ui" } androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" } androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" } @@ -103,7 +92,6 @@ play-services-location = { module = "com.google.android.gms:play-services-locati androidx-core-telecom = { module = "androidx.core:core-telecom", version.ref = "telecom" } # Core dependencies -android-gradlePlugin = { module = "com.android.tools.build:gradle", version.ref = "agp" } androidx-activity = "androidx.activity:activity-ktx:1.13.0" @@ -113,38 +101,12 @@ androidx-exifinterface = "androidx.exifinterface:exifinterface:1.4.2" androidx-fragment = "androidx.fragment:fragment-ktx:1.8.9" androidx-transition = "androidx.transition:transition-ktx:1.7.0" androidx-navigation-fragment = { module = "androidx.navigation:navigation-fragment", version.ref = "androidx-navigation" } -androidx-navigation-testing = { module = "androidx.navigation:navigation-testing", version.ref = "androidx-navigation" } androidx-navigation-ui = { module = "androidx.navigation:navigation-ui", version.ref = "androidx-navigation" } androidx-lifecycle-viewmodel-compose = "androidx.lifecycle:lifecycle-viewmodel-compose:2.11.0" androidx-viewpager2 = "androidx.viewpager2:viewpager2:1.1.0" accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" } -casa-base = { module = "com.google.android.catalog.framework:casa-base", version.ref = "casa" } -casa-processor = { module = "com.google.android.catalog.framework:casa-processor", version.ref = "casa" } -casa-ui = { module = "com.google.android.catalog.framework:casa-ui", version.ref = "casa" } -compose-animation-animation = { module = "androidx.compose.animation:animation" } -compose-foundation-foundation = { module = "androidx.compose.foundation:foundation" } -compose-foundation-layout = { module = "androidx.compose.foundation:layout" } -compose-material3 = { module = "androidx.compose.material3:material3" } -compose-material-material = { module = "androidx.compose.material:material" } compose-material-iconsext = { module = "androidx.compose.material:material-icons-extended" } -compose-runtime-runtime = { module = "androidx.compose.runtime:runtime" } -compose-runtime-livedata = { module = "androidx.compose.runtime:runtime-livedata" } -compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" } -compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" } -compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4" } -compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest" } -compose-ui-ui = { module = "androidx.compose.ui:ui" } -compose-ui-util = { module = "androidx.compose.ui:util" } -coil-base = { module = "io.coil-kt:coil", version.ref = "coil" } -google-ksp-api = { module = "com.google.devtools.ksp:symbol-processing-api", version.ref = "ksp" } -gradle-download-task = { module = "de.undercouch:gradle-download-task", version.ref = "gradleDownloadTask" } -hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "hilt" } -hilt-compiler = { module = "com.google.dagger:hilt-android-compiler", version.ref = "hilt" } hilt-testing = { group = "com.google.dagger", name = "hilt-android-testing", version.ref = "hilt" } -kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" } -kotlin-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" } -kotlin-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" } -kotlin-gradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } # Testing androidx-test-core = { group = "androidx.test", name = "core-ktx", version.ref = "androidxTestCore" } @@ -153,7 +115,6 @@ androidx-test-ext-junit = { group = "androidx.test.ext", name = "junit-ktx", ver androidx-test-ext-truth = { group = "androidx.test.ext", name = "truth", version.ref = "androidxTestExtTruth" } androidx-test-rules = { group = "androidx.test", name = "rules", version.ref = "androidxTestRules" } androidx-test-runner = { group = "androidx.test", name = "runner", version.ref = "androidxTestRunner" } -androidx-test-uiautomator = { group = "androidx.test.uiautomator", name = "uiautomator", version.ref = "androidxUiAutomator" } junit4 = { group = "junit", name = "junit", version.ref = "junit4" } # Sample specific dependencies lottie = "com.airbnb.android:lottie:6.7.1" @@ -198,7 +159,6 @@ fresco-nativeimagetranscoder = "com.facebook.fresco:nativeimagetranscoder:2.6.0! glide = "com.github.bumptech.glide:glide:5.0.7" glide-compose = { group = "com.github.bumptech.glide", name = "compose", version.ref = "glide-compose" } appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" } -constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" } tensorflow-lite = { module = "org.tensorflow:tensorflow-lite", version.ref = "tensorflowLite" } tensorflow-lite-gpu = { module = "org.tensorflow:tensorflow-lite-gpu", version.ref = "tensorflowLite" } tensorflow-lite-gpu-delegate-plugin = { module = "org.tensorflow:tensorflow-lite-gpu-delegate-plugin", version.ref = "tensorflowLiteGpuDelegatePlugin" } @@ -215,12 +175,5 @@ kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "ko android-library = { id = "com.android.library", version.ref = "agp" } compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } -affectedmoduledetector = { id = "com.dropbox.affectedmoduledetector", version = "0.6.2" } -versionCatalogUpdate = { id = "nl.littlerobots.version-catalog-update", version = "1.1.0" } -benManesVersions = { id = "com.github.ben-manes.versions", version = "0.54.0" } -android-test = { id = "com.android.test", version.ref = "agp" } -hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" } -kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } -ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } protobuf = { id = "com.google.protobuf", version.ref = "protobuf" } diff --git a/samples/graphics/pdf/build.gradle.kts b/samples/graphics/pdf/build.gradle.kts index fde45397..881927b9 100644 --- a/samples/graphics/pdf/build.gradle.kts +++ b/samples/graphics/pdf/build.gradle.kts @@ -46,6 +46,6 @@ dependencies { implementation(libs.androidx.lifecycle.viewmodel.compose) implementation(platform(libs.androidx.compose.bom)) implementation(libs.androidx.ui) -// implementation(libs.androidx.ui.tooling.preview) + implementation(libs.androidx.material3) } diff --git a/samples/user-interface/constraintlayout/build.gradle.kts b/samples/user-interface/constraintlayout/build.gradle.kts index fbf5ce03..fbf80f8a 100644 --- a/samples/user-interface/constraintlayout/build.gradle.kts +++ b/samples/user-interface/constraintlayout/build.gradle.kts @@ -16,8 +16,8 @@ plugins { alias(libs.plugins.android.library) -// alias(libs.plugins.kotlin.compose) - alias(libs.plugins.kotlin.android)} + alias(libs.plugins.kotlin.android) +} android { namespace = "com.example.platform.ui.constraintlayout" diff --git a/samples/user-interface/picture-in-picture/build.gradle.kts b/samples/user-interface/picture-in-picture/build.gradle.kts index 0124d96d..6ae0c11f 100644 --- a/samples/user-interface/picture-in-picture/build.gradle.kts +++ b/samples/user-interface/picture-in-picture/build.gradle.kts @@ -17,7 +17,6 @@ plugins { alias(libs.plugins.android.library) -// alias(libs.plugins.kotlin.compose) alias(libs.plugins.kotlin.android) }