fix: update codebase, including to Kotlin v2

Author: jGleitz

.github/workflows/ci.yml

@@ -5,6 +5,9 @@ on:
     branches: [ main ]
   pull_request:
 
+env:
+  ORG_GRADLE_PROJECT_version: ${{ github.sha }}
+
 jobs:
 
   build:

.github/workflows/release.yml

@@ -2,7 +2,12 @@ name: Release
 
 on:
   release:
-    types: [published]
+    types: [ published ]
+
+env:
+  ORG_GRADLE_PROJECT_version: ${{ github.event.release.tag_name }}
+  ORG_GRADLE_PROJECT_githubRepository: ${{ github.repository }}
+  GRADLE_OPTS: -Dorg.gradle.configuration-cache=false
 
 jobs:
   release:
@@ -30,14 +35,11 @@ jobs:
         run: ./gradlew clean dependencies
       - name: Assemble Artefacts
         run: ./gradlew assemble
-        env:
-          ORG_GRADLE_PROJECT_githubRepository: ${{ github.repository }}
       - name: Release Artefacts
         run: ./gradlew release
         env:
           ORG_GRADLE_PROJECT_signingKey: ${{ secrets.PACKAGE_SIGNING_KEY }}
           ORG_GRADLE_PROJECT_signingKeyPassword: ${{ secrets.PACKAGE_SIGNING_KEY_PASSWORD }}
-          ORG_GRADLE_PROJECT_githubRepository: ${{ github.repository }}
           ORG_GRADLE_PROJECT_githubToken: ${{ secrets.RELEASE_GITHUB_TOKEN }}
           ORG_GRADLE_PROJECT_ossrhUsername: ${{ secrets.OSSRH_USERNAME }}
           ORG_GRADLE_PROJECT_ossrhPassword: ${{ secrets.OSSRH_PASSWORD }}
@@ -66,9 +68,7 @@ jobs:
       - name: Prepare
         run: ./gradlew clean dependencies
       - name: Generate Documentation
-        run: ./gradlew dokkaHtml
-        env:
-          ORG_GRADLE_PROJECT_githubRepository: ${{ github.repository }}
+        run: ./gradlew dokkaGenerate
       - name: Publish Documentation
         uses: peaceiris/[email protected]
         with:

build.gradle.kts

@@ -1,21 +1,19 @@
 import io.github.gradlenexus.publishplugin.NexusRepository
 import org.gradle.api.JavaVersion.VERSION_1_8
-import org.jetbrains.dokka.gradle.DokkaTask
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
-	kotlin("jvm") version "1.9.25"
-	id("com.palantir.git-version") version "3.2.0"
-	id("org.jetbrains.dokka") version "1.9.20"
+	kotlin("jvm") version "2.1.10"
+	id("org.jetbrains.dokka-javadoc") version "2.0.0"
+	id("org.jetbrains.dokka") version "2.0.0"
 	`maven-publish`
 	signing
-	id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
-	idea
+	id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
 }
 
 group = "de.joshuagleitze"
-version = if (isSnapshot) versionDetails.gitHash else versionDetails.lastTag.drop("v")
-status = if (isSnapshot) "snapshot" else "release"
+version = if (version == "unspecified") "local" else version.toString().drop("v")
+status = if (version == "local") "snapshot" else "release"
 
 repositories {
 	mavenCentral()
@@ -30,29 +28,23 @@ dependencies {
 		testImplementation(kotlin("reflect", KotlinVersion.CURRENT.toString()))
 	}
 
+	testRuntimeOnly(name = "junit-platform-launcher", group = "org.junit.platform", version = "1.12.1")
 	testRuntimeOnly(name = "junit-jupiter-engine", group = "org.junit.jupiter", version = "5.7.2")
 }
 
-idea {
-	module {
-		isDownloadSources = true
-		isDownloadJavadoc = true
-	}
-}
-
-tasks.withType<Test> {
+tasks.withType<Test>().configureEach {
 	useJUnitPlatform()
-	reports.junitXml.required.set(true)
+	reports.junitXml.required = true
 }
 
 java {
 	sourceCompatibility = VERSION_1_8
 	targetCompatibility = VERSION_1_8
 }
 
-tasks.withType<KotlinCompile> {
-	kotlinOptions {
-		jvmTarget = "1.8"
+kotlin {
+	compilerOptions {
+		jvmTarget = JvmTarget.JVM_1_8
 	}
 }
 
@@ -62,28 +54,28 @@ val githubRepository: String? by project
 val githubOwner = githubRepository?.split("/")?.get(0)
 val githubToken: String? by project
 
-val sourcesJar by tasks.creating(Jar::class) {
+val sourcesJar by tasks.registering(Jar::class) {
 	group = "build"
 	description = "Assembles the source code into a jar"
-	archiveClassifier.set("sources")
-	from(sourceSets.main.get().allSource)
+	archiveClassifier = "sources"
+	from(sourceSets.main.map { it.allSource })
 }
 
-tasks.withType<DokkaTask> {
-	dokkaSourceSets.named("main") {
+dokka {
+	dokkaSourceSets.main {
 		sourceLink {
-			localDirectory.set(file("src/main/kotlin"))
-			remoteUrl.set(uri("https://github.com/$githubRepository/blob/main/src/main/kotlin").toURL())
-			remoteLineSuffix.set("#L")
+			localDirectory = file("src/main/kotlin")
+			remoteUrl = uri("https://github.com/$githubRepository/blob/main/src/main/kotlin")
+			remoteLineSuffix = "#L"
 		}
 	}
 }
 
-val dokkaJar by tasks.creating(Jar::class) {
+val dokkaJar by tasks.registering(Jar::class) {
 	group = "build"
 	description = "Assembles the Kotlin docs with Dokka"
 	archiveClassifier.set("javadoc")
-	from(tasks.named("dokkaJavadoc"))
+	from(tasks.named("dokkaGeneratePublicationJavadoc"))
 }
 
 artifacts {
@@ -103,34 +95,34 @@ publishing {
 			artifact(dokkaJar)
 
 			pom {
-				name.set(provider { "$groupId:$artifactId" })
-				description.set("Convert between different string notations commonly found in programming")
-				inceptionYear.set("2020")
-				url.set("https://github.com/$githubRepository")
+				name = "$groupId:$artifactId"
+				description = "Convert between different string notations commonly found in programming"
+				inceptionYear = "2020"
+				url = "https://github.com/$githubRepository"
 				ciManagement {
-					system.set("GitHub Actions")
-					url.set("https://github.com/$githubRepository/actions")
+					system = "GitHub Actions"
+					url = "https://github.com/$githubRepository/actions"
 				}
 				issueManagement {
-					system.set("GitHub Issues")
-					url.set("https://github.com/$githubRepository/issues")
+					system = "GitHub Issues"
+					url = "https://github.com/$githubRepository/issues"
 				}
 				developers {
 					developer {
-						name.set("Joshua Gleitze")
-						email.set("[email protected]")
+						name = "Joshua Gleitze"
+						email = "[email protected]"
 					}
 				}
 				scm {
-					connection.set("scm:git:https://github.com/$githubRepository.git")
-					developerConnection.set("scm:git:git://[email protected]:$githubRepository.git")
-					url.set("https://github.com/$githubRepository")
+					connection = "scm:git:https://github.com/$githubRepository.git"
+					developerConnection = "scm:git:git://[email protected]:$githubRepository.git"
+					url = "https://github.com/$githubRepository"
 				}
 				licenses {
 					license {
-						name.set("MIT")
-						url.set("https://opensource.org/licenses/MIT")
-						distribution.set("repo")
+						name = "MIT"
+						url = "https://opensource.org/licenses/MIT"
+						distribution = "repo"
 					}
 				}
 			}
@@ -150,8 +142,8 @@ publishing {
 nexusPublishing {
 	repositories {
 		mavenCentral = sonatype {
-			username.set(ossrhUsername)
-			password.set(ossrhPassword)
+			username = ossrhUsername
+			password = ossrhPassword
 		}
 	}
 }
@@ -163,18 +155,15 @@ signing {
 	sign(publication)
 }
 
-val closeAndReleaseStagingRepository by project.tasks
-closeAndReleaseStagingRepository.mustRunAfter(mavenCentral.publishTask)
+val closeAndReleaseStagingRepositories by project.tasks
+closeAndReleaseStagingRepositories.mustRunAfter(mavenCentral.publishTask)
 
-task("release") {
+val release by tasks.registering {
 	group = "release"
 	description = "Releases the project to Maven Central"
-	dependsOn(githubPackages.publishTask, mavenCentral.publishTask, closeAndReleaseStagingRepository)
+	dependsOn(githubPackages.publishTask, mavenCentral.publishTask, closeAndReleaseStagingRepositories)
 }
 
-val Project.isSnapshot get() = versionDetails.commitDistance != 0
 fun String.drop(prefix: String) = if (this.startsWith(prefix)) this.drop(prefix.length) else this
-
-val Project.versionDetails get() = (this.extra["versionDetails"] as groovy.lang.Closure<*>)() as com.palantir.gradle.gitversion.VersionDetails
 val ArtifactRepository.publishTask get() = tasks["publishAllPublicationsTo${this.name}Repository"]
 val NexusRepository.publishTask get() = "publishTo${this.name.replaceFirstChar { it.titlecase() }}"

gradle.properties

@@ -0,0 +1,6 @@
+org.gradle.parallel=true
+org.gradle.configuration-cache=true
+org.gradle.configuration-cache.parallel=true
+
+org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
+org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true

src/main/kotlin/BaseStringNotation.kt

@@ -35,5 +35,5 @@ abstract class BaseStringNotation(private val splitAt: Regex): StringNotation {
 		.foldIndexed(StringBuffer()) { index, existing, part -> existing.append(printBeforePart(index, part)).append(part) }
 		.toString()
 
-	override fun toString() = this::class.java.simpleName!!
+	override fun toString(): String = this::class.java.simpleName
 }

src/main/kotlin/JavaNotations.kt

@@ -11,16 +11,14 @@ import javax.lang.model.SourceVersion
  * Allowed characters are determined using [Character.isJavaIdentifierStart] and [Character.isJavaIdentifierPart]. Keywords are detected
  * using [SourceVersion.isKeyword].
  */
-object JavaTypeName: StringNotation by UpperCamelCase {
+data object JavaTypeName : StringNotation by UpperCamelCase {
 	override fun print(word: Word) = UpperCamelCase.print(
 		Word(word.parts.mapIndexed { index, wordPart ->
 			if (index == 0) wordPart.keepOnlyJavaIdentifierChars()
 			else wordPart.keepOnlyJavaIdentifierContinuationChars()
 		})
 	)
 		.neutralizeJavaReservedKeywords()
-
-	override fun toString() = this::class.java.simpleName!!
 }
 
 /**
@@ -30,17 +28,17 @@ object JavaTypeName: StringNotation by UpperCamelCase {
  * Allowed characters are determined using [Character.isJavaIdentifierStart] and [Character.isJavaIdentifierPart]. Keywords are detected
  * using [SourceVersion.isKeyword].
  */
-object JavaMemberName: BaseStringNotation(camelCaseSplitRegex) {
-	override fun transformPartAfterParse(index: Int, part: String) = part.toLowerCase(Locale.ROOT)
+object JavaMemberName : BaseStringNotation(camelCaseSplitRegex) {
+	override fun transformPartAfterParse(index: Int, part: String) = part.lowercase(Locale.ROOT)
 
 	override fun print(word: Word) = word.parts
 		.foldIndexed(StringBuffer()) { index, existing, part ->
 			val filteredPart =
 				if (index == 0) part.keepOnlyJavaIdentifierChars()
 				else part.keepOnlyJavaIdentifierContinuationChars()
 			val nextPart =
-				if (existing.contains(Regex("[a-zA-Z]"))) filteredPart.toFirstUpperOtherLowerCase()
-				else filteredPart.toLowerCase()
+				if (existing.contains(Regex("[a-zA-Z]"))) filteredPart.firstUpperThenLowerCase()
+				else filteredPart.lowercase(Locale.getDefault())
 			existing.append(printBeforePart(index, nextPart)).append(nextPart)
 		}.toString().makeValidJavaIdentifier()
 }
@@ -54,10 +52,10 @@ object JavaMemberName: BaseStringNotation(camelCaseSplitRegex) {
  * Allowed characters are determined using [Character.isJavaIdentifierStart] and [Character.isJavaIdentifierPart]. Keywords are detected
  * using [SourceVersion.isKeyword].
  */
-object JavaPackagePart: BaseStringNotation(Regex("_|${camelCaseSplitRegex.pattern}")) {
-	override fun transformPartAfterParse(index: Int, part: String) = part.toLowerCase(Locale.ROOT)
+object JavaPackagePart : BaseStringNotation(Regex("_|${camelCaseSplitRegex.pattern}")) {
+	override fun transformPartAfterParse(index: Int, part: String) = part.lowercase(Locale.ROOT)
 
-	override fun transformPartToPrint(index: Int, part: String) = part.toLowerCase(Locale.ROOT)
+	override fun transformPartToPrint(index: Int, part: String) = part.lowercase(Locale.ROOT)
 
 	override fun print(word: Word) = super.print(word).makeValidJavaIdentifier()
 }
@@ -69,8 +67,8 @@ object JavaPackagePart: BaseStringNotation(Regex("_|${camelCaseSplitRegex.patter
  * Allowed characters are determined using [Character.isJavaIdentifierStart] and [Character.isJavaIdentifierPart]. Keywords are detected
  * using [SourceVersion.isKeyword].
  */
-object JavaPackageName: BaseStringNotation(Regex("\\.")) {
-	override fun transformPartToPrint(index: Int, part: String) = part.toLowerCase(Locale.ROOT).makeValidJavaIdentifier()
+object JavaPackageName : BaseStringNotation(Regex("\\.")) {
+	override fun transformPartToPrint(index: Int, part: String) = part.lowercase(Locale.ROOT).makeValidJavaIdentifier()
 
 	override fun printBeforeInnerPart(index: Int, part: String) = "."
 }
@@ -82,10 +80,8 @@ object JavaPackageName: BaseStringNotation(Regex("\\.")) {
  * Allowed characters are determined using [Character.isJavaIdentifierStart] and [Character.isJavaIdentifierPart]. Keywords are detected
  * using [SourceVersion.isKeyword].
  */
-object JavaConstantName: StringNotation by ScreamingSnakeCase {
+data object JavaConstantName : StringNotation by ScreamingSnakeCase {
 	override fun print(word: Word) = ScreamingSnakeCase.print(word).makeValidJavaIdentifier()
-
-	override fun toString() = this::class.java.simpleName!!
 }
 
 private fun String.makeValidJavaIdentifier() = this.keepOnlyJavaIdentifierChars().neutralizeJavaReservedKeywords()
@@ -95,10 +91,15 @@ private fun String.keepOnlyJavaIdentifierChars() = this.chars()
 	.keepOnlyJavaIdentifierContinuationChars()
 	.collectToString()
 
-private fun String.keepOnlyJavaIdentifierContinuationChars() = this.chars().keepOnlyJavaIdentifierContinuationChars().collectToString()
+private fun String.keepOnlyJavaIdentifierContinuationChars() =
+	this.chars().keepOnlyJavaIdentifierContinuationChars().collectToString()
+
 private fun IntStream.keepOnlyJavaIdentifierContinuationChars() = this.filter { Character.isJavaIdentifierPart(it) }
 private fun IntStream.collectToString() =
-	this.collect({ StringBuilder() }, { left, right -> left.appendCodePoint(right) }, { left, right -> left.append(right) })
+	this.collect(
+		{ StringBuilder() },
+		{ left, right -> left.appendCodePoint(right) },
+		{ left, right -> left.append(right) })
 		.toString()
 
 private fun String.neutralizeJavaReservedKeywords() = when {