diff --git a/.github/compilation-check-source.yml b/.github/compilation-check-source.yml
index f804e23fa..0b2c6e82b 100644
--- a/.github/compilation-check-source.yml
+++ b/.github/compilation-check-source.yml
@@ -290,6 +290,49 @@ jobs:
       - *publish_test_report
       - *upload_reports
 
+  check-kotlin-2-dynamic-sample:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        <<: *runner_matrix
+    needs: build-library
+
+    steps:
+      - *checkout
+      - *setup_jdk
+      - *setup_gradle
+      - *cache_konan
+      - *download_maven
+
+      - name: Sample - kotlin-2-dynamic-sample
+        run: cd samples/kotlin-2-dynamic-sample && ./local-check.sh
+        shell: bash
+
+      - *publish_test_report
+      - *upload_reports
+
+  check-kotlin-2-tests:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        <<: *runner_matrix
+    needs: build-library
+
+    steps:
+      - *checkout
+      - *setup_jdk
+      - *setup_gradle
+      - uses: browser-actions/setup-chrome@v1
+      - *cache_konan
+      - *download_maven
+
+      - name: Sample - kotlin-2-tests
+        run: cd samples/kotlin-2-tests && ./local-check.sh
+        shell: bash
+
+      - *publish_test_report
+      - *upload_reports
+
   check-cm-resources-sample:
     runs-on: ${{ matrix.os }}
     strategy:
diff --git a/.github/workflows/compilation-check.yml b/.github/workflows/compilation-check.yml
index bfa220a78..0332c9275 100644
--- a/.github/workflows/compilation-check.yml
+++ b/.github/workflows/compilation-check.yml
@@ -498,6 +498,99 @@ jobs:
         with:
           name: code-coverage-report-${{ github.job }}-${{ matrix.os }}
           path: "**/build/reports/**/*"
+  check-kotlin-2-dynamic-sample:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os:
+          - macOS-latest
+          - windows-latest
+          - ubuntu-latest
+    needs: build-library
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: 17
+          distribution: zulu
+      - name: Setup Gradle
+        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@v4
+        with:
+          path: ~/.konan
+          key: ${{ matrix.os }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }}
+      - name: Download maven artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: maven
+          path: ~/.m2/repository/dev/icerock
+      - name: Sample - kotlin-2-dynamic-sample
+        run: cd samples/kotlin-2-dynamic-sample && ./local-check.sh
+        shell: bash
+      - name: Publish Test Report
+        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@v4
+        if: ${{ always() }}
+        with:
+          name: code-coverage-report-${{ github.job }}-${{ matrix.os }}
+          path: "**/build/reports/**/*"
+  check-kotlin-2-tests:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os:
+          - macOS-latest
+          - windows-latest
+          - ubuntu-latest
+    needs: build-library
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: 17
+          distribution: zulu
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v3
+        with:
+          cache-read-only: ${{ github.ref != 'refs/heads/master' && github.ref !=
+            'refs/heads/develop' }}
+      - uses: browser-actions/setup-chrome@v1
+      - name: Cache .konan
+        uses: actions/cache@v4
+        with:
+          path: ~/.konan
+          key: ${{ matrix.os }}-konan-${{ hashFiles('**/*.gradle*', 'gradle/**/*') }}
+      - name: Download maven artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: maven
+          path: ~/.m2/repository/dev/icerock
+      - name: Sample - kotlin-2-tests
+        run: cd samples/kotlin-2-tests && ./local-check.sh
+        shell: bash
+      - name: Publish Test Report
+        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@v4
+        if: ${{ always() }}
+        with:
+          name: code-coverage-report-${{ github.job }}-${{ matrix.os }}
+          path: "**/build/reports/**/*"
   check-cm-resources-sample:
     runs-on: ${{ matrix.os }}
     strategy:
@@ -543,4 +636,4 @@ jobs:
         if: ${{ always() }}
         with:
           name: code-coverage-report-${{ github.job }}-${{ matrix.os }}
-          path: "**/build/reports/**/*"
\ No newline at end of file
+          path: "**/build/reports/**/*"
diff --git a/gradle/moko.versions.toml b/gradle/moko.versions.toml
index 5214152c5..9fb4c8c78 100644
--- a/gradle/moko.versions.toml
+++ b/gradle/moko.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-resourcesVersion = "0.24.4"
+resourcesVersion = "0.24.5"
 
 [libraries]
 resources = { module = "dev.icerock.moko:resources", version.ref = "resourcesVersion" }
diff --git a/local-samples-check.sh b/local-samples-check.sh
index 4eee84325..332161df9 100755
--- a/local-samples-check.sh
+++ b/local-samples-check.sh
@@ -14,4 +14,6 @@ set -e
 (cd samples/compose-resources-gallery && ./local-check.sh)
 (cd samples/default-hierarchy-gallery-mobile && ./local-check.sh)
 (cd samples/kotlin-2-sample && ./local-check.sh)
+(cd samples/kotlin-2-dynamic-sample && ./local-check.sh)
+(cd samples/kotlin-2-tests && ./local-check.sh)
 (cd samples/cm-resources-sample && ./local-check.sh)
diff --git a/resources-generator/src/main/kotlin/dev/icerock/gradle/actions/apple/CopyResourcesFromKLibsAction.kt b/resources-generator/src/main/kotlin/dev/icerock/gradle/actions/apple/CopyResourcesFromKLibsAction.kt
index 92cf763af..07d8ebd5d 100644
--- a/resources-generator/src/main/kotlin/dev/icerock/gradle/actions/apple/CopyResourcesFromKLibsAction.kt
+++ b/resources-generator/src/main/kotlin/dev/icerock/gradle/actions/apple/CopyResourcesFromKLibsAction.kt
@@ -11,6 +11,7 @@ import org.gradle.api.logging.Logger
 import org.jetbrains.kotlin.gradle.tasks.KotlinNativeLink
 import org.jetbrains.kotlin.library.KotlinLibraryLayout
 import org.jetbrains.kotlin.library.impl.KotlinLibraryLayoutImpl
+import org.jetbrains.kotlin.library.impl.javaFile
 import java.io.File
 
 internal abstract class CopyResourcesFromKLibsAction : Action<Task> {
@@ -19,50 +20,69 @@ internal abstract class CopyResourcesFromKLibsAction : Action<Task> {
         linkTask: KotlinNativeLink,
         outputDir: File
     ) {
-        val packedKlibs: List<File> = linkTask.klibs
-            .filter { it.exists() }
-            .filter { it.extension == "klib" }
-            .map { it }
-        val unpackedKlibs: List<File> = linkTask.klibs
-            .filter { it.exists() }
-            // we need only unpacked klibs
-            .filter { it.name == "manifest" && it.parentFile.name == "default" }
-            // manifest stored in klib inside directory default
-            .map { it.parentFile.parentFile }
+        val logger: Logger = linkTask.logger
 
-        (packedKlibs + unpackedKlibs)
-            .forEach { inputFile ->
-                linkTask.logger.info("found dependency $inputFile, try to copy resources")
-
-                val layout: KotlinLibraryLayout = getKotlinLibraryLayout(inputFile)
-
-                copyResourcesFromKlib(
-                    logger = linkTask.logger,
-                    layout = layout,
-                    outputDir = outputDir,
-                )
+        linkTask.klibs
+            .onEach { logger.debug("found klib dependency {}", it) }
+            .flatMap { getBundlesFromSources(sourceFile = it, logger = logger) }
+            .forEach { bundle ->
+                logger.info("copy $bundle to $outputDir")
+                bundle.copyRecursively(File(outputDir, bundle.name), overwrite = true)
             }
     }
 
-    private fun copyResourcesFromKlib(logger: Logger, layout: KotlinLibraryLayout, outputDir: File) {
-        logger.info("copy resources from $layout into $outputDir")
+    /**
+     * Search bundles in klib different types.
+     *
+     * We know about 3 types of klib in filesystem:
+     * 1. packed klib - single file with .klib extension
+     * 2. unpacked klib directory - root directory with klib content (used for local project
+     * dependencies)
+     * 3. unpacked klib content - all files inside klib directory (used for current project
+     * compilation results)
+     *
+     * @param sourceFile file from linking task dependencies and sources list
+     * @param logger gradle logger
+     *
+     * @return list of .bundle directories founded in klibs
+     */
+    private fun getBundlesFromSources(sourceFile: File, logger: Logger): List<File> {
+        val isPackedKlib = sourceFile.isFile && sourceFile.extension == "klib"
+        val isUnpackedKlib = sourceFile.isDirectory
 
-        try {
-            File(layout.resourcesDir.path).copyRecursively(
-                target = outputDir,
-                overwrite = true
-            )
-        } catch (@Suppress("SwallowedException") exc: NoSuchFileException) {
-            logger.info("resources in $layout not found")
-        } catch (@Suppress("SwallowedException") exc: java.nio.file.NoSuchFileException) {
-            logger.info("resources in $layout not found (empty lib)")
+        return if (isPackedKlib || isUnpackedKlib) {
+            logger.info("found klib {}", sourceFile)
+            getBundlesFromKotlinLibrary(sourceFile)
+        } else if (sourceFile.name == "manifest" && sourceFile.parentFile.name == "default") {
+            // for unpacked klibs we can see content files instead of klib directory.
+            // try to check this case
+            logger.info("found manifest of klib {}", sourceFile)
+            val unpackedKlibRoot: File = sourceFile.parentFile.parentFile
+            getBundlesFromKotlinLibrary(unpackedKlibRoot)
+        } else {
+            logger.debug("found some file {}", sourceFile)
+            emptyList()
         }
     }
 
+    private fun getBundlesFromKotlinLibrary(
+        klibFile: File
+    ): List<File> {
+        val layout: KotlinLibraryLayout = getKotlinLibraryLayout(klibFile)
+        return layout.resourcesDir.listFilesOrEmpty
+            .filter { it.isDirectory && it.extension == "bundle" }
+            .map { it.javaFile() }
+    }
+
     private fun getKotlinLibraryLayout(file: File): KotlinLibraryLayout {
         val klibKonan = org.jetbrains.kotlin.konan.file.File(file.path)
         val klib = KotlinLibraryLayoutImpl(klib = klibKonan, component = "default")
 
+        // while klib zipped we can't check resources directory, so we should unpack all klibs :(
+        // maybe will be better if we will write some state in cache as build result file with
+        // klib path, hash, resources count. to not extract klibs that we already know that not
+        // contains any resources. BUT maybe extraction will be faster then hashing for this logic.
+        // so this improvement should be checked in future
         return if (klib.isZipped) klib.extractingToTemp else klib
     }
 }
diff --git a/samples/kotlin-2-dynamic-sample/.gitignore b/samples/kotlin-2-dynamic-sample/.gitignore
new file mode 100644
index 000000000..fdbf6bc0d
--- /dev/null
+++ b/samples/kotlin-2-dynamic-sample/.gitignore
@@ -0,0 +1,11 @@
+*.iml
+.gradle
+.idea
+.DS_Store
+.kotlin
+build
+captures
+.externalNativeBuild
+.cxx
+local.properties
+xcuserdata
\ No newline at end of file
diff --git a/samples/kotlin-2-dynamic-sample/README.md b/samples/kotlin-2-dynamic-sample/README.md
new file mode 100644
index 000000000..3a32a5129
--- /dev/null
+++ b/samples/kotlin-2-dynamic-sample/README.md
@@ -0,0 +1,6 @@
+# Sample of mobile app with Kotlin 2.1, multimodule and dynamic framework
+
+## Build
+
+1. publish moko-resources to local maven - `./gradlew publishToMavenLocal` in `moko-resources` root
+2. build sample (in IDE or by `./gradlew build`)
diff --git a/samples/kotlin-2-dynamic-sample/androidApp/build.gradle.kts b/samples/kotlin-2-dynamic-sample/androidApp/build.gradle.kts
new file mode 100644
index 000000000..021a2d330
--- /dev/null
+++ b/samples/kotlin-2-dynamic-sample/androidApp/build.gradle.kts
@@ -0,0 +1,47 @@
+plugins {
+    alias(libs.plugins.androidApplication)
+    alias(libs.plugins.kotlinAndroid)
+    alias(libs.plugins.compose.compiler)
+}
+
+android {
+    namespace = "app.kotlin2sample.android"
+    compileSdk = 34
+    defaultConfig {
+        applicationId = "app.kotlin2sample.android"
+        minSdk = 26
+        targetSdk = 34
+        versionCode = 1
+        versionName = "1.0"
+    }
+    buildFeatures {
+        compose = true
+    }
+    packaging {
+        resources {
+            excludes += "/META-INF/{AL2.0,LGPL2.1}"
+        }
+    }
+    buildTypes {
+        getByName("release") {
+            isMinifyEnabled = false
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
+
+dependencies {
+    implementation(projects.shared)
+    implementation(libs.compose.ui)
+    implementation(libs.compose.ui.tooling.preview)
+    implementation(libs.compose.material3)
+    implementation(libs.androidx.activity.compose)
+    implementation(moko.resourcesCompose)
+    debugImplementation(libs.compose.ui.tooling)
+}
\ No newline at end of file
diff --git a/samples/kotlin-2-dynamic-sample/androidApp/src/main/AndroidManifest.xml b/samples/kotlin-2-dynamic-sample/androidApp/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..afe828631
--- /dev/null
+++ b/samples/kotlin-2-dynamic-sample/androidApp/src/main/AndroidManifest.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application
+        android:allowBackup="false"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
+        <activity
+            android:name="app.thirtyninth.compose.navigation.kotlin2sample.android.MainActivity"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest> 
\ No newline at end of file
diff --git a/samples/kotlin-2-dynamic-sample/androidApp/src/main/java/app/thirtyninth/compose/navigation/kotlin2sample/android/MainActivity.kt b/samples/kotlin-2-dynamic-sample/androidApp/src/main/java/app/thirtyninth/compose/navigation/kotlin2sample/android/MainActivity.kt
new file mode 100644
index 000000000..1cfbf627d
--- /dev/null
+++ b/samples/kotlin-2-dynamic-sample/androidApp/src/main/java/app/thirtyninth/compose/navigation/kotlin2sample/android/MainActivity.kt
@@ -0,0 +1,49 @@
+package app.thirtyninth.compose.navigation.kotlin2sample.android
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import app.kotlin2sample.Greeting
+import dev.icerock.moko.resources.compose.localized
+
+class MainActivity : ComponentActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContent {
+            MyApplicationTheme {
+                Surface(
+                    modifier = Modifier.fillMaxSize(),
+                    color = MaterialTheme.colorScheme.background
+                ) {
+                    Column {
+                        GreetingView(Greeting().greet())
+                        Text(text = Greeting().getMR().localized())
+                        Text(text = stringResource(id = app.kotlin2sample.R.string.hello_world))
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+fun GreetingView(text: String) {
+    Text(text = text)
+}
+
+@Preview
+@Composable
+fun DefaultPreview() {
+    MyApplicationTheme {
+        GreetingView("Hello, Android!")
+    }
+}
diff --git a/samples/kotlin-2-dynamic-sample/androidApp/src/main/java/app/thirtyninth/compose/navigation/kotlin2sample/android/MyApplicationTheme.kt b/samples/kotlin-2-dynamic-sample/androidApp/src/main/java/app/thirtyninth/compose/navigation/kotlin2sample/android/MyApplicationTheme.kt
new file mode 100644
index 000000000..b453dcf0b
--- /dev/null
+++ b/samples/kotlin-2-dynamic-sample/androidApp/src/main/java/app/thirtyninth/compose/navigation/kotlin2sample/android/MyApplicationTheme.kt
@@ -0,0 +1,55 @@
+package app.thirtyninth.compose.navigation.kotlin2sample.android
+
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Shapes
+import androidx.compose.material3.Typography
+import androidx.compose.material3.darkColorScheme
+import androidx.compose.material3.lightColorScheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+
+@Composable
+fun MyApplicationTheme(
+    darkTheme: Boolean = isSystemInDarkTheme(),
+    content: @Composable () -> Unit
+) {
+    val colors = if (darkTheme) {
+        darkColorScheme(
+            primary = Color(0xFFBB86FC),
+            secondary = Color(0xFF03DAC5),
+            tertiary = Color(0xFF3700B3)
+        )
+    } else {
+        lightColorScheme(
+            primary = Color(0xFF6200EE),
+            secondary = Color(0xFF03DAC5),
+            tertiary = Color(0xFF3700B3)
+        )
+    }
+    val typography = Typography(
+        bodyMedium = TextStyle(
+            fontFamily = FontFamily.Default,
+            fontWeight = FontWeight.Normal,
+            fontSize = 16.sp
+        )
+    )
+    val shapes = Shapes(
+        small = RoundedCornerShape(4.dp),
+        medium = RoundedCornerShape(4.dp),
+        large = RoundedCornerShape(0.dp)
+    )
+
+    MaterialTheme(
+        colorScheme = colors,
+        typography = typography,
+        shapes = shapes,
+        content = content
+    )
+}
diff --git a/samples/kotlin-2-dynamic-sample/androidApp/src/main/res/values/styles.xml b/samples/kotlin-2-dynamic-sample/androidApp/src/main/res/values/styles.xml
new file mode 100644
index 000000000..6b4fa3d08
--- /dev/null
+++ b/samples/kotlin-2-dynamic-sample/androidApp/src/main/res/values/styles.xml
@@ -0,0 +1,3 @@
+<resources>
+    <style name="AppTheme" parent="android:Theme.Material.NoActionBar"/>
+</resources>
\ No newline at end of file
diff --git a/samples/kotlin-2-dynamic-sample/build.gradle.kts b/samples/kotlin-2-dynamic-sample/build.gradle.kts
new file mode 100644
index 000000000..6593324f1
--- /dev/null
+++ b/samples/kotlin-2-dynamic-sample/build.gradle.kts
@@ -0,0 +1,13 @@
+plugins {
+    //trick: for the same plugin versions in all sub-modules
+    alias(libs.plugins.androidApplication).apply(false)
+    alias(libs.plugins.androidLibrary).apply(false)
+    alias(libs.plugins.kotlinAndroid).apply(false)
+    alias(libs.plugins.kotlinMultiplatform).apply(false)
+}
+
+buildscript{
+    dependencies {
+        classpath(moko.resourcesGradlePlugin)
+    }
+}
\ No newline at end of file
diff --git a/samples/kotlin-2-dynamic-sample/extramodule/build.gradle.kts b/samples/kotlin-2-dynamic-sample/extramodule/build.gradle.kts
new file mode 100644
index 000000000..e451bbb8a
--- /dev/null
+++ b/samples/kotlin-2-dynamic-sample/extramodule/build.gradle.kts
@@ -0,0 +1,46 @@
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+
+plugins {
+    alias(libs.plugins.kotlinMultiplatform)
+    alias(libs.plugins.androidLibrary)
+    id("dev.icerock.mobile.multiplatform-resources")
+}
+
+kotlin {
+    androidTarget {
+        @OptIn(ExperimentalKotlinGradlePluginApi::class)
+        compilerOptions {
+            apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0)
+        }
+    }
+
+    iosX64()
+    iosArm64()
+    iosSimulatorArm64()
+
+    sourceSets {
+        commonMain.dependencies {
+            implementation(moko.resources)
+        }
+        commonTest.dependencies {
+            implementation(libs.kotlin.test)
+        }
+    }
+}
+
+android {
+    namespace = "app.kotlin2sample.extra"
+    compileSdk = 34
+    defaultConfig {
+        minSdk = 26
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+}
+
+multiplatformResources {
+    resourcesPackage.set("app.kotlin2sample.library.extra")
+    resourcesClassName.set("Extra")
+}
diff --git a/samples/kotlin-2-dynamic-sample/extramodule/src/commonMain/moko-resources/colors/colors.xml b/samples/kotlin-2-dynamic-sample/extramodule/src/commonMain/moko-resources/colors/colors.xml
new file mode 100644
index 000000000..ed27c9423
--- /dev/null
+++ b/samples/kotlin-2-dynamic-sample/extramodule/src/commonMain/moko-resources/colors/colors.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="textColor">
+        <light>0x1B5E20FF</light>
+        <dark>0x81C784FF</dark>
+    </color>
+</resources>
\ No newline at end of file
diff --git a/samples/kotlin-2-dynamic-sample/extramodule/src/iosMain/moko-resources/base/strings.xml b/samples/kotlin-2-dynamic-sample/extramodule/src/iosMain/moko-resources/base/strings.xml
new file mode 100644
index 000000000..9acebfd13
--- /dev/null
+++ b/samples/kotlin-2-dynamic-sample/extramodule/src/iosMain/moko-resources/base/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<resources>
+    <string name="hello_ios_world">Hello iOS World</string>
+</resources>
diff --git a/samples/kotlin-2-dynamic-sample/extramodule/src/iosMain/moko-resources/ru/strings.xml b/samples/kotlin-2-dynamic-sample/extramodule/src/iosMain/moko-resources/ru/strings.xml
new file mode 100644
index 000000000..d8b74e1a1
--- /dev/null
+++ b/samples/kotlin-2-dynamic-sample/extramodule/src/iosMain/moko-resources/ru/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<resources>
+    <string name="hello_ios_world">Привет iOS Мир</string>
+</resources>
diff --git a/samples/kotlin-2-dynamic-sample/gradle.properties b/samples/kotlin-2-dynamic-sample/gradle.properties
new file mode 100644
index 000000000..b46afb42f
--- /dev/null
+++ b/samples/kotlin-2-dynamic-sample/gradle.properties
@@ -0,0 +1,14 @@
+#Gradle
+org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx2048M"
+org.gradle.caching=true
+org.gradle.configuration-cache=true
+
+#Kotlin
+kotlin.code.style=official
+
+#Android
+android.useAndroidX=true
+android.nonTransitiveRClass=true
+
+#moko
+moko.resources.disableStaticFrameworkWarning=true
\ No newline at end of file
diff --git a/samples/kotlin-2-dynamic-sample/gradle/libs.versions.toml b/samples/kotlin-2-dynamic-sample/gradle/libs.versions.toml
new file mode 100644
index 000000000..c4c156641
--- /dev/null
+++ b/samples/kotlin-2-dynamic-sample/gradle/libs.versions.toml
@@ -0,0 +1,23 @@
+[versions]
+agp = "8.4.0"
+kotlin = "2.1.0"
+compose = "1.6.7"
+compose-material3 = "1.2.1"
+androidx-activityCompose = "1.9.0"
+
+[libraries]
+kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
+androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" }
+compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose" }
+compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" }
+compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose" }
+compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "compose" }
+compose-material3 = { module = "androidx.compose.material3:material3", version.ref = "compose-material3" }
+
+[plugins]
+androidApplication = { id = "com.android.application", version.ref = "agp" }
+androidLibrary = { id = "com.android.library", version.ref = "agp" }
+kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
+kotlinCocoapods = { id = "org.jetbrains.kotlin.native.cocoapods", version.ref = "kotlin" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
\ No newline at end of file
diff --git a/samples/kotlin-2-dynamic-sample/gradle/wrapper/gradle-wrapper.jar b/samples/kotlin-2-dynamic-sample/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 000000000..e708b1c02
Binary files /dev/null and b/samples/kotlin-2-dynamic-sample/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/samples/kotlin-2-dynamic-sample/gradle/wrapper/gradle-wrapper.properties b/samples/kotlin-2-dynamic-sample/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000..e5129d793
--- /dev/null
+++ b/samples/kotlin-2-dynamic-sample/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Thu Mar 07 12:20:25 NOVT 2024
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/samples/kotlin-2-dynamic-sample/gradlew b/samples/kotlin-2-dynamic-sample/gradlew
new file mode 100755
index 000000000..4f906e0c8
--- /dev/null
+++ b/samples/kotlin-2-dynamic-sample/gradlew
@@ -0,0 +1,185 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"
diff --git a/samples/kotlin-2-dynamic-sample/gradlew.bat b/samples/kotlin-2-dynamic-sample/gradlew.bat
new file mode 100644
index 000000000..107acd32c
--- /dev/null
+++ b/samples/kotlin-2-dynamic-sample/gradlew.bat
@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/samples/kotlin-2-dynamic-sample/iosApp/iosApp.xcodeproj/project.pbxproj b/samples/kotlin-2-dynamic-sample/iosApp/iosApp.xcodeproj/project.pbxproj
new file mode 100644
index 000000000..c170625fb
--- /dev/null
+++ b/samples/kotlin-2-dynamic-sample/iosApp/iosApp.xcodeproj/project.pbxproj
@@ -0,0 +1,394 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 50;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		058557BB273AAA24004C7B11 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 058557BA273AAA24004C7B11 /* Assets.xcassets */; };
+		058557D9273AAEEB004C7B11 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */; };
+		2152FB042600AC8F00CF470E /* iOSApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2152FB032600AC8F00CF470E /* iOSApp.swift */; };
+		7555FF83242A565900829871 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7555FF82242A565900829871 /* ContentView.swift */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+		7555FFB4242A642300829871 /* Embed Frameworks */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+			);
+			name = "Embed Frameworks";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+		058557BA273AAA24004C7B11 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
+		058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
+		2152FB032600AC8F00CF470E /* iOSApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSApp.swift; sourceTree = "<group>"; };
+		7555FF7B242A565900829871 /* dev.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = dev.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		7555FF82242A565900829871 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
+		7555FF8C242A565B00829871 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		7555FF78242A565900829871 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		058557D7273AAEEB004C7B11 /* Preview Content */ = {
+			isa = PBXGroup;
+			children = (
+				058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */,
+			);
+			path = "Preview Content";
+			sourceTree = "<group>";
+		};
+		7555FF72242A565900829871 = {
+			isa = PBXGroup;
+			children = (
+				7555FF7D242A565900829871 /* iosApp */,
+				7555FF7C242A565900829871 /* Products */,
+				7555FFB0242A642200829871 /* Frameworks */,
+			);
+			sourceTree = "<group>";
+		};
+		7555FF7C242A565900829871 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				7555FF7B242A565900829871 /* dev.app */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		7555FF7D242A565900829871 /* iosApp */ = {
+			isa = PBXGroup;
+			children = (
+				058557BA273AAA24004C7B11 /* Assets.xcassets */,
+				7555FF82242A565900829871 /* ContentView.swift */,
+				7555FF8C242A565B00829871 /* Info.plist */,
+				2152FB032600AC8F00CF470E /* iOSApp.swift */,
+				058557D7273AAEEB004C7B11 /* Preview Content */,
+			);
+			path = iosApp;
+			sourceTree = "<group>";
+		};
+		7555FFB0242A642200829871 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		7555FF7A242A565900829871 /* dev */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "dev" */;
+			buildPhases = (
+				7555FFB5242A651A00829871 /* Run script */,
+				7555FF77242A565900829871 /* Sources */,
+				7555FF78242A565900829871 /* Frameworks */,
+				7555FF79242A565900829871 /* Resources */,
+				7555FFB4242A642300829871 /* Embed Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = dev;
+			productName = iosApp;
+			productReference = 7555FF7B242A565900829871 /* dev.app */;
+			productType = "com.apple.product-type.application";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		7555FF73242A565900829871 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastSwiftUpdateCheck = 1130;
+				LastUpgradeCheck = 1130;
+				ORGANIZATIONNAME = orgName;
+				TargetAttributes = {
+					7555FF7A242A565900829871 = {
+						CreatedOnToolsVersion = 11.3.1;
+					};
+				};
+			};
+			buildConfigurationList = 7555FF76242A565900829871 /* Build configuration list for PBXProject "iosApp" */;
+			compatibilityVersion = "Xcode 9.3";
+			developmentRegion = en;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+				Base,
+			);
+			mainGroup = 7555FF72242A565900829871;
+			productRefGroup = 7555FF7C242A565900829871 /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				7555FF7A242A565900829871 /* dev */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		7555FF79242A565900829871 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				058557D9273AAEEB004C7B11 /* Preview Assets.xcassets in Resources */,
+				058557BB273AAA24004C7B11 /* Assets.xcassets in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXShellScriptBuildPhase section */
+		7555FFB5242A651A00829871 /* Run script */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = "Run script";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "cd \"$SRCROOT/..\"\n./gradlew :shared:embedAndSignAppleFrameworkForXcode\n";
+		};
+/* End PBXShellScriptBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		7555FF77242A565900829871 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				2152FB042600AC8F00CF470E /* iOSApp.swift in Sources */,
+				7555FF83242A565900829871 /* ContentView.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		7555FFA3242A565B00829871 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.1;
+				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+				MTL_FAST_MATH = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = iphoneos;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+			};
+			name = Debug;
+		};
+		7555FFA4242A565B00829871 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.1;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				MTL_FAST_MATH = YES;
+				SDKROOT = iphoneos;
+				SWIFT_COMPILATION_MODE = wholemodule;
+				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+		7555FFA6242A565B00829871 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\"";
+				DEVELOPMENT_TEAM = HP9WP2QQG8;
+				ENABLE_PREVIEWS = YES;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
+				);
+				INFOPLIST_FILE = iosApp/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					"-framework",
+					shared,
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = antufeevmichael.moko.test;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Debug;
+		};
+		7555FFA7242A565B00829871 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\"";
+				DEVELOPMENT_TEAM = HP9WP2QQG8;
+				ENABLE_PREVIEWS = YES;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
+				);
+				INFOPLIST_FILE = iosApp/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					"-framework",
+					shared,
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = antufeevmichael.moko.test;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		7555FF76242A565900829871 /* Build configuration list for PBXProject "iosApp" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				7555FFA3242A565B00829871 /* Debug */,
+				7555FFA4242A565B00829871 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "dev" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				7555FFA6242A565B00829871 /* Debug */,
+				7555FFA7242A565B00829871 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 7555FF73242A565900829871 /* Project object */;
+}
diff --git a/samples/kotlin-2-dynamic-sample/iosApp/iosApp.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/samples/kotlin-2-dynamic-sample/iosApp/iosApp.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 000000000..18d981003
--- /dev/null
+++ b/samples/kotlin-2-dynamic-sample/iosApp/iosApp.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/samples/kotlin-2-dynamic-sample/iosApp/iosApp/Assets.xcassets/AccentColor.colorset/Contents.json b/samples/kotlin-2-dynamic-sample/iosApp/iosApp/Assets.xcassets/AccentColor.colorset/Contents.json
new file mode 100644
index 000000000..ee7e3ca03
--- /dev/null
+++ b/samples/kotlin-2-dynamic-sample/iosApp/iosApp/Assets.xcassets/AccentColor.colorset/Contents.json
@@ -0,0 +1,11 @@
+{
+  "colors" : [
+    {
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
\ No newline at end of file
diff --git a/samples/kotlin-2-dynamic-sample/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/Contents.json b/samples/kotlin-2-dynamic-sample/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/Contents.json
new file mode 100644
index 000000000..fb88a396b
--- /dev/null
+++ b/samples/kotlin-2-dynamic-sample/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -0,0 +1,98 @@
+{
+  "images" : [
+    {
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "20x20"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "20x20"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "29x29"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "40x40"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "60x60"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "60x60"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "20x20"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "20x20"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "29x29"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "40x40"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "76x76"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "76x76"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "83.5x83.5"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "scale" : "1x",
+      "size" : "1024x1024"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
\ No newline at end of file
diff --git a/samples/kotlin-2-dynamic-sample/iosApp/iosApp/Assets.xcassets/Contents.json b/samples/kotlin-2-dynamic-sample/iosApp/iosApp/Assets.xcassets/Contents.json
new file mode 100644
index 000000000..4aa7c5350
--- /dev/null
+++ b/samples/kotlin-2-dynamic-sample/iosApp/iosApp/Assets.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
\ No newline at end of file
diff --git a/samples/kotlin-2-dynamic-sample/iosApp/iosApp/ContentView.swift b/samples/kotlin-2-dynamic-sample/iosApp/iosApp/ContentView.swift
new file mode 100644
index 000000000..85c2706bc
--- /dev/null
+++ b/samples/kotlin-2-dynamic-sample/iosApp/iosApp/ContentView.swift
@@ -0,0 +1,17 @@
+import SwiftUI
+import shared
+
+struct ContentView: View {
+    let greet = Greeting().getMR()
+
+	var body: some View {
+        Text(greet.localized())
+            .foregroundStyle(Color(Extra.colors().textColor.getUIColor()))
+	}
+}
+
+struct ContentView_Previews: PreviewProvider {
+	static var previews: some View {
+		ContentView()
+	}
+}
diff --git a/samples/kotlin-2-dynamic-sample/iosApp/iosApp/Info.plist b/samples/kotlin-2-dynamic-sample/iosApp/iosApp/Info.plist
new file mode 100644
index 000000000..9a269f5ea
--- /dev/null
+++ b/samples/kotlin-2-dynamic-sample/iosApp/iosApp/Info.plist
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>UIApplicationSceneManifest</key>
+	<dict>
+		<key>UIApplicationSupportsMultipleScenes</key>
+		<false/>
+	</dict>
+	<key>UILaunchScreen</key>
+	<dict/>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>armv7</string>
+	</array>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+</dict>
+</plist>
diff --git a/samples/kotlin-2-dynamic-sample/iosApp/iosApp/Preview Content/Preview Assets.xcassets/Contents.json b/samples/kotlin-2-dynamic-sample/iosApp/iosApp/Preview Content/Preview Assets.xcassets/Contents.json
new file mode 100644
index 000000000..4aa7c5350
--- /dev/null
+++ b/samples/kotlin-2-dynamic-sample/iosApp/iosApp/Preview Content/Preview Assets.xcassets/Contents.json	
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
\ No newline at end of file
diff --git a/samples/kotlin-2-dynamic-sample/iosApp/iosApp/iOSApp.swift b/samples/kotlin-2-dynamic-sample/iosApp/iosApp/iOSApp.swift
new file mode 100644
index 000000000..0648e8602
--- /dev/null
+++ b/samples/kotlin-2-dynamic-sample/iosApp/iosApp/iOSApp.swift
@@ -0,0 +1,10 @@
+import SwiftUI
+
+@main
+struct iOSApp: App {
+	var body: some Scene {
+		WindowGroup {
+			ContentView()
+		}
+	}
+}
\ No newline at end of file
diff --git a/samples/kotlin-2-dynamic-sample/local-check.sh b/samples/kotlin-2-dynamic-sample/local-check.sh
new file mode 100755
index 000000000..caed1975c
--- /dev/null
+++ b/samples/kotlin-2-dynamic-sample/local-check.sh
@@ -0,0 +1,30 @@
+#
+# Copyright 2024 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+#
+
+set -e
+
+log() {
+  echo "\033[0;32m> $1\033[0m"
+}
+
+./gradlew clean assembleDebug
+log "kotlin-2-dynamic-sample mobile android success"
+
+if ! command -v xcodebuild &> /dev/null
+then
+    log "xcodebuild could not be found, skip ios checks"
+
+    ./gradlew build
+    log "kotlin-2-dynamic-sample full build success"
+else
+    ./gradlew clean compileKotlinIosX64
+    log "kotlin-2-dynamic-sample mobile ios success"
+
+    (
+    cd iosApp &&
+    set -o pipefail &&
+    xcodebuild -scheme dev -configuration Debug -destination "generic/platform=iOS Simulator" build CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO | xcpretty
+    )
+    log "kotlin-2-dynamic-sample mobile ios xcode success"
+fi
diff --git a/samples/kotlin-2-dynamic-sample/settings.gradle.kts b/samples/kotlin-2-dynamic-sample/settings.gradle.kts
new file mode 100644
index 000000000..e5fe6351e
--- /dev/null
+++ b/samples/kotlin-2-dynamic-sample/settings.gradle.kts
@@ -0,0 +1,30 @@
+enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
+pluginManagement {
+    repositories {
+        google()
+        gradlePluginPortal()
+        mavenCentral()
+        maven("https://androidx.dev/storage/compose-compiler/repository/")
+        mavenLocal()
+    }
+}
+
+dependencyResolutionManagement {
+    repositories {
+        google()
+        mavenCentral()
+        maven("https://androidx.dev/storage/compose-compiler/repository/")
+        mavenLocal()
+    }
+
+    versionCatalogs {
+        create("moko") {
+            from(files("../../gradle/moko.versions.toml"))
+        }
+    }
+}
+
+rootProject.name = "kotlin2_dynamic_sample"
+include(":androidApp")
+include(":shared")
+include(":extramodule")
\ No newline at end of file
diff --git a/samples/kotlin-2-dynamic-sample/shared/build.gradle.kts b/samples/kotlin-2-dynamic-sample/shared/build.gradle.kts
new file mode 100644
index 000000000..ce404d612
--- /dev/null
+++ b/samples/kotlin-2-dynamic-sample/shared/build.gradle.kts
@@ -0,0 +1,55 @@
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+
+plugins {
+    alias(libs.plugins.kotlinMultiplatform)
+    alias(libs.plugins.androidLibrary)
+    id("dev.icerock.mobile.multiplatform-resources")
+}
+
+kotlin {
+    androidTarget {
+        @OptIn(ExperimentalKotlinGradlePluginApi::class)
+        compilerOptions {
+            apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0)
+        }
+    }
+    
+    listOf(
+        iosX64(),
+        iosArm64(),
+        iosSimulatorArm64()
+    ).forEach {
+        it.binaries.framework {
+            baseName = "shared"
+            isStatic = false
+            export(moko.resources)
+            export(projects.extramodule)
+        }
+    }
+
+    sourceSets {
+        commonMain.dependencies {
+            api(moko.resources)
+            api(projects.extramodule)
+        }
+        commonTest.dependencies {
+            implementation(libs.kotlin.test)
+        }
+    }
+}
+
+android {
+    namespace = "app.kotlin2sample"
+    compileSdk = 34
+    defaultConfig {
+        minSdk = 26
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+}
+
+multiplatformResources {
+    resourcesPackage.set("app.kotlin2sample.library")
+}
diff --git a/samples/kotlin-2-dynamic-sample/shared/src/androidMain/kotlin/app/kotlin2sample/Platform.android.kt b/samples/kotlin-2-dynamic-sample/shared/src/androidMain/kotlin/app/kotlin2sample/Platform.android.kt
new file mode 100644
index 000000000..4ddcf9e2e
--- /dev/null
+++ b/samples/kotlin-2-dynamic-sample/shared/src/androidMain/kotlin/app/kotlin2sample/Platform.android.kt
@@ -0,0 +1,7 @@
+package app.kotlin2sample
+
+class AndroidPlatform : Platform {
+    override val name: String = "Android ${android.os.Build.VERSION.SDK_INT}"
+}
+
+actual fun getPlatform(): Platform = AndroidPlatform()
\ No newline at end of file
diff --git a/samples/kotlin-2-dynamic-sample/shared/src/commonMain/kotlin/app/kotlin2sample/Greeting.kt b/samples/kotlin-2-dynamic-sample/shared/src/commonMain/kotlin/app/kotlin2sample/Greeting.kt
new file mode 100644
index 000000000..e2428e433
--- /dev/null
+++ b/samples/kotlin-2-dynamic-sample/shared/src/commonMain/kotlin/app/kotlin2sample/Greeting.kt
@@ -0,0 +1,17 @@
+package app.kotlin2sample
+
+import app.kotlin2sample.library.MR
+import dev.icerock.moko.resources.desc.StringDesc
+import dev.icerock.moko.resources.desc.desc
+
+class Greeting {
+    private val platform: Platform = getPlatform()
+
+    fun greet(): String {
+        return "Hello, ${platform.name}!"
+    }
+
+    fun getMR(): StringDesc {
+        return MR.strings.hello_world.desc()
+    }
+}
diff --git a/samples/kotlin-2-dynamic-sample/shared/src/commonMain/kotlin/app/kotlin2sample/Platform.kt b/samples/kotlin-2-dynamic-sample/shared/src/commonMain/kotlin/app/kotlin2sample/Platform.kt
new file mode 100644
index 000000000..32667a0a3
--- /dev/null
+++ b/samples/kotlin-2-dynamic-sample/shared/src/commonMain/kotlin/app/kotlin2sample/Platform.kt
@@ -0,0 +1,7 @@
+package app.kotlin2sample
+
+interface Platform {
+    val name: String
+}
+
+expect fun getPlatform(): Platform
\ No newline at end of file
diff --git a/samples/kotlin-2-dynamic-sample/shared/src/commonMain/moko-resources/base/plurals.xml b/samples/kotlin-2-dynamic-sample/shared/src/commonMain/moko-resources/base/plurals.xml
new file mode 100644
index 000000000..2965d3a73
--- /dev/null
+++ b/samples/kotlin-2-dynamic-sample/shared/src/commonMain/moko-resources/base/plurals.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<resources>
+    <plural name="chars_count">
+        <item quantity="zero">zero chars</item>
+        <item quantity="one">%d char</item>
+        <item quantity="two">%d chars</item>
+        <item quantity="other">%d chars</item>
+    </plural>
+</resources>
\ No newline at end of file
diff --git a/samples/kotlin-2-dynamic-sample/shared/src/commonMain/moko-resources/base/strings.xml b/samples/kotlin-2-dynamic-sample/shared/src/commonMain/moko-resources/base/strings.xml
new file mode 100644
index 000000000..9db4ff73f
--- /dev/null
+++ b/samples/kotlin-2-dynamic-sample/shared/src/commonMain/moko-resources/base/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<resources>
+    <string name="hello_world">Hello moko-resources World</string>
+    <string name="test">Second value for Test</string>
+</resources>
diff --git a/samples/kotlin-2-dynamic-sample/shared/src/commonMain/moko-resources/ru/plurals.xml b/samples/kotlin-2-dynamic-sample/shared/src/commonMain/moko-resources/ru/plurals.xml
new file mode 100644
index 000000000..7b05e4ccd
--- /dev/null
+++ b/samples/kotlin-2-dynamic-sample/shared/src/commonMain/moko-resources/ru/plurals.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<resources>
+    <plural name="chars_count">
+        <item quantity="zero">%d символов</item>
+        <item quantity="one">%d символ</item>
+        <item quantity="few">%d символа</item>
+        <item quantity="many">%d символов</item>
+        <item quantity="other">%d символа</item>
+    </plural>
+</resources>
diff --git a/samples/kotlin-2-dynamic-sample/shared/src/commonMain/moko-resources/ru/strings.xml b/samples/kotlin-2-dynamic-sample/shared/src/commonMain/moko-resources/ru/strings.xml
new file mode 100644
index 000000000..7d0ed01c1
--- /dev/null
+++ b/samples/kotlin-2-dynamic-sample/shared/src/commonMain/moko-resources/ru/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<resources>
+    <string name="hello_world">Привет Мир moko-resources</string>
+    <string name="test">Тестовая строка</string>
+</resources>
diff --git a/samples/kotlin-2-dynamic-sample/shared/src/iosMain/kotlin/app/kotlin2sample/Platform.ios.kt b/samples/kotlin-2-dynamic-sample/shared/src/iosMain/kotlin/app/kotlin2sample/Platform.ios.kt
new file mode 100644
index 000000000..830209913
--- /dev/null
+++ b/samples/kotlin-2-dynamic-sample/shared/src/iosMain/kotlin/app/kotlin2sample/Platform.ios.kt
@@ -0,0 +1,9 @@
+package app.kotlin2sample
+
+import platform.UIKit.UIDevice
+
+class IOSPlatform: Platform {
+    override val name: String = UIDevice.currentDevice.systemName() + " " + UIDevice.currentDevice.systemVersion
+}
+
+actual fun getPlatform(): Platform = IOSPlatform()
\ No newline at end of file
diff --git a/samples/kotlin-2-dynamic-sample/shared/src/iosMain/moko-resources/base/strings.xml b/samples/kotlin-2-dynamic-sample/shared/src/iosMain/moko-resources/base/strings.xml
new file mode 100644
index 000000000..9acebfd13
--- /dev/null
+++ b/samples/kotlin-2-dynamic-sample/shared/src/iosMain/moko-resources/base/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<resources>
+    <string name="hello_ios_world">Hello iOS World</string>
+</resources>
diff --git a/samples/kotlin-2-dynamic-sample/shared/src/iosMain/moko-resources/ru/strings.xml b/samples/kotlin-2-dynamic-sample/shared/src/iosMain/moko-resources/ru/strings.xml
new file mode 100644
index 000000000..d8b74e1a1
--- /dev/null
+++ b/samples/kotlin-2-dynamic-sample/shared/src/iosMain/moko-resources/ru/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<resources>
+    <string name="hello_ios_world">Привет iOS Мир</string>
+</resources>
diff --git a/samples/kotlin-2-dynamic-sample/shared/src/iosSimulatorArm64Main/moko-resources/base/strings.xml b/samples/kotlin-2-dynamic-sample/shared/src/iosSimulatorArm64Main/moko-resources/base/strings.xml
new file mode 100644
index 000000000..e4e3a35f9
--- /dev/null
+++ b/samples/kotlin-2-dynamic-sample/shared/src/iosSimulatorArm64Main/moko-resources/base/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<resources>
+    <string name="hello_simulator_world">Hello simulator World</string>
+    <string name="test">Second value for Test</string>
+</resources>
diff --git a/samples/kotlin-2-tests/.gitignore b/samples/kotlin-2-tests/.gitignore
new file mode 100644
index 000000000..66c3a4dab
--- /dev/null
+++ b/samples/kotlin-2-tests/.gitignore
@@ -0,0 +1,27 @@
+*.iml
+.gradle
+.idea
+.DS_Store
+build
+*/build
+captures
+.externalNativeBuild
+.cxx
+local.properties
+/androidApp/key
+*.jks
+*yarn.lock
+kotlin-js-store/
+moko-resources-generated.js
+.kotlin
+
+## fastlane specific
+**/fastlane/report.xml
+# deliver temporary files
+**/fastlane/Preview.html
+# snapshot generated screenshots
+**/fastlane/screenshots
+# scan temporary files
+**/fastlane/test_output
+
+.kotlin
diff --git a/samples/kotlin-2-tests/build.gradle.kts b/samples/kotlin-2-tests/build.gradle.kts
new file mode 100644
index 000000000..309e1fd58
--- /dev/null
+++ b/samples/kotlin-2-tests/build.gradle.kts
@@ -0,0 +1,21 @@
+allprojects {
+    repositories {
+        google()
+        mavenCentral()
+        mavenLocal()
+    }
+}
+
+plugins {
+    alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.android.library) apply false
+    alias(libs.plugins.kotlin.multiplatform) apply false
+    alias(libs.plugins.kotlin.plugin.serialization) apply false
+    alias(libs.plugins.kotlin.plugin.compose) apply false
+    alias(libs.plugins.kotlin.native.cocoapods) apply false
+    alias(libs.plugins.sqldelight) apply false
+    alias(libs.plugins.compose.multiplatform) apply false
+    alias(libs.plugins.moko.resources) apply false
+    alias(libs.plugins.paparazzi) apply false
+    alias(libs.plugins.licenses) apply false
+}
diff --git a/samples/kotlin-2-tests/gradle.properties b/samples/kotlin-2-tests/gradle.properties
new file mode 100644
index 000000000..ffd8b18cd
--- /dev/null
+++ b/samples/kotlin-2-tests/gradle.properties
@@ -0,0 +1,15 @@
+#Gradle
+org.gradle.jvmargs=-Xmx3G -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx2048M"
+# should speed up build times
+org.gradle.caching=true
+
+#Kotlin
+kotlin.code.style=official
+
+#Android
+android.useAndroidX=true
+
+#MPP
+kotlin.mpp.enableCInteropCommonization=true
+org.jetbrains.compose.experimental.jscanvas.enabled=true
+xcodeproj=./iosApp
diff --git a/samples/kotlin-2-tests/gradle/libs.versions.toml b/samples/kotlin-2-tests/gradle/libs.versions.toml
new file mode 100644
index 000000000..eaf545dbd
--- /dev/null
+++ b/samples/kotlin-2-tests/gradle/libs.versions.toml
@@ -0,0 +1,70 @@
+[versions]
+decompose = "3.2.2"
+agp = "8.7.3"
+coroutines = "1.9.0"
+hamcrest = "3.0"
+ktor = "3.0.1"
+sqldelight = "2.0.2"
+kx-datetime = "0.6.1"
+uuid = "0.8.4"
+kodein = "7.23.1"
+moko-resources = "0.24.5"
+wrappers = "1.0.0-pre.839"
+kotlin = "2.1.0"
+compose-multiplatform = "1.7.1"
+paparazzi = "1.3.4"
+kotest = "5.9.1"
+ax-activity = "1.9.3"
+junit = "4.13.2"
+robolectric = "4.14.1"
+licenses = "2.9"
+
+[libraries]
+decompose = { group = "com.arkivanov.decompose", name = "decompose", version.ref = "decompose" }
+decompose-compose = { group = "com.arkivanov.decompose", name = "extensions-compose", version.ref = "decompose" }
+coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "coroutines" }
+coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "coroutines" }
+hamcrest = { group = "org.hamcrest", name = "hamcrest", version.ref = "hamcrest" }
+ktor-client-core = { group = "io.ktor", name = "ktor-client-core", version.ref = "ktor" }
+ktor-client-contentNegotiation = { group = "io.ktor", name = "ktor-client-content-negotiation", version.ref = "ktor" }
+ktor-client-logging = { group = "io.ktor", name = "ktor-client-logging", version.ref = "ktor" }
+ktor-client-mock = { group = "io.ktor", name = "ktor-client-mock", version.ref = "ktor" }
+ktor-client-auth = { group = "io.ktor", name = "ktor-client-auth", version.ref = "ktor" }
+ktor-client-android = { group = "io.ktor", name = "ktor-client-android", version.ref = "ktor" }
+ktor-client-ios = { group = "io.ktor", name = "ktor-client-ios", version.ref = "ktor" }
+ktor-client-js = { group = "io.ktor", name = "ktor-client-js", version.ref = "ktor" }
+ktor-client-java = { group = "io.ktor", name = "ktor-client-java", version.ref = "ktor" }
+ktor-json = { group = "io.ktor", name = "ktor-serialization-kotlinx-json", version.ref = "ktor" }
+sqldelight-webWorker = { group = "app.cash.sqldelight", name = "web-worker-driver", version.ref = "sqldelight" }
+sqldelight-android = { group = "app.cash.sqldelight", name = "android-driver", version.ref = "sqldelight" }
+sqldelight-native = { group = "app.cash.sqldelight", name = "native-driver", version.ref = "sqldelight" }
+sqldelight-jdbc = { group = "app.cash.sqldelight", name = "sqlite-driver", version.ref = "sqldelight" }
+sqldelight-coroutines = { group = "app.cash.sqldelight", name = "coroutines-extensions", version.ref = "sqldelight" }
+kotlinx-datetime = { group = "org.jetbrains.kotlinx", name = "kotlinx-datetime", version.ref = "kx-datetime" }
+uuid = { group = "com.benasher44", name = "uuid", version.ref = "uuid" }
+kodein-di = { group = "org.kodein.di", name = "kodein-di", version.ref = "kodein" }
+kodein-android = { group = "org.kodein.di", name = "kodein-di-framework-android-x", version.ref = "kodein" }
+moko-resources = { group = "dev.icerock.moko", name = "resources", version.ref = "moko-resources" }
+moko-resources-compose = { group = "dev.icerock.moko", name = "resources-compose", version.ref = "moko-resources" }
+wrappers-js = { group = "org.jetbrains.kotlin-wrappers", name = "kotlin-js", version.ref = "wrappers" }
+wrappers-web = { group = "org.jetbrains.kotlin-wrappers", name = "kotlin-web", version.ref = "wrappers" }
+kotest-assertions-core = { group = "io.kotest", name = "kotest-assertions-core", version.ref = "kotest" }
+kotlin-test = { group = "org.jetbrains.kotlin", name = "kotlin-test", version.ref = "kotlin" }
+androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "ax-activity" }
+androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
+androidx-compose-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
+junit = { group = "junit", name = "junit", version.ref = "junit" }
+robolectric = { group = "org.robolectric", name = "robolectric", version.ref = "robolectric" }
+
+[plugins]
+android-application = { id = "com.android.application", version.ref = "agp" }
+android-library = { id = "com.android.library", version.ref = "agp" }
+sqldelight = { id = "app.cash.sqldelight", version.ref = "sqldelight" }
+moko-resources = { id = "dev.icerock.mobile.multiplatform-resources", version.ref = "moko-resources" }
+compose-multiplatform = { id = "org.jetbrains.compose", version.ref = "compose-multiplatform" }
+kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
+kotlin-plugin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
+kotlin-native-cocoapods = { id = "org.jetbrains.kotlin.native.cocoapods", version.ref = "kotlin" }
+paparazzi = { id = "app.cash.paparazzi", version.ref = "paparazzi" }
+licenses = { id = "com.github.jk1.dependency-license-report", version.ref = "licenses" }
+kotlin-plugin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
diff --git a/samples/kotlin-2-tests/gradle/wrapper/gradle-wrapper.jar b/samples/kotlin-2-tests/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 000000000..f6b961fd5
Binary files /dev/null and b/samples/kotlin-2-tests/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/samples/kotlin-2-tests/gradle/wrapper/gradle-wrapper.properties b/samples/kotlin-2-tests/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000..1b330350f
--- /dev/null
+++ b/samples/kotlin-2-tests/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Tue Apr 06 10:19:50 MSK 2021
+distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionPath=wrapper/dists
+zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
diff --git a/samples/kotlin-2-tests/gradlew b/samples/kotlin-2-tests/gradlew
new file mode 100755
index 000000000..cccdd3d51
--- /dev/null
+++ b/samples/kotlin-2-tests/gradlew
@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/samples/kotlin-2-tests/gradlew.bat b/samples/kotlin-2-tests/gradlew.bat
new file mode 100644
index 000000000..f9553162f
--- /dev/null
+++ b/samples/kotlin-2-tests/gradlew.bat
@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/samples/kotlin-2-tests/local-check.sh b/samples/kotlin-2-tests/local-check.sh
new file mode 100755
index 000000000..61723826c
--- /dev/null
+++ b/samples/kotlin-2-tests/local-check.sh
@@ -0,0 +1,12 @@
+#
+# Copyright 2024 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+#
+
+set -e
+
+log() {
+  echo "\033[0;32m> $1\033[0m"
+}
+
+./gradlew clean build
+log "kotlin-2-test build success"
diff --git a/samples/kotlin-2-tests/settings.gradle.kts b/samples/kotlin-2-tests/settings.gradle.kts
new file mode 100644
index 000000000..f0bbd9209
--- /dev/null
+++ b/samples/kotlin-2-tests/settings.gradle.kts
@@ -0,0 +1,10 @@
+rootProject.name = "kotlin-2-tests"
+include(":shared")
+
+pluginManagement {
+    repositories {
+        google()
+        gradlePluginPortal()
+        mavenLocal()
+    }
+}
diff --git a/samples/kotlin-2-tests/shared/build.gradle.kts b/samples/kotlin-2-tests/shared/build.gradle.kts
new file mode 100644
index 000000000..3afaef8e7
--- /dev/null
+++ b/samples/kotlin-2-tests/shared/build.gradle.kts
@@ -0,0 +1,84 @@
+plugins {
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.multiplatform)
+    alias(libs.plugins.moko.resources)
+}
+
+kotlin {
+    jvmToolchain(17)
+
+    androidTarget()
+    jvm()
+    iosX64()
+    iosArm64()
+    iosSimulatorArm64()
+    js(IR) {
+        browser {
+            testTask {
+                useKarma {
+                    useSourceMapSupport()
+                    useChromeHeadless()
+                }
+            }
+        }
+    }
+
+    sourceSets {
+        commonMain {
+            dependencies {
+                api(libs.coroutines.core)
+                api(libs.moko.resources)
+            }
+        }
+        commonTest {
+            dependencies {
+                implementation(libs.kotest.assertions.core)
+                implementation(libs.kotlin.test)
+
+                implementation(libs.coroutines.test)
+            }
+        }
+
+        androidMain.dependencies {
+        }
+        val androidUnitTest by getting {
+            // must use an android test SourceSet!
+            android.sourceSets.getByName("test").resources.srcDir("src/commonTest/resources")
+            dependencies {
+                implementation(libs.junit)
+                implementation(libs.robolectric)
+            }
+        }
+
+        jsMain.dependencies {
+            implementation(devNpm("copy-webpack-plugin", "12.0.2"))
+        }
+        jsTest.dependencies {
+            implementation(npm("karma-safarinative-launcher", "1.1.0"))
+        }
+
+        iosMain.dependencies {
+        }
+
+        jvmMain.dependencies {
+        }
+    }
+}
+
+multiplatformResources {
+    resourcesPackage.set("template.composemultiplatform.shared")
+    resourcesClassName.set("SharedRes")
+}
+
+android {
+    namespace = "template.composemultiplatform.shared"
+    compileSdk = 35
+    defaultConfig {
+        minSdk = 21
+    }
+    testOptions {
+        unitTests {
+            isIncludeAndroidResources = true
+        }
+    }
+}
diff --git a/samples/kotlin-2-tests/shared/src/androidMain/kotlin/template/composemultiplatform/shared/common/resources/Localizer.kt b/samples/kotlin-2-tests/shared/src/androidMain/kotlin/template/composemultiplatform/shared/common/resources/Localizer.kt
new file mode 100644
index 000000000..27cc99f5a
--- /dev/null
+++ b/samples/kotlin-2-tests/shared/src/androidMain/kotlin/template/composemultiplatform/shared/common/resources/Localizer.kt
@@ -0,0 +1,9 @@
+package template.composemultiplatform.shared.common.resources
+
+import android.content.Context
+import dev.icerock.moko.resources.StringResource
+import dev.icerock.moko.resources.format
+
+actual class Localizer(private val context: Context) {
+    actual fun localize(res: StringResource, vararg args: Any?) = res.format(args).toString(context)
+}
diff --git a/samples/kotlin-2-tests/shared/src/androidUnitTest/kotlin/testutils/MultiPlatformTest.kt b/samples/kotlin-2-tests/shared/src/androidUnitTest/kotlin/testutils/MultiPlatformTest.kt
new file mode 100644
index 000000000..84be4bffb
--- /dev/null
+++ b/samples/kotlin-2-tests/shared/src/androidUnitTest/kotlin/testutils/MultiPlatformTest.kt
@@ -0,0 +1,12 @@
+package testutils
+
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+import template.composemultiplatform.shared.common.resources.Localizer
+
+@RunWith(RobolectricTestRunner::class)
+actual abstract class MultiPlatformTest {
+    private val context = RuntimeEnvironment.getApplication()
+    actual suspend fun getTestLocalizer() = Localizer(context)
+}
diff --git a/samples/kotlin-2-tests/shared/src/commonMain/kotlin/template/composemultiplatform/shared/common/resources/Localizer.kt b/samples/kotlin-2-tests/shared/src/commonMain/kotlin/template/composemultiplatform/shared/common/resources/Localizer.kt
new file mode 100644
index 000000000..a171037c2
--- /dev/null
+++ b/samples/kotlin-2-tests/shared/src/commonMain/kotlin/template/composemultiplatform/shared/common/resources/Localizer.kt
@@ -0,0 +1,7 @@
+package template.composemultiplatform.shared.common.resources
+
+import dev.icerock.moko.resources.StringResource
+
+expect class Localizer {
+    fun localize(res: StringResource, vararg args: Any?): String
+}
diff --git a/samples/kotlin-2-tests/shared/src/commonMain/moko-resources/base/strings.xml b/samples/kotlin-2-tests/shared/src/commonMain/moko-resources/base/strings.xml
new file mode 100644
index 000000000..7edc1384b
--- /dev/null
+++ b/samples/kotlin-2-tests/shared/src/commonMain/moko-resources/base/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="appName">ExampleApp</string>
+</resources>
diff --git a/samples/kotlin-2-tests/shared/src/commonTest/kotlin/testutils/GeneratedResourcesTest.kt b/samples/kotlin-2-tests/shared/src/commonTest/kotlin/testutils/GeneratedResourcesTest.kt
new file mode 100644
index 000000000..3c4389dd8
--- /dev/null
+++ b/samples/kotlin-2-tests/shared/src/commonTest/kotlin/testutils/GeneratedResourcesTest.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2025 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package testutils
+
+import io.kotest.matchers.shouldBe
+import kotlinx.coroutines.test.runTest
+import template.composemultiplatform.shared.SharedRes
+import kotlin.test.Test
+
+class GeneratedResourcesTest : MultiPlatformTest() {
+
+    @Test
+    fun readBuildInfoTest() = runTest {
+        getTestLocalizer().localize(SharedRes.strings.appName)
+            .shouldBe("ExampleApp")
+    }
+}
\ No newline at end of file
diff --git a/samples/kotlin-2-tests/shared/src/commonTest/kotlin/testutils/MultiPlatformTest.kt b/samples/kotlin-2-tests/shared/src/commonTest/kotlin/testutils/MultiPlatformTest.kt
new file mode 100644
index 000000000..ffb869757
--- /dev/null
+++ b/samples/kotlin-2-tests/shared/src/commonTest/kotlin/testutils/MultiPlatformTest.kt
@@ -0,0 +1,7 @@
+package testutils
+
+import template.composemultiplatform.shared.common.resources.Localizer
+
+expect abstract class MultiPlatformTest() {
+    suspend fun getTestLocalizer(): Localizer
+}
diff --git a/samples/kotlin-2-tests/shared/src/iosMain/kotlin/template/composemultiplatform/shared/common/resources/Localizer.kt b/samples/kotlin-2-tests/shared/src/iosMain/kotlin/template/composemultiplatform/shared/common/resources/Localizer.kt
new file mode 100644
index 000000000..596bff47c
--- /dev/null
+++ b/samples/kotlin-2-tests/shared/src/iosMain/kotlin/template/composemultiplatform/shared/common/resources/Localizer.kt
@@ -0,0 +1,8 @@
+package template.composemultiplatform.shared.common.resources
+
+import dev.icerock.moko.resources.StringResource
+import dev.icerock.moko.resources.format
+
+actual class Localizer {
+    actual fun localize(res: StringResource, vararg args: Any?) = res.format(args).localized()
+}
diff --git a/samples/kotlin-2-tests/shared/src/iosTest/kotlin/testutils/MultiPlatformTest.kt b/samples/kotlin-2-tests/shared/src/iosTest/kotlin/testutils/MultiPlatformTest.kt
new file mode 100644
index 000000000..d25bda041
--- /dev/null
+++ b/samples/kotlin-2-tests/shared/src/iosTest/kotlin/testutils/MultiPlatformTest.kt
@@ -0,0 +1,7 @@
+package testutils
+
+import template.composemultiplatform.shared.common.resources.Localizer
+
+actual abstract class MultiPlatformTest {
+    actual suspend fun getTestLocalizer() = Localizer()
+}
diff --git a/samples/kotlin-2-tests/shared/src/jsMain/kotlin/template/composemultiplatform/shared/common/resources/Localizer.kt b/samples/kotlin-2-tests/shared/src/jsMain/kotlin/template/composemultiplatform/shared/common/resources/Localizer.kt
new file mode 100644
index 000000000..8a1ebf52b
--- /dev/null
+++ b/samples/kotlin-2-tests/shared/src/jsMain/kotlin/template/composemultiplatform/shared/common/resources/Localizer.kt
@@ -0,0 +1,9 @@
+package template.composemultiplatform.shared.common.resources
+
+import dev.icerock.moko.resources.StringResource
+import dev.icerock.moko.resources.format
+import dev.icerock.moko.resources.provider.JsStringProvider
+
+actual class Localizer(private val strings: JsStringProvider) {
+    actual fun localize(res: StringResource, vararg args: Any?) = res.format(args).toLocalizedString(strings)
+}
diff --git a/samples/kotlin-2-tests/shared/src/jsTest/kotlin/testutils/MultiPlatformTest.kt b/samples/kotlin-2-tests/shared/src/jsTest/kotlin/testutils/MultiPlatformTest.kt
new file mode 100644
index 000000000..2243c1662
--- /dev/null
+++ b/samples/kotlin-2-tests/shared/src/jsTest/kotlin/testutils/MultiPlatformTest.kt
@@ -0,0 +1,8 @@
+package testutils
+
+import template.composemultiplatform.shared.SharedRes
+import template.composemultiplatform.shared.common.resources.Localizer
+
+actual abstract class MultiPlatformTest {
+    actual suspend fun getTestLocalizer() = Localizer(SharedRes.strings.stringsLoader.getOrLoad())
+}
diff --git a/samples/kotlin-2-tests/shared/src/jvmMain/kotlin/template/composemultiplatform/shared/common/resources/Localizer.jvm.kt b/samples/kotlin-2-tests/shared/src/jvmMain/kotlin/template/composemultiplatform/shared/common/resources/Localizer.jvm.kt
new file mode 100644
index 000000000..0eb5333c0
--- /dev/null
+++ b/samples/kotlin-2-tests/shared/src/jvmMain/kotlin/template/composemultiplatform/shared/common/resources/Localizer.jvm.kt
@@ -0,0 +1,10 @@
+package template.composemultiplatform.shared.common.resources
+
+import dev.icerock.moko.resources.StringResource
+import dev.icerock.moko.resources.format
+
+actual class Localizer {
+    actual fun localize(res: StringResource, vararg args: Any?): String {
+        return res.format(args).localized()
+    }
+}
diff --git a/samples/kotlin-2-tests/shared/src/jvmTest/kotlin/testutils/MultiPlatformTest.jvm.kt b/samples/kotlin-2-tests/shared/src/jvmTest/kotlin/testutils/MultiPlatformTest.jvm.kt
new file mode 100644
index 000000000..bff547fea
--- /dev/null
+++ b/samples/kotlin-2-tests/shared/src/jvmTest/kotlin/testutils/MultiPlatformTest.jvm.kt
@@ -0,0 +1,7 @@
+package testutils
+
+import template.composemultiplatform.shared.common.resources.Localizer
+
+actual abstract class MultiPlatformTest actual constructor() {
+    actual suspend fun getTestLocalizer() = Localizer()
+}
diff --git a/samples/kotlin-ios-app/xcode-project/TestProj.xcodeproj/project.pbxproj b/samples/kotlin-ios-app/xcode-project/TestProj.xcodeproj/project.pbxproj
index 0c96d8d69..13303a629 100644
--- a/samples/kotlin-ios-app/xcode-project/TestProj.xcodeproj/project.pbxproj
+++ b/samples/kotlin-ios-app/xcode-project/TestProj.xcodeproj/project.pbxproj
@@ -333,7 +333,7 @@
 		7FD0DE9027F45B08007F61A3 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
@@ -415,7 +415,7 @@
 		7FD0DE9127F45B08007F61A3 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;