Update project and generate correct language region for android resource files

Author: chippmann

.idea/kotlinc.xml

@@ -2,25 +2,23 @@ import org.ajoberstar.grgit.Grgit
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    kotlin("jvm") version "1.9.21"
+    alias(libs.plugins.kotlin.jvm)
     `java-gradle-plugin`
     `maven-publish`
-    // https://plugins.gradle.org/plugin/com.gradle.plugin-publish
-    id("com.gradle.plugin-publish") version "1.2.1"
-    // https://github.com/ajoberstar/grgit/releases
-    id("org.ajoberstar.grgit") version "5.2.1"
+    alias(libs.plugins.gradle.publish)
+    alias(libs.plugins.grgit)
 }
 
 group = "ch.hippmann"
-version = "1.0.3"
-
+version = libs.versions.localizer.get()
 
 gradlePlugin {
     plugins {
         create("localizer") {
             id = "ch.hippmann.localizer"
             displayName = "Generate localization files for Android and KMP"
-            description = "Gradle plugin for generating localization files for Android projects and small Kotlin Multiplatform projects"
+            description =
+                "Gradle plugin for generating localization files for Android projects and small Kotlin Multiplatform projects"
             implementationClass = "ch.hippmann.localizer.plugin.LocalizerGradlePlugin"
             tags.set(listOf("kotlin", "android"))
         }
@@ -36,22 +34,25 @@ dependencies {
     compileOnly(kotlin("gradle-plugin-api"))
     compileOnly(kotlin("gradle-plugin"))
 
-    // https://github.com/ktorio/ktor/releases
-    val ktorVersion = "2.3.6"
-    implementation("io.ktor:ktor-client-core:$ktorVersion")
-    implementation("io.ktor:ktor-client-cio:$ktorVersion")
+    implementation(libs.kotlinx.coroutines.core)
 
-    // https://github.com/Kotlin/kotlinx.coroutines/releases
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
+    implementation(libs.ktor.client.core)
+    implementation(libs.ktor.client.cio)
 
-    // https://github.com/square/kotlinpoet/releases
-    implementation("com.squareup:kotlinpoet:1.15.1")
+    implementation(libs.kotlinpoet)
 }
 
 java {
     withSourcesJar()
 }
 
+kotlin {
+    jvmToolchain {
+        this.languageVersion = JavaLanguageVersion.of(libs.versions.toolchain.jvm.get().toInt())
+        this.vendor = JvmVendorSpec.ADOPTIUM
+    }
+}
+
 val grGit: Grgit = Grgit.open(mapOf("currentDir" to project.rootDir))
 
 tasks {
@@ -60,15 +61,13 @@ tasks {
     }
 
     withType<KotlinCompile> {
-        kotlinOptions {
-            freeCompilerArgs += listOf(
-                "-Xopt-in=kotlin.time.ExperimentalTime"
-            )
+        compilerOptions.freeCompilerArgs.apply {
+            add("-Xopt-in=kotlin.time.ExperimentalTime")
         }
     }
 
     @Suppress("UNUSED_VARIABLE") // used by github actions
-    val generateChangelog by creating {
+    val generateChangelog by registering {
         group = "localizer"
 
         doLast {
@@ -125,6 +124,7 @@ tasks {
 publishing {
     publications {
         // this is only used for publishing locally.
+        @Suppress("unused")
         val localizerPlugin by creating(MavenPublication::class) {
             pom {
                 groupId = "${project.group}"

.idea/misc.xml

@@ -0,0 +1,27 @@
+[versions]
+
+localizer = "1.0.4"
+
+toolchain-jvm = "21"
+
+kotlin = "2.1.20" # https://github.com/jetbrains/kotlin/releases
+kotlinx-coroutines = "1.10.2" # https://github.com/Kotlin/kotlinx.coroutines/releases
+
+gradle-publish = "1.3.1" # https://plugins.gradle.org/plugin/com.gradle.plugin-publish
+
+grgit = "5.3.0" # https://github.com/ajoberstar/grgit/releases
+
+ktor = "3.1.2" # https://github.com/ktorio/ktor/releases
+
+kotlinpoet = "2.1.0" # https://github.com/square/kotlinpoet/releases
+
+[libraries]
+kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
+ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
+ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" }
+kotlinpoet = { module = "com.squareup:kotlinpoet", version.ref = "kotlinpoet" }
+
+[plugins]
+kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
+gradle-publish = { id = "com.gradle.plugin-publish", version.ref = "gradle-publish" }
+grgit = { id = "org.ajoberstar.grgit", version.ref = "grgit" }

build.gradle.kts

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/libs.versions.toml

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,18 +198,28 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.