Merge pull request #247 from MohamedRejeb/1.x

Update Compose to 1.6.1
MohamedRejeb · Apr 8, 2024 · 71a878c · 71a878c
2 parents f77c52b + d8954de
commit 71a878c
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 49 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -17,48 +17,39 @@ jobs:
     uses: ./.github/workflows/gradle.yml
   deploy:
     needs: build
-    strategy:
-      matrix:
-        include:
-          - target: publishIosArm64PublicationToSonatypeRepository
-            os: macos-latest
-          - target: publishIosSimulatorArm64PublicationToSonatypeRepository
-            os: macos-latest
-          - target: publishIosX64PublicationToSonatypeRepository
-            os: macos-latest
-          - target: publishAndroidReleasePublicationToSonatypeRepository
-            os: macos-latest
-          - target: publishDesktopPublicationToSonatypeRepository
-            os: macos-latest
-          - target: publishJsPublicationToSonatypeRepository
-            os: macos-latest
-          - target: publishKotlinMultiplatformPublicationToSonatypeRepository
-            os: macos-latest
-    runs-on: ${{ matrix.os }}
+    runs-on: macos-14
+
+    env:
+      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 }}
+
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v1
-      - uses: actions/cache@v3
+        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@v3
+        uses: actions/setup-java@v4
         with:
           java-version: '17'
           distribution: 'temurin'
+
+      - name: Setup gradle
+        uses: gradle/actions/setup-gradle@v3
+
       - name: Gradle publish
-        uses: gradle/gradle-build-action@ce999babab2de1c4b649dc15f0ee67e6246c994f
-        with:
-          arguments: |
-            ${{ matrix.target }}
-            closeAndReleaseSonatypeStagingRepository
-        env:
-          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: Gradle close and release
+        run: ./gradlew closeAndReleaseSonatypeStagingRepository
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -19,18 +19,7 @@ permissions:
 
 jobs:
   build:
-    strategy:
-      matrix:
-        include:
-          - target: iosSimulatorArm64Test
-            os: macos-latest
-          - target: desktopTest
-            os: macos-latest
-          - target: testDebugUnitTest
-            os: macos-latest
-          - target: testReleaseUnitTest
-            os: macos-latest
-    runs-on: ${{ matrix.os }}
+    runs-on: macos-14
 
     steps:
       - uses: actions/checkout@v3
@@ -51,7 +40,7 @@ jobs:
         uses: gradle/actions/setup-gradle@v3
 
       - name: Run tests
-        run: ./gradlew ${{ matrix.target }}
+        run: ./gradlew allTests
 
   deploy:
     if: github.event_name == 'push' && github.ref == 'refs/heads/main'

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 agp = "8.2.2"
-kotlin = "1.9.22"
-compose = "1.6.0"
+kotlin = "1.9.23"
+compose = "1.6.1"
 dokka = "1.9.10"
 
 ksoup = "0.3.1"