CI: use config cache and test on macOS

hfhbd · Oct 31, 2023 · 2aa5fcd · 2aa5fcd
1 parent cd3fe7d
commit 2aa5fcd
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 72 deletions.
diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml
@@ -9,7 +9,7 @@ concurrency:
   cancel-in-progress: false
 
 env:
-  GRADLE_OPTS: -Dorg.gradle.parallel=true -Dorg.gradle.caching=true
+  GRADLE_OPTS: -Dorg.gradle.caching=true
 
 jobs:
   build:
@@ -27,8 +27,6 @@ jobs:
           distribution: 'adopt'
           java-version: 11
       - uses: gradle/gradle-build-action@v2
-      - name: Build with Gradle
-        run: ./gradlew build
       - name: Publish
         run: ./gradlew -Pversion=$version -Dorg.gradle.parallel=false publish closeAndReleaseStagingRepository
         env:

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -7,11 +7,11 @@ on:
     branches: [ main ]
 
 env:
-  GRADLE_OPTS: -Dorg.gradle.parallel=true -Dorg.gradle.caching=true
+  GRADLE_OPTS: -Dorg.gradle.caching=true
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: macos-latest
     permissions:
       contents: write
       security-events: write

diff --git a/.github/workflows/Docs.yml b/.github/workflows/Docs.yml
@@ -6,7 +6,7 @@ on:
   workflow_dispatch:
 
 env:
-  GRADLE_OPTS: -Dorg.gradle.parallel=true -Dorg.gradle.caching=true
+  GRADLE_OPTS: -Dorg.gradle.caching=true
 
 jobs:
   build:
@@ -32,4 +32,4 @@ jobs:
           path: build/dokka/htmlMultiModule
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@main
+        uses: actions/deploy-pages@v2
diff --git a/gradle.properties b/gradle.properties
@@ -4,6 +4,8 @@
 #
 kotlin.code.style=official
 org.gradle.parallel=true
+org.gradle.configuration-cache=true
+org.gradle.configureondemand=true
 kotlin.native.ignoreDisabledTargets=true
 org.gradle.jvmargs=-XX:MaxMetaspaceSize=1g
 group=app.softwork
diff --git a/gradle/build-logic/src/main/kotlin/kotlinMPP.gradle.kts b/gradle/build-logic/src/main/kotlin/kotlinMPP.gradle.kts
@@ -7,5 +7,37 @@ plugins {
 plugins.apply("org.jetbrains.kotlin.multiplatform")
 
 extensions.configure<KotlinMultiplatformExtension>("kotlin") {
+    jvm()
+    js(IR) {
+        browser()
+        nodejs()
+    }
+
+    // tier 1
+    linuxX64()
+    macosX64()
+    macosArm64()
+    iosSimulatorArm64()
+    iosX64()
+
+    // tier 2
+    linuxArm64()
+    watchosSimulatorArm64()
+    watchosX64()
+    watchosArm32()
+    watchosArm64()
+    tvosSimulatorArm64()
+    tvosX64()
+    tvosArm64()
+    iosArm64()
+
+    // tier 3
+    androidNativeArm32()
+    androidNativeArm64()
+    androidNativeX86()
+    androidNativeX64()
+    mingwX64()
+    watchosDeviceArm64()
+
     kotlinConfig()
 }
diff --git a/kotlinx-uuid-core/build.gradle.kts b/kotlinx-uuid-core/build.gradle.kts
@@ -20,38 +20,6 @@ kotlin {
         }
     }
 
-    jvm()
-    js(IR) {
-        browser()
-        nodejs()
-    }
-
-    // tier 1
-    linuxX64()
-    macosX64()
-    macosArm64()
-    iosSimulatorArm64()
-    iosX64()
-
-    // tier 2
-    linuxArm64()
-    watchosSimulatorArm64()
-    watchosX64()
-    watchosArm32()
-    watchosArm64()
-    tvosSimulatorArm64()
-    tvosX64()
-    tvosArm64()
-    iosArm64()
-
-    // tier 3
-    androidNativeArm32()
-    androidNativeArm64()
-    androidNativeX86()
-    androidNativeX64()
-    mingwX64()
-    watchosDeviceArm64()
-
     sourceSets {
         commonMain {
             dependencies {

diff --git a/kotlinx-uuid-exposed/build.gradle.kts b/kotlinx-uuid-exposed/build.gradle.kts
@@ -5,9 +5,9 @@
 
 plugins {
     id("kotlinJvm")
+    id("publish")
     id("dokkaLicensee")
     id("kover")
-    id("publish")
 }
 
 kotlin.jvmToolchain(11)

diff --git a/kotlinx-uuid-sqldelight/build.gradle.kts b/kotlinx-uuid-sqldelight/build.gradle.kts
@@ -8,38 +8,6 @@ plugins {
 }
 
 kotlin {
-    jvm()
-    js(IR) {
-        browser()
-        nodejs()
-    }
-
-    // tier 1
-    linuxX64()
-    macosX64()
-    macosArm64()
-    iosSimulatorArm64()
-    iosX64()
-
-    // tier 2
-    linuxArm64()
-    watchosSimulatorArm64()
-    watchosX64()
-    watchosArm32()
-    watchosArm64()
-    tvosSimulatorArm64()
-    tvosX64()
-    tvosArm64()
-    iosArm64()
-
-    // tier 3
-    androidNativeArm32()
-    androidNativeArm64()
-    androidNativeX86()
-    androidNativeX64()
-    mingwX64()
-    watchosDeviceArm64()
-
     sourceSets {
         commonMain {
             dependencies {

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -30,6 +30,7 @@ gradleEnterprise {
 rootProject.name = "kotlinx-uuid"
 
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
+enableFeaturePreview("STABLE_CONFIGURATION_CACHE")
 
 include(":kotlinx-uuid-core")