diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f3e28298..35ba2d44 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 kotlinVersion = "1.6.10"
-androidGradleVersion = "7.2.0"
+androidGradleVersion = "7.3.1"
 
 # kotlinx
 kotlinxSerializationVersion = "1.2.1"
@@ -94,4 +94,4 @@ kotlinCompilerEmbeddable = { module = "org.jetbrains.kotlin:kotlin-compiler-embe
 detektGradlePlugin = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detektVersion" }
 mokoMultiplatformPlugin = { module = "dev.icerock:mobile-multiplatform", version.ref = "mokoMultiplatformPluginVersion" }
 composeJetBrainsPlugin = { module = "org.jetbrains.compose:compose-gradle-plugin", version.ref = "composeJetbrainsVersion" }
-autoManifestPlugin = { module = "com.gradleup:auto-manifest-plugin", version = "1.1.1" }
+autoManifestPlugin = { module = "com.gradleup:auto-manifest-plugin", version = "2.0" }
diff --git a/resources/build.gradle.kts b/resources/build.gradle.kts
index 0465e2e0..fc429b78 100644
--- a/resources/build.gradle.kts
+++ b/resources/build.gradle.kts
@@ -77,3 +77,9 @@ val copyIosArm64TestResources = tasks.register<Copy>("copyIosArm64TestResources"
 }
 
 tasks.findByName("iosSimulatorArm64Test")!!.dependsOn(copyIosArm64TestResources)
+
+listOf("iosX64Test","iosSimulatorArm64Test").forEach {
+    tasks.getByName<org.jetbrains.kotlin.gradle.targets.native.tasks.KotlinNativeSimulatorTest>(it){
+        deviceId = "iPhone 14"
+    }
+}
diff --git a/sample/android-mpp-app/build.gradle.kts b/sample/android-mpp-app/build.gradle.kts
index 6f49203e..744b71b1 100644
--- a/sample/android-mpp-app/build.gradle.kts
+++ b/sample/android-mpp-app/build.gradle.kts
@@ -20,6 +20,11 @@ android {
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
+    sourceSets{
+        this.getByName("main"){
+            res.srcDir(File(buildDir, "generated/moko/androidMain/res"))
+        }
+    }
 }
 
 kotlin {
diff --git a/sample/mpp-conditional/build.gradle.kts b/sample/mpp-conditional/build.gradle.kts
index f454c67c..c405fab3 100644
--- a/sample/mpp-conditional/build.gradle.kts
+++ b/sample/mpp-conditional/build.gradle.kts
@@ -11,8 +11,13 @@ plugins {
 }
 
 android {
-    lintOptions {
-        disable("ImpliedQuantity")
+    lint {
+        disable += "ImpliedQuantity"
+    }
+    sourceSets{
+        this.getByName("main"){
+            res.srcDir(File(buildDir, "generated/moko/androidMain/res"))
+        }
     }
 }
 
diff --git a/sample/mpp-hierarhical/build.gradle.kts b/sample/mpp-hierarhical/build.gradle.kts
index 9eb0be15..244084b5 100644
--- a/sample/mpp-hierarhical/build.gradle.kts
+++ b/sample/mpp-hierarhical/build.gradle.kts
@@ -23,6 +23,12 @@ android {
     testOptions {
         unitTests.isIncludeAndroidResources = true
     }
+
+    sourceSets{
+        this.getByName("main"){
+            res.srcDir(File(buildDir, "generated/moko/androidMain/res"))
+        }
+    }
 }
 
 // CocoaPods requires the podspec to have a version.
@@ -112,6 +118,13 @@ kotlin {
         }
 }
 
+listOf("iosX64Test","iosSimulatorArm64Test").forEach {
+    tasks.getByName<org.jetbrains.kotlin.gradle.targets.native.tasks.KotlinNativeSimulatorTest>(it){
+        deviceId = "iPhone 14"
+    }
+}
+
+
 multiplatformResources {
     multiplatformResourcesPackage = "com.icerockdev.library"
     disableStaticFrameworkWarning = true
diff --git a/sample/mpp-library/build.gradle.kts b/sample/mpp-library/build.gradle.kts
index 8dded80b..6f34b5d3 100644
--- a/sample/mpp-library/build.gradle.kts
+++ b/sample/mpp-library/build.gradle.kts
@@ -13,12 +13,19 @@ plugins {
 
 android {
     namespace = "com.icerockdev.library"
-
+    lint {
+        disable += "ImpliedQuantity"
+    }
     testOptions {
         unitTests {
             isIncludeAndroidResources = true
         }
     }
+    sourceSets{
+        this.getByName("main"){
+            res.srcDir(File(buildDir, "generated/moko/androidMain/res"))
+        }
+    }
 }
 
 kotlin {
@@ -33,6 +40,12 @@ kotlin {
         }
 }
 
+listOf("iosX64Test","iosSimulatorArm64Test").forEach {
+    tasks.getByName<org.jetbrains.kotlin.gradle.targets.native.tasks.KotlinNativeSimulatorTest>(it){
+        deviceId = "iPhone 14"
+    }
+}
+
 dependencies {
     commonMainApi(projects.resources)
     commonMainApi(libs.mokoGraphics)
diff --git a/sample/mpp-library/nested-module/build.gradle.kts b/sample/mpp-library/nested-module/build.gradle.kts
index b3964c8c..2cd2e89b 100644
--- a/sample/mpp-library/nested-module/build.gradle.kts
+++ b/sample/mpp-library/nested-module/build.gradle.kts
@@ -11,6 +11,15 @@ plugins {
     id("com.gradleup.auto.manifest")
 }
 
+android {
+    sourceSets{
+        this.getByName("main"){
+            res.srcDir(File(buildDir, "generated/moko/androidMain/res"))
+        }
+    }
+}
+
+
 dependencies {
     commonMainApi(projects.resources)
 }
diff --git a/sample/mpp-mixed/build.gradle.kts b/sample/mpp-mixed/build.gradle.kts
index 57fa78cf..5abfc0f2 100644
--- a/sample/mpp-mixed/build.gradle.kts
+++ b/sample/mpp-mixed/build.gradle.kts
@@ -11,8 +11,13 @@ plugins {
 }
 
 android {
-    lintOptions {
-        disable("ImpliedQuantity")
+    lint {
+        disable += "ImpliedQuantity"
+    }
+    sourceSets{
+        this.getByName("main"){
+            res.srcDir(File(buildDir, "generated/moko/androidMain/res"))
+        }
     }
 }