misc build-logic cleanup

Author: RBusarow

build-logic/build.gradle.kts

@@ -20,14 +20,18 @@ buildscript {
   }
 }
 
-// `alias(libs.______)` inside the plugins block throws a false positive warning
-// https://youtrack.jetbrains.com/issue/KTIJ-19369
-// There's also an IntelliJ plugin to disable this warning globally:
-// https://plugins.jetbrains.com/plugin/18949-gradle-libs-error-suppressor
 @Suppress("DSL_SCOPE_VIOLATION")
 plugins {
   base
   alias(libs.plugins.ktlint)
+  alias(libs.plugins.dependencyAnalysis)
+  alias(libs.plugins.moduleCheck)
+}
+
+moduleCheck {
+  checks {
+    sortDependencies = true
+  }
 }
 
 allprojects {
@@ -50,6 +54,20 @@ allprojects {
       )
     }
   }
+
+  tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+    kotlinOptions {
+
+      languageVersion = "1.6"
+      apiVersion = "1.6"
+
+      jvmTarget = "11"
+
+      freeCompilerArgs = freeCompilerArgs + listOf(
+        "-opt-in=kotlin.RequiresOptIn"
+      )
+    }
+  }
 }
 
 tasks.withType<org.jlleitschuh.gradle.ktlint.tasks.BaseKtLintCheckTask> rootTask@{

build-logic/mcbuild/build.gradle.kts

@@ -13,10 +13,6 @@
  * limitations under the License.
  */
 
-// `alias(libs.______)` inside the plugins block throws a false positive warning
-// https://youtrack.jetbrains.com/issue/KTIJ-19369
-// There's also an IntelliJ plugin to disable this warning globally:
-// https://plugins.jetbrains.com/plugin/18949-gradle-libs-error-suppressor
 @Suppress("DSL_SCOPE_VIOLATION")
 plugins {
   `kotlin-dsl`
@@ -25,11 +21,12 @@ plugins {
   alias(libs.plugins.google.ksp)
 }
 
-val kotlinVersion = libs.versions.kotlin.get()
-
 dependencies {
 
+  api(libs.square.moshi)
+
   compileOnly(gradleApi())
+
   compileOnly(libs.kotlin.gradle.plug)
 
   implementation(libs.benManes.versions)
@@ -39,32 +36,13 @@ dependencies {
   implementation(libs.google.dagger.api)
   implementation(libs.google.ksp)
   implementation(libs.kotlin.compiler)
+  implementation(libs.kotlin.gradle.plug)
   implementation(libs.kotlinx.knit)
   implementation(libs.ktlint.gradle)
   implementation(libs.scabbard)
   implementation(libs.square.anvil.gradle)
-  implementation(libs.square.moshi)
+  implementation(libs.square.kotlinPoet)
   implementation(libs.vanniktech.publish)
 
   ksp(libs.square.moshi.codegen)
 }
-
-java {
-  // This is different from the Kotlin jvm target.
-  @Suppress("MagicNumber")
-  toolchain.languageVersion.set(JavaLanguageVersion.of(11))
-}
-
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-  kotlinOptions {
-
-    languageVersion = "1.5"
-    apiVersion = "1.5"
-
-    jvmTarget = "11"
-
-    freeCompilerArgs = freeCompilerArgs + listOf(
-      "-opt-in=kotlin.RequiresOptIn"
-    )
-  }
-}

build-logic/mcbuild/src/main/kotlin/mcbuild.dokka.gradle.kts

@@ -13,8 +13,7 @@
  * limitations under the License.
  */
 
-import modulecheck.builds.ModuleCheckBuildExtension
-import org.gradle.kotlin.dsl.findByType
+import modulecheck.builds.ArtifactIdExtension
 import org.jetbrains.dokka.gradle.AbstractDokkaLeafTask
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.jlleitschuh.gradle.ktlint.tasks.KtLintCheckTask
@@ -24,9 +23,8 @@ plugins {
   id("org.jetbrains.dokka")
 }
 
-tasks
-  .withType<AbstractDokkaLeafTask>()
-  .all {
+tasks.withType<AbstractDokkaLeafTask>()
+  .configureEach {
 
     // Dokka doesn't support configuration caching
     notCompatibleWithConfigurationCache("Dokka doesn't support configuration caching")
@@ -39,7 +37,7 @@ tasks
     // The default moduleName for each module in the module list is its unqualified "name",
     // meaning the list would be full of "api", "impl", etc.  Instead, use the module's maven
     // artifact ID, if it has one, or default to its full Gradle path for internal modules.
-    val fullModuleName = extensions.findByType<ModuleCheckBuildExtension>()?.artifactId
+    val fullModuleName = extensions.findByType<ArtifactIdExtension>()?.artifactId
       ?: project.path.removePrefix(":")
     moduleName.set(fullModuleName)
 

build-logic/mcbuild/src/main/kotlin/mcbuild.gradle.kts

@@ -13,16 +13,7 @@
  * limitations under the License.
  */
 
-@file:Suppress("SpellCheckingInspection", "VariableNaming")
-
-import modulecheck.builds.ArtifactIdListener
-import modulecheck.builds.DIListener
-import modulecheck.builds.KspListener
 import modulecheck.builds.ModuleCheckBuildExtension
-import modulecheck.builds.applyAnvil
-import modulecheck.builds.applyDagger
-import modulecheck.builds.applyKsp
-import modulecheck.builds.configurePublishing
 import modulecheck.builds.libsCatalog
 
 plugins {
@@ -34,31 +25,17 @@ plugins {
   id("mcbuild.kotlin")
   id("mcbuild.ktlint")
   id("mcbuild.test")
-}
-
-val settings = extensions.create<ModuleCheckBuildExtension>(
-  "mcbuild",
-  ArtifactIdListener { onNewArtifactId(it) },
-  DIListener { anvil, dagger ->
-    applyAnvil(anvil = anvil, dagger = dagger)
-    applyDagger(anvil = anvil, dagger = dagger)
-  },
-  KspListener { onKspToggled(it) }
-)
 
-fun onNewArtifactId(artifactId: String) {
-  project.configurePublishing(artifactId)
+  id("com.google.devtools.ksp") apply false
 }
 
-fun onKspToggled(useKsp: Boolean) {
-  project.applyKsp(useKsp)
-}
+val settings = extensions.create<ModuleCheckBuildExtension>("mcbuild")
 
-@Suppress("UnstableApiUsage")
 val kotlinVersion = project.libsCatalog
   .findVersion("kotlin")
   .get()
   .requiredVersion
+
 configurations.all {
   resolutionStrategy {
     eachDependency {

build-logic/mcbuild/src/main/kotlin/mcbuild.kotlin.gradle.kts

@@ -22,7 +22,7 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>()
     kotlinOptions {
       allWarningsAsErrors = false
 
-      val kotlinMajor = "1.5"
+      val kotlinMajor = "1.6"
 
       languageVersion = kotlinMajor
       apiVersion = kotlinMajor

build-logic/mcbuild/src/main/kotlin/mcbuild.ktlint.gradle.kts

@@ -22,10 +22,15 @@ plugins {
 }
 
 extensions.configure(KtlintExtension::class.java) {
+  val libVersion = libsCatalog.version("ktlint-lib").requiredVersion
+  version.set(libVersion)
   debug.set(false)
-  version.set(libsCatalog.version("ktlint-lib").requiredVersion)
   outputToConsole.set(true)
   enableExperimentalRules.set(true)
+  filter {
+    exclude("**/generated/**")
+    exclude("**/build/**")
+  }
   disabledRules.set(
     setOf(
       "max-line-length", // manually formatting still does this, and KTLint will still wrap long chains when possible
@@ -39,18 +44,21 @@ extensions.configure(KtlintExtension::class.java) {
       "experimental:function-signature"
     )
   )
-  require(libsCatalog.version("ktlint-lib").requiredVersion < "0.46.0") {
-    """
-    when updating to 0.46.0:
-    - Re-enable `experimental:type-parameter-list-spacing`
-    - remove 'experimental' from 'argument-list-wrapping'
-    - remove 'experimental' from 'no-empty-first-line-in-method-block'
-    """.trimIndent()
-  }
-}
 
-dependencies {
-  "ktlintRuleset"(project(path = ":ktlint-rules"))
+  extensions.configure(KtlintExtension::class.java) {
+
+    require(libVersion < "0.46.0") {
+      """
+      when updating to 0.46.0:
+      - Re-enable `experimental:type-parameter-list-spacing`
+      - remove 'experimental' from 'argument-list-wrapping'
+      - remove 'experimental' from 'no-empty-first-line-in-method-block'
+      """.trimIndent()
+    }
+  }
+  dependencies {
+    "ktlintRuleset"(project(path = ":ktlint-rules"))
+  }
 }
 
 tasks.withType<org.jlleitschuh.gradle.ktlint.tasks.BaseKtLintCheckTask> {

…kotlin/modulecheck/builds/KspListener.kt …odulecheck/builds/ArtifactIdExtension.ktbuild-logic/mcbuild/src/main/kotlin/modulecheck/builds/KspListener.kt renamed to build-logic/mcbuild/src/main/kotlin/modulecheck/builds/ArtifactIdExtension.kt build-logic/mcbuild/src/main/kotlin/modulecheck/builds/KspListener.kt renamed to build-logic/mcbuild/src/main/kotlin/modulecheck/builds/ArtifactIdExtension.kt

@@ -15,6 +15,6 @@
 
 package modulecheck.builds
 
-fun interface KspListener {
-  fun onChanged(useKsp: Boolean)
+interface ArtifactIdExtension {
+  val artifactId: String?
 }

build-logic/mcbuild/src/main/kotlin/modulecheck/builds/ArtifactIdListener.kt

@@ -15,12 +15,18 @@
 
 package modulecheck.builds
 
-import org.gradle.api.Project
-import org.gradle.kotlin.dsl.apply
+interface DiExtension {
+  /**
+   * Applies the Anvil plugin with `generateDaggerFactories` set to `true`. Do not use at the same
+   * time as `dagger()`.
+   */
+  fun anvil()
 
-fun Project.applyKsp(useKsp: Boolean) {
-
-  if (!useKsp) return
-
-  apply(plugin = "com.google.devtools.ksp")
+  /**
+   * Applies kapt and the Anvil plugin with `generateDaggerFactories` set to `false`. Also adds the
+   * Dagger compiler `kapt` dependency.
+   *
+   * Do not use at the same time as `anvil()`.
+   */
+  fun dagger()
 }