Kotlin to v2.1.0

.gitignore

@@ -3,4 +3,5 @@
 /local.properties
 .DS_Store
 /build
-.idea/
+.idea/
+.kotlin/

CHANGELOG.md

@@ -6,6 +6,8 @@ Please add your entries according to this format.
 ## Unreleased
 
 - Add tasks `ktfmtCheckScripts` and `ktfmtFormatScripts` to check and format the `.kts` files in the project folder.
+- Kotlin to 2.1.0
+- Gradle to 8.12
 
 ## Version 0.21.0 _(2024-11-01)_
 - KtFmt to 0.53

README.md

@@ -43,8 +43,6 @@ Please note that `ktfmt-gradle` relies on `ktfmt` hence the minimum supported JD
 
 Please also note the following requirements:
 
-* **Kotlin 1.4+**. In order to reformat Kotlin 1.4 code, you need run on **Gradle to 6.8+** (This is due to Gradle 6.7 embedding Kotlin 1.3.x - See [#12660](https://github.com/gradle/gradle/issues/12660)).
-
 * **Android**. `ktfmt-gradle` relies on features from **Android Gradle Plugin 4.1+**. So make sure you bump AGP before applying this plugin.
 
 ### Task

example/build.gradle.kts

@@ -3,7 +3,7 @@ import app.cash.sqldelight.gradle.VerifyMigrationTask
 plugins {
     kotlin("jvm")
     id("com.ncorti.ktfmt.gradle")
-    id("com.google.devtools.ksp") version "2.0.21-1.0.27"
+    id("com.google.devtools.ksp") version "2.1.0-1.0.29"
     id("app.cash.sqldelight") version "2.0.2"
 }
 

gradle/libs.versions.toml

@@ -4,7 +4,7 @@ binaryCompatibilityValidator = "0.16.3"
 detekt = "1.23.7"
 diffUtils = "4.15"
 junit = "5.11.4"
-kotlin = "2.0.21"
+kotlin = "2.1.0"
 ktfmt-plugin = "0.21.0"
 ktfmt = "0.53"
 pluginPublish = "1.3.0"

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

plugin-build/gradle/wrapper/gradle-wrapper.properties

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

plugin-build/gradlew

@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

plugin-build/plugin/build.gradle.kts

@@ -15,8 +15,8 @@ java {
 
 kotlin {
     compilerOptions {
-        apiVersion.set(KotlinVersion.fromVersion("1.4"))
-        languageVersion.set(KotlinVersion.fromVersion("1.4"))
+        apiVersion.set(KotlinVersion.fromVersion("1.6"))
+        languageVersion.set(KotlinVersion.fromVersion("1.6"))
         jvmTarget = JvmTarget.JVM_11
     }
 }

plugin-build/plugin/src/main/java/com/ncorti/ktfmt/gradle/KtfmtPluginUtils.kt

@@ -116,10 +116,7 @@ internal object KtfmtPluginUtils {
             name.split(" ").joinToString("") {
                 val charArray = it.toCharArray()
                 if (charArray[0].isLowerCase()) {
-                    // We use toUpperCase here to retain compatibility with Gradle 6.9 and Kotlin
-                    // 1.4
-                    @Suppress("DEPRECATION")
-                    charArray[0] = charArray[0].toUpperCase()
+                    charArray[0] = charArray[0].uppercaseChar()
                 }
                 charArray.concatToString()
             }
@@ -144,10 +141,7 @@ internal object KtfmtPluginUtils {
             name.split(" ").joinToString("") {
                 val charArray = it.toCharArray()
                 if (charArray[0].isLowerCase()) {
-                    // We use toUpperCase here to retain compatibility with Gradle 6.9 and Kotlin
-                    // 1.4
-                    @Suppress("DEPRECATION")
-                    charArray[0] = charArray[0].toUpperCase()
+                    charArray[0] = charArray[0].uppercaseChar()
                 }
                 charArray.concatToString()
             }