Update configuration and dependencies

pedrosax · web-flow · commit e3ca9f8fb9e8 · 2026-05-17T11:31:54.000-07:00
Update build configuration and dependencies

- Upgrade Gradle to 9.5.0, AGP to 9.1.1, and Kotlin to 2.3.21.
- Migrate `app/build.gradle.kts` to the new Kotlin Android DSL.
- Update Target SDK to 37.
- Configure project to use Java 17 toolchain and bytecode target.
- Enable `android.newDsl` and `android.builtInKotlin` in `gradle.properties`.
- Update copyright headers to 2026.
diff --git a/HelloAndroid/app/build.gradle.kts b/HelloAndroid/app/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 The Android Open Source Project
+ * Copyright 2026 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,54 +16,56 @@
 
 plugins {
     alias(libs.plugins.android.application)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.compose.compiler)
 }
+kotlin {
+    android {
+        namespace = "com.example.android.helloandroid"
+        compileSdk {
+            version = release(36) {
+                minorApiLevel = 1
+            }
+        }
 
-android {
-    namespace = "com.example.android.helloandroid"
-    compileSdk = 36
-
-    defaultConfig {
-        applicationId = "com.example.android.helloandroid"
-        minSdk = 23
-        targetSdk = 36
-        versionCode = 1
-        versionName = "1.0"
+        defaultConfig {
+            applicationId = "com.example.android.helloandroid"
+            minSdk = 23
+            targetSdk = 37
+            versionCode = 1
+            versionName = "1.0"
 
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables {
-            useSupportLibrary = true
+            testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+            vectorDrawables {
+                useSupportLibrary = true
+            }
         }
-    }
 
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
-            )
+        buildTypes {
+            release {
+                isMinifyEnabled = false
+                proguardFiles(
+                    getDefaultProguardFile("proguard-android-optimize.txt"),
+                    "proguard-rules.pro"
+                )
+            }
+        }
+        compileOptions {
+            sourceCompatibility = JavaVersion.VERSION_17
+            targetCompatibility = JavaVersion.VERSION_17
+        }
+        buildFeatures {
+            compose = true
         }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-    buildFeatures {
-        compose = true
-    }
 
-    packaging {
-        resources {
-            excludes += "/META-INF/{AL2.0,LGPL2.1}"
+        packaging {
+            resources {
+                excludes += "/META-INF/{AL2.0,LGPL2.1}"
+            }
         }
     }
-}
 
-kotlin {
     compilerOptions {
-        jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8)
+        jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
     }
 }
 
diff --git a/HelloAndroid/app/src/androidTest/kotlin/com/example/android/helloandroid/ExampleInstrumentedTest.kt b/HelloAndroid/app/src/androidTest/kotlin/com/example/android/helloandroid/ExampleInstrumentedTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 The Android Open Source Project
+ * Copyright 2026 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/HelloAndroid/app/src/main/AndroidManifest.xml b/HelloAndroid/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright 2025 The Android Open Source Project
+  Copyright 2026 The Android Open Source Project
 
   Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
   in compliance with the License. You may obtain a copy of the License at
diff --git a/HelloAndroid/app/src/main/kotlin/com/example/android/helloandroid/MainActivity.kt b/HelloAndroid/app/src/main/kotlin/com/example/android/helloandroid/MainActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 The Android Open Source Project
+ * Copyright 2026 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/HelloAndroid/app/src/main/kotlin/com/example/android/helloandroid/ui/theme/Color.kt b/HelloAndroid/app/src/main/kotlin/com/example/android/helloandroid/ui/theme/Color.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 The Android Open Source Project
+ * Copyright 2026 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/HelloAndroid/app/src/main/kotlin/com/example/android/helloandroid/ui/theme/Theme.kt b/HelloAndroid/app/src/main/kotlin/com/example/android/helloandroid/ui/theme/Theme.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 The Android Open Source Project
+ * Copyright 2026 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/HelloAndroid/app/src/main/kotlin/com/example/android/helloandroid/ui/theme/Type.kt b/HelloAndroid/app/src/main/kotlin/com/example/android/helloandroid/ui/theme/Type.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 The Android Open Source Project
+ * Copyright 2026 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/HelloAndroid/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/HelloAndroid/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright 2025 The Android Open Source Project
+  Copyright 2026 The Android Open Source Project
 
   Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
   in compliance with the License. You may obtain a copy of the License at
diff --git a/HelloAndroid/app/src/main/res/drawable/ic_launcher_background.xml b/HelloAndroid/app/src/main/res/drawable/ic_launcher_background.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright 2025 The Android Open Source Project
+  Copyright 2026 The Android Open Source Project
 
   Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
   in compliance with the License. You may obtain a copy of the License at
diff --git a/HelloAndroid/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/HelloAndroid/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright 2025 The Android Open Source Project
+  Copyright 2026 The Android Open Source Project
 
   Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
   in compliance with the License. You may obtain a copy of the License at
diff --git a/HelloAndroid/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/HelloAndroid/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright 2025 The Android Open Source Project
+  Copyright 2026 The Android Open Source Project
 
   Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
   in compliance with the License. You may obtain a copy of the License at
diff --git a/HelloAndroid/app/src/main/res/values/strings.xml b/HelloAndroid/app/src/main/res/values/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright 2025 The Android Open Source Project
+  Copyright 2026 The Android Open Source Project
 
   Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
   in compliance with the License. You may obtain a copy of the License at
diff --git a/HelloAndroid/app/src/main/res/values/themes.xml b/HelloAndroid/app/src/main/res/values/themes.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright 2025 The Android Open Source Project
+  Copyright 2026 The Android Open Source Project
 
   Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
   in compliance with the License. You may obtain a copy of the License at
diff --git a/HelloAndroid/app/src/test/kotlin/com/example/android/helloandroid/ExampleUnitTest.kt b/HelloAndroid/app/src/test/kotlin/com/example/android/helloandroid/ExampleUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 The Android Open Source Project
+ * Copyright 2026 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/HelloAndroid/build.gradle.kts b/HelloAndroid/build.gradle.kts
@@ -17,6 +17,5 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
     alias(libs.plugins.android.application) apply false
-    alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.compose.compiler) apply false
 }
diff --git a/HelloAndroid/gradle.properties b/HelloAndroid/gradle.properties
@@ -33,7 +33,6 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 android.useAndroidX=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-# Enables namespacing of each library's R class so that its R class includes only the
-# resources declared in the library itself and none from the library's dependencies,
-# thereby reducing the size of the R class for that library
+android.newDsl=true
+android.builtInKotlin=true
 android.nonTransitiveRClass=true
diff --git a/HelloAndroid/gradle/gradle-daemon-jvm.properties b/HelloAndroid/gradle/gradle-daemon-jvm.properties
@@ -0,0 +1,3 @@
+# This file was generated by a migration to the Gradle Daemon toolchain.
+# It aligns the JVM used by the Gradle Daemon between the IDE and CLI.
+toolchainVersion=17
diff --git a/HelloAndroid/gradle/libs.versions.toml b/HelloAndroid/gradle/libs.versions.toml
@@ -1,13 +1,13 @@
 [versions]
-agp = "8.13.1"
-kotlin = "2.2.21"
+agp = "9.1.1"
+kotlin = "2.3.21"
 coreKtx = "1.17.0"
 junit = "4.13.2"
 junitVersion = "1.3.0"
 espressoCore = "3.7.0"
 lifecycleRuntimeKtx = "2.10.0"
-activityCompose = "1.12.1"
-composeBom = "2025.12.00"
+activityCompose = "1.13.0"
+composeBom = "2026.05.00"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
diff --git a/HelloAndroid/gradle/wrapper/gradle-wrapper.properties b/HelloAndroid/gradle/wrapper/gradle-wrapper.properties
@@ -15,6 +15,6 @@
 
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/HelloAndroid/settings.gradle.kts b/HelloAndroid/settings.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 The Android Open Source Project
+ * Copyright 2026 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2025 The Android Open Source Project`
	`2`	`+ * Copyright 2026 The Android Open Source Project`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`