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.