diff --git a/.github/compilation-check-source.yml b/.github/compilation-check-source.yml index d0814cbc..f804e23f 100644 --- a/.github/compilation-check-source.yml +++ b/.github/compilation-check-source.yml @@ -12,23 +12,24 @@ on: - develop .checkout: &checkout - uses: actions/checkout@v1 + uses: actions/checkout@v4 .setup_jdk: &setup_jdk name: Set up JDK 17 - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: java-version: 17 + distribution: zulu .setup_gradle: &setup_gradle name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/gradle-build-action@v3 with: cache-read-only: ${{ github.ref != 'refs/heads/master' && github.ref != 'refs/heads/develop' }} .publish_test_report: &publish_test_report name: Publish Test Report - uses: mikepenz/action-junit-report@v2 + uses: mikepenz/action-junit-report@v4 if: ${{ always() }} with: report_paths: '**/build/test-results/**/TEST-*.xml' @@ -36,27 +37,25 @@ on: .upload_reports: &upload_reports name: Archive reports - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 if: ${{ always() }} with: - name: code-coverage-report-${{ github.job }} + name: code-coverage-report-${{ github.job }}-${{ matrix.os }} path: '**/build/reports/**/*' .download_maven: &download_maven name: Download maven artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: maven path: ~/.m2/repository/dev/icerock .cache_konan: &cache_konan name: Cache .konan - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ~/.konan - key: ${{ runner.os }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }} - restore-keys: | - ${{ runner.os }}-konan- + key: ${{ matrix.os }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }} .runner_matrix: &runner_matrix os: [ macOS-latest, windows-latest, ubuntu-latest ] @@ -82,7 +81,7 @@ jobs: shell: bash - name: Upload artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: maven path: ~/.m2/repository/dev/icerock diff --git a/.github/workflows/compilation-check.yml b/.github/workflows/compilation-check.yml index da9995fd..bfa220a7 100644 --- a/.github/workflows/compilation-check.yml +++ b/.github/workflows/compilation-check.yml @@ -14,23 +14,22 @@ jobs: build-library: runs-on: macOS-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Set up JDK 17 - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: java-version: 17 + distribution: zulu - name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/gradle-build-action@v3 with: cache-read-only: ${{ github.ref != 'refs/heads/master' && github.ref != 'refs/heads/develop' }} - name: Cache .konan - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ~/.konan - key: ${{ runner.os }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }} - restore-keys: | - ${{ runner.os }}-konan- + key: ${{ matrix.os }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }} - name: Check run: ./local-check.sh shell: bash @@ -41,21 +40,21 @@ jobs: run: ./gradlew publishToMavenLocal shell: bash - name: Upload artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: maven path: ~/.m2/repository/dev/icerock - name: Publish Test Report - uses: mikepenz/action-junit-report@v2 + uses: mikepenz/action-junit-report@v4 if: ${{ always() }} with: report_paths: "**/build/test-results/**/TEST-*.xml" github_token: ${{ secrets.GITHUB_TOKEN }} - name: Archive reports - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 if: ${{ always() }} with: - name: code-coverage-report-${{ github.job }} + name: code-coverage-report-${{ github.job }}-${{ matrix.os }} path: "**/build/reports/**/*" check-sample-android-mpp-app: runs-on: ${{ matrix.os }} @@ -67,25 +66,24 @@ jobs: - ubuntu-latest needs: build-library steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Set up JDK 17 - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: java-version: 17 + distribution: zulu - name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/gradle-build-action@v3 with: cache-read-only: ${{ github.ref != 'refs/heads/master' && github.ref != 'refs/heads/develop' }} - name: Cache .konan - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ~/.konan - key: ${{ runner.os }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }} - restore-keys: | - ${{ runner.os }}-konan- + key: ${{ matrix.os }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }} - name: Download maven artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: maven path: ~/.m2/repository/dev/icerock @@ -93,16 +91,16 @@ jobs: run: cd samples/android-mpp-app && ./local-check.sh shell: bash - name: Publish Test Report - uses: mikepenz/action-junit-report@v2 + uses: mikepenz/action-junit-report@v4 if: ${{ always() }} with: report_paths: "**/build/test-results/**/TEST-*.xml" github_token: ${{ secrets.GITHUB_TOKEN }} - name: Archive reports - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 if: ${{ always() }} with: - name: code-coverage-report-${{ github.job }} + name: code-coverage-report-${{ github.job }}-${{ matrix.os }} path: "**/build/reports/**/*" check-sample-auto-manifest: runs-on: ${{ matrix.os }} @@ -114,25 +112,24 @@ jobs: - ubuntu-latest needs: build-library steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Set up JDK 17 - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: java-version: 17 + distribution: zulu - name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/gradle-build-action@v3 with: cache-read-only: ${{ github.ref != 'refs/heads/master' && github.ref != 'refs/heads/develop' }} - name: Cache .konan - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ~/.konan - key: ${{ runner.os }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }} - restore-keys: | - ${{ runner.os }}-konan- + key: ${{ matrix.os }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }} - name: Download maven artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: maven path: ~/.m2/repository/dev/icerock @@ -140,16 +137,16 @@ jobs: run: cd samples/auto-manifest && ./local-check.sh shell: bash - name: Publish Test Report - uses: mikepenz/action-junit-report@v2 + uses: mikepenz/action-junit-report@v4 if: ${{ always() }} with: report_paths: "**/build/test-results/**/TEST-*.xml" github_token: ${{ secrets.GITHUB_TOKEN }} - name: Archive reports - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 if: ${{ always() }} with: - name: code-coverage-report-${{ github.job }} + name: code-coverage-report-${{ github.job }}-${{ matrix.os }} path: "**/build/reports/**/*" check-sample-compose-jvm-app: runs-on: ${{ matrix.os }} @@ -161,25 +158,24 @@ jobs: - ubuntu-latest needs: build-library steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Set up JDK 17 - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: java-version: 17 + distribution: zulu - name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/gradle-build-action@v3 with: cache-read-only: ${{ github.ref != 'refs/heads/master' && github.ref != 'refs/heads/develop' }} - name: Cache .konan - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ~/.konan - key: ${{ runner.os }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }} - restore-keys: | - ${{ runner.os }}-konan- + key: ${{ matrix.os }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }} - name: Download maven artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: maven path: ~/.m2/repository/dev/icerock @@ -187,16 +183,16 @@ jobs: run: cd samples/compose-jvm-app && ./local-check.sh shell: bash - name: Publish Test Report - uses: mikepenz/action-junit-report@v2 + uses: mikepenz/action-junit-report@v4 if: ${{ always() }} with: report_paths: "**/build/test-results/**/TEST-*.xml" github_token: ${{ secrets.GITHUB_TOKEN }} - name: Archive reports - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 if: ${{ always() }} with: - name: code-coverage-report-${{ github.job }} + name: code-coverage-report-${{ github.job }}-${{ matrix.os }} path: "**/build/reports/**/*" check-sample-resources-gallery: runs-on: ${{ matrix.os }} @@ -208,25 +204,24 @@ jobs: - ubuntu-latest needs: build-library steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Set up JDK 17 - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: java-version: 17 + distribution: zulu - name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/gradle-build-action@v3 with: cache-read-only: ${{ github.ref != 'refs/heads/master' && github.ref != 'refs/heads/develop' }} - name: Cache .konan - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ~/.konan - key: ${{ runner.os }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }} - restore-keys: | - ${{ runner.os }}-konan- + key: ${{ matrix.os }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }} - name: Download maven artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: maven path: ~/.m2/repository/dev/icerock @@ -234,16 +229,16 @@ jobs: run: cd samples/resources-gallery && ./local-check.sh shell: bash - name: Publish Test Report - uses: mikepenz/action-junit-report@v2 + uses: mikepenz/action-junit-report@v4 if: ${{ always() }} with: report_paths: "**/build/test-results/**/TEST-*.xml" github_token: ${{ secrets.GITHUB_TOKEN }} - name: Archive reports - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 if: ${{ always() }} with: - name: code-coverage-report-${{ github.job }} + name: code-coverage-report-${{ github.job }}-${{ matrix.os }} path: "**/build/reports/**/*" check-sample-default-hierarchy-resources-gallery-mobile: runs-on: ${{ matrix.os }} @@ -255,25 +250,24 @@ jobs: - ubuntu-latest needs: build-library steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Set up JDK 17 - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: java-version: 17 + distribution: zulu - name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/gradle-build-action@v3 with: cache-read-only: ${{ github.ref != 'refs/heads/master' && github.ref != 'refs/heads/develop' }} - name: Cache .konan - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ~/.konan - key: ${{ runner.os }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }} - restore-keys: | - ${{ runner.os }}-konan- + key: ${{ matrix.os }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }} - name: Download maven artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: maven path: ~/.m2/repository/dev/icerock @@ -281,40 +275,39 @@ jobs: run: cd samples/default-hierarchy-gallery-mobile && ./local-check.sh shell: bash - name: Publish Test Report - uses: mikepenz/action-junit-report@v2 + uses: mikepenz/action-junit-report@v4 if: ${{ always() }} with: report_paths: "**/build/test-results/**/TEST-*.xml" github_token: ${{ secrets.GITHUB_TOKEN }} - name: Archive reports - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 if: ${{ always() }} with: - name: code-coverage-report-${{ github.job }} + name: code-coverage-report-${{ github.job }}-${{ matrix.os }} path: "**/build/reports/**/*" check-sample-ios-static-xcframework: runs-on: macOS-latest needs: build-library steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Set up JDK 17 - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: java-version: 17 + distribution: zulu - name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/gradle-build-action@v3 with: cache-read-only: ${{ github.ref != 'refs/heads/master' && github.ref != 'refs/heads/develop' }} - name: Cache .konan - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ~/.konan - key: ${{ runner.os }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }} - restore-keys: | - ${{ runner.os }}-konan- + key: ${{ matrix.os }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }} - name: Download maven artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: maven path: ~/.m2/repository/dev/icerock @@ -322,40 +315,39 @@ jobs: run: cd samples/ios-static-xcframework && ./local-check.sh shell: bash - name: Publish Test Report - uses: mikepenz/action-junit-report@v2 + uses: mikepenz/action-junit-report@v4 if: ${{ always() }} with: report_paths: "**/build/test-results/**/TEST-*.xml" github_token: ${{ secrets.GITHUB_TOKEN }} - name: Archive reports - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 if: ${{ always() }} with: - name: code-coverage-report-${{ github.job }} + name: code-coverage-report-${{ github.job }}-${{ matrix.os }} path: "**/build/reports/**/*" check-sample-ios-cocoapods-static-framework: runs-on: macOS-latest needs: build-library steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Set up JDK 17 - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: java-version: 17 + distribution: zulu - name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/gradle-build-action@v3 with: cache-read-only: ${{ github.ref != 'refs/heads/master' && github.ref != 'refs/heads/develop' }} - name: Cache .konan - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ~/.konan - key: ${{ runner.os }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }} - restore-keys: | - ${{ runner.os }}-konan- + key: ${{ matrix.os }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }} - name: Download maven artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: maven path: ~/.m2/repository/dev/icerock @@ -363,40 +355,39 @@ jobs: run: cd samples/ios-cocoapods-static-framework && ./local-check.sh shell: bash - name: Publish Test Report - uses: mikepenz/action-junit-report@v2 + uses: mikepenz/action-junit-report@v4 if: ${{ always() }} with: report_paths: "**/build/test-results/**/TEST-*.xml" github_token: ${{ secrets.GITHUB_TOKEN }} - name: Archive reports - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 if: ${{ always() }} with: - name: code-coverage-report-${{ github.job }} + name: code-coverage-report-${{ github.job }}-${{ matrix.os }} path: "**/build/reports/**/*" check-sample-kotlin-ios-app: runs-on: macOS-latest needs: build-library steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Set up JDK 17 - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: java-version: 17 + distribution: zulu - name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/gradle-build-action@v3 with: cache-read-only: ${{ github.ref != 'refs/heads/master' && github.ref != 'refs/heads/develop' }} - name: Cache .konan - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ~/.konan - key: ${{ runner.os }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }} - restore-keys: | - ${{ runner.os }}-konan- + key: ${{ matrix.os }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }} - name: Download maven artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: maven path: ~/.m2/repository/dev/icerock @@ -404,16 +395,16 @@ jobs: run: cd samples/kotlin-ios-app && ./local-check.sh shell: bash - name: Publish Test Report - uses: mikepenz/action-junit-report@v2 + uses: mikepenz/action-junit-report@v4 if: ${{ always() }} with: report_paths: "**/build/test-results/**/TEST-*.xml" github_token: ${{ secrets.GITHUB_TOKEN }} - name: Archive reports - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 if: ${{ always() }} with: - name: code-coverage-report-${{ github.job }} + name: code-coverage-report-${{ github.job }}-${{ matrix.os }} path: "**/build/reports/**/*" check-sample-compose-resources-gallery: runs-on: ${{ matrix.os }} @@ -425,25 +416,24 @@ jobs: - ubuntu-latest needs: build-library steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Set up JDK 17 - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: java-version: 17 + distribution: zulu - name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/gradle-build-action@v3 with: cache-read-only: ${{ github.ref != 'refs/heads/master' && github.ref != 'refs/heads/develop' }} - name: Cache .konan - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ~/.konan - key: ${{ runner.os }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }} - restore-keys: | - ${{ runner.os }}-konan- + key: ${{ matrix.os }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }} - name: Download maven artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: maven path: ~/.m2/repository/dev/icerock @@ -451,16 +441,16 @@ jobs: run: cd samples/compose-resources-gallery && ./local-check.sh shell: bash - name: Publish Test Report - uses: mikepenz/action-junit-report@v2 + uses: mikepenz/action-junit-report@v4 if: ${{ always() }} with: report_paths: "**/build/test-results/**/TEST-*.xml" github_token: ${{ secrets.GITHUB_TOKEN }} - name: Archive reports - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 if: ${{ always() }} with: - name: code-coverage-report-${{ github.job }} + name: code-coverage-report-${{ github.job }}-${{ matrix.os }} path: "**/build/reports/**/*" check-kotlin-2-sample: runs-on: ${{ matrix.os }} @@ -472,25 +462,24 @@ jobs: - ubuntu-latest needs: build-library steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Set up JDK 17 - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: java-version: 17 + distribution: zulu - name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/gradle-build-action@v3 with: cache-read-only: ${{ github.ref != 'refs/heads/master' && github.ref != 'refs/heads/develop' }} - name: Cache .konan - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ~/.konan - key: ${{ runner.os }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }} - restore-keys: | - ${{ runner.os }}-konan- + key: ${{ matrix.os }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }} - name: Download maven artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: maven path: ~/.m2/repository/dev/icerock @@ -498,16 +487,16 @@ jobs: run: cd samples/kotlin-2-sample && ./local-check.sh shell: bash - name: Publish Test Report - uses: mikepenz/action-junit-report@v2 + uses: mikepenz/action-junit-report@v4 if: ${{ always() }} with: report_paths: "**/build/test-results/**/TEST-*.xml" github_token: ${{ secrets.GITHUB_TOKEN }} - name: Archive reports - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 if: ${{ always() }} with: - name: code-coverage-report-${{ github.job }} + name: code-coverage-report-${{ github.job }}-${{ matrix.os }} path: "**/build/reports/**/*" check-cm-resources-sample: runs-on: ${{ matrix.os }} @@ -519,25 +508,24 @@ jobs: - ubuntu-latest needs: build-library steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Set up JDK 17 - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: java-version: 17 + distribution: zulu - name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/gradle-build-action@v3 with: cache-read-only: ${{ github.ref != 'refs/heads/master' && github.ref != 'refs/heads/develop' }} - name: Cache .konan - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ~/.konan - key: ${{ runner.os }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }} - restore-keys: | - ${{ runner.os }}-konan- + key: ${{ matrix.os }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }} - name: Download maven artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: maven path: ~/.m2/repository/dev/icerock @@ -545,14 +533,14 @@ jobs: run: cd samples/cm-resources-sample && ./local-check.sh shell: bash - name: Publish Test Report - uses: mikepenz/action-junit-report@v2 + uses: mikepenz/action-junit-report@v4 if: ${{ always() }} with: report_paths: "**/build/test-results/**/TEST-*.xml" github_token: ${{ secrets.GITHUB_TOKEN }} - name: Archive reports - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 if: ${{ always() }} with: - name: code-coverage-report-${{ github.job }} - path: "**/build/reports/**/*" + name: code-coverage-report-${{ github.job }}-${{ matrix.os }} + path: "**/build/reports/**/*" \ No newline at end of file diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 1030e492..c00a50f7 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -20,11 +20,12 @@ jobs: SIGNING_KEY: ${{ secrets.GPG_KEY_CONTENTS }} steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Set up JDK 17 - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: java-version: 17 + distribution: zulu - name: Prebuild library run: ./gradlew publishToMavenLocal --rerun-tasks - name: Publish library diff --git a/README.md b/README.md index 3480d0a8..f3d53aa0 100755 --- a/README.md +++ b/README.md @@ -64,7 +64,7 @@ buildscript { } dependencies { - classpath "dev.icerock.moko:resources-generator:0.24.2" + classpath "dev.icerock.moko:resources-generator:0.24.3" } } @@ -82,10 +82,10 @@ project build.gradle apply plugin: "dev.icerock.mobile.multiplatform-resources" dependencies { - commonMainApi("dev.icerock.moko:resources:0.24.2") - commonMainApi("dev.icerock.moko:resources-compose:0.24.2") // for compose multiplatform + commonMainApi("dev.icerock.moko:resources:0.24.3") + commonMainApi("dev.icerock.moko:resources-compose:0.24.3") // for compose multiplatform - commonTestImplementation("dev.icerock.moko:resources-test:0.24.2") + commonTestImplementation("dev.icerock.moko:resources-test:0.24.3") } multiplatformResources { @@ -132,7 +132,7 @@ should [add `export` declarations](https://kotlinlang.org/docs/multiplatform-bui ``` framework { - export("dev.icerock.moko:resources:0.24.2") + export("dev.icerock.moko:resources:0.24.3") export("dev.icerock.moko:graphics:0.9.0") // toUIColor here } ``` diff --git a/gradle/moko.versions.toml b/gradle/moko.versions.toml index 7f31400a..5b9b28a3 100644 --- a/gradle/moko.versions.toml +++ b/gradle/moko.versions.toml @@ -1,5 +1,5 @@ [versions] -resourcesVersion = "0.24.2" +resourcesVersion = "0.24.3" [libraries] resources = { module = "dev.icerock.moko:resources", version.ref = "resourcesVersion" } diff --git a/resources-generator/src/main/kotlin/dev/icerock/gradle/generator/platform/apple/SetupAppleUtils.kt b/resources-generator/src/main/kotlin/dev/icerock/gradle/generator/platform/apple/SetupAppleUtils.kt index e7f55ff2..fe3b1151 100644 --- a/resources-generator/src/main/kotlin/dev/icerock/gradle/generator/platform/apple/SetupAppleUtils.kt +++ b/resources-generator/src/main/kotlin/dev/icerock/gradle/generator/platform/apple/SetupAppleUtils.kt @@ -152,15 +152,6 @@ internal fun registerCopyFrameworkResourcesToAppTask( if (platform == null || archs == null || configuration == null) return val kotlinMultiplatformExtension = project.extensions.getByType() - val configMap: Map = (kotlinMultiplatformExtension as? ExtensionAware) - ?.extensions - ?.findByType() - ?.xcodeConfigurationToNativeBuildType - ?: emptyMap() - - val configName: String = (configMap[configuration]?.name ?: configuration).lowercase() - val requiredKonanTargets: List = - AppleSdk.defineNativeTargets(platform, archs).map { it.name } val frameworkNames: DomainObjectSet = project.objects.domainObjectSet(String::class.java) @@ -176,6 +167,17 @@ internal fun registerCopyFrameworkResourcesToAppTask( ) xcodeTask.configure { + val configMap: Map = + (kotlinMultiplatformExtension as? ExtensionAware) + ?.extensions + ?.findByType() + ?.xcodeConfigurationToNativeBuildType + ?: emptyMap() + + val configName: String = (configMap[configuration]?.name ?: configuration).lowercase() + val requiredKonanTargets: List = + AppleSdk.defineNativeTargets(platform, archs).map { it.name } + it.dependsOn( project.tasks.withType().matching { copyTask -> val isCorrectConfiguration: Boolean = diff --git a/resources-generator/src/main/kotlin/dev/icerock/gradle/utils/StringExt.kt b/resources-generator/src/main/kotlin/dev/icerock/gradle/utils/StringExt.kt index 0778a593..f527d751 100644 --- a/resources-generator/src/main/kotlin/dev/icerock/gradle/utils/StringExt.kt +++ b/resources-generator/src/main/kotlin/dev/icerock/gradle/utils/StringExt.kt @@ -53,6 +53,8 @@ internal fun String.removeAndroidMirroringFormat(): String { // Remove android format from string return replace("""\'""", "'") .replace("""\"""", "\"") + .replace("""\?""", "?") + .replace("""\@""", "@") } internal fun String.convertXmlStringToAndroidLocalization(): String {