Update build things for better future support

Of Kotlin 2.2, Gradle 9, etc.

Author: JakeWharton

.github/workflows/build.yaml

@@ -23,7 +23,7 @@ jobs:
           distribution: 'zulu'
           java-version-file: .github/workflows/.java-version
 
-      - run: ./gradlew build dokkaHtml
+      - run: ./gradlew build dokkaGenerate
 
       - run: ./gradlew publish
         if: ${{ github.ref == 'refs/heads/trunk' && github.repository == 'cashapp/turbine' }}

.github/workflows/release.yaml

@@ -25,7 +25,7 @@ jobs:
           ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD_APP_CASH }}
           ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.GPG_SECRET_KEY }}
           ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.GPG_SECRET_PASSPHRASE }}
-        run: ./gradlew dokkaHtml publish
+        run: ./gradlew dokkaGenerate publish
 
       - name: Extract release notes
         id: release_notes

build.gradle

@@ -51,17 +51,26 @@ kotlin {
   tvosSimulatorArm64()
   tvosX64()
 
-  wasmJs()
-  wasmWasi {
-    nodejs()
-  }
+  wasmJs().nodejs()
+  wasmWasi().nodejs()
 
   watchosArm32()
   watchosArm64()
   watchosDeviceArm64()
   watchosSimulatorArm64()
   watchosX64()
 
+  applyDefaultHierarchyTemplate {
+    it.group("common") {
+      it.group('nonJvm') {
+        it.group('native') {}
+        it.withJs()
+        it.withWasmJs()
+        it.withWasmWasi()
+      }
+    }
+  }
+
   sourceSets {
     commonMain {
       dependencies {
@@ -74,9 +83,6 @@ kotlin {
         implementation 'org.jetbrains.kotlin:kotlin-test'
       }
     }
-    nonJvmTest {
-      dependsOn(commonTest)
-    }
   }
 
   sourceSets.matching { it.name.endsWith("Test") }.configureEach {
@@ -86,13 +92,6 @@ kotlin {
       optIn('kotlinx.coroutines.ExperimentalCoroutinesApi')
     }
   }
-
-  targets.each { target ->
-    if (target.platformType == KotlinPlatformType.common) return
-    if (target.platformType != KotlinPlatformType.jvm) {
-      target.compilations.test.defaultSourceSet.dependsOn(sourceSets.nonJvmTest)
-    }
-  }
 }
 
 spotless {
@@ -104,7 +103,7 @@ spotless {
   }
 }
 
-dokkaHtml {
+dokka {
   dokkaSourceSets {
     configureEach {
       skipDeprecated.set(true)

gradle.properties

@@ -26,3 +26,6 @@ POM_DEVELOPER_NAME=CashApp
 POM_DEVELOPER_URL=https://github.com/cashapp/
 
 kotlin.mpp.stability.nowarn=true
+
+org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
+org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true