Merge pull request #27 from MohamedRejeb/0.2.x

Update ci
MohamedRejeb · Oct 7, 2024 · ccef323 · ccef323
2 parents 7c78d6e + 14a7339
commit ccef323
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 45 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -12,56 +12,57 @@ permissions:
 
 jobs:
     build:
-        strategy:
-            matrix:
-                include:
-                    -   target: allTests
-                        os: ubuntu-latest
-                    -   target: spotlessCheck
-                        os: ubuntu-latest
-        runs-on: ${{ matrix.os }}
+        runs-on: macos-14
 
         steps:
-            -   uses: actions/checkout@v4
-            -   name: Validate Gradle Wrapper
-                uses: gradle/wrapper-validation-action@v1
-            -   uses: actions/cache@v3
-                with:
-                    path: |
-                        ~/.konan
-                    key: ${{ runner.os }}-${{ hashFiles('**/.lock') }}
-            -   name: Set up JDK 17
-                uses: actions/setup-java@v4
-                with:
-                    java-version: '17'
-                    distribution: 'temurin'
-            -   name: Build with Gradle
-                uses: gradle/gradle-build-action@ce999babab2de1c4b649dc15f0ee67e6246c994f
-                with:
-                    arguments: ${{ matrix.target }}
+            - uses: actions/checkout@v4
+
+            - name: Validate Gradle Wrapper
+              uses: gradle/wrapper-validation-action@v2
+
+            - uses: actions/cache@v4
+              with:
+                  path: |
+                      ~/.konan
+                  key: ${{ runner.os }}-${{ hashFiles('**/.lock') }}
+
+            - name: Set up JDK 17
+              uses: actions/setup-java@v4
+              with:
+                  java-version: '17'
+                  distribution: 'temurin'
+
+            - name: Setup gradle
+              uses: gradle/actions/setup-gradle@v3
+
+            - name: Gradle test
+              run: ./gradlew allTests
+
+            - name: Spotless check
+              run: ./gradlew spotlessCheck
 
     deploy:
         if: github.event_name == 'push' && github.ref == 'refs/heads/main'
         needs: build
         runs-on: macos-14
         steps:
-            -   uses: actions/checkout@v4
-            -   name: Set up JDK 17
-                uses: actions/setup-java@v4
-                with:
-                    java-version: '17'
-                    distribution: 'temurin'
+            - uses: actions/checkout@v4
+            - name: Set up JDK 17
+              uses: actions/setup-java@v4
+              with:
+                  java-version: '17'
+                  distribution: 'temurin'
 
-            -   name: Setup Gradle
-                uses: gradle/actions/setup-gradle@v3
+            - name: Setup Gradle
+              uses: gradle/actions/setup-gradle@v3
 
-            -   name: Deploy snapshot
-                env:
-                    VERSION: 0.2.0-SNAPSHOT
-                    OSSRH_STAGING_PROFILE_ID: ${{ secrets.OSSRH_STAGING_PROFILE_ID }}
-                    OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-                    OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
-                    OSSRH_GPG_SECRET_KEY_PASSWORD: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
-                    OSSRH_GPG_SECRET_KEY_ID: ${{ secrets.OSSRH_GPG_SECRET_KEY_ID }}
-                    OSSRH_GPG_SECRET_KEY: ${{ secrets.OSSRH_GPG_SECRET_KEY }}
-                run: ./gradlew publish
+            - name: Deploy snapshot
+              env:
+                  VERSION: 0.5.0-SNAPSHOT
+                  OSSRH_STAGING_PROFILE_ID: ${{ secrets.OSSRH_STAGING_PROFILE_ID }}
+                  OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+                  OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
+                  OSSRH_GPG_SECRET_KEY_PASSWORD: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
+                  OSSRH_GPG_SECRET_KEY_ID: ${{ secrets.OSSRH_GPG_SECRET_KEY_ID }}
+                  OSSRH_GPG_SECRET_KEY: ${{ secrets.OSSRH_GPG_SECRET_KEY }}
+              run: ./gradlew publish
diff --git a/compose-dnd/build.gradle.kts b/compose-dnd/build.gradle.kts
@@ -15,7 +15,7 @@
  */
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 
 /*
  * Copyright 2023, Mohamed Ben Rejeb and the Compose Dnd project contributors

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME