Merge pull request #106 from yshrsmz/renovate/kotlin-monorepo

yshrsmz · Nov 7, 2023 · e4f9856 · e4f9856
2 parents 676865c + c9080a9
commit e4f9856
Show file tree

Hide file tree

Showing 14 changed files with 48 additions and 72 deletions.
diff --git a/README.md b/README.md
@@ -456,7 +456,7 @@ Have a look at `./sample` directory.
 
 ```
 # Publish the latest version of the plugin to test maven repository(./build/localMaven)
-$ ./gradlew publishAllPublicationsToTestMavenRepository
+$ ./gradlew publishAllPublicationsToTestMavenRepository -PRELEASE_SIGNING_ENABLED=false
 
 # Try out the samples.
 # BuildKonfig will be generated in ./sample/build/buildkonfig

diff --git a/buildkonfig-gradle-plugin/build.gradle.kts b/buildkonfig-gradle-plugin/build.gradle.kts
@@ -3,7 +3,6 @@ plugins {
     alias(libs.plugins.mavenPublish)
     alias(libs.plugins.pluginPublish)
     id("java-gradle-plugin")
-    id("signing")
 }
 
 java {

diff --git a/...ig-gradle-plugin/src/main/kotlin/com/codingfeline/buildkonfig/gradle/BuildKonfigPlugin.kt b/...ig-gradle-plugin/src/main/kotlin/com/codingfeline/buildkonfig/gradle/BuildKonfigPlugin.kt
@@ -93,7 +93,7 @@ fun decideOutputs(
     outputDirectory: File
 ): Map<String, TargetConfigSource> {
     return mppExtension.sources()
-        // Map<SourceName, TargetConfigSource
+        // Map<SourceName, TargetConfigSource>
         .fold(emptyMap()) { acc, source ->
             if (targetConfigs.size == 1 && source.name != COMMON_SOURCESET_NAME) {
                 // there's only common config

diff --git a/...plugin/src/test/kotlin/com/codingfeline/buildkonfig/gradle/BuildKonfigPluginFlavorTest.kt b/...plugin/src/test/kotlin/com/codingfeline/buildkonfig/gradle/BuildKonfigPluginFlavorTest.kt
@@ -36,7 +36,7 @@ class BuildKonfigPluginFlavorTest {
         |    browser()
         |    nodejs()
         |  }
-        |  iosX64('ios')
+        |  iosX64()
         |}
     """.trimMargin()
 
@@ -99,7 +99,7 @@ class BuildKonfigPluginFlavorTest {
         val jsResult = File(buildDir, "jsMain/com/example/BuildKonfig.kt")
         Truth.assertThat(jsResult.exists()).isFalse()
 
-        val iosResult = File(buildDir, "iosMain/com/example/BuildKonfig.kt")
+        val iosResult = File(buildDir, "iosX64Main/com/example/BuildKonfig.kt")
         Truth.assertThat(iosResult.exists()).isFalse()
     }
 
@@ -150,7 +150,7 @@ class BuildKonfigPluginFlavorTest {
         val jsResult = File(buildDir, "jsMain/com/example/BuildKonfig.kt")
         Truth.assertThat(jsResult.exists()).isFalse()
 
-        val iosResult = File(buildDir, "iosMain/com/example/BuildKonfig.kt")
+        val iosResult = File(buildDir, "iosX64Main/com/example/BuildKonfig.kt")
         Truth.assertThat(iosResult.exists()).isFalse()
     }
 
@@ -204,7 +204,7 @@ class BuildKonfigPluginFlavorTest {
         val jsResult = File(buildDir, "jsMain/com/example/BuildKonfig.kt")
         Truth.assertThat(jsResult.exists()).isFalse()
 
-        val iosResult = File(buildDir, "iosMain/com/example/BuildKonfig.kt")
+        val iosResult = File(buildDir, "iosX64Main/com/example/BuildKonfig.kt")
         Truth.assertThat(iosResult.exists()).isFalse()
     }
 
@@ -258,7 +258,7 @@ class BuildKonfigPluginFlavorTest {
         Truth.assertThat(jsResult.readText())
             .contains("devDefaultValue")
 
-        val iosResult = File(buildDir, "iosMain/com/example/BuildKonfig.kt")
+        val iosResult = File(buildDir, "iosX64Main/com/example/BuildKonfig.kt")
         Truth.assertThat(iosResult.readText())
             .contains("devDefaultValue")
     }
@@ -313,7 +313,7 @@ class BuildKonfigPluginFlavorTest {
         Truth.assertThat(jsResult.readText())
             .contains("devJsValue")
 
-        val iosResult = File(buildDir, "iosMain/com/example/BuildKonfig.kt")
+        val iosResult = File(buildDir, "iosX64Main/com/example/BuildKonfig.kt")
         Truth.assertThat(iosResult.readText())
             .contains("devDefaultValue")
     }
@@ -454,7 +454,7 @@ class BuildKonfigPluginFlavorTest {
         Truth.assertThat(jsResult.readText())
             .contains("devJsValue")
 
-        val iosResult = File(buildDir, "iosMain/com/example/BuildKonfig.kt")
+        val iosResult = File(buildDir, "iosX64Main/com/example/BuildKonfig.kt")
         Truth.assertThat(iosResult.readText())
             .contains("defaultValue")
     }
@@ -511,7 +511,7 @@ class BuildKonfigPluginFlavorTest {
         Truth.assertThat(jsResult.readText())
             .contains("defaultJsValue")
 
-        val iosResult = File(buildDir, "iosMain/com/example/BuildKonfig.kt")
+        val iosResult = File(buildDir, "iosX64Main/com/example/BuildKonfig.kt")
         Truth.assertThat(iosResult.readText())
             .contains("defaultValue")
     }
@@ -610,7 +610,7 @@ class BuildKonfigPluginFlavorTest {
         Truth.assertThat(jvmResult.readText())
             .contains("internal actual object AwesomeConfig")
 
-        val iosResult = File(buildDir, "iosMain/com/example/AwesomeConfig.kt")
+        val iosResult = File(buildDir, "iosX64Main/com/example/AwesomeConfig.kt")
         Truth.assertThat(iosResult.readText())
             .contains("internal actual object AwesomeConfig")
     }
@@ -715,7 +715,7 @@ class BuildKonfigPluginFlavorTest {
         Truth.assertThat(jvmResult.readText())
             .contains("object AwesomeConfig")
 
-        val iosResult = File(buildDir, "iosMain/com/example/AwesomeConfig.kt")
+        val iosResult = File(buildDir, "iosX64Main/com/example/AwesomeConfig.kt")
         Truth.assertThat(iosResult.readText())
             .contains("object AwesomeConfig")
     }

diff --git a/...e-plugin/src/test/kotlin/com/codingfeline/buildkonfig/gradle/BuildKonfigPluginHMPPTest.kt b/...e-plugin/src/test/kotlin/com/codingfeline/buildkonfig/gradle/BuildKonfigPluginHMPPTest.kt
@@ -115,7 +115,9 @@ class BuildKonfigPluginHMPPTest {
             |    browser()
             |    nodejs()
             |   }
-            |   ios()
+            |   iosX64()
+            |   iosArm64()
+            |   iosSimulatorArm64() 
             |
             |   sourceSets {
             |     commonMain {
@@ -276,16 +278,18 @@ class BuildKonfigPluginHMPPTest {
             |kotlin {
             |    jvm {}
             |    android {}
-            |    js("browser") {
+            |    js("jsCommon", IR) {
             |        browser()
-            |    }
-            |    js("node") {
             |        nodejs()
             |    }
-            |    ios()
+            |    iosX64()
+            |    iosArm64()
+            |    iosSimulatorArm64()
             |    macosX64()
             |    linuxX64()
             |    mingwX64()
+            |    
+            |    applyDefaultHierarchyTemplate()
             |
             |    sourceSets {
             |     commonMain {}
@@ -315,12 +319,6 @@ class BuildKonfigPluginHMPPTest {
             |     jsCommonMain {
             |       dependsOn(commonMain)
             |     }
-            |     browserMain {
-            |       dependsOn(jsCommonMain)
-            |     }
-            |     nodeMain {
-            |       dependsOn(jsCommonMain)
-            |     }
             |   }
             |}
             """.trimMargin()

diff --git a/...c/test/kotlin/com/codingfeline/buildkonfig/gradle/BuildKonfigPluginKotlinDSLFlavorTest.kt b/...c/test/kotlin/com/codingfeline/buildkonfig/gradle/BuildKonfigPluginKotlinDSLFlavorTest.kt
@@ -36,7 +36,9 @@ class BuildKonfigPluginKotlinDSLFlavorTest {
         |    browser()
         |    nodejs()
         |  }
-        |  iosX64("ios")
+        |  iosX64()
+        |  iosArm64()
+        |  iosSimulatorArm64()
         |}
     """.trimMargin()
 
@@ -105,7 +107,7 @@ class BuildKonfigPluginKotlinDSLFlavorTest {
                 contains("devJsValue")
             }
 
-        val iosResult = File(buildDir, "iosMain/com/example/BuildKonfig.kt")
+        val iosResult = File(buildDir, "iosX64Main/com/example/BuildKonfig.kt")
         Truth.assertThat(iosResult.readText())
             .contains("defaultValue")
     }

diff --git a/...radle-plugin/src/test/kotlin/com/codingfeline/buildkonfig/gradle/BuildKonfigPluginTest.kt b/...radle-plugin/src/test/kotlin/com/codingfeline/buildkonfig/gradle/BuildKonfigPluginTest.kt
@@ -36,7 +36,7 @@ class BuildKonfigPluginTest {
         |    browser()
         |    nodejs()
         |  }
-        |  iosX64('ios')
+        |  iosX64()
         |
         |  sourceSets {
         |    commonMain {

diff --git a/...gin/src/test/kotlin/com/codingfeline/buildkonfig/gradle/BuildkonfigPluginKotlinDSLTest.kt b/...gin/src/test/kotlin/com/codingfeline/buildkonfig/gradle/BuildkonfigPluginKotlinDSLTest.kt
@@ -40,23 +40,15 @@ class BuildkonfigPluginKotlinDSLTest {
             |kotlin {
             |    android()
             |
-            |    val iosTarget: (String, KotlinNativeTarget.() -> Unit) -> KotlinNativeTarget =
-            |        if (System.getenv("SDK_NAME")?.startsWith("iphoneos") == true)
-            |            ::iosArm64
-            |        else
-            |            ::iosX64
-            |
-            |    iosTarget("ios") {
-            |        binaries {
-            |            framework {
-            |                baseName = "shared"
-            |            }
-            |        }
-            |   }
+            |    iosX64()
+            |    iosArm64()
+            |    iosSimulatorArm64()
             |
             |    js(IR) {
             |        browser()
             |    }
+            |    
+            |    applyDefaultHierarchyTemplate()
             |
             |    sourceSets {
             |        val commonMain by getting
@@ -103,6 +95,8 @@ class BuildkonfigPluginKotlinDSLTest {
             .withArguments("generateBuildKonfig", "--stacktrace")
             .build()
 
+//        println(result.output)
+
         assertThat(result.output).contains("BUILD SUCCESSFUL")
 
         val commonResult = File(buildDir, "commonMain/com/sample/buildkonfig/issues/BuildKonfig.kt")

diff --git a/buildkonfig-gradle-plugin/src/test/kotlin/com/codingfeline/buildkonfig/gradle/TestUtils.kt b/buildkonfig-gradle-plugin/src/test/kotlin/com/codingfeline/buildkonfig/gradle/TestUtils.kt
@@ -26,7 +26,6 @@ val settingsGradle = """
             |
             |   repositories {
             |       mavenCentral()
-            |       jcenter()
             |       maven { url 'https://plugins.gradle.org/m2/' }
             |   }
             |}

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 gradle = "8.2.1"
-kotlin = "1.9.10"
+kotlin = "1.9.20"
 dokka = "1.9.10"
 android = "8.1.1"
 jvmTarget = "1.8"

diff --git a/sample-kts/.gitignore b/sample-kts/.gitignore
@@ -0,0 +1 @@
+kotlin-js-store
diff --git a/sample-kts/build.gradle.kts b/sample-kts/build.gradle.kts
@@ -7,17 +7,19 @@ plugins {
 
 kotlin {
     jvm()
-    js(IR) {
+    js("jsCommon", IR) {
         browser()
-    }
-    js("node") {
         nodejs()
     }
     ios()
+    iosArm64()
+    iosSimulatorArm64()
     macosX64()
     linuxX64()
     mingwX64()
 
+    applyDefaultHierarchyTemplate()
+
     /**
      * - commonMain
      *   - appMain
@@ -27,8 +29,6 @@ kotlin {
      *       - linuxX64Main
      *       - mingwX64Main
      *   - jsCommonMain
-     *     - jsMain
-     *     - nodeMain
      *   - iosMain
      *     - iosArm64Main
      *     - iosX64Main
@@ -59,15 +59,9 @@ kotlin {
             dependsOn(desktopMain)
         }
 
-        val jsCommonMain by creating {
+        val jsCommonMain by getting {
             dependsOn(commonMain)
         }
-        val jsMain by getting {
-            dependsOn(jsCommonMain)
-        }
-        val nodeMain by getting {
-            dependsOn(jsCommonMain)
-        }
     }
 }
 

diff --git a/sample/.gitignore b/sample/.gitignore
@@ -0,0 +1 @@
+kotlin-js-store
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -1,21 +1,22 @@
 plugins {
-    id("org.jetbrains.kotlin.multiplatform") version "1.9.10"
+    id("org.jetbrains.kotlin.multiplatform") version "1.9.20"
     id("com.codingfeline.buildkonfig") version "+"
 }
 
 kotlin {
     jvm {}
-    js(IR) {
+    js("jsCommon", IR) {
         browser()
-    }
-    js("node") {
         nodejs()
     }
-    ios()
+    iosArm64()
+    iosSimulatorArm64()
     macosX64()
     linuxX64()
     mingwX64()
 
+    applyDefaultHierarchyTemplate()
+
     /**
      * - commonMain
      *   - appMain
@@ -25,28 +26,22 @@ kotlin {
      *       - linuxX64Main
      *       - mingwX64Main
      *   - jsCommonMain
-     *     - jsMain
-     *     - nodeMain
      *   - iosMain
      *     - iosArm64Main
      *     - iosX64Main
      */
     sourceSets {
         commonMain {}
         commonTest {}
-
         appMain {
             dependsOn(commonMain)
         }
-
         jvmMain {
             dependsOn(appMain)
         }
-
         desktopMain {
             dependsOn(appMain)
         }
-
         macosX64Main {
             dependsOn(desktopMain)
         }
@@ -56,16 +51,9 @@ kotlin {
         mingwX64Main {
             dependsOn(desktopMain)
         }
-
         jsCommonMain {
             dependsOn(commonMain)
         }
-        jsMain {
-            dependsOn(jsCommonMain)
-        }
-        nodeMain {
-            dependsOn(jsCommonMain)
-        }
     }
 }