Merge pull request #410 from alabiaga/main

Add semantic coloring example from Android 17

Author: alabiaga

app/build.gradle.kts

@@ -23,12 +23,12 @@ plugins {
 
 android {
     namespace = "com.example.platform"
-    compileSdk = 36
+    compileSdk = 37
 
     defaultConfig {
         applicationId = "com.example.platform"
         minSdk = 24
-        targetSdk = 36
+        targetSdk = 37
         versionCode = 1
         versionName = "1.0"
 

gradle.properties

@@ -58,8 +58,14 @@ org.gradle.java.installations.auto-download=false
 
 # Disable build features that are enabled by default,
 # https://developer.android.com/studio/releases/gradle-plugin#buildFeatures
-android.defaults.buildfeatures.buildconfig=false
-android.defaults.buildfeatures.aidl=false
-android.defaults.buildfeatures.renderscript=false
 android.defaults.buildfeatures.resvalues=false
 android.defaults.buildfeatures.shaders=false
+android.sdk.defaultTargetSdkToCompileSdkIfUnset=false
+android.enableAppCompileTimeRClass=false
+android.usesSdkInManifest.disallowed=false
+android.uniquePackageNames=false
+android.dependency.useConstraints=true
+android.r8.strictFullModeForKeepRules=false
+android.r8.optimizedResourceShrinking=false
+android.builtInKotlin=false
+android.newDsl=false

gradle/libs.versions.toml

@@ -14,9 +14,9 @@
 # limitations under the License.
 #
 [versions]
-agp = "8.13.2"
+agp = "9.1.1"
 fragmentCompose = "1.8.6"
-kotlin = "2.1.10"
+kotlin = "2.2.10"
 coreKtx = "1.17.0"
 junit = "4.13.2"
 junitVersion = "1.2.1"

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

samples/accessibility/build.gradle.kts

@@ -28,15 +28,26 @@ android {
 
     defaultConfig {
         minSdk = 21
-        targetSdk = 35
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
     }
 
     buildFeatures {
         viewBinding = true
     }
+    lint {
+        targetSdk = 35
+    }
+    testOptions {
+        targetSdk = 35
+    }
 }
 
 dependencies {

samples/camera/camera2/build.gradle.kts

@@ -26,13 +26,27 @@ android {
 
     defaultConfig {
         minSdk = 21
-        targetSdk = 35
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
+    }
+
+    buildFeatures {
+        viewBinding = true
     }
 
-    viewBinding.isEnabled = true
+    lint {
+        targetSdk = 35
+    }
+    testOptions {
+        targetSdk = 35
+    }
 }
 
 dependencies {
@@ -53,4 +67,3 @@ dependencies {
     // Link to UltraHDR Graphics Samples
     implementation(project(mapOf("path" to ":samples:graphics:ultrahdr")))
 }
-

samples/camera/camerax/build.gradle.kts

@@ -28,8 +28,14 @@ android {
         minSdk = 21
         testOptions.targetSdk = 35
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
     }
 }
 

samples/connectivity/UwbRanging/build.gradle.kts

@@ -29,22 +29,30 @@ android {
 
     defaultConfig {
         minSdk = 31
-        targetSdk = 35
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
+
     compileOptions {
-        sourceCompatibility(JavaVersion.VERSION_1_8)
-        targetCompatibility(JavaVersion.VERSION_1_8)
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
+    kotlinOptions {
+        jvmTarget = "11"
     }
+
     sourceSets {
         getByName("main") {
             java.srcDirs("src/main/java", "src/main/proto")
         }
     }
+    lint {
+        targetSdk = 35
+    }
+    testOptions {
+        targetSdk = 35
+    }
 }
 
 protobuf {

samples/connectivity/audio/build.gradle.kts

@@ -27,10 +27,21 @@ android {
 
     defaultConfig {
         minSdk = 21
-        targetSdk = 35
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
+    }
+    lint {
+        targetSdk = 35
+    }
+    testOptions {
+        targetSdk = 35
     }
 }
 

samples/connectivity/bluetooth/ble/build.gradle.kts

@@ -27,10 +27,22 @@ android {
 
     defaultConfig {
         minSdk = 21
-        targetSdk = 35
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
+    }
+
+    lint {
+        targetSdk = 35
+    }
+    testOptions {
+        targetSdk = 35
     }
 }