Build script cleanups

Author: wkornewald

build-logic/build-logic-base/build.gradle.kts

@@ -4,15 +4,15 @@ plugins {
 }
 
 dependencies {
-    api(libs.gradle.android)
-    api(libs.gradle.kotlin)
-    api(libs.gradle.cocoapods)
-    api(libs.gradle.detekt)
-    api(libs.gradle.dokka)
-    api(libs.gradle.kotlin.compose)
-    api(libs.gradle.jetbrains.compose)
-    api(libs.gradle.kotlin.jvm)
-    api(libs.gradle.maven.publish)
+    api(rootLibs.gradle.android)
+    api(rootLibs.gradle.kotlin)
+    api(rootLibs.gradle.cocoapods)
+    api(rootLibs.gradle.detekt)
+    api(rootLibs.gradle.dokka)
+    api(rootLibs.gradle.kotlin.compose)
+    api(rootLibs.gradle.jetbrains.compose)
+    api(rootLibs.gradle.kotlin.jvm)
+    api(rootLibs.gradle.maven.publish)
 }
 
 val autoDetectPluginRegex = Regex("""^(?:public\s+)?class\s+(\w+)BuildLogicPlugin\s*:.*$""", RegexOption.MULTILINE)

build-logic/build-logic-base/src/main/kotlin/com/ensody/buildlogic/KotlinMultiplatformExt.kt

@@ -146,7 +146,7 @@ fun KotlinMultiplatformExtension.allAndroidNative() {
     androidNativeX86()
 }
 
-fun KotlinMultiplatformExtension.allAppleMobile(x64: Boolean = true, onlyComposeSupport: Boolean) {
+fun KotlinMultiplatformExtension.allAppleMobile(x64: Boolean = true, onlyComposeSupport: Boolean = false) {
     allIos(x64 = x64)
     allTvos()
     allWatchos(onlyComposeSupport = onlyComposeSupport)

build-logic/build-logic-base/src/main/kotlin/com/ensody/buildlogic/Plugins.kt

@@ -167,4 +167,4 @@ fun Project.setupBuildLogicBase(block: Project.() -> Unit) {
     }
 }
 
-val libs get() = buildLogicBaseDeps.libs
+val rootLibs get() = buildLogicBaseDeps.libs

build-logic/build-logic-base/src/main/kotlin/com/ensody/buildlogic/Utils.kt

@@ -10,13 +10,21 @@ import java.io.File
 
 val Project.isRootProject get() = this == rootProject
 
-fun shell(
-    command: String,
+fun cli(
+    vararg command: String,
     workingDir: File? = null,
     env: Map<String, String> = emptyMap(),
     inheritIO: Boolean = false,
 ): String {
-    val processBuilder = ProcessBuilder("/bin/bash", "-c", command)
+    var cmd = command.first().replace("/", File.separator)
+    if (OS.current == OS.Windows) {
+        if (File("$cmd.bat").exists()) {
+            cmd += ".bat"
+        } else if (File("$cmd.exe").exists()) {
+            cmd += ".exe"
+        }
+    }
+    val processBuilder = ProcessBuilder(cmd, *command.drop(1).toTypedArray())
     workingDir?.let { processBuilder.directory(it) }
     processBuilder.redirectErrorStream(true)
     processBuilder.environment().putAll(env)
@@ -26,10 +34,18 @@ fun shell(
         if (inheritIO) {
             println(it)
         }
-        check(exitCode == 0) { "Process exit code was: $exitCode\nOriginal command: $command" }
+        check(exitCode == 0) { "Process exit code was: $exitCode\nOriginal command: ${command.toList()}\nResult:$it" }
     }
 }
 
+fun shell(
+    command: String,
+    workingDir: File? = null,
+    env: Map<String, String> = emptyMap(),
+    inheritIO: Boolean = false,
+): String =
+    cli("/bin/bash", "-c", command, workingDir = workingDir, env = env, inheritIO = inheritIO)
+
 fun Project.withGeneratedBuildFile(category: String, path: String, sourceSet: String? = null, content: () -> String) {
     val generatedDir = file("${getGeneratedBuildFilesRoot()}/$category")
     extensions.findByType<KotlinJvmExtension>()?.apply {
@@ -61,16 +77,35 @@ internal fun Project.getGeneratedBuildFilesRoot(): File =
     file("$projectDir/build/generated/source/build-logic")
 
 internal fun Project.detectProjectVersion(): String =
-    System.getenv("OVERRIDE_VERSION")?.takeIf { it.isNotBlank() }
-        ?: shell("git tag --points-at HEAD").split("\n").filter {
+    System.getenv("OVERRIDE_VERSION")?.removePrefix("v")?.removePrefix("-")?.takeIf { it.isNotBlank() }
+        ?: cli("git", "tag", "--points-at", "HEAD").split("\n").filter {
             versionRegex.matchEntire(it) != null
         }.maxByOrNull {
             VersionComparable(versionRegex.matchEntire(it)!!.destructured.toList())
         }?.removePrefix("v")?.removePrefix("-") ?: run {
-            val branchName = shell("git rev-parse --abbrev-ref HEAD")
+            val branchName = cli("git", "rev-parse", "--abbrev-ref", "HEAD")
             "999999.0.0-${sanitizeBranchName(branchName)}.1"
         }
 
+enum class OS {
+    Linux,
+    macOS,
+    Windows,
+    ;
+
+    companion object Companion {
+        val current: OS by lazy {
+            val osName = System.getProperty("os.name").lowercase()
+            when {
+                "mac" in osName || "darwin" in osName -> macOS
+                "linux" in osName -> Linux
+                "windows" in osName -> Windows
+                else -> error("Unknown operating system: $osName")
+            }
+        }
+    }
+}
+
 private class VersionComparable(val parts: List<String>) : Comparable<VersionComparable> {
     override fun compareTo(other: VersionComparable): Int {
         for ((l, r) in parts.zip(other.parts)) {

build-logic/build-logic-base/src/main/kotlin/com/ensody/buildlogic/VersionCatalogExt.kt

@@ -9,7 +9,7 @@ fun Project.setupVersionCatalog() {
     gradle.taskGraph.whenReady {
         configure<CatalogPluginExtension> {
             versionCatalog {
-                version("kotlin", libs.findVersion("kotlin").get().toString())
+                version("kotlin", rootLibs.findVersion("kotlin").get().toString())
                 val versionAlias = version(rootProject.name.lowercase(), project.version.toString())
                 for (subproject in rootProject.subprojects) {
                     if (!subproject.plugins.hasPlugin("maven-publish") ||

build-logic/build-logic/src/main/kotlin/com/ensody/buildlogic/BuildLogicPlugin.kt

@@ -48,7 +48,7 @@ fun Project.setupBuildLogic(block: Project.() -> Unit) {
             setupPlatformProject()
         }
         if (extensions.findByType<BaseExtension>() != null) {
-            setupAndroid(coreLibraryDesugaring = libs.findLibrary("desugarJdkLibs").get())
+            setupAndroid(coreLibraryDesugaring = rootLibs.findLibrary("desugarJdkLibs").get())
         }
         if (extensions.findByType<KotlinMultiplatformExtension>() != null) {
             setupKmp {
@@ -61,8 +61,8 @@ fun Project.setupBuildLogic(block: Project.() -> Unit) {
                 }
 
                 sourceSets["jvmCommonTest"].dependencies {
-                    implementation(libs.findLibrary("kotlin-test-junit").get())
-                    implementation(libs.findLibrary("junit").get())
+                    implementation(rootLibs.findLibrary("kotlin-test-junit").get())
+                    implementation(rootLibs.findLibrary("junit").get())
                 }
             }
             // testDebugUnitTest throws an error if there are no tests
@@ -86,7 +86,7 @@ fun Project.setupBuildLogic(block: Project.() -> Unit) {
             }
         }
         if (extensions.findByType<KotlinBaseExtension>() != null) {
-            setupKtLint(libs.findLibrary("ktlint-cli").get())
+            setupKtLint(rootLibs.findLibrary("ktlint-cli").get())
         }
         if (extensions.findByType<KotlinJvmExtension>() != null) {
             setupKotlinJvm()

build-logic/build.gradle.kts

@@ -0,0 +1,3 @@
+plugins {
+    alias(libs.plugins.kotlin) apply false
+}

build-logic/gradle/libs.versions.toml

@@ -0,0 +1,7 @@
+[versions]
+kotlin = "2.2.0"
+
+[libraries]
+
+[plugins]
+kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }

build-logic/settings.gradle.kts

@@ -8,13 +8,30 @@ dependencyResolutionManagement {
     }
 
     versionCatalogs {
-        create("libs") {
+        create("rootLibs") {
             from(files("../gradle/libs.versions.toml"))
         }
     }
 }
 
 rootProject.name = "build-logic-root"
 
-include(":build-logic-base")
-include(":build-logic")
+val ignorePaths = setOf("build", "docs", "gradle", "src")
+fun autoDetectModules(root: File) {
+    for (file in root.listFiles()) {
+        if (file.name.startsWith(".") || file.name in ignorePaths) {
+            continue
+        }
+        if (file.isDirectory) {
+            val children = file.list()
+            if ("settings.gradle.kts" in children) continue
+            if (children.any { it == "build.gradle.kts" }) {
+                include(":" + file.relativeTo(rootDir).path.replace("/", ":").replace("\\", ":"))
+            } else {
+                autoDetectModules(file)
+            }
+        }
+    }
+}
+
+autoDetectModules(rootDir)

gradle.properties

@@ -25,10 +25,8 @@ kotlin.mpp.androidSourceSetLayoutVersion=2
 
 # This is not yet ready for strict mode
 #kotlin.js.generate.externals=true
-# FIXME: This breaks Dokka + Gradle 8 and will be fixed with Kotlin 1.9. We currently don't need it anyway.
-# https://youtrack.jetbrains.com/issue/KT-57482/cleanNativeDistributionCommonization-is-not-compatible-with-configuration-cache-with-gradle-8.0
-# https://youtrack.jetbrains.com/issue/KT-58818
-#kotlin.mpp.enableCInteropCommonization=true
+
+kotlin.mpp.enableCInteropCommonization=true
 
 kotlin.native.binary.objcExportSuspendFunctionLaunchThreadRestriction=none