Merge pull request #674 from qdsfdhvh/master

Version to 1.10.0

.github/workflows/Check.yml

@@ -23,84 +23,83 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v3
+      - name: Set up Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'zulu'
+          java-version: 21
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Copy CI gradle.properties
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
 
-      - name: Set up JDK
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'zulu'
-          java-version: 17
-
-      - name: Check spotless
+      - name: Check Spotless
         run: ./gradlew spotlessCheck --stacktrace
 
-  lint:
-    needs: spotless
+  api-check:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v3
+      - name: Set up Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'zulu'
+          java-version: 21
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Copy CI gradle.properties
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
 
-      - name: Set up JDK
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'zulu'
-          java-version: 17
-
-      - name: Lint
-        run: ./gradlew lint --stacktrace
+      - name: Check API
+        run: ./gradlew apiCheck --stacktrace
 
-  api-check:
-    needs: spotless
+  lint:
+    needs: [ spotless, api-check ]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v3
+      - name: Set up Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'zulu'
+          java-version: 21
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Copy CI gradle.properties
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
 
-      - name: Set up JDK
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'zulu'
-          java-version: 17
-
       - name: Lint
-        run: ./gradlew apiCheck --stacktrace
+        run: ./gradlew lint --stacktrace
 
   test:
-    needs: spotless
+    needs: [ spotless, api-check ]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v3
+      - name: Set up Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'zulu'
+          java-version: 21
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Copy CI gradle.properties
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
 
-      - name: Set up JDK
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'zulu'
-          java-version: 17
-
       - name: Test
         run: ./gradlew test --stacktrace
 
@@ -111,77 +110,65 @@ jobs:
           path: '**/build/reports'
 
   assemble:
-    needs: spotless
+    needs: [ spotless, api-check ]
     runs-on: macos-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v3
-
-      - name: Copy CI gradle.properties
-        run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
-
-      - name: Set up JDK
-        uses: actions/setup-java@v3
+      - name: Set up Java
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: 21
 
-      #      - name: Setup Gradle
-      #        uses: gradle/gradle-build-action@v2
-      #        with:
-      #          gradle-home-cache-cleanup: true
-      #          cache-read-only: ${{ github.ref != 'refs/heads/main' }}
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
 
-      # Cleans managed device if previously settle and space currently is not available
-      #      - name: Clean Managed Devices
-      #        run: ./gradlew cleanManagedDevices --unused-only
+      - name: Copy CI gradle.properties
+        run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
 
       - name: Assemble
         run: |
-          ./gradlew kotlinUpgradeYarnLock \
-            :image-loader:assemble \
-            :extension:imageio:assemble \
-            :extension:moko-resources:assemble \
-            --stacktrace -PnoAppApple \
-            -Pandroid.testoptions.manageddevices.emulator.gpu="swiftshader_indirect"
+          ./gradlew \
+          :image-loader:assemble \
+          :image-loader-singleton:assemble \
+          :extension:compose-resources:assemble \
+          :extension:imageio:assemble \
+          :extension:ktor-network:assemble \
+          :extension:moko-resources:assemble \
+          :extension:nine-patch:assemble \
+          :extension:svg:assemble \
+          --stacktrace
 
   build:
-    needs: spotless
+    needs: [ spotless, api-check ]
     runs-on: macos-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v3
-
-      - name: Copy CI gradle.properties
-        run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
-
-      - name: Set up JDK
-        uses: actions/setup-java@v3
+      - name: Set up Java
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: 21
 
-      #      - name: Setup Gradle
-      #        uses: gradle/gradle-build-action@v2
-      #        with:
-      #          gradle-home-cache-cleanup: true
-      #          cache-read-only: ${{ github.ref != 'refs/heads/main' }}
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
 
-      # Cleans managed device if previously settle and space currently is not available
-      #      - name: Clean Managed Devices
-      #        run: ./gradlew cleanManagedDevices --unused-only
+      - name: Copy CI gradle.properties
+        run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
 
       - name: Build
         run: |
           ./gradlew kotlinUpgradeYarnLock \
-            :image-loader:build \
-            :extension:imageio:build \
-            :extension:moko-resources:build \
-            --stacktrace -PnoAppApple \
-            -Pandroid.testoptions.manageddevices.emulator.gpu="swiftshader_indirect"
+          :image-loader:build \
+          :image-loader-singleton:build \
+          :extension:compose-resources:build \
+          :extension:imageio:build \
+          :extension:ktor-network:build \
+          :extension:moko-resources:build \
+          :extension:nine-patch:build \
+          :extension:svg:build \
+          --stacktrace

.github/workflows/CompareScreenshot.yml

@@ -21,21 +21,21 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
 
       - name: Setup Gradle
         uses: gradle/gradle-build-action@ac2d340dc04d9e1113182899e983b5400c17cda1 # v3.5.0
         with:
           gradle-version: wrapper
 
       # Download screenshots from main branch
-      - uses: dawidd6/action-download-artifact@v6
+      - uses: dawidd6/action-download-artifact@v7
         continue-on-error: true
         with:
           name: screenshot

.github/workflows/CompareScreenshotComment.yml

@@ -7,6 +7,10 @@ on:
     types:
       - completed
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref }}-${{ github.event.workflow_run.id }}
+  cancel-in-progress: true
+
 permissions: { }
 
 jobs:

.github/workflows/DocsDeploy.yml

@@ -10,25 +10,20 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout
+        uses: actions/checkout@v4
 
-      - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v3
-
-      - name: Copy CI gradle.properties
-        run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
-
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
+      - name: Set up Java
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: 21
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v3
-        with:
-          gradle-home-cache-cleanup: true
-          cache-read-only: ${{ github.ref != 'refs/heads/main' }}
+        uses: gradle/actions/setup-gradle@v4
+
+      - name: Copy CI gradle.properties
+        run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
 
       - name: Run dokka
         run: ./gradlew dokkaHtmlMultiModule --stacktrace
@@ -54,4 +49,4 @@ jobs:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./docs/build
           user_name: github-actions[bot]
-          user_email: 41898282+github-actions[bot]@users.noreply.github.com
+          user_email: 41898282+github-actions[bot]@users.noreply.github.com

.github/workflows/DocsTest.yml

@@ -10,25 +10,20 @@ jobs:
     name: Test deployment
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout
+        uses: actions/checkout@v4
 
-      - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v3
-
-      - name: Copy CI gradle.properties
-        run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
-
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
+      - name: Set up Java
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: 21
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v3
-        with:
-          gradle-home-cache-cleanup: true
-          cache-read-only: ${{ github.ref != 'refs/heads/main' }}
+        uses: gradle/actions/setup-gradle@v4
+
+      - name: Copy CI gradle.properties
+        run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
 
       - name: Run dokka
         run: ./gradlew dokkaHtmlMultiModule --stacktrace
@@ -46,4 +41,4 @@ jobs:
 
       - name: Build website
         run: yarn build
-        working-directory: ./docs
+        working-directory: ./docs

.github/workflows/Publish.yml

@@ -18,17 +18,14 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v3
-
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
+      - name: Set up Java
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: 21
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v3
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Publish to MavenCentral
         run: ./gradlew publishAllPublicationsToMavenCentral --no-build-cache

.github/workflows/StoreScreenshot.yml

@@ -23,13 +23,13 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
 
       # Better than caching and/or extensions of actions/setup-java
       - name: Setup Gradle