Merge pull request #19 from dwursteisen/main

Bump Gradle / Kotlin / JVM target / other libs to the latest version

Author: dwursteisen

.github/workflows/build.yml

@@ -12,16 +12,16 @@ jobs:
       - name: Validate Gradle Wrapper
         uses: gradle/wrapper-validation-action@v1
       - name: Cache gradle
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }}
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
       - name: build
         run: ./gradlew build
 
 env:
-  GRADLE_OPTS: -Dorg.gradle.configureondemand=true -Dorg.gradle.parallel=true -Dkotlin.incremental=false -Dorg.gradle.jvmargs="-Xmx3g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8"
+  GRADLE_OPTS: -Dorg.gradle.configureondemand=true -Dorg.gradle.parallel=true -Dkotlin.incremental=false -Dorg.gradle.jvmargs="-Xmx3g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8"

.github/workflows/publish-release.yml

@@ -14,15 +14,16 @@ jobs:
       - name: Validate Gradle Wrapper
         uses: gradle/wrapper-validation-action@v1
       - name: Cache gradle
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
           path: ~/.gradle/caches
-      - name: Set up JDK 11
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }}
+      - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
       - name: build
         run: ./gradlew publishPlugins -Pversion="${{github.event.release.tag_name}}" -Dgradle.publish.key=${{secrets.GRADLE_PUBLISH_KEY}} -Dgradle.publish.secret=${{secrets.GRADLE_PUBLISH_SECRET}}
 
 env:
-  GRADLE_OPTS: -Dorg.gradle.configureondemand=true -Dorg.gradle.parallel=true -Dkotlin.incremental=false -Dorg.gradle.jvmargs="-Xmx3g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8"
+  GRADLE_OPTS: -Dorg.gradle.configureondemand=true -Dorg.gradle.parallel=true -Dkotlin.incremental=false -Dorg.gradle.jvmargs="-Xmx3g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8"

developer-plugin/build.gradle.kts

@@ -1,3 +1,4 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 @Suppress("DSL_SCOPE_VIOLATION")
@@ -36,6 +37,8 @@ dependencies {
     implementation(libs.jdoctor.core)
     implementation(libs.jdoctor.utils)
 
+    implementation(libs.publish.on.central.plugin)
+
     // Use the Kotlin test library.
     testImplementation(libs.bundles.test)
 }
@@ -94,7 +97,7 @@ tasks.check {
     dependsOn(functionalTest)
 }
 
-val javaVersion = JavaLanguageVersion.of(11)
+val javaVersion = JavaLanguageVersion.of(17)
 java {
     toolchain {
         languageVersion.set(javaVersion)
@@ -108,7 +111,9 @@ kotlin {
 }
 
 project.tasks.withType(KotlinCompile::class.java).configureEach {
-    kotlinOptions.jvmTarget = "11"
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_17)
+    }
     val toolchainService = project.extensions.getByType(JavaToolchainService::class.java)
     kotlinJavaToolchain.toolchain.use(
         toolchainService.launcherFor {
@@ -117,8 +122,17 @@ project.tasks.withType(KotlinCompile::class.java).configureEach {
     )
 }
 
-// Ensure "org.gradle.jvm.version" is set to "11" in Gradle metadata.
+// Ensure "org.gradle.jvm.version" is set to "17" in Gradle metadata.
 project.tasks.withType(JavaCompile::class.java).configureEach {
-    sourceCompatibility = JavaVersion.VERSION_11.toString()
-    targetCompatibility = JavaVersion.VERSION_11.toString()
+    sourceCompatibility = JavaVersion.VERSION_17.toString()
+    targetCompatibility = JavaVersion.VERSION_17.toString()
 }
+
+testing.suites {
+    withType<JvmTestSuite>().configureEach {
+        useJUnitJupiter()
+        dependencies {
+            implementation(gradleTestKit())
+        }
+    }
+}

developer-plugin/src/functionalTest/kotlin/com/github/minigdx/gradle/plugin/MinigdxDeveloperPluginFunctionalTest.kt

@@ -5,8 +5,8 @@ package com.github.minigdx.gradle.plugin
 
 import org.gradle.testkit.runner.GradleRunner
 import org.gradle.testkit.runner.TaskOutcome
-import org.junit.Rule
-import org.junit.rules.TemporaryFolder
+import org.junit.jupiter.api.io.TempDir
+import java.io.File
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
@@ -15,13 +15,12 @@ import kotlin.test.assertTrue
  * A simple functional test for the 'com.github.minigdx.gradle.plugin.greeting' plugin.
  */
 class MinigdxDeveloperPluginFunctionalTest {
-
-    @get:Rule
-    val temporaryFolder: TemporaryFolder = TemporaryFolder()
+    @TempDir
+    lateinit var temporaryFolder: File
 
     @Test fun `can create github workflow`() {
         // Setup the test build
-        val projectDir = temporaryFolder.newFolder("build", "functionalTest")
+        val projectDir = File(temporaryFolder, "build/functionalTest")
         projectDir.mkdirs()
         projectDir.resolve("settings.gradle").writeText("""
             plugins {
@@ -51,7 +50,7 @@ class MinigdxDeveloperPluginFunctionalTest {
 
     @Test fun `can create makefile`() {
         // Setup the test build
-        val projectDir = temporaryFolder.newFolder("build", "functionalTest")
+        val projectDir = File(temporaryFolder, "build/functionalTest")
         projectDir.mkdirs()
         projectDir.resolve("settings.gradle").writeText("""
 plugins {

developer-plugin/src/functionalTest/kotlin/com/github/minigdx/gradle/plugin/MinigdxKotlinJvmPluginFunctionalTest.kt

@@ -5,9 +5,9 @@ package com.github.minigdx.gradle.plugin
 
 import org.gradle.testkit.runner.GradleRunner
 import org.gradle.testkit.runner.TaskOutcome
-import org.junit.Rule
-import org.junit.rules.TemporaryFolder
-import kotlin.test.Test
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.io.TempDir
+import java.io.File
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
 
@@ -16,14 +16,12 @@ import kotlin.test.assertTrue
  */
 class MinigdxKotlinJvmPluginFunctionalTest {
 
-    @get:Rule
-    val temporaryFolder: TemporaryFolder = TemporaryFolder()
+    @TempDir
+    lateinit var projectDir: File
 
     @Test
     fun `can build`() {
         // Setup the test build
-        val projectDir = temporaryFolder.newFolder("build", "functionalTest")
-        projectDir.mkdirs()
         projectDir.resolve("settings.gradle").writeText("""
 plugins {
     id("org.gradle.toolchains.foojay-resolver-convention") version("0.4.0")
@@ -40,7 +38,8 @@ plugins {
         // Run the build
         val result = GradleRunner.create()
             .forwardOutput()
-            .withPluginClasspath().withArguments("build")
+            .withPluginClasspath()
+            .withArguments("build")
             .withProjectDir(projectDir)
             .build()
 
@@ -51,8 +50,6 @@ plugins {
     @Test
     fun `can build with configuration cache`() {
         // Setup the test build
-        val projectDir = temporaryFolder.newFolder("build", "functionalTest")
-        projectDir.mkdirs()
         projectDir.resolve("settings.gradle").writeText("""
 plugins {
     id("org.gradle.toolchains.foojay-resolver-convention") version("0.4.0")
@@ -66,19 +63,23 @@ plugins {
         """
         )
 
-        // Run the build
+        // Run the build (first run to populate cache)
         GradleRunner.create()
             .forwardOutput()
-            .withPluginClasspath().withArguments("build", "--configuration-cache")
+            .withPluginClasspath()
+            .withArguments("build", "--configuration-cache")
             .withProjectDir(projectDir)
             .build()
+
+        // Run the build again and check for cache reuse
         val result = GradleRunner.create()
             .forwardOutput()
-            .withPluginClasspath().withArguments("build", "--configuration-cache")
+            .withPluginClasspath()
+            .withArguments("build", "--configuration-cache")
             .withProjectDir(projectDir)
             .build()
 
         // Verify the result
         assertTrue(result.output.contains("Reusing configuration cache."))
     }
-}
+}

developer-plugin/src/functionalTest/kotlin/com/github/minigdx/gradle/plugin/MinigdxKotlinMppPluginFunctionalTest.kt

@@ -5,10 +5,10 @@ package com.github.minigdx.gradle.plugin
 
 import org.gradle.testkit.runner.GradleRunner
 import org.gradle.testkit.runner.TaskOutcome
-import org.junit.Ignore
-import org.junit.Rule
-import org.junit.rules.TemporaryFolder
-import kotlin.test.Test
+import org.junit.jupiter.api.Disabled
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.io.TempDir
+import java.io.File
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
 
@@ -17,13 +17,15 @@ import kotlin.test.assertTrue
  */
 class MinigdxKotlinMppPluginFunctionalTest {
 
-    @get:Rule
-    val temporaryFolder: TemporaryFolder = TemporaryFolder()
+    @TempDir
+    lateinit var projectDir: File
 
-    @Test fun `can build`() {
+    @Test
+    fun `can build`() {
         // Setup the test build
-        val projectDir = temporaryFolder.newFolder("build", "functionalTest")
-        projectDir.mkdirs()
+        val buildDir = projectDir.resolve("build")
+        val functionalTestDir = projectDir.resolve("functionalTest")
+        functionalTestDir.mkdirs()
         projectDir.resolve("settings.gradle").writeText("""
 plugins {
     id("org.gradle.toolchains.foojay-resolver-convention") version("0.4.0")
@@ -48,11 +50,9 @@ plugins {
     }
 
     @Test
-    @Ignore("Configuration Cache not yet supported by Kotlin Multiplatform")
+    @Disabled("Configuration Cache not yet supported by Kotlin Multiplatform")
     fun `can build with configuration cache`() {
         // Setup the test build
-        val projectDir = temporaryFolder.newFolder("build", "functionalTest")
-        projectDir.mkdirs()
         projectDir.resolve("settings.gradle").writeText("""
 plugins {
     id("org.gradle.toolchains.foojay-resolver-convention") version("0.4.0")
@@ -64,22 +64,23 @@ plugins {
             }
         """)
 
-        // Run the build
+        // Run the build (first run to populate cache)
         GradleRunner.create()
             .forwardOutput()
             .withPluginClasspath()
             .withArguments("build", "--configuration-cache")
             .withProjectDir(projectDir)
             .build()
 
+        // Run the build again and check for cache reuse
         val result = GradleRunner.create()
-        .forwardOutput()
-        .withPluginClasspath()
-        .withArguments("build", "--configuration-cache")
-        .withProjectDir(projectDir)
-       .build()
+            .forwardOutput()
+            .withPluginClasspath()
+            .withArguments("build", "--configuration-cache")
+            .withProjectDir(projectDir)
+            .build()
 
         // Verify the result
         assertTrue(result.output.contains("Reusing configuration cache."))
     }
-}
+}

developer-plugin/src/main/kotlin/com/github/minigdx/gradle/plugin/MiniGdxDeveloperExtension.kt

@@ -65,8 +65,10 @@ open class MiniGdxDeveloperExtension(private val project: Project) {
     companion object {
 
         val IOS_MPP_PROPERTY = "minigdx.mpp.ios"
+        val WASM_MPP_PROPERTY = "minigdx.mpp.wasm"
         val K2_MPP_PROPERTY = "minigdx.mpp.k2"
         val KTLINT_PROPERTY = "mnigdx.ktlint"
+        val DOKKA_SKIP_PROPERTY = "minigdx.dokka.skip"
     }
 }