ADFA-6180 | NDK template: build under AGP 9's built-in Kotlin (#107)

fix(ADFA-6180): build NDK template projects under AGP 9's built-in Kotlin

AGP 9 compiles Kotlin itself and puts the Kotlin Gradle plugin on the
classpath, so the template's kotlin("android") plugin request failed with
"already on the classpath with an unknown version". Follow the core
templates: pin KGP on the root buildscript classpath, drop the plugin,
force kotlin-stdlib to KOTLIN_VERSION instead of 1.9.22, and move
jvmTarget from the removed kotlinOptions to kotlin.compilerOptions.

Bump NDK-Installer to 1.1.1.

Co-authored-by: Daniel Alome <astrocoder007@gmail.com>

Author: Daniel-ADFA

plugins/NDK-Installer/build.gradle.kts

@@ -23,8 +23,8 @@ android {
         applicationId = "org.appdevforall.ndkinstaller"
         minSdk = 26
         targetSdk = 36
-        versionCode = 2
-        versionName = "1.1.0"
+        versionCode = 3
+        versionName = "1.1.1"
     }
 
     buildTypes {

plugins/NDK-Installer/src/main/assets/templates/ndk/app/build.gradle.kts.peb

@@ -3,9 +3,6 @@ import java.io.FileInputStream
 
 plugins {
 id("com.android.application") version "${{AGP_VERSION}}" 
-${% if LANGUAGE == 'kotlin' %}
-        kotlin("android") version "${{KOTLIN_VERSION}}"
-${% endif %} 
 }
 
 val keystorePropsFile = rootProject.file("release.properties")
@@ -136,10 +133,10 @@ android {
 
     configurations.all {
         resolutionStrategy {
-            // Force the use of Kotlin stdlib 1.9.22 for all modules
-            force("org.jetbrains.kotlin:kotlin-stdlib:1.9.22")
-            force("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.22")
-            force("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.22")
+            // Force the use of Kotlin stdlib for all modules
+            force("org.jetbrains.kotlin:kotlin-stdlib:${{KOTLIN_VERSION}}")
+            force("org.jetbrains.kotlin:kotlin-stdlib-jdk7:${{KOTLIN_VERSION}}")
+            force("org.jetbrains.kotlin:kotlin-stdlib-jdk8:${{KOTLIN_VERSION}}")
 
             // Force specific AndroidX versions to avoid conflicts
             force("androidx.collection:collection:1.4.2")
@@ -157,9 +154,11 @@ tasks.withType<JavaCompile> {
 
 
 ${% if LANGUAGE == 'kotlin' %}
-    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
-      kotlinOptions.jvmTarget = "${{JAVA_TARGET}}"
+kotlin {
+    compilerOptions {
+        jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget("${{JAVA_TARGET}}"))
     }
+}
 ${% endif %}
 
 dependencies {

plugins/NDK-Installer/src/main/assets/templates/ndk/build.gradle.kts.peb

@@ -1,4 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
+buildscript {
+    repositories {
+        google()
+        mavenCentral()
+    }
+    dependencies {
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${{KOTLIN_VERSION}}")
+    }
+}
+
 plugins {
     id("com.android.application") apply false version "${{AGP_VERSION}}"
     id("com.android.library") apply false version "${{AGP_VERSION}}"