diff --git a/.github/workflows/bld.yml b/.github/workflows/bld.yml index be80a2f..f518c42 100644 --- a/.github/workflows/bld.yml +++ b/.github/workflows/bld.yml @@ -16,7 +16,7 @@ jobs: strategy: matrix: java-version: [17, 21, 24] - kotlin-version: [1.9.25, 2.1.20] + kotlin-version: [1.9.25, 2.1.10] steps: - name: Checkout source repository diff --git a/.idea/app.iml b/.idea/app.iml index 381e063..a350d1f 100644 --- a/.idea/app.iml +++ b/.idea/app.iml @@ -5,6 +5,10 @@ + + + + diff --git a/README.md b/README.md index 441e433..309209f 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ [![License (3-Clause BSD)](https://img.shields.io/badge/license-BSD%203--Clause-blue.svg?style=flat-square)](https://opensource.org/licenses/BSD-3-Clause) -[![Kotlin](https://img.shields.io/badge/kotlin-2.1.20-7f52ff)](https://kotlinlang.org/) +[![Kotlin](https://img.shields.io/badge/kotlin-2.1.10-7f52ff)](https://kotlinlang.org/) [![bld](https://img.shields.io/badge/2.2.1-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld) [![Release](https://img.shields.io/github/release/ethauvin/akismet-kotlin.svg)](https://github.com/ethauvin/akismet-kotlin/releases/latest) [![Nexus Snapshot](https://img.shields.io/nexus/s/net.thauvin.erik/akismet-kotlin?label=snapshot&server=https%3A%2F%2Foss.sonatype.org%2F)](https://oss.sonatype.org/content/repositories/snapshots/net/thauvin/erik/akismet-kotlin/) diff --git a/examples/gradle/build.gradle.kts b/examples/gradle/build.gradle.kts index 1d9e3ef..927fc12 100644 --- a/examples/gradle/build.gradle.kts +++ b/examples/gradle/build.gradle.kts @@ -1,7 +1,7 @@ plugins { id("application") id("com.github.ben-manes.versions") version "0.51.0" - kotlin("jvm") version "2.1.20" + kotlin("jvm") version "2.1.10" } defaultTasks(ApplicationPlugin.TASK_RUN_NAME) diff --git a/pom.xml b/pom.xml index 33a7c4f..ff558a4 100644 --- a/pom.xml +++ b/pom.xml @@ -18,19 +18,19 @@ org.jetbrains.kotlin kotlin-stdlib - 2.1.20 + 2.1.10 compile org.jetbrains.kotlin kotlin-stdlib-jdk7 - 2.1.20 + 2.1.10 compile org.jetbrains.kotlin kotlin-stdlib-jdk8 - 2.1.20 + 2.1.10 compile diff --git a/src/bld/java/net/thauvin/erik/AkismetBuild.java b/src/bld/java/net/thauvin/erik/AkismetBuild.java index f0457a7..47f1629 100644 --- a/src/bld/java/net/thauvin/erik/AkismetBuild.java +++ b/src/bld/java/net/thauvin/erik/AkismetBuild.java @@ -37,7 +37,6 @@ import rife.bld.extension.*; import rife.bld.extension.dokka.LoggingLevel; import rife.bld.extension.dokka.OutputFormat; import rife.bld.extension.dokka.SourceSet; -import rife.bld.extension.kotlin.CompileOptions; import rife.bld.extension.kotlin.CompilerPlugin; import rife.bld.operations.exceptions.ExitStatusException; import rife.bld.publish.PomBuilder; @@ -72,14 +71,14 @@ public class AkismetBuild extends Project { repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL); var okHttp = version(4, 12, 0); - final var kotlin = version(2, 1, 20); + final var kotlin = version(2, 1, 10); scope(compile) .include(dependency("org.jetbrains.kotlin", "kotlin-stdlib", kotlin)) .include(dependency("org.jetbrains.kotlin", "kotlin-stdlib-jdk7", kotlin)) .include(dependency("org.jetbrains.kotlin", "kotlin-stdlib-jdk8", kotlin)) .include(dependency("com.squareup.okhttp3", "okhttp", okHttp)) .include(dependency("com.squareup.okhttp3", "logging-interceptor", okHttp)) - .include(dependency("org.jetbrains.kotlinx", "kotlinx-serialization-json", "1.8.0")); + .include(dependency("org.jetbrains.kotlinx", "kotlinx-serialization-json", version(1, 8, 0))); scope(provided) .include(dependency("jakarta.servlet", "jakarta.servlet-api", version(6, 1, 0))); scope(test) @@ -139,12 +138,10 @@ public class AkismetBuild extends Project { @Override public void compile() throws Exception { genver(); - final var options = new CompileOptions(); - options.verbose(true).jvmOptions().add("--enable-native-access=ALL-UNNAMED"); var op = new CompileKotlinOperation() .fromProject(this) - .compileOptions(options) .plugins(CompilerPlugin.KOTLIN_SERIALIZATION); + op.compileOptions().verbose(true); op.execute(); }