chore(gradle): migrate from buildSrc to build-logic

build-logic/convention/build.gradle.kts

@@ -0,0 +1,39 @@
+plugins {
+    `kotlin-dsl`
+}
+
+dependencies {
+    compileOnly(libs.androidx.gradle)
+    compileOnly(libs.kotlin.gradle)
+    compileOnly(libs.compose.compiler.gradle)
+    implementation(libs.spotless.gradle)
+}
+
+gradlePlugin {
+    plugins {
+        register("androidApplication") {
+            id = "cfw.android.application"
+            implementationClass = "AndroidApplicationConventionPlugin"
+        }
+        register("androidTests") {
+            id = "cfw.android.tests"
+            implementationClass = "AndroidTestsConventionPlugin"
+        }
+        register("codeLint") {
+            id = "cfw.code.lint"
+            implementationClass = "CodeLintConventionPlugin"
+        }
+        register("androidLibrary") {
+            id = "cfw.library"
+            implementationClass = "AndroidLibraryConventionPlugin"
+        }
+        register("androidLibraryTests") {
+            id = "cfw.library.tests"
+            implementationClass = "AndroidLibraryTestsConventionPlugin"
+        }
+        register("sampleCommonDeps") {
+            id = "cfw.sample.common.deps"
+            implementationClass = "SampleCommonDepsConventionPlugin"
+        }
+    }
+}

build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt

@@ -0,0 +1,41 @@
+import com.android.build.api.dsl.ApplicationExtension
+import cfw.buildlogic.AndroidConfig
+import cfw.buildlogic.configureAndroid
+import cfw.buildlogic.configureCommonKotlinCompileOptions
+import cfw.buildlogic.libs
+import cfw.buildlogic.pluginId
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.configure
+
+@Suppress("unused")
+class AndroidApplicationConventionPlugin : Plugin<Project> {
+    override fun apply(target: Project) {
+        with(target) {
+            with(pluginManager) {
+                apply("com.android.application")
+                apply(libs.pluginId("compose-compiler"))
+                apply("cfw.code.lint")
+            }
+
+            extensions.configure<ApplicationExtension> {
+                defaultConfig {
+                    targetSdk = AndroidConfig.TARGET_SDK
+                }
+                configureAndroid(this)
+
+                buildFeatures {
+                    compose = true
+                }
+
+                packaging {
+                    resources {
+                        excludes.add("/META-INF/{AL2.0,LGPL2.1}")
+                    }
+                }
+            }
+
+            configureCommonKotlinCompileOptions()
+        }
+    }
+}

build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt

@@ -0,0 +1,41 @@
+import com.android.build.api.dsl.LibraryExtension
+import cfw.buildlogic.AndroidConfig
+import cfw.buildlogic.configureAndroid
+import cfw.buildlogic.configureCommonKotlinCompileOptions
+import cfw.buildlogic.libs
+import cfw.buildlogic.pluginId
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.configure
+
+@Suppress("unused")
+class AndroidLibraryConventionPlugin : Plugin<Project> {
+    override fun apply(target: Project) {
+        with(target) {
+            with(pluginManager) {
+                apply("com.android.library")
+                apply(libs.pluginId("compose-compiler"))
+                apply("cfw.code.lint")
+            }
+
+            extensions.configure<LibraryExtension> {
+                defaultConfig {
+                    lint.targetSdk = AndroidConfig.TARGET_SDK
+                }
+                configureAndroid(this)
+
+                buildFeatures {
+                    compose = true
+                }
+
+                packaging {
+                    resources {
+                        excludes.add("/META-INF/{AL2.0,LGPL2.1}")
+                    }
+                }
+            }
+
+            configureCommonKotlinCompileOptions()
+        }
+    }
+}

build-logic/convention/src/main/kotlin/AndroidLibraryTestsConventionPlugin.kt

@@ -0,0 +1,35 @@
+import com.android.build.api.dsl.LibraryExtension
+import cfw.buildlogic.library
+import cfw.buildlogic.libs
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.dependencies
+
+@Suppress("unused")
+class AndroidLibraryTestsConventionPlugin : Plugin<Project> {
+    override fun apply(target: Project) {
+        with(target) {
+            pluginManager.apply("com.android.library")
+
+            extensions.configure<LibraryExtension> {
+                defaultConfig {
+                    testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+                }
+                testOptions {
+                    unitTests.all {
+                        it.useJUnitPlatform()
+                    }
+                }
+            }
+
+            dependencies {
+                add("testImplementation", libs.library("junit"))
+                add("androidTestImplementation", libs.library("androidx-test-junit"))
+                add("androidTestImplementation", libs.library("androidx-test-espresso"))
+                add("androidTestImplementation", platform(libs.library("compose-bom")))
+                add("androidTestImplementation", libs.library("compose-ui-test-junit4"))
+            }
+        }
+    }
+}

build-logic/convention/src/main/kotlin/AndroidTestsConventionPlugin.kt

@@ -0,0 +1,30 @@
+import com.android.build.api.dsl.ApplicationExtension
+import cfw.buildlogic.library
+import cfw.buildlogic.libs
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.dependencies
+
+@Suppress("unused")
+class AndroidTestsConventionPlugin : Plugin<Project> {
+    override fun apply(target: Project) {
+        with(target) {
+            pluginManager.apply("com.android.application")
+
+            extensions.configure<ApplicationExtension> {
+                defaultConfig {
+                    testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+                }
+            }
+
+            dependencies {
+                add("testImplementation", libs.library("junit"))
+                add("androidTestImplementation", libs.library("androidx-test-junit"))
+                add("androidTestImplementation", libs.library("androidx-test-espresso"))
+                add("androidTestImplementation", platform(libs.library("compose-bom")))
+                add("androidTestImplementation", libs.library("compose-ui-test-junit4"))
+            }
+        }
+    }
+}

build-logic/convention/src/main/kotlin/CodeLintConventionPlugin.kt

@@ -0,0 +1,33 @@
+import com.diffplug.gradle.spotless.SpotlessExtension
+import cfw.buildlogic.libs
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.configure
+
+@Suppress("unused")
+class CodeLintConventionPlugin : Plugin<Project> {
+    override fun apply(target: Project) {
+        with(target) {
+            pluginManager.apply("com.diffplug.spotless")
+
+            extensions.configure<SpotlessExtension> {
+                kotlin {
+                    target("**/*.kt", "**/*.kts")
+                    targetExclude("**/build/**/*.kt")
+                    ktlint(
+                        libs.findLibrary("ktlint-core").get().get().version!!,
+                    ).editorConfigOverride(
+                        mapOf("ktlint_standard_annotation" to "disabled"),
+                    )
+                    trimTrailingWhitespace()
+                    endWithNewline()
+                }
+                format("xml") {
+                    target("**/*.xml")
+                    trimTrailingWhitespace()
+                    endWithNewline()
+                }
+            }
+        }
+    }
+}

build-logic/convention/src/main/kotlin/SampleCommonDepsConventionPlugin.kt

@@ -0,0 +1,24 @@
+import cfw.buildlogic.library
+import cfw.buildlogic.libs
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.dependencies
+
+@Suppress("unused")
+class SampleCommonDepsConventionPlugin : Plugin<Project> {
+    override fun apply(target: Project) {
+        with(target) {
+            pluginManager.apply("com.android.application")
+
+            dependencies {
+                add("implementation", libs.library("appcompat"))
+                add("implementation", libs.library("androidx-core-ktx"))
+                add("implementation", libs.library("androidx-lifecycle-runtime-ktx"))
+                add("implementation", libs.library("androidx-lifecycle-viewmodel-compose"))
+                add("implementation", libs.library("activity-compose"))
+                add("implementation", platform(libs.library("compose-bom")))
+                add("implementation", libs.findBundle("compose-ui").get())
+            }
+        }
+    }
+}

buildSrc/src/main/kotlin/buildLogic/AndroidConfig.kt → build-logic/convention/src/main/kotlin/cfw/buildlogic/AndroidConfig.kt

@@ -1,4 +1,4 @@
-package buildlogic
+package cfw.buildlogic
 
 import org.gradle.api.JavaVersion as GradleJavaVersion
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget as KotlinJvmTarget
@@ -11,4 +11,4 @@ object AndroidConfig {
     // https://youtrack.jetbrains.com/issue/KT-66995/JvmTarget-and-JavaVersion-compatibility-for-easier-JVM-version-setup
     val JavaVersion = GradleJavaVersion.VERSION_17
     val JvmTarget = KotlinJvmTarget.JVM_17
-}
+}

build-logic/convention/src/main/kotlin/cfw/buildlogic/Libs.kt

@@ -0,0 +1,20 @@
+package cfw.buildlogic
+
+import org.gradle.api.Project
+import org.gradle.api.artifacts.MinimalExternalModuleDependency
+import org.gradle.api.artifacts.VersionCatalog
+import org.gradle.api.artifacts.VersionCatalogsExtension
+import org.gradle.api.provider.Provider
+import org.gradle.kotlin.dsl.getByType
+
+val Project.libs: VersionCatalog
+    get() = extensions.getByType<VersionCatalogsExtension>().named("libs")
+
+fun VersionCatalog.library(name: String): Provider<MinimalExternalModuleDependency> =
+    findLibrary(name).get()
+
+fun VersionCatalog.pluginId(name: String): String =
+    findPlugin(name).get().get().pluginId
+
+fun VersionCatalog.version(name: String): String =
+    findVersion(name).get().requiredVersion

buildSrc/src/main/kotlin/buildLogic/ProjectExtensions.kt → build-logic/convention/src/main/kotlin/cfw/buildlogic/ProjectExtensions.kt

@@ -1,11 +1,9 @@
-package buildlogic
+package cfw.buildlogic
 
 import com.android.build.api.dsl.CommonExtension
-import org.gradle.accessors.dm.LibrariesForLibs
 import org.gradle.api.Project
-import org.gradle.kotlin.dsl.the
-
-val Project.libs get() = the<LibrariesForLibs>()
+import org.gradle.kotlin.dsl.withType
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 internal fun Project.configureAndroid(commonExtension: CommonExtension) {
     commonExtension.apply {
@@ -21,3 +19,11 @@ internal fun Project.configureAndroid(commonExtension: CommonExtension) {
         }
     }
 }
+
+internal fun Project.configureCommonKotlinCompileOptions() {
+    tasks.withType<KotlinCompile>().configureEach {
+        compilerOptions {
+            jvmTarget.set(AndroidConfig.JvmTarget)
+        }
+    }
+}

build-logic/gradle.properties

@@ -0,0 +1,4 @@
+# Gradle properties are not passed to included builds https://github.com/gradle/gradle/issues/2534
+org.gradle.parallel=true
+org.gradle.caching=true
+org.gradle.configureondemand=true

build-logic/settings.gradle.kts

@@ -0,0 +1,21 @@
+dependencyResolutionManagement {
+    repositories {
+        google {
+            content {
+                includeGroupByRegex("com\\.android.*")
+                includeGroupByRegex("com\\.google.*")
+                includeGroupByRegex("androidx.*")
+            }
+        }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+    versionCatalogs {
+        create("libs") {
+            from(files("../gradle/libs.versions.toml"))
+        }
+    }
+}
+
+rootProject.name = "build-logic"
+include(":convention")

build.gradle.kts

@@ -1,16 +1,10 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
+    alias(libs.plugins.agp) apply false
+    alias(libs.plugins.android.library) apply false
+    alias(libs.plugins.kotlin.android) apply false
+    alias(libs.plugins.compose.compiler) apply false
+    alias(libs.plugins.spotless) apply false
     alias(libs.plugins.ksp) apply false
     alias(libs.plugins.hilt.android) apply false
 }
-
-subprojects {
-    tasks.withType<KotlinCompile>().configureEach {
-        compilerOptions {
-            jvmTarget.set(JvmTarget.JVM_17)
-        }
-    }
-}