move convention plugins from buildSrc to an included build-logic …

…project This decouples the convention plugins' build classpath from the main project's, which makes navigating Gradle/Kotlin/Compose/KSP upgrades a little easier. Unfortunately, an included build doesn't get the same special treatment during classloading that `buildSrc` does, so convention plugins must be applied via `id("my-convention")` instead of just their name.
square · Jun 9, 2023 · 67a7177 · 67a7177
1 parent 42ef981
commit 67a7177
Show file tree

Hide file tree

Showing 63 changed files with 99 additions and 98 deletions.
diff --git a/benchmarks/performance-poetry/complex-poetry/build.gradle.kts b/benchmarks/performance-poetry/complex-poetry/build.gradle.kts
@@ -3,7 +3,7 @@ import com.squareup.workflow1.version
 
 plugins {
   id("com.android.application")
-  `kotlin-android`
+  id("kotlin-android")
   id("kotlin-parcelize")
 }
 android {

diff --git a/buildSrc/build.gradle.kts → build-logic/build.gradle.kts b/buildSrc/build.gradle.kts → build-logic/build.gradle.kts
diff --git a/buildSrc/settings.gradle.kts → build-logic/settings.gradle.kts b/buildSrc/settings.gradle.kts → build-logic/settings.gradle.kts
diff --git a/buildSrc/src/main/java/Versions.kt → build-logic/src/main/java/Versions.kt b/buildSrc/src/main/java/Versions.kt → build-logic/src/main/java/Versions.kt
diff --git a/...src/main/java/android-defaults.gradle.kts → ...src/main/java/android-defaults.gradle.kts b/...src/main/java/android-defaults.gradle.kts → ...src/main/java/android-defaults.gradle.kts
diff --git a/...c/main/java/android-sample-app.gradle.kts → ...c/main/java/android-sample-app.gradle.kts b/...c/main/java/android-sample-app.gradle.kts → ...c/main/java/android-sample-app.gradle.kts
diff --git a/...src/main/java/android-ui-tests.gradle.kts → ...src/main/java/android-ui-tests.gradle.kts b/...src/main/java/android-ui-tests.gradle.kts → ...src/main/java/android-ui-tests.gradle.kts
diff --git a/.../src/main/java/artifacts-check.gradle.kts → .../src/main/java/artifacts-check.gradle.kts b/.../src/main/java/artifacts-check.gradle.kts → .../src/main/java/artifacts-check.gradle.kts
diff --git a/...orkflow1/buildsrc/KotlinCommonSettings.kt → ...orkflow1/buildsrc/KotlinCommonSettings.kt b/...orkflow1/buildsrc/KotlinCommonSettings.kt → ...orkflow1/buildsrc/KotlinCommonSettings.kt
diff --git a/...buildsrc/KotlinMultiplatformExtensions.kt → ...buildsrc/KotlinMultiplatformExtensions.kt b/...buildsrc/KotlinMultiplatformExtensions.kt → ...buildsrc/KotlinMultiplatformExtensions.kt
diff --git a/...low1/buildsrc/artifacts/ArtifactConfig.kt → ...low1/buildsrc/artifacts/ArtifactConfig.kt b/...low1/buildsrc/artifacts/ArtifactConfig.kt → ...low1/buildsrc/artifacts/ArtifactConfig.kt
diff --git a/.../buildsrc/artifacts/ArtifactsCheckTask.kt → .../buildsrc/artifacts/ArtifactsCheckTask.kt b/.../buildsrc/artifacts/ArtifactsCheckTask.kt → .../buildsrc/artifacts/ArtifactsCheckTask.kt
diff --git a/...1/buildsrc/artifacts/ArtifactsDumpTask.kt → ...1/buildsrc/artifacts/ArtifactsDumpTask.kt b/...1/buildsrc/artifacts/ArtifactsDumpTask.kt → ...1/buildsrc/artifacts/ArtifactsDumpTask.kt
diff --git a/...flow1/buildsrc/artifacts/ArtifactsTask.kt → ...flow1/buildsrc/artifacts/ArtifactsTask.kt b/...flow1/buildsrc/artifacts/ArtifactsTask.kt → ...flow1/buildsrc/artifacts/ArtifactsTask.kt
diff --git a/...com/squareup/workflow1/buildsrc/ktlint.kt → ...com/squareup/workflow1/buildsrc/ktlint.kt b/...com/squareup/workflow1/buildsrc/ktlint.kt → ...com/squareup/workflow1/buildsrc/ktlint.kt
diff --git a/...n/java/com/squareup/workflow1/catalogs.kt → ...n/java/com/squareup/workflow1/catalogs.kt b/...n/java/com/squareup/workflow1/catalogs.kt → ...n/java/com/squareup/workflow1/catalogs.kt
diff --git a/...src/main/java/compose-ui-tests.gradle.kts → ...src/main/java/compose-ui-tests.gradle.kts b/...src/main/java/compose-ui-tests.gradle.kts → ...src/main/java/compose-ui-tests.gradle.kts
diff --git a/...src/main/java/dependency-guard.gradle.kts → ...src/main/java/dependency-guard.gradle.kts b/...src/main/java/dependency-guard.gradle.kts → ...src/main/java/dependency-guard.gradle.kts
diff --git a/...c/src/main/java/kotlin-android.gradle.kts → ...c/src/main/java/kotlin-android.gradle.kts b/...c/src/main/java/kotlin-android.gradle.kts → ...c/src/main/java/kotlin-android.gradle.kts
diff --git a/buildSrc/src/main/java/kotlin-jvm.gradle.kts → ...logic/src/main/java/kotlin-jvm.gradle.kts b/buildSrc/src/main/java/kotlin-jvm.gradle.kts → ...logic/src/main/java/kotlin-jvm.gradle.kts
diff --git a/...main/java/kotlin-multiplatform.gradle.kts → ...main/java/kotlin-multiplatform.gradle.kts b/...main/java/kotlin-multiplatform.gradle.kts → ...main/java/kotlin-multiplatform.gradle.kts
diff --git a/buildSrc/src/main/java/published.gradle.kts → ...-logic/src/main/java/published.gradle.kts b/buildSrc/src/main/java/published.gradle.kts → ...-logic/src/main/java/published.gradle.kts
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -24,8 +24,8 @@ buildscript {
 
 plugins {
   base
-  `artifacts-check`
-  `dependency-guard`
+  id("artifacts-check")
+  id("dependency-guard")
 }
 
 subprojects {

diff --git a/internal-testing-utils/build.gradle.kts b/internal-testing-utils/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-  `kotlin-jvm`
-  published
+  id("kotlin-jvm")
+  id("published")
 }
 
 dependencies {

diff --git a/samples/compose-samples/build.gradle.kts b/samples/compose-samples/build.gradle.kts
@@ -1,9 +1,9 @@
 plugins {
   id("com.android.application")
-  `kotlin-android`
-  `android-sample-app`
-  `android-ui-tests`
-  `compose-ui-tests`
+  id("kotlin-android")
+  id("android-sample-app")
+  id("android-ui-tests")
+  id("compose-ui-tests")
 }
 
 android {

diff --git a/samples/containers/android/build.gradle.kts b/samples/containers/android/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
   id("com.android.library")
-  `kotlin-android`
-  `android-defaults`
+  id("kotlin-android")
+  id("android-defaults")
 }
 
 android {

diff --git a/samples/containers/app-poetry/build.gradle.kts b/samples/containers/app-poetry/build.gradle.kts
@@ -1,8 +1,8 @@
 plugins {
   id("com.android.application")
-  `kotlin-android`
-  `android-sample-app`
-  `android-ui-tests`
+  id("kotlin-android")
+  id("android-sample-app")
+  id("android-ui-tests")
 }
 
 android {

diff --git a/samples/containers/app-raven/build.gradle.kts b/samples/containers/app-raven/build.gradle.kts
@@ -1,8 +1,8 @@
 plugins {
   id("com.android.application")
-  `kotlin-android`
-  `android-sample-app`
-  `android-ui-tests`
+  id("kotlin-android")
+  id("android-sample-app")
+  id("android-ui-tests")
 }
 
 android {

diff --git a/samples/containers/common/build.gradle.kts b/samples/containers/common/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-  `kotlin-jvm`
+  id("kotlin-jvm")
 }
 
 dependencies {

diff --git a/samples/containers/hello-back-button/build.gradle.kts b/samples/containers/hello-back-button/build.gradle.kts
@@ -1,8 +1,8 @@
 plugins {
   id("com.android.application")
-  `kotlin-android`
-  `android-sample-app`
-  `android-ui-tests`
+  id("kotlin-android")
+  id("android-sample-app")
+  id("android-ui-tests")
   id("kotlin-parcelize")
 }
 

diff --git a/samples/containers/poetry/build.gradle.kts b/samples/containers/poetry/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
   id("com.android.library")
-  `kotlin-android`
-  `android-defaults`
+  id("kotlin-android")
+  id("android-defaults")
 }
 
 android {

diff --git a/samples/dungeon/app/build.gradle.kts b/samples/dungeon/app/build.gradle.kts
@@ -1,8 +1,8 @@
 plugins {
   id("com.android.application")
-  `kotlin-android`
-  `android-sample-app`
-  `android-ui-tests`
+  id("kotlin-android")
+  id("android-sample-app")
+  id("android-ui-tests")
 }
 
 android {

diff --git a/samples/dungeon/common/build.gradle.kts b/samples/dungeon/common/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-  `kotlin-jvm`
+  id("kotlin-jvm")
   id("kotlinx-serialization")
 }
 

diff --git a/samples/dungeon/timemachine-shakeable/build.gradle.kts b/samples/dungeon/timemachine-shakeable/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
   id("com.android.library")
-  `kotlin-android`
-  `android-defaults`
+  id("kotlin-android")
+  id("android-defaults")
 }
 
 android {

diff --git a/samples/dungeon/timemachine/build.gradle.kts b/samples/dungeon/timemachine/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-  `kotlin-jvm`
+  id("kotlin-jvm")
 }
 
 dependencies {

diff --git a/samples/hello-terminal/hello-terminal-app/build.gradle.kts b/samples/hello-terminal/hello-terminal-app/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
   application
-  `kotlin-jvm`
+  id("kotlin-jvm")
 }
 
 application.mainClassName = "com.squareup.sample.helloterminal.MainKt"

diff --git a/samples/hello-terminal/terminal-workflow/build.gradle.kts b/samples/hello-terminal/terminal-workflow/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-  `kotlin-jvm`
+  id("kotlin-jvm")
 }
 
 dependencies {

diff --git a/samples/hello-terminal/todo-terminal-app/build.gradle.kts b/samples/hello-terminal/todo-terminal-app/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
   application
-  `kotlin-jvm`
+  id("kotlin-jvm")
 }
 
 application.mainClassName = "com.squareup.sample.hellotodo.MainKt"

diff --git a/samples/hello-workflow-fragment/build.gradle.kts b/samples/hello-workflow-fragment/build.gradle.kts
@@ -1,8 +1,8 @@
 plugins {
   id("com.android.application")
-  `kotlin-android`
-  `android-sample-app`
-  `android-ui-tests`
+  id("kotlin-android")
+  id("android-sample-app")
+  id("android-ui-tests")
 }
 
 android {

diff --git a/samples/hello-workflow/build.gradle.kts b/samples/hello-workflow/build.gradle.kts
@@ -1,8 +1,8 @@
 plugins {
   id("com.android.application")
-  `kotlin-android`
-  `android-sample-app`
-  `android-ui-tests`
+  id("kotlin-android")
+  id("android-sample-app")
+  id("android-ui-tests")
 }
 
 android {

diff --git a/samples/nested-overlays/build.gradle.kts b/samples/nested-overlays/build.gradle.kts
@@ -1,8 +1,8 @@
 plugins {
   id("com.android.application")
-  `kotlin-android`
-  `android-sample-app`
-  `android-ui-tests`
+  id("kotlin-android")
+  id("android-sample-app")
+  id("android-ui-tests")
 }
 
 android {

diff --git a/samples/stub-visibility/build.gradle.kts b/samples/stub-visibility/build.gradle.kts
@@ -1,8 +1,8 @@
 plugins {
   id("com.android.application")
-  `kotlin-android`
-  `android-sample-app`
-  `android-ui-tests`
+  id("kotlin-android")
+  id("android-sample-app")
+  id("android-ui-tests")
 }
 
 android {

diff --git a/samples/tictactoe/app/build.gradle.kts b/samples/tictactoe/app/build.gradle.kts
@@ -1,8 +1,8 @@
 plugins {
   id("com.android.application")
-  `kotlin-android`
-  `android-sample-app`
-  `android-ui-tests`
+  id("kotlin-android")
+  id("android-sample-app")
+  id("android-ui-tests")
 }
 
 android {

diff --git a/samples/tictactoe/common/build.gradle.kts b/samples/tictactoe/common/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-  `kotlin-jvm`
+  id("kotlin-jvm")
 }
 
 dependencies {

diff --git a/samples/todo-android/app/build.gradle.kts b/samples/todo-android/app/build.gradle.kts
@@ -1,8 +1,8 @@
 plugins {
   id("com.android.application")
-  `kotlin-android`
-  `android-sample-app`
-  `android-ui-tests`
+  id("kotlin-android")
+  id("android-sample-app")
+  id("android-ui-tests")
 }
 
 android {

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -10,6 +10,7 @@ pluginManagement {
     // For binary compatibility validator.
     maven { url = uri("https://kotlin.bintray.com/kotlinx") }
   }
+  includeBuild("build-logic")
 }
 
 plugins {

diff --git a/trace-encoder/build.gradle.kts b/trace-encoder/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
-  `kotlin-jvm`
+  id("kotlin-jvm")
   id("com.google.devtools.ksp")
-  published
+  id("published")
 }
 
 dependencies {

diff --git a/workflow-config/config-android/build.gradle.kts b/workflow-config/config-android/build.gradle.kts
@@ -1,8 +1,8 @@
 plugins {
   id("com.android.library")
-  `kotlin-android`
-  `android-defaults`
-  published
+  id("kotlin-android")
+  id("android-defaults")
+  id("published")
 }
 
 android {

diff --git a/workflow-config/config-jvm/build.gradle.kts b/workflow-config/config-jvm/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
   `java-library`
-  `kotlin-jvm`
-  published
+  id("kotlin-jvm")
+  id("published")
 }
 
 tasks.withType<Test> {

diff --git a/workflow-core/build.gradle.kts b/workflow-core/build.gradle.kts
@@ -1,8 +1,8 @@
 import com.squareup.workflow1.buildsrc.iosWithSimulatorArm64
 
 plugins {
-  `kotlin-multiplatform`
-  published
+  id("kotlin-multiplatform")
+  id("published")
 }
 
 kotlin {

diff --git a/workflow-runtime/build.gradle.kts b/workflow-runtime/build.gradle.kts
@@ -1,8 +1,8 @@
 import com.squareup.workflow1.buildsrc.iosWithSimulatorArm64
 
 plugins {
-  `kotlin-multiplatform`
-  published
+  id("kotlin-multiplatform")
+  id("published")
 }
 
 kotlin {

diff --git a/workflow-rx2/build.gradle.kts b/workflow-rx2/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-  `kotlin-jvm`
-  published
+  id("kotlin-jvm")
+  id("published")
 }
 
 dependencies {

diff --git a/workflow-testing/build.gradle.kts b/workflow-testing/build.gradle.kts
@@ -1,9 +1,9 @@
 @file:Suppress("SuspiciousCollectionReassignment")
 
 plugins {
-  `java-library`
-  `kotlin-jvm`
-  published
+  id("java-library")
+  id("kotlin-jvm")
+  id("published")
 }
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {

diff --git a/workflow-tracing/build.gradle.kts b/workflow-tracing/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-  `kotlin-jvm`
-  published
+  id("kotlin-jvm")
+  id("published")
 }
 
 dependencies {

diff --git a/workflow-ui/compose-tooling/build.gradle.kts b/workflow-ui/compose-tooling/build.gradle.kts
@@ -2,10 +2,10 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
   id("com.android.library")
-  `kotlin-android`
-  `android-defaults`
-  `android-ui-tests`
-  published
+  id("kotlin-android")
+  id("android-defaults")
+  id("android-ui-tests")
+  id("published")
 }
 
 android {

diff --git a/workflow-ui/compose/build.gradle.kts b/workflow-ui/compose/build.gradle.kts
@@ -2,10 +2,10 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
   id("com.android.library")
-  `kotlin-android`
-  `android-defaults`
-  `android-ui-tests`
-  published
+  id("kotlin-android")
+  id("android-defaults")
+  id("android-ui-tests")
+  id("published")
 }
 
 android {

diff --git a/workflow-ui/container-android/build.gradle.kts b/workflow-ui/container-android/build.gradle.kts
@@ -1,9 +1,9 @@
 plugins {
   id("com.android.library")
-  `kotlin-android`
-  `android-defaults`
-  `android-ui-tests`
-  published
+  id("kotlin-android")
+  id("android-defaults")
+  id("android-ui-tests")
+  id("published")
 }
 
 android {

diff --git a/workflow-ui/container-common/build.gradle.kts b/workflow-ui/container-common/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-  `kotlin-jvm`
-  published
+  id("kotlin-jvm")
+  id("published")
 }
 
 dependencies {