Update to K2 + modernize (#111)

* Update deps

* Fix illegal smartcast

Correctly caught in K2

* Add .kotlin to ignored

* Enable more gradle APIs

* nit

* Regenerate API

* Beta4

* Beta5

* RC1

* Spotless

* RC2

* RC3

* Gradle 8.7

* 2.0 final

* Final versions

* 2.0.20 + gradle 8.10

* moshix update

* JDK 22

Author: ZacSweers

.github/workflows/ci.yml

@@ -31,7 +31,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: '21'
+          java-version: '22'
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3

.gitignore

@@ -1,4 +1,5 @@
 .gradle
+.kotlin/
 local.properties
 .idea
 !/.idea/codeStyles

api/kotlin-cli-util.api

@@ -57,7 +57,7 @@ spotless {
   }
 }
 
-configure<JavaPluginExtension> { toolchain { languageVersion.set(JavaLanguageVersion.of(21)) } }
+configure<JavaPluginExtension> { toolchain { languageVersion.set(JavaLanguageVersion.of(22)) } }
 
 tasks.withType<JavaCompile>().configureEach {
   options.release.set(libs.versions.jvmTarget.get().toInt())
@@ -66,7 +66,7 @@ tasks.withType<JavaCompile>().configureEach {
 tasks.withType<Detekt>().configureEach { jvmTarget = libs.versions.jvmTarget.get() }
 
 tasks.withType<DokkaTask>().configureEach {
-  outputDirectory.set(rootDir.resolve("../docs/0.x"))
+  outputDirectory.set(rootProject.layout.projectDirectory.dir("docs/2.x"))
   dokkaSourceSets.configureEach { skipDeprecated.set(true) }
 }
 
@@ -85,11 +85,13 @@ kotlin {
   }
 }
 
+lint { baseline = file("lint-baseline.xml") }
+
 moshi { enableSealed.set(true) }
 
 // We have a couple flaky tests on CI right now
 if (System.getenv("CI") != null) {
-  tasks.withType<Test>().configureEach {
+  tasks.test {
     retry {
       maxRetries.set(2)
       maxFailures.set(20)

build.gradle.kts

@@ -7,8 +7,17 @@ org.gradle.jvmargs=-Xms1g -Xmx2g -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemor
 
 org.gradle.parallel=true
 org.gradle.caching=true
+org.gradle.configureondemand=true
+org.gradle.configuration-cache=true
 moshix.generateProguardRules=false
 
+# Use new K2 UAST for lint
+android.lint.useK2Ugast=true
+android.experimental.lint.missingBaselineIsEmptyBaseline=true
+
+# Use KSP2
+ksp.useKSP2=true
+
 POM_NAME=Kotlin CLI Util
 POM_ARTIFACT_ID=kotlin-cli-util
 POM_PACKAGING=jar

gradle.properties

@@ -1,18 +1,18 @@
 [versions]
-kotlin = "1.9.24"
-kotlinx-serialization = "1.6.3"
-ksp = "1.9.24-1.0.20"
+kotlin = "2.0.20"
+kotlinx-serialization = "1.7.0"
+ksp = "2.0.20-1.0.24"
 ktfmt = "0.49"
 jvmTarget = "17"
-moshix = "0.26.0"
+moshix = "0.28.0"
 moshi = "1.15.1"
 tikxml = "0.8.15"
 xmlutil = "0.86.3"
 
 [plugins]
 detekt = { id = "io.gitlab.arturbosch.detekt", version = "1.23.6" }
 dokka = { id = "org.jetbrains.dokka", version = "1.9.20" }
-lint = { id = "com.android.lint", version = "8.4.1" }
+lint = { id = "com.android.lint", version = "8.7.0-alpha08" }
 mavenPublish = { id = "com.vanniktech.maven.publish", version = "0.29.0" }
 moshix = { id = "dev.zacsweers.moshix", version.ref = "moshix" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }

gradle/libs.versions.toml

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

gradle/wrapper/gradle-wrapper.jar

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ 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 "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradle/wrapper/gradle-wrapper.properties

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

gradlew

@@ -74,7 +74,7 @@ git commit -am "Prepare for release $NEW_VERSION."
 git tag -a "$NEW_VERSION" -m "Version $NEW_VERSION"
 
 # Publish
-./gradlew publish -x dokkaHtml
+./gradlew publish -x dokkaHtml --no-configuration-cache
 
 # Prepare next snapshot
 echo "Setting next snapshot version $NEXT_SNAPSHOT_VERSION"

gradlew.bat

@@ -173,8 +173,8 @@ private object JsonLiteralSerializer : KSerializer<JsonLiteral> {
       return encoder.encodeString(value.content)
     }
 
-    if (value.coerceToInlineType != null) {
-      return encoder.encodeInline(value.coerceToInlineType).encodeString(value.content)
+    value.coerceToInlineType?.let {
+      return encoder.encodeInline(it).encodeString(value.content)
     }
 
     // use .content instead of .longOrNull as latter can process exponential notation,