From b2993a02613bdafa4589dd7951d384dc722f6117 Mon Sep 17 00:00:00 2001 From: Yongshun Shreck Ye Date: Tue, 26 Nov 2024 12:38:33 +0800 Subject: [PATCH 01/10] Try resolving an error that occurs when syncing the project in IntelliJ IDEA without success, by removing the module-wide opt-in and bumping the Gradle wrapper The Gradle error message when syncing in IntelliJ IDEA: ```text Execution failed for task ':kotlin-common-gradle-plugins:configurePrecompiledScriptDependenciesResolver'. > The value for property 'freeCompilerArgs' is final and cannot be changed any further. ``` This error doesn't occur when I run `publishToMavenLocal` or `check` from the command line. The commands work in the command line. See https://github.com/gradle/gradle/issues/22091 which could be related. --- buildSrc/build.gradle.kts | 4 ++-- .../main/kotlin/aligned-version-plugin-conventions.gradle.kts | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- .../src/main/kotlin/com/huanshankeji/Internal.kt | 3 +-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index db36dd1..fa7fdc3 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -26,8 +26,8 @@ dependencies { */ // for `KotlinCompilationTask` and the version is compatible with Compose 1.6.11 // With Kotlin 2.0.20, a "Could not parse POM" build error occurs in the JVM projects of some dependent projects. - implementation(kotlin("gradle-plugin", "2.0.10")) - implementation("org.gradle.kotlin:gradle-kotlin-dsl-plugins:4.5.0") // This version has to be used for Gradle 8.10. + implementation(kotlin("gradle-plugin", "2.0.20")) + implementation("org.gradle.kotlin:gradle-kotlin-dsl-plugins:5.1.1") // This version has to be used for Gradle 8.11.2. implementation("com.gradle.publish:plugin-publish-plugin:1.3.0") diff --git a/buildSrc/src/main/kotlin/aligned-version-plugin-conventions.gradle.kts b/buildSrc/src/main/kotlin/aligned-version-plugin-conventions.gradle.kts index 174453d..b595e10 100644 --- a/buildSrc/src/main/kotlin/aligned-version-plugin-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/aligned-version-plugin-conventions.gradle.kts @@ -1,5 +1,3 @@ -import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask - plugins { id("conventions") id("aligned-version-plugin-version") @@ -10,6 +8,8 @@ dependencies { implementation("com.huanshankeji:common-gradle-dependencies:$pluginProjectSourceDependentStableCommonGradleDependenciesVersion") } +/* tasks.named>("compileKotlin").configure { compilerOptions.freeCompilerArgs.add("-opt-in=com.huanshankeji.InternalApi") } +*/ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 79eb9d0..c1d5e01 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/kotlin-common-gradle-plugins/src/main/kotlin/com/huanshankeji/Internal.kt b/kotlin-common-gradle-plugins/src/main/kotlin/com/huanshankeji/Internal.kt index cd5f39e..3bdc043 100644 --- a/kotlin-common-gradle-plugins/src/main/kotlin/com/huanshankeji/Internal.kt +++ b/kotlin-common-gradle-plugins/src/main/kotlin/com/huanshankeji/Internal.kt @@ -1,6 +1,5 @@ package com.huanshankeji -@RequiresOptIn +@RequiresOptIn("This API is internal in this project.", RequiresOptIn.Level.WARNING) // TODO consider removing `WARNING` @Retention(AnnotationRetention.BINARY) -@Target(AnnotationTarget.PROPERTY) annotation class InternalApi \ No newline at end of file From 6f91b61c76b15eeb46622fa25ddb8d17dc97b78e Mon Sep 17 00:00:00 2001 From: Yongshun Shreck Ye Date: Tue, 26 Nov 2024 13:43:35 +0800 Subject: [PATCH 02/10] This might be a bug in IntelliJ IDEA 2024.3 as IntelliJ IDEA 2024.2.4, reported at https://youtrack.jetbrains.com/issue/IDEA-363846/Loading-a-Gradle-project-of-Gradle-plugins-changes-a-final-Kotlin-freeCompilerArgs-since-IntelliJ-IDEA-2024.3 --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index f3d9d1c..b865a26 100644 --- a/README.md +++ b/README.md @@ -53,3 +53,4 @@ configurations.all { 1. IntelliJ IDEA doesn't work well with applying plugins to script plugins in project sources. If a script plugin's code does not resolve, try restarting IntelliJ IDEA. 1. `./gradlew build` (and tasks depending on it) somehow has to run twice to work. I haven't identified the cause yet. +1. IntelliJ IDEA 2024.3 doesn't load this project, which is reported at [IDEA-363846](https://youtrack.jetbrains.com/issue/IDEA-363846/Loading-a-Gradle-project-of-Gradle-plugins-changes-a-final-Kotlin-freeCompilerArgs-since-IntelliJ-IDEA-2024.3). From 62e09f63b38f58bc83c1792a89f0c03bf8f11798 Mon Sep 17 00:00:00 2001 From: Yongshun Shreck Ye Date: Tue, 26 Nov 2024 18:27:50 +0800 Subject: [PATCH 03/10] Revert the opt-in configurations --- .../main/kotlin/aligned-version-plugin-conventions.gradle.kts | 4 ++-- .../src/main/kotlin/com/huanshankeji/Internal.kt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/buildSrc/src/main/kotlin/aligned-version-plugin-conventions.gradle.kts b/buildSrc/src/main/kotlin/aligned-version-plugin-conventions.gradle.kts index b595e10..174453d 100644 --- a/buildSrc/src/main/kotlin/aligned-version-plugin-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/aligned-version-plugin-conventions.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask + plugins { id("conventions") id("aligned-version-plugin-version") @@ -8,8 +10,6 @@ dependencies { implementation("com.huanshankeji:common-gradle-dependencies:$pluginProjectSourceDependentStableCommonGradleDependenciesVersion") } -/* tasks.named>("compileKotlin").configure { compilerOptions.freeCompilerArgs.add("-opt-in=com.huanshankeji.InternalApi") } -*/ diff --git a/kotlin-common-gradle-plugins/src/main/kotlin/com/huanshankeji/Internal.kt b/kotlin-common-gradle-plugins/src/main/kotlin/com/huanshankeji/Internal.kt index 3bdc043..29de1d2 100644 --- a/kotlin-common-gradle-plugins/src/main/kotlin/com/huanshankeji/Internal.kt +++ b/kotlin-common-gradle-plugins/src/main/kotlin/com/huanshankeji/Internal.kt @@ -1,5 +1,5 @@ package com.huanshankeji -@RequiresOptIn("This API is internal in this project.", RequiresOptIn.Level.WARNING) // TODO consider removing `WARNING` +@RequiresOptIn("This API is internal in this project.") @Retention(AnnotationRetention.BINARY) annotation class InternalApi \ No newline at end of file From d528e20b72d465be40a5ca93547002b95c2bb3c6 Mon Sep 17 00:00:00 2001 From: Yongshun Shreck Ye Date: Sun, 1 Dec 2024 19:58:04 +0800 Subject: [PATCH 04/10] Bump Kotlin to 2.1.0 and kotlinx-benchmark to 0.4.13 --- buildSrc/build.gradle.kts | 2 +- buildSrc/src/main/kotlin/VersionsAndDependencies.kt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index db36dd1..87ba65d 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -26,7 +26,7 @@ dependencies { */ // for `KotlinCompilationTask` and the version is compatible with Compose 1.6.11 // With Kotlin 2.0.20, a "Could not parse POM" build error occurs in the JVM projects of some dependent projects. - implementation(kotlin("gradle-plugin", "2.0.10")) + implementation(kotlin("gradle-plugin", "2.1.0")) implementation("org.gradle.kotlin:gradle-kotlin-dsl-plugins:4.5.0") // This version has to be used for Gradle 8.10. implementation("com.gradle.publish:plugin-publish-plugin:1.3.0") diff --git a/buildSrc/src/main/kotlin/VersionsAndDependencies.kt b/buildSrc/src/main/kotlin/VersionsAndDependencies.kt index 167cd94..f67f21a 100644 --- a/buildSrc/src/main/kotlin/VersionsAndDependencies.kt +++ b/buildSrc/src/main/kotlin/VersionsAndDependencies.kt @@ -6,9 +6,9 @@ val commonGradleClasspathDependencies = CommonGradleClasspathDependencies(common object DependencyVersions { - val kotlin = "2.0.10" // compatible with the compose version below + val kotlin = "2.1.0" // compatible with the compose version below val composeMultiplatform = "1.7.0" - val kotlinxBenchmark = "0.4.11" + val kotlinxBenchmark = "0.4.13" val dokka = "2.0.0-Beta" val binaryCompatibilityValidator = "0.16.3" } @@ -17,7 +17,7 @@ val alignedPluginVersion = "0.7.1-SNAPSHOT" // "x.y.z" indicates the version of the way of organizing the code, // and the date indicates the version when the dependency versions are updated. -val commonGradleDependenciesVersion = "0.8.0-20241129-SNAPSHOT" +val commonGradleDependenciesVersion = "0.8.0-20241201-SNAPSHOT" // This is the source dependency version. There is another build source dependency in "buildSrc/build.gradle.kts". val pluginProjectSourceDependentStableCommonGradleDependenciesVersion = "0.8.0-20241016".apply { From b93e9798ddeebdd5aea755f7d91ad884b68bc967 Mon Sep 17 00:00:00 2001 From: Yongshun Shreck Ye Date: Mon, 2 Dec 2024 15:56:17 +0800 Subject: [PATCH 05/10] Bump the Gradle wrapper to the latest version of v8.11.1 which depends on Kotlin 2.0.20 --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 79eb9d0..c1d5e01 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From 9b54ad279b3d72213b9541662171a26093caa0d7 Mon Sep 17 00:00:00 2001 From: Yongshun Shreck Ye Date: Mon, 2 Dec 2024 17:46:03 +0800 Subject: [PATCH 06/10] Make the project versions explicit --- buildSrc/src/main/kotlin/VersionsAndDependencies.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/kotlin/VersionsAndDependencies.kt b/buildSrc/src/main/kotlin/VersionsAndDependencies.kt index f67f21a..e46b266 100644 --- a/buildSrc/src/main/kotlin/VersionsAndDependencies.kt +++ b/buildSrc/src/main/kotlin/VersionsAndDependencies.kt @@ -13,11 +13,11 @@ object DependencyVersions { val binaryCompatibilityValidator = "0.16.3" } -val alignedPluginVersion = "0.7.1-SNAPSHOT" +val alignedPluginVersion = "0.7.1-kotlin-2.1.0-SNAPSHOT" // "x.y.z" indicates the version of the way of organizing the code, // and the date indicates the version when the dependency versions are updated. -val commonGradleDependenciesVersion = "0.8.0-20241201-SNAPSHOT" +val commonGradleDependenciesVersion = "0.8.0-20241201-kotlin-2.1.0-SNAPSHOT" // This is the source dependency version. There is another build source dependency in "buildSrc/build.gradle.kts". val pluginProjectSourceDependentStableCommonGradleDependenciesVersion = "0.8.0-20241016".apply { From a4906668c43d3ffb3b3eec3876b71f8c7ddb3472 Mon Sep 17 00:00:00 2001 From: Yongshun Shreck Ye Date: Tue, 3 Dec 2024 01:26:59 +0800 Subject: [PATCH 07/10] Remove the `kotlin-jvm-*-app-conventions` script plugins as they are unnecessary as it turns out, and the `implementation(platform(kotlin("bom")))` line without a Kotlin version has introduced a "Could not parse POM" build error in projects dependent on a project with one of these plugins applied via Maven since Kotlin 2.0.20 See commit 1648b7e096a4f3c34c2ec3d3fd88cde753ac958e and commit dc9d1c8541912235d508a017c5395773e90fa63c for more details. --- .../build.gradle.kts | 14 +-------- ...jvm-application-app-conventions.gradle.kts | 13 --------- ...tlin-jvm-common-app-conventions.gradle.kts | 29 ------------------- ...lin-jvm-library-app-conventions.gradle.kts | 13 --------- .../main/kotlin/VersionsAndDependencies.kt | 2 +- 5 files changed, 2 insertions(+), 69 deletions(-) delete mode 100644 architecture-common-gradle-plugins/src/main/kotlin/com/huanshankeji/kotlin-jvm-application-app-conventions.gradle.kts delete mode 100644 architecture-common-gradle-plugins/src/main/kotlin/com/huanshankeji/kotlin-jvm-common-app-conventions.gradle.kts delete mode 100644 architecture-common-gradle-plugins/src/main/kotlin/com/huanshankeji/kotlin-jvm-library-app-conventions.gradle.kts diff --git a/architecture-common-gradle-plugins/build.gradle.kts b/architecture-common-gradle-plugins/build.gradle.kts index 8faa1fc..6c3925d 100644 --- a/architecture-common-gradle-plugins/build.gradle.kts +++ b/architecture-common-gradle-plugins/build.gradle.kts @@ -23,19 +23,7 @@ gradlePlugin { fun scriptConventionsPlugin(idSuffix: String, displayName: String, description: String = displayName) = scriptPlugin(`package`, idSuffix, displayName, description) - scriptConventionsPlugin( - "kotlin-jvm-common-app-conventions", - "Kotlin/JVM common app conventions" - ) - scriptConventionsPlugin( - "kotlin-jvm-application-app-conventions", - "Kotlin/JVM application app conventions" - ) - scriptConventionsPlugin( - "kotlin-jvm-library-app-conventions", - "Kotlin/JVM library app conventions" - ) - + // TODO consider removing these too scriptConventionsPlugin( "kotlin-multiplatform-app-conventions", "Kotlin Multiplatform app conventions" diff --git a/architecture-common-gradle-plugins/src/main/kotlin/com/huanshankeji/kotlin-jvm-application-app-conventions.gradle.kts b/architecture-common-gradle-plugins/src/main/kotlin/com/huanshankeji/kotlin-jvm-application-app-conventions.gradle.kts deleted file mode 100644 index 9f14629..0000000 --- a/architecture-common-gradle-plugins/src/main/kotlin/com/huanshankeji/kotlin-jvm-application-app-conventions.gradle.kts +++ /dev/null @@ -1,13 +0,0 @@ -package com.huanshankeji - -/* - * This file was generated by the Gradle 'init' task. - */ - -plugins { - // Apply the common convention plugin for shared build configuration between library and application projects. - id("com.huanshankeji.kotlin-jvm-common-app-conventions") - - // Apply the application plugin to add support for building a CLI application in Java. - application -} diff --git a/architecture-common-gradle-plugins/src/main/kotlin/com/huanshankeji/kotlin-jvm-common-app-conventions.gradle.kts b/architecture-common-gradle-plugins/src/main/kotlin/com/huanshankeji/kotlin-jvm-common-app-conventions.gradle.kts deleted file mode 100644 index 07d2a4f..0000000 --- a/architecture-common-gradle-plugins/src/main/kotlin/com/huanshankeji/kotlin-jvm-common-app-conventions.gradle.kts +++ /dev/null @@ -1,29 +0,0 @@ -package com.huanshankeji - -plugins { - kotlin("jvm") -} - -dependencies { - implementation(platform(kotlin("bom"))) - - testImplementation(kotlin("test")) - with(commonDependencies.orgJunit.jupiter) { - testImplementation(apiWithVersion()) - testRuntimeOnly(engineWithoutVersion()) - } - - with(commonDependencies.kotlinx.coroutines) { - implementation(core()) - testImplementation(test()) - } -} - -tasks.test { - // Use junit platform for unit tests. - useJUnitPlatform() -} - -kotlin.sourceSets.all { - languageSettings.defaultOptIns() -} diff --git a/architecture-common-gradle-plugins/src/main/kotlin/com/huanshankeji/kotlin-jvm-library-app-conventions.gradle.kts b/architecture-common-gradle-plugins/src/main/kotlin/com/huanshankeji/kotlin-jvm-library-app-conventions.gradle.kts deleted file mode 100644 index 6a5be43..0000000 --- a/architecture-common-gradle-plugins/src/main/kotlin/com/huanshankeji/kotlin-jvm-library-app-conventions.gradle.kts +++ /dev/null @@ -1,13 +0,0 @@ -package com.huanshankeji - -/* - * This file was generated by the Gradle 'init' task. - */ - -plugins { - // Apply the common convention plugin for shared build configuration between library and application projects. - id("com.huanshankeji.kotlin-jvm-common-app-conventions") - - // Apply the java-library plugin for API and implementation separation. - `java-library` -} diff --git a/buildSrc/src/main/kotlin/VersionsAndDependencies.kt b/buildSrc/src/main/kotlin/VersionsAndDependencies.kt index e46b266..695e7d8 100644 --- a/buildSrc/src/main/kotlin/VersionsAndDependencies.kt +++ b/buildSrc/src/main/kotlin/VersionsAndDependencies.kt @@ -13,7 +13,7 @@ object DependencyVersions { val binaryCompatibilityValidator = "0.16.3" } -val alignedPluginVersion = "0.7.1-kotlin-2.1.0-SNAPSHOT" +val alignedPluginVersion = "0.8.0-kotlin-2.1.0-SNAPSHOT" // "x.y.z" indicates the version of the way of organizing the code, // and the date indicates the version when the dependency versions are updated. From 8933fe2269c068719a08e31c8c49f2f1e9816719 Mon Sep 17 00:00:00 2001 From: Yongshun Shreck Ye Date: Tue, 3 Dec 2024 18:12:30 +0800 Subject: [PATCH 08/10] Remove the Kotlin Multiplatform `*-app-conventions` plugins too --- .../build.gradle.kts | 14 ---------- ...efault-web-frontend-conventions.gradle.kts | 2 +- ...tions-with-conventional-targets.gradle.kts | 6 ----- ...n-multiplatform-app-conventions.gradle.kts | 27 ------------------- ...form-js-browser-app-conventions.gradle.kts | 6 ----- 5 files changed, 1 insertion(+), 54 deletions(-) delete mode 100644 architecture-common-gradle-plugins/src/main/kotlin/com/huanshankeji/kotlin-multiplatform-app-conventions-with-conventional-targets.gradle.kts delete mode 100644 architecture-common-gradle-plugins/src/main/kotlin/com/huanshankeji/kotlin-multiplatform-app-conventions.gradle.kts delete mode 100644 architecture-common-gradle-plugins/src/main/kotlin/com/huanshankeji/kotlin-multiplatform-js-browser-app-conventions.gradle.kts diff --git a/architecture-common-gradle-plugins/build.gradle.kts b/architecture-common-gradle-plugins/build.gradle.kts index 6c3925d..daa46be 100644 --- a/architecture-common-gradle-plugins/build.gradle.kts +++ b/architecture-common-gradle-plugins/build.gradle.kts @@ -23,20 +23,6 @@ gradlePlugin { fun scriptConventionsPlugin(idSuffix: String, displayName: String, description: String = displayName) = scriptPlugin(`package`, idSuffix, displayName, description) - // TODO consider removing these too - scriptConventionsPlugin( - "kotlin-multiplatform-app-conventions", - "Kotlin Multiplatform app conventions" - ) - scriptConventionsPlugin( - "kotlin-multiplatform-js-browser-app-conventions", - "Kotlin Multiplatform app conventions with the JS browser target" - ) - scriptConventionsPlugin( - "kotlin-multiplatform-app-conventions-with-conventional-targets", - "Kotlin Multiplatform app conventions with the conventional targets JVM, JS (browser), iOS (`iosX64`, `iosArm64`, and `iosSimulatorArm64`), and Wasm JS" - ) - scriptConventionsPlugin( "default-web-frontend-conventions", "Default web frontend conventions for our projects with Compose for Web and kotlinx.html HTML generation" diff --git a/architecture-common-gradle-plugins/src/main/kotlin/com/huanshankeji/default-web-frontend-conventions.gradle.kts b/architecture-common-gradle-plugins/src/main/kotlin/com/huanshankeji/default-web-frontend-conventions.gradle.kts index cfea229..92c58f5 100644 --- a/architecture-common-gradle-plugins/src/main/kotlin/com/huanshankeji/default-web-frontend-conventions.gradle.kts +++ b/architecture-common-gradle-plugins/src/main/kotlin/com/huanshankeji/default-web-frontend-conventions.gradle.kts @@ -1,7 +1,7 @@ package com.huanshankeji plugins { - id("com.huanshankeji.kotlin-multiplatform-js-browser-app-conventions") + id("com.huanshankeji.kotlin-multiplatform-js-browser-conventions") kotlin("plugin.compose") id("org.jetbrains.compose") } diff --git a/architecture-common-gradle-plugins/src/main/kotlin/com/huanshankeji/kotlin-multiplatform-app-conventions-with-conventional-targets.gradle.kts b/architecture-common-gradle-plugins/src/main/kotlin/com/huanshankeji/kotlin-multiplatform-app-conventions-with-conventional-targets.gradle.kts deleted file mode 100644 index 682bb07..0000000 --- a/architecture-common-gradle-plugins/src/main/kotlin/com/huanshankeji/kotlin-multiplatform-app-conventions-with-conventional-targets.gradle.kts +++ /dev/null @@ -1,6 +0,0 @@ -package com.huanshankeji - -plugins { - id("com.huanshankeji.kotlin-multiplatform-app-conventions") - id("com.huanshankeji.kotlin-multiplatform-conventional-targets") -} diff --git a/architecture-common-gradle-plugins/src/main/kotlin/com/huanshankeji/kotlin-multiplatform-app-conventions.gradle.kts b/architecture-common-gradle-plugins/src/main/kotlin/com/huanshankeji/kotlin-multiplatform-app-conventions.gradle.kts deleted file mode 100644 index 4f4eefb..0000000 --- a/architecture-common-gradle-plugins/src/main/kotlin/com/huanshankeji/kotlin-multiplatform-app-conventions.gradle.kts +++ /dev/null @@ -1,27 +0,0 @@ -package com.huanshankeji - -plugins { - kotlin("multiplatform") -} - -kotlin { - sourceSets { - val commonMain by getting { - dependencies { - //implementation(platform(kotlin("bom", kotlinVersion))) - implementation(commonDependencies.kotlinx.coroutines.core()) - } - } - - val commonTest by getting { - dependencies { - implementation(kotlin("test")) - implementation(commonDependencies.kotlinx.coroutines.test()) - } - } - - all { - languageSettings.defaultOptIns() - } - } -} diff --git a/architecture-common-gradle-plugins/src/main/kotlin/com/huanshankeji/kotlin-multiplatform-js-browser-app-conventions.gradle.kts b/architecture-common-gradle-plugins/src/main/kotlin/com/huanshankeji/kotlin-multiplatform-js-browser-app-conventions.gradle.kts deleted file mode 100644 index 38fc82a..0000000 --- a/architecture-common-gradle-plugins/src/main/kotlin/com/huanshankeji/kotlin-multiplatform-js-browser-app-conventions.gradle.kts +++ /dev/null @@ -1,6 +0,0 @@ -package com.huanshankeji - -plugins { - id("com.huanshankeji.kotlin-multiplatform-app-conventions") - id("com.huanshankeji.kotlin-multiplatform-js-browser-conventions") -} From 431bd01d66d376b49817b8f074f58237886eb063 Mon Sep 17 00:00:00 2001 From: Yongshun Shreck Ye Date: Tue, 3 Dec 2024 18:14:54 +0800 Subject: [PATCH 09/10] Run `apiDump` --- .../architecture-common-gradle-plugins.api | 66 ------------------- 1 file changed, 66 deletions(-) diff --git a/architecture-common-gradle-plugins/api/architecture-common-gradle-plugins.api b/architecture-common-gradle-plugins/api/architecture-common-gradle-plugins.api index 6c9c584..57ecb6c 100644 --- a/architecture-common-gradle-plugins/api/architecture-common-gradle-plugins.api +++ b/architecture-common-gradle-plugins/api/architecture-common-gradle-plugins.api @@ -43,72 +43,6 @@ public final class com/huanshankeji/GenerateKotlinJsBrowserWebrootForVertxWebPlu public final synthetic fun execute (Ljava/lang/Object;)V } -public final class com/huanshankeji/KotlinJvmApplicationAppConventionsPlugin : org/gradle/api/Plugin { - public fun ()V - public synthetic fun apply (Ljava/lang/Object;)V - public fun apply (Lorg/gradle/api/Project;)V -} - -public final class com/huanshankeji/KotlinJvmCommonAppConventionsPlugin : org/gradle/api/Plugin { - public fun ()V - public synthetic fun apply (Ljava/lang/Object;)V - public fun apply (Lorg/gradle/api/Project;)V -} - -public final class com/huanshankeji/KotlinJvmLibraryAppConventionsPlugin : org/gradle/api/Plugin { - public fun ()V - public synthetic fun apply (Ljava/lang/Object;)V - public fun apply (Lorg/gradle/api/Project;)V -} - -public final class com/huanshankeji/KotlinMultiplatformAppConventionsPlugin : org/gradle/api/Plugin { - public fun ()V - public synthetic fun apply (Ljava/lang/Object;)V - public fun apply (Lorg/gradle/api/Project;)V -} - -public final class com/huanshankeji/KotlinMultiplatformAppConventionsWithConventionalTargetsPlugin : org/gradle/api/Plugin { - public fun ()V - public synthetic fun apply (Ljava/lang/Object;)V - public fun apply (Lorg/gradle/api/Project;)V -} - -public final class com/huanshankeji/KotlinMultiplatformJsBrowserAppConventionsPlugin : org/gradle/api/Plugin { - public fun ()V - public synthetic fun apply (Ljava/lang/Object;)V - public fun apply (Lorg/gradle/api/Project;)V -} - -public final class com/huanshankeji/Kotlin_jvm_application_app_conventions_gradle : org/gradle/kotlin/dsl/precompile/v1/PrecompiledProjectScript { - public fun (Lorg/gradle/api/Project;Lorg/gradle/api/Project;)V - public static final fun main ([Ljava/lang/String;)V -} - -public final class com/huanshankeji/Kotlin_jvm_common_app_conventions_gradle : org/gradle/kotlin/dsl/precompile/v1/PrecompiledProjectScript { - public fun (Lorg/gradle/api/Project;Lorg/gradle/api/Project;)V - public static final fun main ([Ljava/lang/String;)V -} - -public final class com/huanshankeji/Kotlin_jvm_library_app_conventions_gradle : org/gradle/kotlin/dsl/precompile/v1/PrecompiledProjectScript { - public fun (Lorg/gradle/api/Project;Lorg/gradle/api/Project;)V - public static final fun main ([Ljava/lang/String;)V -} - -public final class com/huanshankeji/Kotlin_multiplatform_app_conventions_gradle : org/gradle/kotlin/dsl/precompile/v1/PrecompiledProjectScript { - public fun (Lorg/gradle/api/Project;Lorg/gradle/api/Project;)V - public static final fun main ([Ljava/lang/String;)V -} - -public final class com/huanshankeji/Kotlin_multiplatform_app_conventions_with_conventional_targets_gradle : org/gradle/kotlin/dsl/precompile/v1/PrecompiledProjectScript { - public fun (Lorg/gradle/api/Project;Lorg/gradle/api/Project;)V - public static final fun main ([Ljava/lang/String;)V -} - -public final class com/huanshankeji/Kotlin_multiplatform_js_browser_app_conventions_gradle : org/gradle/kotlin/dsl/precompile/v1/PrecompiledProjectScript { - public fun (Lorg/gradle/api/Project;Lorg/gradle/api/Project;)V - public static final fun main ([Ljava/lang/String;)V -} - public final class com/huanshankeji/OptInsKt { public static final fun defaultOptIns (Lorg/jetbrains/kotlin/gradle/plugin/LanguageSettingsBuilder;)V } From e3c03d7fa2ad314413c8dce6e2ed4d22311567ec Mon Sep 17 00:00:00 2001 From: Yongshun Shreck Ye Date: Tue, 3 Dec 2024 20:48:50 +0800 Subject: [PATCH 10/10] Remove "kotlin-2.1.0" in the project versions for the merge --- buildSrc/src/main/kotlin/VersionsAndDependencies.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/kotlin/VersionsAndDependencies.kt b/buildSrc/src/main/kotlin/VersionsAndDependencies.kt index 695e7d8..5247b78 100644 --- a/buildSrc/src/main/kotlin/VersionsAndDependencies.kt +++ b/buildSrc/src/main/kotlin/VersionsAndDependencies.kt @@ -13,11 +13,11 @@ object DependencyVersions { val binaryCompatibilityValidator = "0.16.3" } -val alignedPluginVersion = "0.8.0-kotlin-2.1.0-SNAPSHOT" +val alignedPluginVersion = "0.8.0-SNAPSHOT" // "x.y.z" indicates the version of the way of organizing the code, // and the date indicates the version when the dependency versions are updated. -val commonGradleDependenciesVersion = "0.8.0-20241201-kotlin-2.1.0-SNAPSHOT" +val commonGradleDependenciesVersion = "0.8.0-20241201-SNAPSHOT" // This is the source dependency version. There is another build source dependency in "buildSrc/build.gradle.kts". val pluginProjectSourceDependentStableCommonGradleDependenciesVersion = "0.8.0-20241016".apply {