Convert addBuildTypeUsingDslFinalize to be 9.0 compatible

The changes include:
- remove KGP (required)
- update to new DSL (optional but best practice)

This also adds two quick script to use convert.sh more
easily when making workingcopies, and update the
kotlin version for 9.0 recipe to be aligned with
AGP's dependency (2.1.20)

Bug: 446130745
Test: existing validation
Change-Id: I23b651fe3147f0250730b1b0a960f7ccb091d58b

Author: ducrohet

apply-workingcopy.sh

@@ -0,0 +1,2 @@
+# Usage: ./apply-workingcopy.sh <working-copy-folder>
+./convert.sh convert --overwrite --mode source --source $1 --destination recipes/

make-workingcopy.sh

@@ -0,0 +1,2 @@
+# Usage: ./make-workingcopy.sh recipes/<recipe-name> <destination> <agpversion>
+./convert.sh convert --mode workingcopy --source $1 --destination $2 --agpVersion $3

recipes/addBuildTypeUsingDslFinalize/app/build.gradle.kts

@@ -16,15 +16,20 @@
 
 plugins {
     alias(libs.plugins.android.application)
-    alias(libs.plugins.kotlin.android)
     id("android.recipes.addBuildTypeUsingDslFinalize")
 }
 
 android {
     namespace = "com.example.android.recipes.addBuildTypeUsingDslFinalize"
-    compileSdk = $COMPILE_SDK
+    compileSdk {
+        version = release($COMPILE_SDK)
+    }
     defaultConfig {
-       minSdk = $MINIMUM_SDK
-       targetSdk = $COMPILE_SDK
+        minSdk {
+            version = release($MINIMUM_SDK)
+        }
+        targetSdk {
+            version = release($COMPILE_SDK)
+        }
     }
 }

recipes/addBuildTypeUsingDslFinalize/build.gradle.kts

@@ -16,5 +16,4 @@
 
 plugins {
     alias(libs.plugins.android.application) apply false
-    alias(libs.plugins.kotlin.android) apply false
 }

recipes/addBuildTypeUsingDslFinalize/gradle.properties

@@ -11,20 +11,5 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 org.gradle.parallel=true
-# AndroidX package structure to make it clearer which packages are bundled with the
-# Android operating system, and which are packaged with your app's APK
-# https://developer.android.com/topic/libraries/support-library/androidx-rn
-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.nonTransitiveRClass=true
-
-# TODO(b/385745419): Migrate to built-in Kotlin
-android.builtInKotlin=false
-# TODO(b/417183956) Migrate to new variant API
-android.enableLegacyVariantApi=true
-# TODO(b/418804641): Migrate to new DSL
-android.newDsl=false

recipes/addBuildTypeUsingDslFinalize/gradle/libs.versions.toml

@@ -1,9 +1,7 @@
 [versions]
 androidGradlePlugin = $AGP_VERSION
-kotlin = $KOTLIN_VERSION
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 
 

version_mappings.txt

@@ -12,4 +12,4 @@
 8.11;8.13;2.1.20
 8.12;8.13;2.1.20
 8.13;8.13;2.1.20
-9.0;9.0;2.2.20-RC
+9.0;9.0;2.1.20