Switch build-logic to buildSrc

Composite build doesn't work with Dokka workaround: Kotlin/dokka#2977 (comment)
jeffdgr8 · Jun 1, 2023 · f053e40 · f053e40
1 parent 464d032
commit f053e40
Show file tree

Hide file tree

Showing 18 changed files with 16 additions and 18 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
-    alias(libs.plugins.kotlin.multiplatform) apply false
-    alias(libs.plugins.android.library) apply false
-    alias(libs.plugins.dokka)
+    id(libs.plugins.kotlin.multiplatform.get().pluginId) apply false
+    id(libs.plugins.android.library.get().pluginId) apply false
+    id(libs.plugins.dokka.get().pluginId)
 }
 
 allprojects {

diff --git a/build-logic/build.gradle.kts → buildSrc/build.gradle.kts b/build-logic/build.gradle.kts → buildSrc/build.gradle.kts
diff --git a/build-logic/settings.gradle.kts → buildSrc/settings.gradle.kts b/build-logic/settings.gradle.kts → buildSrc/settings.gradle.kts
diff --git a/...rc/main/kotlin/base-convention.gradle.kts → ...rc/main/kotlin/base-convention.gradle.kts b/...rc/main/kotlin/base-convention.gradle.kts → ...rc/main/kotlin/base-convention.gradle.kts
diff --git a/build-logic/src/main/kotlin/libcblite.kt → buildSrc/src/main/kotlin/libcblite.kt b/build-logic/src/main/kotlin/libcblite.kt → buildSrc/src/main/kotlin/libcblite.kt
diff --git a/...main/kotlin/library-convention.gradle.kts → ...main/kotlin/library-convention.gradle.kts b/...main/kotlin/library-convention.gradle.kts → ...main/kotlin/library-convention.gradle.kts
diff --git a/...otlin/multiplatform-convention.gradle.kts → ...otlin/multiplatform-convention.gradle.kts b/...otlin/multiplatform-convention.gradle.kts → ...otlin/multiplatform-convention.gradle.kts
diff --git a/...rc/main/kotlin/rules/CouchbaseLiteRule.kt → ...rc/main/kotlin/rules/CouchbaseLiteRule.kt b/...rc/main/kotlin/rules/CouchbaseLiteRule.kt → ...rc/main/kotlin/rules/CouchbaseLiteRule.kt
diff --git a/couchbase-lite-ee-ktx/build.gradle.kts b/couchbase-lite-ee-ktx/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-    id("multiplatform-convention")
-    id("library-convention")
+    `multiplatform-convention`
+    `library-convention`
 }
 
 kotlin {

diff --git a/couchbase-lite-ee-paging/build.gradle.kts b/couchbase-lite-ee-paging/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("library-convention")
+    `library-convention`
 }
 
 kotlin {

diff --git a/couchbase-lite-ee/build.gradle.kts b/couchbase-lite-ee/build.gradle.kts
@@ -4,8 +4,8 @@ import org.jetbrains.kotlin.gradle.tasks.DefFileTask
 import org.jetbrains.kotlin.konan.target.Family
 
 plugins {
-    id("multiplatform-convention")
-    id("library-convention")
+    `multiplatform-convention`
+    `library-convention`
 }
 
 kotlin {

diff --git a/couchbase-lite-ktx/build.gradle.kts b/couchbase-lite-ktx/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-    id("multiplatform-convention")
-    id("library-convention")
+    `multiplatform-convention`
+    `library-convention`
 }
 
 kotlin {

diff --git a/couchbase-lite-paging/build.gradle.kts b/couchbase-lite-paging/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("library-convention")
+    `library-convention`
 }
 
 kotlin {

diff --git a/couchbase-lite/build.gradle.kts b/couchbase-lite/build.gradle.kts
@@ -4,8 +4,8 @@ import org.jetbrains.kotlin.gradle.tasks.DefFileTask
 import org.jetbrains.kotlin.konan.target.Family
 
 plugins {
-    id("multiplatform-convention")
-    id("library-convention")
+    `multiplatform-convention`
+    `library-convention`
 }
 
 kotlin {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -8,7 +8,7 @@ mockk = "1.13.3" # 1.13.4 breaks QueryExtensionKtTest on Android https://github.
 [plugins]
 android-library = { id = "com.android.library", version = "7.4.2" }
 dokka = { id = "org.jetbrains.dokka", version = "1.8.10" }
-kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version = "1.9.0-RC-237" }
+kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version = "1.9.0-RC-238" }
 
 [libraries]
 androidx-lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version = "2.6.1" }

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -19,8 +19,6 @@ dependencyResolutionManagement {
 
 rootProject.name = "couchbase-lite-kmp"
 
-includeBuild("build-logic")
-
 include(":couchbase-lite", ":couchbase-lite-ee")
 include(":couchbase-lite-ktx", ":couchbase-lite-ee-ktx")
 include(":couchbase-lite-paging", ":couchbase-lite-ee-paging")

diff --git a/testing-support-ee/build.gradle.kts b/testing-support-ee/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("multiplatform-convention")
+    `multiplatform-convention`
 }
 
 kotlin {

diff --git a/testing-support/build.gradle.kts b/testing-support/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("multiplatform-convention")
+    `multiplatform-convention`
 }
 
 kotlin {