Modernize the build scripts (#207)

.github/workflows/gradle.yml

@@ -13,8 +13,8 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-java@v2
       with:
-        distribution: 'temurin'
-        java-version: '11'
+        distribution: 'zulu'
+        java-version: '19'
         cache: 'gradle'
     - name: Run Checks
       run: ./gradlew check --continue --stacktrace -Pkotshi.createAnnotationsUsingConstructor=false
@@ -24,8 +24,8 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-java@v2
       with:
-        distribution: 'temurin'
-        java-version: '11'
+        distribution: 'zulu'
+        java-version: '19'
         cache: 'gradle'
     - name: Run Checks
       run: ./gradlew check --continue --stacktrace
@@ -35,8 +35,8 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-java@v2
       with:
-        distribution: 'temurin'
-        java-version: '11'
+        distribution: 'zulu'
+        java-version: '19'
         cache: 'gradle'
     - name: Run Checks
       run: ./gradlew check --continue --stacktrace -Pkotshi.useLegacyDataClassRenderer=true
@@ -47,8 +47,8 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-java@v2
       with:
-        distribution: 'temurin'
-        java-version: '11'
+        distribution: 'zulu'
+        java-version: '19'
         cache: 'gradle'
     - name: Deploy snapshot
       run: ./gradlew publishSnapshot --stacktrace

api/build.gradle.kts

@@ -1,41 +1,19 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-//import org.jetbrains.kotlin.incremental.mkdirsOrThrow
-import java.net.URL
+import org.jetbrains.dokka.gradle.DokkaTask
 
 plugins {
-    `published-library`
+    id("published-library")
 }
 
 dependencies {
-    api(deps.moshi.oldestSupported)
-    testImplementation(deps.junit)
-    testImplementation(deps.truth)
-    testImplementation(deps.kotlin.junit)
-}
-
-tasks.withType<KotlinCompile> {
-    kotlinOptions {
-        freeCompilerArgs = freeCompilerArgs + listOf(
-            "-opt-in=kotlin.RequiresOptIn"
-        )
-    }
-}
-
-tasks.compileTestKotlin {
-    kotlinOptions {
-        freeCompilerArgs = freeCompilerArgs + listOf(
-            "-Xjvm-default=all"
-        )
-    }
+    api(libs.moshi.oldestSupported)
 }
 
 val packagesMarkdown = buildDir.resolve("generated/docs/packages.md")
-val buildPackagesDocs by tasks.registering(Task::class) {
+val buildPackagesDocs by tasks.registering {
     val readme = rootDir.resolve("README.md")
     inputs.file(readme)
     outputs.file(packagesMarkdown)
     doFirst {
-//        packagesMarkdown.parentFile!!.mkdirsOrThrow()
         packagesMarkdown.writer().use { writer ->
             writer.write("# Module kotshi\n\n")
             readme.reader().use { reader ->
@@ -45,18 +23,11 @@ val buildPackagesDocs by tasks.registering(Task::class) {
     }
 }
 
-tasks.withType<org.jetbrains.dokka.gradle.DokkaTask> {
+tasks.withType<DokkaTask>().configureEach {
     dependsOn(buildPackagesDocs)
     moduleName.set("kotshi")
     dokkaSourceSets {
         configureEach {
-            sourceLink {
-                localDirectory.set(file("src/main/kotlin"))
-                remoteUrl.set(URL("https://github.com/ansman/kotshi/blob/main/api/src/main/kotlin"))
-                remoteLineSuffix.set("#L")
-            }
-            externalDocumentationLink { url.set(URL("https://square.github.io/okio/2.x/okio/")) }
-            externalDocumentationLink { url.set(URL("https://square.github.io/moshi/1.x/moshi/")) }
             includes.from(packagesMarkdown)
         }
     }

api/src/test/kotlin/se/ansman/kotshi/TestKotshiUtils.kt

@@ -1,6 +1,8 @@
 package se.ansman.kotshi
 
-import com.google.common.truth.Truth.assertThat
+import assertk.assertThat
+import assertk.assertions.isEqualTo
+import assertk.assertions.isNotEqualTo
 import com.squareup.moshi.JsonQualifier
 import org.junit.Test
 import se.ansman.kotshi.KotshiUtils.createJsonQualifierImplementation

build.gradle.kts

@@ -1,33 +1,8 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
-    id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.11.0"
-}
-
-allprojects {
-    repositories {
-        google()
-        mavenCentral()
-        mavenLocal()
-    }
-    tasks.withType<Javadoc> { enabled = false }
-    tasks.withType<KotlinCompile> {
-        kotlinOptions {
-            freeCompilerArgs = freeCompilerArgs + listOf(
-                "-opt-in=kotlin.RequiresOptIn"
-            )
-        }
-    }
+    kotlin("jvm") version libs.versions.kotlin.get() apply false
+    alias(libs.plugins.kotlinx.binaryCompatibilityValidator)
 }
 
 apiValidation {
     allprojects.filterNot { it.path == ":api" }.mapTo(ignoredProjects) { it.name }
-}
-
-tasks.register("publishSnapshot") {
-    if (version.toString().endsWith("-SNAPSHOT")) {
-        for (project in allprojects) {
-            project.tasks.findByName("publishAllPublicationsToSonatypeSnapshotsRepository")?.let { dependsOn(it) }
-        }
-    }
 }