6.x: Build logic housekeep

.github/workflows/publish_release.yml

@@ -25,5 +25,3 @@ jobs:
           ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.MAVEN_CENTRAL_REPOSITORY_PASSWORD }}
           ORG_GRADLE_PROJECT_SIGNING_PRIVATE_KEY: ${{ secrets.GPG_SIGNING_PRIVATE_KEY }}
           ORG_GRADLE_PROJECT_SIGNING_PASSWORD: ${{ secrets.GPG_SIGNING_PASSWORD }}
-      - name: Publish plugins
-        run: ./gradlew publishPlugins -Pgradle.publish.key=${{secrets.GRADLE_PUBLISH_KEY}} -Pgradle.publish.secret=${{secrets.GRADLE_PUBLISH_SECRET}}

arkitekt-lint/build.gradle.kts

@@ -3,6 +3,10 @@ plugins {
     id("java-library")
 }
 
+kotlin {
+    jvmToolchain(17)
+}
+
 dependencies {
 
     compileOnly(Deps.Lint.api)

build.gradle.kts

@@ -55,17 +55,15 @@ subprojects {
         }
     }
 
-    plugins.whenPluginAdded {
-        if (this is SigningPlugin) {
-            extensions.findByType<SigningExtension>()?.apply {
-                val hasKey = project.hasProperty("SIGNING_PRIVATE_KEY")
-                val hasPassword = project.hasProperty("SIGNING_PASSWORD")
-                if (hasKey && hasPassword) {
-                    useInMemoryPgpKeys(
-                        project.properties["SIGNING_PRIVATE_KEY"].toString(),
-                        project.properties["SIGNING_PASSWORD"].toString(),
-                    )
-                }
+    plugins.withId("signing") {
+        extensions.findByType<SigningExtension>()?.apply {
+            val hasKey = project.hasProperty("SIGNING_PRIVATE_KEY")
+            val hasPassword = project.hasProperty("SIGNING_PASSWORD")
+            if (hasKey && hasPassword) {
+                useInMemoryPgpKeys(
+                    project.properties["SIGNING_PRIVATE_KEY"].toString(),
+                    project.properties["SIGNING_PASSWORD"].toString(),
+                )
             }
         }
     }
@@ -75,20 +73,15 @@ detekt {
     autoCorrect = false
     version = Versions.detekt
     source.setFrom(
-        files(
-            "example/src/main/java",
-            "core/src/main/java",
-            "compose/src/main/java",
-            "core-test/src/main/java",
-            "cr-usecases/src/commonMain/kotlin",
-            "cr-usecases-test/src/main/java",
-            "decompose/src/commonMain/kotlin",
-            "decompose/src/androidMain/kotlin",
-            "decompose-annotation/src/commonMain/kotlin",
-            "decompose-processor/src/jvmMain/kotlin",
-            "arkitekt-lint/src/main/java",
-        ),
+        subprojects.flatMap { sub ->
+            listOf(
+                "src/main/java",
+                "src/commonMain/kotlin",
+                "src/androidMain/kotlin",
+                "src/jvmMain/kotlin",
+                "src/iosMain/kotlin",
+            ).map { sub.projectDir.resolve(it) }.filter { it.exists() }
+        },
     )
-//    filters = ".*/resources/.*,.*/build/.*"
     config.setFrom(files("detekt.yml"))
 }

buildSrc/build.gradle.kts

@@ -4,6 +4,7 @@ plugins {
 
 repositories {
     gradlePluginPortal()
+    mavenCentral()
 }
 
 dependencies {

buildSrc/src/main/kotlin/ArkitektPom.kt

@@ -0,0 +1,29 @@
+import org.gradle.api.publish.maven.MavenPom
+
+/**
+ * Applies the shared Arkitekt POM metadata (url, licenses, scm, developers) to this pom.
+ *
+ * Per-module values (name, description, inceptionYear) are configured separately and may be
+ * set before or after invoking this function.
+ */
+fun MavenPom.arkitektPomBase() {
+    url.set("https://github.com/futuredapp/arkitekt")
+    licenses {
+        license {
+            name.set("MIT")
+            url.set("https://github.com/futuredapp/arkitekt/blob/master/LICENCE")
+        }
+    }
+    scm {
+        connection.set("scm:git:git://github.com/futuredapp/arkitekt.git")
+        developerConnection.set("scm:git:ssh://github.com/futuredapp/arkitekt.git")
+        url.set("https://github.com/futuredapp/arkitekt")
+    }
+    developers {
+        developer {
+            id.set("futured")
+            name.set("Futured")
+            url.set("https://futured.app")
+        }
+    }
+}

buildSrc/src/main/kotlin/ProjectSettings.kt

@@ -5,45 +5,5 @@ object ProjectSettings {
     const val minSdk = 23
     const val group = "app.futured.arkitekt"
 
-    /**
-     * this version will be used only for local builds, jitpack will automatically provide TAG version
-     */
     val version = System.getenv("VERSION_NAME") ?: "0.0.1-SNAPSHOT"
-
-    object Core {
-        const val artifact = "core"
-        const val libraryDescription = "Core module of Arkitekt framework"
-    }
-
-    object CoreTest {
-        const val artifact = "core-test"
-        const val libraryDescription = "Test utilities for core module"
-    }
-
-    object CrUseCases {
-        const val artifact = "cr-usecases"
-        const val libraryDescription = "Coroutine based use cases meant to be used with Arkitekt framework"
-    }
-
-    object CrUseCasesTest {
-        const val artifact = "cr-usecases-test"
-        const val libraryDescription = "Test utilities for cr-usecases module"
-    }
-
-    object Dagger {
-        const val artifact = "dagger"
-        const val libraryDescription = "Dagger ready base classes meant to be used with Arkitekt framework"
-    }
-
-    object Publish {
-        const val bintrayRepo = "arkitekt"
-        const val siteUrl = "https://github.com/futuredapp/arkitekt"
-        const val gitUrl = "https://github.com/futuredapp/arkitekt.git"
-        const val developerId = "FuturedApp"
-        const val developerName = "FuturedApp"
-        const val developerEmail = "ops@futured.app"
-        const val licenseName = "MIT Licence"
-        const val licenseUrl = "https://github.com/futuredapp/arkitekt/blob/master/LICENCE"
-        val allLicenses = listOf("MIT")
-    }
 }

buildSrc/src/main/kotlin/Versions.kt

@@ -6,7 +6,7 @@ object Versions {
     const val detekt = "1.23.8"
     const val ktlint = "14.0.1"
     const val ktlintExtension = "1.8.0"
-    const val mavenPublish = "0.34.0"
+    const val mavenPublish = "0.36.0"
     const val dokka = "1.6.10"
 
     // kotlin

compose/build.gradle.kts

@@ -1,5 +1,3 @@
-import com.vanniktech.maven.publish.AndroidSingleVariantLibrary
-
 plugins {
     id("com.android.library")
     id("org.jetbrains.kotlin.plugin.compose")
@@ -26,48 +24,23 @@ android {
         targetSdk = ProjectSettings.targetSdk
     }
 
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-
     namespace = "app.futured.arkitekt.compose"
 }
 
 kotlin {
-    compilerOptions {
-        jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
-    }
+    jvmToolchain(17)
 }
 
 mavenPublishing {
-    configure(AndroidSingleVariantLibrary(publishJavadocJar = false))
-    coordinates(
-        groupId = ProjectSettings.group,
-        artifactId = "compose",
-    )
+    publishToMavenCentral()
+    signAllPublications()
+    configureBasedOnAppliedPlugins()
+    coordinates(groupId = ProjectSettings.group, artifactId = "compose")
     pom {
+        arkitektPomBase()
         name = "Arkitekt Compose"
         description = "Compose UI module of Arkitekt framework"
-        url = "https://github.com/futuredapp/arkitekt"
-        licenses {
-            license {
-                name = "MIT"
-                url = "https://github.com/futuredapp/arkitekt/blob/master/LICENCE"
-            }
-        }
-        scm {
-            connection = "scm:git:git://github.com/futuredapp/arkitekt.git"
-            developerConnection = "scm:git:ssh://github.com/futuredapp/arkitekt.git"
-            url = "https://github.com/futuredapp/arkitekt"
-        }
-        developers {
-            developer {
-                id = "futured"
-                name = "Futured"
-                url = "https://futured.app"
-            }
-        }
+        inceptionYear = "2018"
     }
 }
 

core-test/build.gradle.kts

@@ -1,5 +1,3 @@
-import com.vanniktech.maven.publish.AndroidSingleVariantLibrary
-
 plugins {
     id("com.android.library")
     id(Deps.Plugins.mavenPublish)
@@ -19,11 +17,6 @@ android {
         buildConfig = true
     }
 
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-
     namespace = "app.futured.arkitekt.core.test"
     testOptions {
         targetSdk = ProjectSettings.targetSdk
@@ -36,39 +29,19 @@ android {
 }
 
 kotlin {
-    compilerOptions {
-        jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
-    }
+    jvmToolchain(17)
 }
 
 mavenPublishing {
-    configure(AndroidSingleVariantLibrary(publishJavadocJar = false))
-    coordinates(
-        groupId = ProjectSettings.group,
-        artifactId = "core-test",
-    )
+    publishToMavenCentral()
+    signAllPublications()
+    configureBasedOnAppliedPlugins()
+    coordinates(groupId = ProjectSettings.group, artifactId = "core-test")
     pom {
+        arkitektPomBase()
         name = "Arkitekt Core Test"
         description = "Test utilities for Arkitekt core module"
-        url = "https://github.com/futuredapp/arkitekt"
-        licenses {
-            license {
-                name = "MIT"
-                url = "https://github.com/futuredapp/arkitekt/blob/master/LICENCE"
-            }
-        }
-        scm {
-            connection = "scm:git:git://github.com/futuredapp/arkitekt.git"
-            developerConnection = "scm:git:ssh://github.com/futuredapp/arkitekt.git"
-            url = "https://github.com/futuredapp/arkitekt"
-        }
-        developers {
-            developer {
-                id = "futured"
-                name = "Futured"
-                url = "https://futured.app"
-            }
-        }
+        inceptionYear = "2018"
     }
 }
 

core/build.gradle.kts

@@ -1,5 +1,3 @@
-import com.vanniktech.maven.publish.AndroidSingleVariantLibrary
-
 plugins {
     id("com.android.library")
     id("org.jetbrains.kotlin.plugin.compose")
@@ -29,48 +27,23 @@ android {
         targetSdk = ProjectSettings.targetSdk
     }
 
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-
     namespace = "app.futured.arkitekt.core"
 }
 
 kotlin {
-    compilerOptions {
-        jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
-    }
+    jvmToolchain(17)
 }
 
 mavenPublishing {
-    configure(AndroidSingleVariantLibrary(publishJavadocJar = false))
-    coordinates(
-        groupId = ProjectSettings.group,
-        artifactId = "core",
-    )
+    publishToMavenCentral()
+    signAllPublications()
+    configureBasedOnAppliedPlugins()
+    coordinates(groupId = ProjectSettings.group, artifactId = "core")
     pom {
+        arkitektPomBase()
         name = "Arkitekt Core"
         description = "Core module of Arkitekt framework"
-        url = "https://github.com/futuredapp/arkitekt"
-        licenses {
-            license {
-                name = "MIT"
-                url = "https://github.com/futuredapp/arkitekt/blob/master/LICENCE"
-            }
-        }
-        scm {
-            connection = "scm:git:git://github.com/futuredapp/arkitekt.git"
-            developerConnection = "scm:git:ssh://github.com/futuredapp/arkitekt.git"
-            url = "https://github.com/futuredapp/arkitekt"
-        }
-        developers {
-            developer {
-                id = "futured"
-                name = "Futured"
-                url = "https://futured.app"
-            }
-        }
+        inceptionYear = "2018"
     }
 }