JVM enhancements (#10)

Author: alexandru

.github/workflows/build.yaml

@@ -7,14 +7,14 @@ on:
     branches: [ main ]
 
 jobs:
-  test:
+  test-gradle:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         java-version: ['11', '21']
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK ${{ matrix.java-version }}
         uses: actions/setup-java@v4
         with:
@@ -37,6 +37,24 @@ jobs:
             **/build/reports/
             **/build/test-results/
 
+  test-sbt:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          cache: 'sbt'
+          java-version: 21
+          distribution: 'temurin'
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
+      - name: Setup sbt
+        uses: sbt/setup-sbt@v1
+      - name: Build and test
+        run: sbt -v publishLocalGradleDependencies ++test
+        working-directory: ./tasks-scala
+
 #  publish-snapshot:
 #    runs-on: ubuntu-latest
 #    needs: test

.gitignore

@@ -42,6 +42,28 @@ bin/
 /.kotlin
 /kotlin-js-store/
 
+# sbt specific
+dist/*
+target/
+lib_managed/
+src_managed/
+project/boot/
+project/plugins/project/
+project/local-plugins.sbt
+.history
+.ensime
+.ensime_cache/
+.sbt-scripted/
+local.sbt
+
+# Bloop
+.bsp
+
+# Metals
+.bloop/
+.metals/
+metals.sbt
+
 ### Secrets
 .envrc
 

Makefile

@@ -1,3 +1,8 @@
+.PHONY: build
+
+build:
+	./gradlew build
+
 dependency-updates:
 	./gradlew dependencyUpdates \
 		-Drevision=release \
@@ -12,6 +17,6 @@ test-watch:
 	./gradlew -t -i check
 
 test-coverage:
-	./gradlew clean jvmTest koverHtmlReportJvm
-	open ./tasks-core/build/reports/kover/htmlJvm/index.html
+	./gradlew clean build jacocoTestReport koverHtmlReportJvm
+	open tasks-jvm/build/reports/jacoco/test/html/index.html
 	open ./tasks-kotlin/build/reports/kover/htmlJvm/index.html

build.gradle.kts

@@ -13,11 +13,18 @@ repositories {
 
 buildscript {
     dependencies {
-        classpath("org.jetbrains.dokka:dokka-base:1.9.20")
-        // classpath("org.jetbrains.dokka:kotlin-as-java-plugin:1.9.20")
+        classpath("org.jetbrains.dokka:dokka-base:2.0.0")
+        // classpath("org.jetbrains.dokka:kotlin-as-java-plugin:2.0.0")
     }
 }
 
+//dokka {
+//    dokkaPublications.html {
+//        outputDirectory.set(rootDir.resolve("build/dokka"))
+//        outputDirectory.set(file("build/dokka"))
+//    }
+//}
+
 tasks.dokkaHtmlMultiModule {
     outputDirectory.set(file("build/dokka"))
 }

buildSrc/src/main/kotlin/tasks.java-project.gradle.kts

@@ -0,0 +1,5 @@
+plugins {
+    `java-library`
+    jacoco
+    id("tasks.base")
+}

buildSrc/src/main/kotlin/tasks.kmp-project.gradle.kts

@@ -27,14 +27,12 @@ val javadocJar = tasks.create<Jar>("javadocJar") {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 kotlin {
-    jvm {
-        withJava()
-    }
+    jvm {}
 
     js(IR) {
         browser {
@@ -47,23 +45,23 @@ kotlin {
     }
 
     tasks.withType<JavaCompile> {
-        sourceCompatibility = "11"
-        targetCompatibility = "11"
+        sourceCompatibility = JavaVersion.VERSION_17.majorVersion
+        targetCompatibility = JavaVersion.VERSION_17.majorVersion
         jvmToolchain {
-            languageVersion.set(JavaLanguageVersion.of(11))
+            languageVersion.set(JavaLanguageVersion.of(JavaVersion.VERSION_17.majorVersion))
         }
     }
 
     tasks.withType<KotlinCompile> {
         compilerOptions {
             // explicitApiMode = ExplicitApiMode.Strict
             // allWarningsAsErrors = true
-            jvmTarget.set(JvmTarget.JVM_11)
+            jvmTarget.set(JvmTarget.JVM_17)
             freeCompilerArgs.add("-Xjvm-default=all")
         }
         kotlinJavaToolchain.toolchain.use(
             javaLauncher = javaToolchains.launcherFor {
-                languageVersion = JavaLanguageVersion.of(11)
+                languageVersion = JavaLanguageVersion.of(JavaVersion.VERSION_17.majorVersion)
             }
         )
     }
@@ -73,6 +71,6 @@ tasks.withType<Test> {
     useJUnitPlatform()
     javaLauncher =
         javaToolchains.launcherFor {
-            languageVersion = JavaLanguageVersion.of(11)
+            languageVersion = JavaLanguageVersion.of(JavaVersion.VERSION_17.majorVersion)
         }
 }

gradle.properties

@@ -2,3 +2,6 @@ kotlin.code.style=official
 
 # TO BE modified whenever a new version is released
 project.version=0.0.2
+
+# https://kotlinlang.org/docs/dokka-migration.html#sync-your-project-with-gradle
+org.jetbrains.dokka.experimental.gradle.pluginMode=V2EnabledWithHelpers

gradle/libs.versions.toml

@@ -1,14 +1,14 @@
 [versions]
-kotlin = "2.0.0"
-kover = "0.8.2"
-dokka = "1.9.20"
+kotlin = "2.1.20"
+kover = "0.9.1"
+dokka = "2.0.0"
 gradleVersions = "0.51.0"
-kotlinx-coroutines = "1.9.0-RC"
-jetbrains-annotations = "24.1.0"
+kotlinx-coroutines = "1.10.1"
+jetbrains-annotations = "26.0.2"
 junit-jupiter = "5.10.3"
 publish = "0.29.0"
 jspecify = "1.0.0"
-lombok = "1.18.34"
+lombok = "1.18.36"
 binary-compatibility-validator = "0.16.2"
 
 [libraries]

gradle/wrapper/gradle-wrapper.jar

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