Refactor build logic (#203)

hfhbd · web-flow · commit 0b3140e99812 · 2023-08-14T19:15:41.000Z
Co-authored-by: hfhbd &lt;hfhbd@users.noreply.github.com&gt;
diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml
@@ -8,16 +8,14 @@ jobs:
   build:
     runs-on: ubuntu-latest
 
+    env:
+      GRADLE_OPTS: -Dorg.gradle.caching=true
+
     steps:
       - uses: actions/checkout@v3
-      - uses: gradle/wrapper-validation-action@v1
-      - name: Set environment for version
-        run: long="${{ github.ref }}"; version=${long#"refs/tags/v"}; echo "version=${version}" >> $GITHUB_ENV
       - uses: gradle/gradle-build-action@v2
-      - name: Build all modules with Gradle
-        run: ./gradlew build -Pversion=$version
       - name: Publish
-        run: ./gradlew -Pversion=$version -Dorg.gradle.parallel=false publish closeAndReleaseStagingRepository
+        run: ./gradlew -Pversion=${{  github.ref_name }} -Dorg.gradle.parallel=false publish closeAndReleaseStagingRepository
         env:
           ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGNING_PRIVATE_KEY }}
           ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGNING_PASSWORD }}
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -9,10 +9,17 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
+
+    env:
+      GRADLE_OPTS: -Dorg.gradle.caching=true
 
     steps:
       - uses: actions/checkout@v3
-      - uses: gradle/wrapper-validation-action@v1
       - uses: gradle/gradle-build-action@v2
+        with:
+          dependency-graph: generate-and-submit
+          gradle-home-cache-cleanup: true
       - name: Build all modules with Gradle
         run: ./gradlew build
diff --git a/.github/workflows/gradleWrapper.yml b/.github/workflows/gradleWrapper.yml
@@ -0,0 +1,18 @@
+name: Gradle Wrapper Validation
+
+on:
+  pull_request:
+    paths:
+      - 'gradlew'
+      - 'gradlew.bat'
+      - 'gradle/wrapper/'
+
+jobs:
+  validateWrapper:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: gradle/wrapper-validation-action@v1
diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
@@ -3,12 +3,12 @@ plugins {
 }
 
 dependencies {
-    val kotlin = "1.9.0"
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin")
-    implementation("org.jetbrains.kotlin:kotlin-serialization:$kotlin")
-    implementation("app.cash.licensee:licensee-gradle-plugin:1.7.0")
-    implementation("org.jetbrains.kotlinx.binary-compatibility-validator:org.jetbrains.kotlinx.binary-compatibility-validator.gradle.plugin:0.13.2")
-    implementation("org.jetbrains.dokka:org.jetbrains.dokka.gradle.plugin:1.8.20")
+    implementation(libs.plugins.kotlin.mpp.toDep())
+    implementation(libs.plugins.kotlin.serialization.toDep())
+    implementation(libs.plugins.licensee.toDep())
+    implementation(libs.plugins.binary.toDep())
+    implementation(libs.plugins.dokka.toDep())
+    implementation(libs.plugins.publish.toDep())
 }
 
 gradlePlugin {
@@ -19,3 +19,7 @@ gradlePlugin {
         }
     }
 }
+
+fun Provider<PluginDependency>.toDep() = map {
+    "${it.pluginId}:${it.pluginId}.gradle.plugin:${it.version}"
+}
diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts
@@ -4,6 +4,9 @@ dependencyResolutionManagement {
         mavenCentral()
         gradlePluginPortal()
     }
+    versionCatalogs.register("libs") {
+        from(files("../gradle/libs.versions.toml"))
+    }
 }
 
 rootProject.name = "build-logic"
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
+    id("io.github.gradle-nexus.publish-plugin")
 }
 
 nexusPublishing {
diff --git a/cloudkitclient-core/build.gradle.kts b/cloudkitclient-core/build.gradle.kts
@@ -6,23 +6,22 @@ plugins {
 
 kotlin {
     sourceSets {
-        // Apache 2, https://github.com/ktorio/ktor/releases/latest
-        val ktorVersion = "2.3.3"
         commonMain {
             dependencies {
-                api("io.ktor:ktor-client-core:$ktorVersion")
-                api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1")
-                api("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")
+                api(libs.ktor.client.core)
+                api(libs.serialization.json)
+                api(libs.datetime)
             }
         }
         commonTest {
             dependencies {
                 implementation(kotlin("test"))
+                implementation(libs.coroutines.test)
             }
         }
         named("jvmMain") {
             dependencies {
-                api("io.ktor:ktor-client-cio:$ktorVersion")
+                api(libs.ktor.client.cio)
             }
         }
     }
diff --git a/cloudkitclient-core/src/commonTest/kotlin/app/softwork/cloudkitclient/internal/SHA256Test.kt b/cloudkitclient-core/src/commonTest/kotlin/app/softwork/cloudkitclient/internal/SHA256Test.kt
@@ -1,5 +1,6 @@
 package app.softwork.cloudkitclient.internal
 
+import kotlinx.coroutines.test.*
 import kotlin.test.*
 
 internal class SHA256Test {
diff --git a/cloudkitclient-core/src/commonTest/kotlin/app/softwork/cloudkitclient/internal/runTest.kt b/cloudkitclient-core/src/commonTest/kotlin/app/softwork/cloudkitclient/internal/runTest.kt
diff --git a/cloudkitclient-core/src/jvmTest/kotlin/app/softwork/cloudkitclient/internal/runTest.kt b/cloudkitclient-core/src/jvmTest/kotlin/app/softwork/cloudkitclient/internal/runTest.kt
diff --git a/cloudkitclient-testing/build.gradle.kts b/cloudkitclient-testing/build.gradle.kts
@@ -9,8 +9,8 @@ kotlin {
         commonMain {
             dependencies {
                 api(projects.cloudkitclientCore)
-                api("app.softwork:kotlinx-uuid-core:0.0.21")
-                api("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3")
+                api(libs.uuid)
+                api(libs.coroutines.test)
             }
         }
         commonTest {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -0,0 +1,21 @@
+[versions]
+kotlin = "1.9.0"
+ktor = "2.3.3"
+
+[libraries]
+ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
+ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" }
+
+serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version = "1.5.1" }
+datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version = "0.4.0" }
+uuid = { module = "app.softwork:kotlinx-uuid-core", version = "0.0.21" }
+
+coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version = "1.7.3"}
+
+[plugins]
+kotlin-mpp = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin"}
+kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin"}
+publish = { id = "io.github.gradle-nexus.publish-plugin", version = "1.3.0" }
+licensee = { id = "app.cash.licensee", version = "1.7.0" }
+binary = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.13.2" }
+dokka = { id = "org.jetbrains.dokka", version = "1.8.20" }
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -8,6 +8,19 @@ pluginManagement {
 
 plugins {
     id("MyRepos")
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.6.0"
+    id("com.gradle.enterprise") version "3.14.1"
+}
+
+gradleEnterprise {
+    buildScan {
+        termsOfServiceUrl = "https://gradle.com/terms-of-service"
+        termsOfServiceAgree = "yes"
+        if (System.getenv("CI") != null) {
+            publishAlways()
+            tag("CI")
+        }
+    }
 }
 
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")

Original file line number	Diff line number	Diff line change
`@@ -3,12 +3,12 @@ plugins {`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`dependencies {`
`6`		`- val kotlin = "1.9.0"`
`7`		`- implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin")`
`8`		`- implementation("org.jetbrains.kotlin:kotlin-serialization:$kotlin")`
`9`		`- implementation("app.cash.licensee:licensee-gradle-plugin:1.7.0")`
`10`		`- implementation("org.jetbrains.kotlinx.binary-compatibility-validator:org.jetbrains.kotlinx.binary-compatibility-validator.gradle.plugin:0.13.2")`
`11`		`- implementation("org.jetbrains.dokka:org.jetbrains.dokka.gradle.plugin:1.8.20")`
	`6`	`+ implementation(libs.plugins.kotlin.mpp.toDep())`
	`7`	`+ implementation(libs.plugins.kotlin.serialization.toDep())`
	`8`	`+ implementation(libs.plugins.licensee.toDep())`
	`9`	`+ implementation(libs.plugins.binary.toDep())`
	`10`	`+ implementation(libs.plugins.dokka.toDep())`
	`11`	`+ implementation(libs.plugins.publish.toDep())`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`gradlePlugin {`
`@@ -19,3 +19,7 @@ gradlePlugin {`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`	`}`
	`22`	`+`
	`23`	`+fun Provider<PluginDependency>.toDep() = map {`
	`24`	`+ "${it.pluginId}:${it.pluginId}.gradle.plugin:${it.version}"`
	`25`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,9 @@ dependencyResolutionManagement {`
`4`	`4`	`mavenCentral()`
`5`	`5`	`gradlePluginPortal()`
`6`	`6`	`}`
	`7`	`+ versionCatalogs.register("libs") {`
	`8`	`+ from(files("../gradle/libs.versions.toml"))`
	`9`	`+ }`
`7`	`10`	`}`
`8`	`11`
`9`	`12`	`rootProject.name = "build-logic"`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`plugins {`
`2`		`- id("io.github.gradle-nexus.publish-plugin") version "1.3.0"`
	`2`	`+ id("io.github.gradle-nexus.publish-plugin")`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`nexusPublishing {`
Original file line number	Diff line number	Diff line change
`@@ -6,23 +6,22 @@ plugins {`
`6`	`6`
`7`	`7`	`kotlin {`
`8`	`8`	`sourceSets {`
`9`		`- // Apache 2, https://github.com/ktorio/ktor/releases/latest`
`10`		`- val ktorVersion = "2.3.3"`
`11`	`9`	`commonMain {`
`12`	`10`	`dependencies {`
`13`		`- api("io.ktor:ktor-client-core:$ktorVersion")`
`14`		`- api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1")`
`15`		`- api("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")`
	`11`	`+ api(libs.ktor.client.core)`
	`12`	`+ api(libs.serialization.json)`
	`13`	`+ api(libs.datetime)`
`16`	`14`	`}`
`17`	`15`	`}`
`18`	`16`	`commonTest {`
`19`	`17`	`dependencies {`
`20`	`18`	`implementation(kotlin("test"))`
	`19`	`+ implementation(libs.coroutines.test)`
`21`	`20`	`}`
`22`	`21`	`}`
`23`	`22`	`named("jvmMain") {`
`24`	`23`	`dependencies {`
`25`		`- api("io.ktor:ktor-client-cio:$ktorVersion")`
	`24`	`+ api(libs.ktor.client.cio)`
`26`	`25`	`}`
`27`	`26`	`}`
`28`	`27`	`}`