From 9e8934aaa89367af60aa26df71b9dbed91b31bcd Mon Sep 17 00:00:00 2001
From: Mitchell Syer <Syer10@users.noreply.github.com>
Date: Mon, 2 Sep 2024 12:24:22 -0400
Subject: [PATCH 01/12] Fix escaped ?

---
 .../src/main/kotlin/dev/icerock/gradle/utils/StringExt.kt        | 1 +
 1 file changed, 1 insertion(+)

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..f894ac86 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,7 @@ internal fun String.removeAndroidMirroringFormat(): String {
     //  Remove android format from string
     return replace("""\'""", "'")
         .replace("""\"""", "\"")
+        .replace("""\?""", "?") 
 }
 
 internal fun String.convertXmlStringToAndroidLocalization(): String {

From 266422840ab82cb874437a868dac44c5d5cc3b72 Mon Sep 17 00:00:00 2001
From: Mitchell Syer <Syer10@users.noreply.github.com>
Date: Mon, 2 Sep 2024 12:35:46 -0400
Subject: [PATCH 02/12] Update StringExt.kt

---
 .../src/main/kotlin/dev/icerock/gradle/utils/StringExt.kt       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 f894ac86..fcff8f2c 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,7 +53,7 @@ internal fun String.removeAndroidMirroringFormat(): String {
     //  Remove android format from string
     return replace("""\'""", "'")
         .replace("""\"""", "\"")
-        .replace("""\?""", "?") 
+        .replace("""\?""", "?")
 }
 
 internal fun String.convertXmlStringToAndroidLocalization(): String {

From 5e4700dfd4e98a82235a77f02d0f5645881398a1 Mon Sep 17 00:00:00 2001
From: Konstantin Kolchurin <theunrealkosyak@gmail.com>
Date: Sat, 7 Sep 2024 03:25:01 +0700
Subject: [PATCH 03/12] #762 added support custom build configuration for apple
 target

---
 gradle/moko.versions.toml                             |  2 +-
 .../generator/platform/apple/SetupAppleUtils.kt       | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

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..d1a7ed45 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
@@ -159,6 +159,15 @@ internal fun registerCopyFrameworkResourcesToAppTask(
         ?: emptyMap()
 
     val configName: String = (configMap[configuration]?.name ?: configuration).lowercase()
+    // Map any configuration to standard with two types: "Debug/Release" builds
+    val clearConfigurationName: String = when{
+        configName.matches(".*debug.*".toRegex()) -> "debug"
+        configName.matches(".*release.*".toRegex()) -> "release"
+        else -> throw IllegalArgumentException(
+            "Invalid build configuration name: $configName. Please, update your configuration." +
+                "Configuration name should contains Debug or Release in name"
+        )
+    }
     val requiredKonanTargets: List<String> =
         AppleSdk.defineNativeTargets(platform, archs).map { it.name }
     val frameworkNames: DomainObjectSet<String> =
@@ -179,7 +188,7 @@ internal fun registerCopyFrameworkResourcesToAppTask(
             it.dependsOn(
                 project.tasks.withType<CopyFrameworkResourcesToAppTask>().matching { copyTask ->
                     val isCorrectConfiguration: Boolean =
-                        copyTask.configuration.lowercase() == configName
+                        copyTask.configuration.lowercase() == clearConfigurationName
                     val isCorrectFrameworkPrefix: Boolean =
                         copyTask.frameworkPrefix == frameworkPrefix
                     val isCorrectKonanTarget: Boolean =

From 7cfdd9a83b561427c7337154719fbb31bc7c2d82 Mon Sep 17 00:00:00 2001
From: Konstantin Kolchurin <theunrealkosyak@gmail.com>
Date: Sat, 7 Sep 2024 03:32:46 +0700
Subject: [PATCH 04/12] #762 fix detekt

---
 .../icerock/gradle/generator/platform/apple/SetupAppleUtils.kt   | 1 +
 1 file changed, 1 insertion(+)

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 d1a7ed45..3a057fc2 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
@@ -161,6 +161,7 @@ internal fun registerCopyFrameworkResourcesToAppTask(
     val configName: String = (configMap[configuration]?.name ?: configuration).lowercase()
     // Map any configuration to standard with two types: "Debug/Release" builds
     val clearConfigurationName: String = when{
+    val clearConfigurationName: String = when {
         configName.matches(".*debug.*".toRegex()) -> "debug"
         configName.matches(".*release.*".toRegex()) -> "release"
         else -> throw IllegalArgumentException(

From f5bc03b02dbbda0da1b824be072a2cd0b2f198f2 Mon Sep 17 00:00:00 2001
From: Konstantin Kolchurin <theunrealkosyak@gmail.com>
Date: Sat, 7 Sep 2024 03:43:47 +0700
Subject: [PATCH 05/12] #762 fix duplicate of code

---
 .../icerock/gradle/generator/platform/apple/SetupAppleUtils.kt   | 1 -
 1 file changed, 1 deletion(-)

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 3a057fc2..1d1df3a5 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
@@ -160,7 +160,6 @@ internal fun registerCopyFrameworkResourcesToAppTask(
 
     val configName: String = (configMap[configuration]?.name ?: configuration).lowercase()
     // Map any configuration to standard with two types: "Debug/Release" builds
-    val clearConfigurationName: String = when{
     val clearConfigurationName: String = when {
         configName.matches(".*debug.*".toRegex()) -> "debug"
         configName.matches(".*release.*".toRegex()) -> "release"

From 84a47b735db69d5d9ba312a762fab944bea0c811 Mon Sep 17 00:00:00 2001
From: Mitchell Syer <Syer10@users.noreply.github.com>
Date: Mon, 9 Sep 2024 00:09:28 -0400
Subject: [PATCH 06/12] Fix Escaped @

---
 .../src/main/kotlin/dev/icerock/gradle/utils/StringExt.kt        | 1 +
 1 file changed, 1 insertion(+)

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 fcff8f2c..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
@@ -54,6 +54,7 @@ internal fun String.removeAndroidMirroringFormat(): String {
     return replace("""\'""", "'")
         .replace("""\"""", "\"")
         .replace("""\?""", "?")
+        .replace("""\@""", "@")
 }
 
 internal fun String.convertXmlStringToAndroidLocalization(): String {

From c6a069e2cf810fad255d68bd64b379385d5998a2 Mon Sep 17 00:00:00 2001
From: Aleksey Mikhailov <Aleksey.Mikhailov@icerockdev.com>
Date: Sun, 22 Sep 2024 15:17:19 +0700
Subject: [PATCH 07/12] #762 fix support of custom build configurations

---
 README.md                                     | 10 +++---
 .../platform/apple/SetupAppleUtils.kt         | 31 +++++++------------
 2 files changed, 17 insertions(+), 24 deletions(-)

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/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 1d1df3a5..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,24 +152,6 @@ internal fun registerCopyFrameworkResourcesToAppTask(
     if (platform == null || archs == null || configuration == null) return
 
     val kotlinMultiplatformExtension = project.extensions.getByType<KotlinMultiplatformExtension>()
-    val configMap: Map<String, NativeBuildType> = (kotlinMultiplatformExtension as? ExtensionAware)
-        ?.extensions
-        ?.findByType<CocoapodsExtension>()
-        ?.xcodeConfigurationToNativeBuildType
-        ?: emptyMap()
-
-    val configName: String = (configMap[configuration]?.name ?: configuration).lowercase()
-    // Map any configuration to standard with two types: "Debug/Release" builds
-    val clearConfigurationName: String = when {
-        configName.matches(".*debug.*".toRegex()) -> "debug"
-        configName.matches(".*release.*".toRegex()) -> "release"
-        else -> throw IllegalArgumentException(
-            "Invalid build configuration name: $configName. Please, update your configuration." +
-                "Configuration name should contains Debug or Release in name"
-        )
-    }
-    val requiredKonanTargets: List<String> =
-        AppleSdk.defineNativeTargets(platform, archs).map { it.name }
     val frameworkNames: DomainObjectSet<String> =
         project.objects.domainObjectSet(String::class.java)
 
@@ -185,10 +167,21 @@ internal fun registerCopyFrameworkResourcesToAppTask(
         )
 
         xcodeTask.configure {
+            val configMap: Map<String, NativeBuildType> =
+                (kotlinMultiplatformExtension as? ExtensionAware)
+                    ?.extensions
+                    ?.findByType<CocoapodsExtension>()
+                    ?.xcodeConfigurationToNativeBuildType
+                    ?: emptyMap()
+
+            val configName: String = (configMap[configuration]?.name ?: configuration).lowercase()
+            val requiredKonanTargets: List<String> =
+                AppleSdk.defineNativeTargets(platform, archs).map { it.name }
+
             it.dependsOn(
                 project.tasks.withType<CopyFrameworkResourcesToAppTask>().matching { copyTask ->
                     val isCorrectConfiguration: Boolean =
-                        copyTask.configuration.lowercase() == clearConfigurationName
+                        copyTask.configuration.lowercase() == configName
                     val isCorrectFrameworkPrefix: Boolean =
                         copyTask.frameworkPrefix == frameworkPrefix
                     val isCorrectKonanTarget: Boolean =

From d6d200eebf338624a7c6fb1f7f4cce038a4c4ed6 Mon Sep 17 00:00:00 2001
From: Aleksey Mikhailov <Aleksey.Mikhailov@icerockdev.com>
Date: Sun, 22 Sep 2024 15:26:37 +0700
Subject: [PATCH 08/12] fix upload-artifact version

---
 .github/compilation-check-source.yml    |  2 +-
 .github/workflows/compilation-check.yml | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/compilation-check-source.yml b/.github/compilation-check-source.yml
index d0814cbc..fbcc4a0f 100644
--- a/.github/compilation-check-source.yml
+++ b/.github/compilation-check-source.yml
@@ -36,7 +36,7 @@ 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 }}
diff --git a/.github/workflows/compilation-check.yml b/.github/workflows/compilation-check.yml
index da9995fd..153893ea 100644
--- a/.github/workflows/compilation-check.yml
+++ b/.github/workflows/compilation-check.yml
@@ -52,7 +52,7 @@ jobs:
           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 }}
@@ -99,7 +99,7 @@ jobs:
           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 }}
@@ -146,7 +146,7 @@ jobs:
           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 }}
@@ -193,7 +193,7 @@ jobs:
           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 }}
@@ -240,7 +240,7 @@ jobs:
           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 }}
@@ -287,7 +287,7 @@ jobs:
           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 }}
@@ -328,7 +328,7 @@ jobs:
           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 }}
@@ -369,7 +369,7 @@ jobs:
           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 }}
@@ -410,7 +410,7 @@ jobs:
           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 }}
@@ -457,7 +457,7 @@ jobs:
           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 }}
@@ -504,7 +504,7 @@ jobs:
           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 }}
@@ -551,7 +551,7 @@ jobs:
           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 }}

From 14df36be1c6ad8cf7428625c5f39474fa1cf7cc5 Mon Sep 17 00:00:00 2001
From: Aleksey Mikhailov <Aleksey.Mikhailov@icerockdev.com>
Date: Sun, 22 Sep 2024 16:09:03 +0700
Subject: [PATCH 09/12] fix github actions

---
 .github/compilation-check-source.yml    |  16 +-
 .github/workflows/compilation-check.yml | 191 +++++++++++-------------
 .github/workflows/publish.yml           |   4 +-
 3 files changed, 93 insertions(+), 118 deletions(-)

diff --git a/.github/compilation-check-source.yml b/.github/compilation-check-source.yml
index fbcc4a0f..24a29c4f 100644
--- a/.github/compilation-check-source.yml
+++ b/.github/compilation-check-source.yml
@@ -12,17 +12,17 @@ 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
 
 .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' }}
 
@@ -39,24 +39,22 @@ on:
   uses: actions/upload-artifact@v4
   if: ${{ always() }}
   with:
-    name: code-coverage-report-${{ github.job }}
+    name: code-coverage-report-${{ github.job }}-${{ matrix.runs-on }}
     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.runs-on }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }}
 
 .runner_matrix: &runner_matrix
   os: [ macOS-latest, windows-latest, ubuntu-latest ]
diff --git a/.github/workflows/compilation-check.yml b/.github/workflows/compilation-check.yml
index 153893ea..21fa1f61 100644
--- a/.github/workflows/compilation-check.yml
+++ b/.github/workflows/compilation-check.yml
@@ -14,23 +14,21 @@ 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
       - 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.runs-on }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }}
       - name: Check
         run: ./local-check.sh
         shell: bash
@@ -55,7 +53,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: ${{ always() }}
         with:
-          name: code-coverage-report-${{ github.job }}
+          name: code-coverage-report-${{ github.job }}-${{ matrix.runs-on }}
           path: "**/build/reports/**/*"
   check-sample-android-mpp-app:
     runs-on: ${{ matrix.os }}
@@ -67,25 +65,23 @@ 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
       - 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.runs-on }}-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
@@ -102,7 +98,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: ${{ always() }}
         with:
-          name: code-coverage-report-${{ github.job }}
+          name: code-coverage-report-${{ github.job }}-${{ matrix.runs-on }}
           path: "**/build/reports/**/*"
   check-sample-auto-manifest:
     runs-on: ${{ matrix.os }}
@@ -114,25 +110,23 @@ 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
       - 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.runs-on }}-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
@@ -149,7 +143,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: ${{ always() }}
         with:
-          name: code-coverage-report-${{ github.job }}
+          name: code-coverage-report-${{ github.job }}-${{ matrix.runs-on }}
           path: "**/build/reports/**/*"
   check-sample-compose-jvm-app:
     runs-on: ${{ matrix.os }}
@@ -161,25 +155,23 @@ 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
       - 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.runs-on }}-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
@@ -196,7 +188,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: ${{ always() }}
         with:
-          name: code-coverage-report-${{ github.job }}
+          name: code-coverage-report-${{ github.job }}-${{ matrix.runs-on }}
           path: "**/build/reports/**/*"
   check-sample-resources-gallery:
     runs-on: ${{ matrix.os }}
@@ -208,25 +200,23 @@ 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
       - 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.runs-on }}-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
@@ -243,7 +233,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: ${{ always() }}
         with:
-          name: code-coverage-report-${{ github.job }}
+          name: code-coverage-report-${{ github.job }}-${{ matrix.runs-on }}
           path: "**/build/reports/**/*"
   check-sample-default-hierarchy-resources-gallery-mobile:
     runs-on: ${{ matrix.os }}
@@ -255,25 +245,23 @@ 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
       - 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.runs-on }}-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
@@ -290,31 +278,29 @@ jobs:
         uses: actions/upload-artifact@v4
         if: ${{ always() }}
         with:
-          name: code-coverage-report-${{ github.job }}
+          name: code-coverage-report-${{ github.job }}-${{ matrix.runs-on }}
           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
       - 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.runs-on }}-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
@@ -331,31 +317,29 @@ jobs:
         uses: actions/upload-artifact@v4
         if: ${{ always() }}
         with:
-          name: code-coverage-report-${{ github.job }}
+          name: code-coverage-report-${{ github.job }}-${{ matrix.runs-on }}
           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
       - 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.runs-on }}-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
@@ -372,31 +356,29 @@ jobs:
         uses: actions/upload-artifact@v4
         if: ${{ always() }}
         with:
-          name: code-coverage-report-${{ github.job }}
+          name: code-coverage-report-${{ github.job }}-${{ matrix.runs-on }}
           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
       - 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.runs-on }}-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
@@ -413,7 +395,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: ${{ always() }}
         with:
-          name: code-coverage-report-${{ github.job }}
+          name: code-coverage-report-${{ github.job }}-${{ matrix.runs-on }}
           path: "**/build/reports/**/*"
   check-sample-compose-resources-gallery:
     runs-on: ${{ matrix.os }}
@@ -425,25 +407,23 @@ 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
       - 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.runs-on }}-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
@@ -460,7 +440,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: ${{ always() }}
         with:
-          name: code-coverage-report-${{ github.job }}
+          name: code-coverage-report-${{ github.job }}-${{ matrix.runs-on }}
           path: "**/build/reports/**/*"
   check-kotlin-2-sample:
     runs-on: ${{ matrix.os }}
@@ -472,25 +452,23 @@ 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
       - 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.runs-on }}-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
@@ -507,7 +485,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: ${{ always() }}
         with:
-          name: code-coverage-report-${{ github.job }}
+          name: code-coverage-report-${{ github.job }}-${{ matrix.runs-on }}
           path: "**/build/reports/**/*"
   check-cm-resources-sample:
     runs-on: ${{ matrix.os }}
@@ -519,25 +497,23 @@ 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
       - 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.runs-on }}-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
@@ -554,5 +530,6 @@ jobs:
         uses: actions/upload-artifact@v4
         if: ${{ always() }}
         with:
-          name: code-coverage-report-${{ github.job }}
+          name: code-coverage-report-${{ github.job }}-${{ matrix.runs-on }}
           path: "**/build/reports/**/*"
+  
\ No newline at end of file
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 1030e492..ffa1946a 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -20,9 +20,9 @@ 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
       - name: Prebuild library

From 8ee81581ec4f98c22c761df33fe87046804b9f7a Mon Sep 17 00:00:00 2001
From: Aleksey Mikhailov <Aleksey.Mikhailov@icerockdev.com>
Date: Sun, 22 Sep 2024 16:11:25 +0700
Subject: [PATCH 10/12] fix setup-java

---
 .github/compilation-check-source.yml    |  1 +
 .github/workflows/compilation-check.yml | 12 ++++++++++++
 .github/workflows/publish.yml           |  1 +
 3 files changed, 14 insertions(+)

diff --git a/.github/compilation-check-source.yml b/.github/compilation-check-source.yml
index 24a29c4f..b1154620 100644
--- a/.github/compilation-check-source.yml
+++ b/.github/compilation-check-source.yml
@@ -19,6 +19,7 @@ on:
   uses: actions/setup-java@v4
   with:
     java-version: 17
+    distribution: zulu
 
 .setup_gradle: &setup_gradle
   name: Setup Gradle
diff --git a/.github/workflows/compilation-check.yml b/.github/workflows/compilation-check.yml
index 21fa1f61..c17e2dfe 100644
--- a/.github/workflows/compilation-check.yml
+++ b/.github/workflows/compilation-check.yml
@@ -19,6 +19,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           java-version: 17
+          distribution: zulu
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v3
         with:
@@ -70,6 +71,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           java-version: 17
+          distribution: zulu
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v3
         with:
@@ -115,6 +117,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           java-version: 17
+          distribution: zulu
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v3
         with:
@@ -160,6 +163,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           java-version: 17
+          distribution: zulu
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v3
         with:
@@ -205,6 +209,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           java-version: 17
+          distribution: zulu
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v3
         with:
@@ -250,6 +255,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           java-version: 17
+          distribution: zulu
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v3
         with:
@@ -289,6 +295,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           java-version: 17
+          distribution: zulu
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v3
         with:
@@ -328,6 +335,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           java-version: 17
+          distribution: zulu
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v3
         with:
@@ -367,6 +375,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           java-version: 17
+          distribution: zulu
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v3
         with:
@@ -412,6 +421,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           java-version: 17
+          distribution: zulu
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v3
         with:
@@ -457,6 +467,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           java-version: 17
+          distribution: zulu
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v3
         with:
@@ -502,6 +513,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           java-version: 17
+          distribution: zulu
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v3
         with:
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index ffa1946a..c00a50f7 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -25,6 +25,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           java-version: 17
+          distribution: zulu
       - name: Prebuild library
         run: ./gradlew publishToMavenLocal --rerun-tasks
       - name: Publish library

From 8bd2734c7a4ed98a469ee479511fe1a219390f66 Mon Sep 17 00:00:00 2001
From: Aleksey Mikhailov <Aleksey.Mikhailov@icerockdev.com>
Date: Sun, 22 Sep 2024 17:14:47 +0700
Subject: [PATCH 11/12] fix ci actions versions

---
 .github/compilation-check-source.yml    |  4 ++--
 .github/workflows/compilation-check.yml | 26 ++++++++++++-------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.github/compilation-check-source.yml b/.github/compilation-check-source.yml
index b1154620..af57e59e 100644
--- a/.github/compilation-check-source.yml
+++ b/.github/compilation-check-source.yml
@@ -29,7 +29,7 @@ on:
 
 .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'
@@ -81,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 c17e2dfe..d4b1ce83 100644
--- a/.github/workflows/compilation-check.yml
+++ b/.github/workflows/compilation-check.yml
@@ -40,12 +40,12 @@ 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"
@@ -91,7 +91,7 @@ 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"
@@ -137,7 +137,7 @@ 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"
@@ -183,7 +183,7 @@ 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"
@@ -229,7 +229,7 @@ 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"
@@ -275,7 +275,7 @@ 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"
@@ -315,7 +315,7 @@ 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"
@@ -355,7 +355,7 @@ 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"
@@ -395,7 +395,7 @@ 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"
@@ -441,7 +441,7 @@ 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"
@@ -487,7 +487,7 @@ 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"
@@ -533,7 +533,7 @@ 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"

From b44d9ce8dddc5a8a4a590c48e1fe514f6603ba26 Mon Sep 17 00:00:00 2001
From: Aleksey Mikhailov <aleksey.mikhailov@icerockdev.com>
Date: Sun, 22 Sep 2024 17:42:07 +0700
Subject: [PATCH 12/12] fix matrix usage

---
 .github/compilation-check-source.yml    |  4 +-
 .github/workflows/compilation-check.yml | 51 ++++++++++++-------------
 2 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/.github/compilation-check-source.yml b/.github/compilation-check-source.yml
index af57e59e..f804e23f 100644
--- a/.github/compilation-check-source.yml
+++ b/.github/compilation-check-source.yml
@@ -40,7 +40,7 @@ on:
   uses: actions/upload-artifact@v4
   if: ${{ always() }}
   with:
-    name: code-coverage-report-${{ github.job }}-${{ matrix.runs-on }}
+    name: code-coverage-report-${{ github.job }}-${{ matrix.os }}
     path: '**/build/reports/**/*'
 
 .download_maven: &download_maven
@@ -55,7 +55,7 @@ on:
   uses: actions/cache@v4
   with:
     path: ~/.konan
-    key: ${{ matrix.runs-on }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }}
+    key: ${{ matrix.os }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }}
 
 .runner_matrix: &runner_matrix
   os: [ macOS-latest, windows-latest, ubuntu-latest ]
diff --git a/.github/workflows/compilation-check.yml b/.github/workflows/compilation-check.yml
index d4b1ce83..bfa220a7 100644
--- a/.github/workflows/compilation-check.yml
+++ b/.github/workflows/compilation-check.yml
@@ -29,7 +29,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/.konan
-          key: ${{ matrix.runs-on }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }}
+          key: ${{ matrix.os }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }}
       - name: Check
         run: ./local-check.sh
         shell: bash
@@ -54,7 +54,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: ${{ always() }}
         with:
-          name: code-coverage-report-${{ github.job }}-${{ matrix.runs-on }}
+          name: code-coverage-report-${{ github.job }}-${{ matrix.os }}
           path: "**/build/reports/**/*"
   check-sample-android-mpp-app:
     runs-on: ${{ matrix.os }}
@@ -81,7 +81,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/.konan
-          key: ${{ matrix.runs-on }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }}
+          key: ${{ matrix.os }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }}
       - name: Download maven artifacts
         uses: actions/download-artifact@v4
         with:
@@ -100,7 +100,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: ${{ always() }}
         with:
-          name: code-coverage-report-${{ github.job }}-${{ matrix.runs-on }}
+          name: code-coverage-report-${{ github.job }}-${{ matrix.os }}
           path: "**/build/reports/**/*"
   check-sample-auto-manifest:
     runs-on: ${{ matrix.os }}
@@ -127,7 +127,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/.konan
-          key: ${{ matrix.runs-on }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }}
+          key: ${{ matrix.os }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }}
       - name: Download maven artifacts
         uses: actions/download-artifact@v4
         with:
@@ -146,7 +146,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: ${{ always() }}
         with:
-          name: code-coverage-report-${{ github.job }}-${{ matrix.runs-on }}
+          name: code-coverage-report-${{ github.job }}-${{ matrix.os }}
           path: "**/build/reports/**/*"
   check-sample-compose-jvm-app:
     runs-on: ${{ matrix.os }}
@@ -173,7 +173,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/.konan
-          key: ${{ matrix.runs-on }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }}
+          key: ${{ matrix.os }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }}
       - name: Download maven artifacts
         uses: actions/download-artifact@v4
         with:
@@ -192,7 +192,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: ${{ always() }}
         with:
-          name: code-coverage-report-${{ github.job }}-${{ matrix.runs-on }}
+          name: code-coverage-report-${{ github.job }}-${{ matrix.os }}
           path: "**/build/reports/**/*"
   check-sample-resources-gallery:
     runs-on: ${{ matrix.os }}
@@ -219,7 +219,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/.konan
-          key: ${{ matrix.runs-on }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }}
+          key: ${{ matrix.os }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }}
       - name: Download maven artifacts
         uses: actions/download-artifact@v4
         with:
@@ -238,7 +238,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: ${{ always() }}
         with:
-          name: code-coverage-report-${{ github.job }}-${{ matrix.runs-on }}
+          name: code-coverage-report-${{ github.job }}-${{ matrix.os }}
           path: "**/build/reports/**/*"
   check-sample-default-hierarchy-resources-gallery-mobile:
     runs-on: ${{ matrix.os }}
@@ -265,7 +265,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/.konan
-          key: ${{ matrix.runs-on }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }}
+          key: ${{ matrix.os }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }}
       - name: Download maven artifacts
         uses: actions/download-artifact@v4
         with:
@@ -284,7 +284,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: ${{ always() }}
         with:
-          name: code-coverage-report-${{ github.job }}-${{ matrix.runs-on }}
+          name: code-coverage-report-${{ github.job }}-${{ matrix.os }}
           path: "**/build/reports/**/*"
   check-sample-ios-static-xcframework:
     runs-on: macOS-latest
@@ -305,7 +305,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/.konan
-          key: ${{ matrix.runs-on }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }}
+          key: ${{ matrix.os }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }}
       - name: Download maven artifacts
         uses: actions/download-artifact@v4
         with:
@@ -324,7 +324,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: ${{ always() }}
         with:
-          name: code-coverage-report-${{ github.job }}-${{ matrix.runs-on }}
+          name: code-coverage-report-${{ github.job }}-${{ matrix.os }}
           path: "**/build/reports/**/*"
   check-sample-ios-cocoapods-static-framework:
     runs-on: macOS-latest
@@ -345,7 +345,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/.konan
-          key: ${{ matrix.runs-on }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }}
+          key: ${{ matrix.os }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }}
       - name: Download maven artifacts
         uses: actions/download-artifact@v4
         with:
@@ -364,7 +364,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: ${{ always() }}
         with:
-          name: code-coverage-report-${{ github.job }}-${{ matrix.runs-on }}
+          name: code-coverage-report-${{ github.job }}-${{ matrix.os }}
           path: "**/build/reports/**/*"
   check-sample-kotlin-ios-app:
     runs-on: macOS-latest
@@ -385,7 +385,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/.konan
-          key: ${{ matrix.runs-on }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }}
+          key: ${{ matrix.os }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }}
       - name: Download maven artifacts
         uses: actions/download-artifact@v4
         with:
@@ -404,7 +404,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: ${{ always() }}
         with:
-          name: code-coverage-report-${{ github.job }}-${{ matrix.runs-on }}
+          name: code-coverage-report-${{ github.job }}-${{ matrix.os }}
           path: "**/build/reports/**/*"
   check-sample-compose-resources-gallery:
     runs-on: ${{ matrix.os }}
@@ -431,7 +431,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/.konan
-          key: ${{ matrix.runs-on }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }}
+          key: ${{ matrix.os }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }}
       - name: Download maven artifacts
         uses: actions/download-artifact@v4
         with:
@@ -450,7 +450,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: ${{ always() }}
         with:
-          name: code-coverage-report-${{ github.job }}-${{ matrix.runs-on }}
+          name: code-coverage-report-${{ github.job }}-${{ matrix.os }}
           path: "**/build/reports/**/*"
   check-kotlin-2-sample:
     runs-on: ${{ matrix.os }}
@@ -477,7 +477,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/.konan
-          key: ${{ matrix.runs-on }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }}
+          key: ${{ matrix.os }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }}
       - name: Download maven artifacts
         uses: actions/download-artifact@v4
         with:
@@ -496,7 +496,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: ${{ always() }}
         with:
-          name: code-coverage-report-${{ github.job }}-${{ matrix.runs-on }}
+          name: code-coverage-report-${{ github.job }}-${{ matrix.os }}
           path: "**/build/reports/**/*"
   check-cm-resources-sample:
     runs-on: ${{ matrix.os }}
@@ -523,7 +523,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/.konan
-          key: ${{ matrix.runs-on }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }}
+          key: ${{ matrix.os }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }}
       - name: Download maven artifacts
         uses: actions/download-artifact@v4
         with:
@@ -542,6 +542,5 @@ jobs:
         uses: actions/upload-artifact@v4
         if: ${{ always() }}
         with:
-          name: code-coverage-report-${{ github.job }}-${{ matrix.runs-on }}
-          path: "**/build/reports/**/*"
-  
\ No newline at end of file
+          name: code-coverage-report-${{ github.job }}-${{ matrix.os }}
+          path: "**/build/reports/**/*"
\ No newline at end of file