Updated build scripts

Author: wkornewald

.github/dependabot.yml

@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: "/"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: gradle
+    directory: "/"
+    schedule:
+      interval: "daily"

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

@@ -33,7 +33,6 @@ fun Project.initBuildLogicBase() {
 
 fun Project.setupBuildLogicBase() {
     pluginManager.apply("com.ensody.build-logic-base")
-    setupDependencyUpdates()
 
     if (isRootProject) return
 

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

@@ -0,0 +1,40 @@
+@file:OptIn(ExperimentalWasmDsl::class, ExperimentalKotlinGradlePluginApi::class)
+
+package com.ensody.buildlogic
+
+import org.gradle.api.JavaVersion
+import org.gradle.api.Project
+import org.gradle.api.tasks.testing.Test
+import org.gradle.api.tasks.testing.logging.TestExceptionFormat
+import org.gradle.jvm.toolchain.JavaLanguageVersion
+import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.withType
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
+import org.jetbrains.kotlin.gradle.dsl.ExplicitApiMode
+import org.jetbrains.kotlin.gradle.dsl.KotlinJvmExtension
+
+fun Project.setupKotlinJvm(
+    javaVersion: JavaVersion = JavaVersion.VERSION_17,
+    block: KotlinJvmExtension.() -> Unit = {},
+) {
+    pluginManager.apply("org.jetbrains.kotlin.jvm")
+    tasks.withType<Test> {
+        testLogging {
+            exceptionFormat = TestExceptionFormat.FULL
+        }
+    }
+    configure< KotlinJvmExtension> {
+        explicitApi = ExplicitApiMode.Strict
+        jvmToolchain {
+            languageVersion.set(JavaLanguageVersion.of(javaVersion.majorVersion))
+        }
+        compilerOptions {
+            allWarningsAsErrors.set(true)
+            optIn.add("kotlin.RequiresOptIn")
+            optIn.add("kotlin.io.encoding.ExperimentalEncodingApi")
+            freeCompilerArgs.add("-Xexpect-actual-classes")
+        }
+        block()
+    }
+}

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

@@ -33,13 +33,8 @@ fun Project.setupKmp(
         compilerOptions {
             allWarningsAsErrors.set(true)
             optIn.add("kotlin.RequiresOptIn")
-            optIn.add("kotlinx.coroutines.ExperimentalCoroutinesApi")
-            optIn.add("kotlinx.coroutines.ExperimentalForInheritanceCoroutinesApi")
-            optIn.add("kotlinx.coroutines.FlowPreview")
             optIn.add("kotlin.io.encoding.ExperimentalEncodingApi")
-            optIn.add("com.ensody.reactivestate.ExperimentalReactiveStateApi")
             freeCompilerArgs.add("-Xexpect-actual-classes")
-//            freeCompilerArgs.add("-Xexplicit-api=strict")
         }
         applyKmpHierarchy()
         block()

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

@@ -4,6 +4,7 @@ package com.ensody.buildlogic
 
 import com.android.build.gradle.LibraryExtension
 import org.gradle.api.Project
+import org.gradle.api.plugins.JavaPluginExtension
 import org.gradle.api.publish.PublishingExtension
 import org.gradle.api.publish.maven.MavenPomLicenseSpec
 import org.gradle.api.publish.maven.MavenPublication
@@ -19,6 +20,7 @@ import org.gradle.kotlin.dsl.withType
 import org.gradle.plugins.signing.Sign
 import org.gradle.plugins.signing.SigningExtension
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.dsl.KotlinJvmExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 
 fun Project.setupPublication(
@@ -53,15 +55,30 @@ fun Project.setupPublication(
             publishing {
                 withSourcesJar(withSources)
             }
+        } ?: extensions.findByType<KotlinJvmExtension>()?.apply {
+            if (withSources) {
+                extensions.findByType<JavaPluginExtension>()?.withSourcesJar()
+            }
+            configure<PublishingExtension> {
+                publications {
+                    create<MavenPublication>("maven") {
+                        from(components.getByName("java"))
+                    }
+                }
+            }
         }
 
         if (withJavadocJar) {
-            val emptyJar = tasks.register<Jar>("emptyJar") {
-                archiveAppendix = "empty"
-            }
-            configure<PublishingExtension> {
-                publications.withType<MavenPublication> {
-                    artifact(emptyJar) { classifier = "javadoc" }
+            if (extensions.findByType<KotlinMultiplatformExtension>() == null) {
+                extensions.findByType<JavaPluginExtension>()?.apply { withJavadocJar() }
+            } else {
+                val emptyJar = tasks.register<Jar>("emptyJar") {
+                    archiveAppendix = "empty"
+                }
+                configure<PublishingExtension> {
+                    publications.withType<MavenPublication> {
+                        artifact(emptyJar) { classifier = "javadoc" }
+                    }
                 }
             }
         }

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

@@ -41,6 +41,9 @@ fun Project.setupBuildLogic() {
     repositories {
         google()
         mavenCentral()
+        if (System.getenv("RUNNING_ON_CI") != "true") {
+            mavenLocal()
+        }
     }
 
     if (isRootProject) return
@@ -53,8 +56,14 @@ fun Project.setupBuildLogic() {
         setupAndroid(coreLibraryDesugaring = libs.findLibrary("desugarJdkLibs").get())
         setupKmp {
             addAllTargets(onlyComposeSupport = project.name == "reactivestate-compose")
+            compilerOptions {
+                optIn.add("kotlinx.coroutines.ExperimentalCoroutinesApi")
+                optIn.add("kotlinx.coroutines.ExperimentalForInheritanceCoroutinesApi")
+                optIn.add("kotlinx.coroutines.FlowPreview")
+                optIn.add("com.ensody.reactivestate.ExperimentalReactiveStateApi")
+            }
         }
-        tasks.create("testAll") {
+        tasks.register("testAll") {
             group = "verification"
             dependsOn(
                 "testDebugUnitTest",

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

@@ -1,6 +1,8 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
+distributionSha256Sum=fba8464465835e74f7270bbf43d6d8a8d7709ab0a43ce1aa3323f73e9aa0c612
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.jar

@@ -5,6 +5,9 @@ pluginManagement {
         google()
         gradlePluginPortal()
         mavenCentral()
+        if (System.getenv("RUNNING_ON_CI") != "true") {
+            mavenLocal()
+        }
     }
 }