Adding targets and trying targetHierarchy

square · Sep 6, 2023 · 12ff5fb · 12ff5fb
1 parent 067561d
commit 12ff5fb
Show file tree

Hide file tree

Showing 6 changed files with 932 additions and 88 deletions.
diff --git a/samples/js/build.gradle.kts b/samples/js/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-  kotlin("js")
+  kotlin("multiplatform")
   id("com.squareup.wire")
 }
 

diff --git a/wire-grpc-client/build.gradle.kts b/wire-grpc-client/build.gradle.kts
@@ -1,6 +1,7 @@
 import com.vanniktech.maven.publish.JavadocJar.Javadoc
 import com.vanniktech.maven.publish.KotlinMultiplatform
 import com.vanniktech.maven.publish.MavenPublishBaseExtension
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 
 plugins {
   kotlin("multiplatform")
@@ -15,9 +16,7 @@ if (project.rootProject.name == "wire") {
 }
 
 kotlin {
-  jvm {
-    withJava()
-  }
+  jvm().withJava()
   if (System.getProperty("kjs", "true").toBoolean()) {
     js(IR) {
       configure(listOf(compilations.getByName("main"), compilations.getByName("test"))) {
@@ -34,18 +33,32 @@ kotlin {
     }
   }
   if (System.getProperty("knative", "true").toBoolean()) {
-    iosX64()
+    androidNativeArm32()
+    androidNativeArm64()
+    androidNativeX64()
+    androidNativeX86()
     iosArm64()
     iosSimulatorArm64()
-    // Required to generate tests tasks: https://youtrack.jetbrains.com/issue/KT-26547
-    linuxX64()
-    macosX64()
+    iosSimulatorArm64()
+    iosX64()
+    linuxArm64()
+    linuxX64() // Required to generate tests tasks: https://youtrack.jetbrains.com/issue/KT-26547
     macosArm64()
+    macosX64()
     mingwX64()
-    tvosX64()
     tvosArm64()
     tvosSimulatorArm64()
+    tvosX64()
+    wasm().nodejs()
+    watchosArm32()
+    watchosArm64()
+    watchosDeviceArm64()
+    watchosSimulatorArm64()
+    watchosX64()
   }
+
+  @OptIn(ExperimentalKotlinGradlePluginApi::class) targetHierarchy.default()
+
   sourceSets {
     val commonMain by getting {
       dependencies {
@@ -59,24 +72,6 @@ kotlin {
         api(libs.okhttp.core)
       }
     }
-    if (System.getProperty("knative", "true").toBoolean()) {
-      val nativeMain by creating {
-        dependsOn(commonMain)
-      }
-      val iosX64Main by getting
-      val iosArm64Main by getting
-      val iosSimulatorArm64Main by getting
-      val linuxX64Main by getting
-      val macosX64Main by getting
-      val macosArm64Main by getting
-      val mingwX64Main by getting
-      val tvosX64Main by getting
-      val tvosArm64Main by getting
-      val tvosSimulatorArm64Main by getting
-      for (it in listOf(iosX64Main, iosArm64Main, iosSimulatorArm64Main, linuxX64Main, macosX64Main, macosArm64Main, mingwX64Main, tvosX64Main, tvosArm64Main, tvosSimulatorArm64Main)) {
-        it.dependsOn(nativeMain)
-      }
-    }
   }
 }
 

diff --git a/wire-runtime/build.gradle.kts b/wire-runtime/build.gradle.kts
@@ -2,6 +2,8 @@ import com.diffplug.gradle.spotless.SpotlessExtension
 import com.vanniktech.maven.publish.JavadocJar.Javadoc
 import com.vanniktech.maven.publish.KotlinMultiplatform
 import com.vanniktech.maven.publish.MavenPublishBaseExtension
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 
 plugins {
   kotlin("multiplatform")
@@ -17,9 +19,7 @@ if (project.rootProject.name == "wire") {
 }
 
 kotlin {
-  jvm {
-    withJava()
-  }
+  jvm().withJava()
   if (System.getProperty("kjs", "true").toBoolean()) {
     js(IR) {
       configure(listOf(compilations.getByName("main"), compilations.getByName("test"))) {
@@ -36,18 +36,32 @@ kotlin {
     }
   }
   if (System.getProperty("knative", "true").toBoolean()) {
-    iosX64()
+    androidNativeArm32()
+    androidNativeArm64()
+    androidNativeX64()
+    androidNativeX86()
     iosArm64()
     iosSimulatorArm64()
-    // Required to generate tests tasks: https://youtrack.jetbrains.com/issue/KT-26547
-    linuxX64()
-    macosX64()
+    iosSimulatorArm64()
+    iosX64()
+    linuxArm64()
+    linuxX64() // Required to generate tests tasks: https://youtrack.jetbrains.com/issue/KT-26547
     macosArm64()
+    macosX64()
     mingwX64()
-    tvosX64()
     tvosArm64()
     tvosSimulatorArm64()
+    tvosX64()
+    wasm().nodejs()
+    watchosArm32()
+    watchosArm64()
+    watchosDeviceArm64()
+    watchosSimulatorArm64()
+    watchosX64()
   }
+
+  @OptIn(ExperimentalKotlinGradlePluginApi::class) targetHierarchy.default()
+
   sourceSets {
     val commonMain by getting {
       dependencies {
@@ -78,50 +92,6 @@ kotlin {
         }
       }
     }
-    if (System.getProperty("knative", "true").toBoolean()) {
-      val nativeMain by creating {
-        dependsOn(commonMain)
-      }
-      val nativeTest by creating {
-        dependsOn(commonTest)
-      }
-      val darwinMain by creating {
-        dependsOn(commonMain)
-      }
-
-      val iosX64Main by getting
-      val iosArm64Main by getting
-      val iosSimulatorArm64Main by getting
-      val linuxX64Main by getting
-      val macosX64Main by getting
-      val macosArm64Main by getting
-      val mingwX64Main by getting
-      val tvosX64Main by getting
-      val tvosArm64Main by getting
-      val tvosSimulatorArm64Main by getting
-      val iosX64Test by getting
-      val iosArm64Test by getting
-      val iosSimulatorArm64Test by getting
-      val linuxX64Test by getting
-      val macosX64Test by getting
-      val macosArm64Test by getting
-      val mingwX64Test by getting
-      val tvosX64Test by getting
-      val tvosArm64Test by getting
-      val tvosSimulatorArm64Test by getting
-
-      for (it in listOf(iosX64Main, iosArm64Main, iosSimulatorArm64Main, linuxX64Main, macosX64Main, macosArm64Main, mingwX64Main, tvosX64Main, tvosArm64Main, tvosSimulatorArm64Main)) {
-        it.dependsOn(nativeMain)
-      }
-
-      for (it in listOf(iosX64Test, iosArm64Test, iosSimulatorArm64Test, linuxX64Test, macosX64Test, macosArm64Test, mingwX64Test, tvosX64Test, tvosArm64Test, tvosSimulatorArm64Test)) {
-        it.dependsOn(nativeTest)
-      }
-
-      for (it in listOf(iosX64Main, iosArm64Main, macosX64Main, macosArm64Main, tvosX64Main, tvosArm64Main)) {
-        it.dependsOn(darwinMain)
-      }
-    }
   }
 }
 

diff --git a/wire-schema-tests/build.gradle.kts b/wire-schema-tests/build.gradle.kts
@@ -2,6 +2,7 @@ import com.vanniktech.maven.publish.JavadocJar.Javadoc
 import com.vanniktech.maven.publish.KotlinJvm
 import com.vanniktech.maven.publish.KotlinMultiplatform
 import com.vanniktech.maven.publish.MavenPublishBaseExtension
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 
 plugins {
   kotlin("multiplatform")
@@ -16,10 +17,7 @@ if (project.rootProject.name == "wire") {
 }
 
 kotlin {
-  jvm {
-    // Required by MavenPublishBaseExtension even though we do not have Java sources.
-    withJava()
-  }
+  jvm().withJava() // Required by MavenPublishBaseExtension even though we do not have Java sources.
   if (System.getProperty("kjs", "true").toBoolean()) {
     js(IR) {
       configure(listOf(compilations.getByName("main"), compilations.getByName("test"))) {
@@ -35,6 +33,9 @@ kotlin {
       browser()
     }
   }
+
+  @OptIn(ExperimentalKotlinGradlePluginApi::class) targetHierarchy.default()
+
   sourceSets {
     val commonMain by getting {
       dependencies {

diff --git a/wire-schema/build.gradle.kts b/wire-schema/build.gradle.kts
@@ -2,6 +2,7 @@ import com.diffplug.gradle.spotless.SpotlessExtension
 import com.vanniktech.maven.publish.JavadocJar.Javadoc
 import com.vanniktech.maven.publish.KotlinMultiplatform
 import com.vanniktech.maven.publish.MavenPublishBaseExtension
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 
 plugins {
   kotlin("multiplatform")
@@ -16,9 +17,7 @@ if (project.rootProject.name == "wire") {
 }
 
 kotlin {
-  jvm {
-    withJava()
-  }
+  jvm().withJava()
   if (System.getProperty("kjs", "true").toBoolean()) {
     js(IR) {
       configure(listOf(compilations.getByName("main"), compilations.getByName("test"))) {
@@ -34,14 +33,15 @@ kotlin {
       browser()
     }
   }
+
+  @OptIn(ExperimentalKotlinGradlePluginApi::class) targetHierarchy.default()
+
   sourceSets {
     val commonMain by getting {
       dependencies {
         api(projects.wireRuntime)
       }
     }
-    val commonTest by getting {
-    }
     val jvmMain by getting {
       dependencies {
         api(libs.okio.core)