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 · ec36342 · ec36342
1 parent 42ef981
commit ec36342
Show file tree

Hide file tree

Showing 64 changed files with 121 additions and 99 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/dependencies/classpath.txt b/dependencies/classpath.txt
@@ -1,3 +1,4 @@
+:
 androidx.databinding:databinding-common:7.4.1
 androidx.databinding:databinding-compiler-common:7.4.1
 com.android.databinding:baseLibrary:7.4.1
@@ -38,6 +39,7 @@ com.android.tools:sdk-common:30.4.1
 com.android.tools:sdklib:30.4.1
 com.android:signflinger:7.4.1
 com.android:zipflinger:7.4.1
+com.dropbox.dependency-guard:dependency-guard:0.1.0
 com.fasterxml.jackson.core:jackson-annotations:2.12.7
 com.fasterxml.jackson.core:jackson-core:2.12.7
 com.fasterxml.jackson.core:jackson-databind:2.12.7.1
@@ -66,6 +68,15 @@ com.google.protobuf:protobuf-java:3.17.2
 com.google.testing.platform:core-proto:0.0.8-alpha08
 com.googlecode.java-diff-utils:diffutils:1.3.0
 com.googlecode.juniversalchardet:juniversalchardet:1.0.3
+com.pinterest.ktlint:ktlint-core:0.47.1
+com.pinterest.ktlint:ktlint-reporter-checkstyle:0.47.1
+com.pinterest.ktlint:ktlint-reporter-html:0.47.1
+com.pinterest.ktlint:ktlint-reporter-json:0.47.1
+com.pinterest.ktlint:ktlint-reporter-plain:0.47.1
+com.pinterest.ktlint:ktlint-reporter-sarif:0.47.1
+com.pinterest.ktlint:ktlint-ruleset-experimental:0.47.1
+com.pinterest.ktlint:ktlint-ruleset-standard:0.47.1
+com.squareup.moshi:moshi-adapters:1.13.0
 com.squareup.moshi:moshi:1.13.0
 com.squareup.okhttp3:okhttp:4.10.0
 com.squareup.okio:okio-jvm:3.0.0
@@ -82,6 +93,8 @@ com.vanniktech:nexus:0.22.0
 commons-codec:commons-codec:1.11
 commons-io:commons-io:2.4
 commons-logging:commons-logging:1.2
+io.github.detekt.sarif4k:sarif4k:0.0.1
+io.github.microutils:kotlin-logging-jvm:2.1.23
 io.grpc:grpc-api:1.39.0
 io.grpc:grpc-context:1.39.0
 io.grpc:grpc-core:1.39.0
@@ -118,6 +131,7 @@ org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-qual:3.5.0
 org.codehaus.mojo:animal-sniffer-annotations:1.19
 org.codehaus.woodstox:stax2-api:4.2.1
+org.ec4j.core:ec4j-core:0.3.0
 org.glassfish.jaxb:jaxb-runtime:2.3.2
 org.glassfish.jaxb:txw2:2.3.2
 org.jdom:jdom2:2.0.6
@@ -126,6 +140,7 @@ org.jetbrains.dokka:dokka-gradle-plugin:1.8.10
 org.jetbrains.intellij.deps:trove4j:1.0.20200330
 org.jetbrains.kotlin:kotlin-android-extensions:1.7.20
 org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.7.20
+org.jetbrains.kotlin:kotlin-bom:1.7.20
 org.jetbrains.kotlin:kotlin-build-common:1.7.20
 org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.20
 org.jetbrains.kotlin:kotlin-compiler-runner:1.7.20
@@ -140,6 +155,7 @@ org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.7.20
 org.jetbrains.kotlin:kotlin-native-utils:1.7.20
 org.jetbrains.kotlin:kotlin-project-model:1.7.20
 org.jetbrains.kotlin:kotlin-reflect:1.6.21
+org.jetbrains.kotlin:kotlin-script-runtime:1.7.20
 org.jetbrains.kotlin:kotlin-scripting-common:1.7.20
 org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.7.20
 org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.7.20
@@ -157,9 +173,14 @@ org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.3
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.3
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.3
 org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.5.0
+org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.1.0
+org.jetbrains.kotlinx:kotlinx-serialization-core:1.1.0
+org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.1.0
+org.jetbrains.kotlinx:kotlinx-serialization-json:1.1.0
 org.jetbrains:annotations:13.0
 org.jetbrains:markdown-jvm:0.3.1
 org.jetbrains:markdown:0.3.1
+org.jmailen.gradle:kotlinter-gradle:3.12.0
 org.json:json:20180813
 org.jsoup:jsoup:1.15.3
 org.jvnet.staxex:stax-ex:1.8.1
@@ -168,7 +189,7 @@ org.ow2.asm:asm-commons:9.2
 org.ow2.asm:asm-tree:9.2
 org.ow2.asm:asm-util:9.2
 org.ow2.asm:asm:9.2
-org.slf4j:slf4j-api:1.7.30
+org.slf4j:slf4j-api:1.7.32
 org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2
 xerces:xercesImpl:2.12.0
 xml-apis:xml-apis:1.4.01
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 {