diff --git a/build.gradle.kts b/build.gradle.kts
index 6157b43..e236e9f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,3 +6,12 @@ plugins {
     alias(libs.plugins.kotlinCocoapods).apply(false)
     id("com.google.gms.google-services") version "4.4.2" apply false
 }
+
+allprojects {
+    configurations.all {
+        resolutionStrategy {
+            force("org.jetbrains.kotlin:kotlin-stdlib:2.1.0")
+            force("org.jetbrains.kotlin:kotlin-stdlib-common:2.1.0")
+        }
+    }
+}
diff --git a/compose-remote-layout-router/build.gradle.kts b/compose-remote-layout-router/build.gradle.kts
index 9e53a65..5d7d3b4 100644
--- a/compose-remote-layout-router/build.gradle.kts
+++ b/compose-remote-layout-router/build.gradle.kts
@@ -118,7 +118,7 @@ kotlin {
 
 android {
     namespace = "com.utsman.composeremote.app.router"
-    compileSdk = 35
+    compileSdk = 36
 
     defaultConfig {
         minSdk = 21
diff --git a/compose-remote-layout/build.gradle.kts b/compose-remote-layout/build.gradle.kts
index 37dfe29..a898181 100644
--- a/compose-remote-layout/build.gradle.kts
+++ b/compose-remote-layout/build.gradle.kts
@@ -102,7 +102,7 @@ kotlin {
 
 android {
     namespace = "com.utsman.composeremote.app"
-    compileSdk = 35
+    compileSdk = 36
 
     defaultConfig {
         minSdk = 21
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1697cbe..3dab552 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,13 +1,13 @@
 [versions]
 
 kotlin = "2.1.0"
-agp = "8.6.1"
-kotlinx-coroutines = "1.10.1"
+agp = "8.13.0"
+kotlinx-coroutines = "1.10.2"
 kotlinx-serialization = "1.7.3"
-ktor = "3.1.1"
-compose = "1.7.1"
-androidx-activityCompose = "1.9.3"
-kotlinx-datetime = "0.6.2"
+ktor = "3.3.0"
+compose = "1.8.0"
+androidx-activityCompose = "1.11.0"
+kotlinx-datetime = "0.6.1"
 
 [libraries]
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index cea7a79..37f853b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/jsonBuilderWeb/build.gradle.kts b/jsonBuilderWeb/build.gradle.kts
index 307d132..8c0f1e7 100644
--- a/jsonBuilderWeb/build.gradle.kts
+++ b/jsonBuilderWeb/build.gradle.kts
@@ -11,7 +11,6 @@ plugins {
 kotlin {
     @OptIn(ExperimentalWasmDsl::class)
     wasmJs {
-        moduleName = "jsonBuilderWeb"
         browser {
             val rootDirPath = project.rootDir.path
             val projectDirPath = project.projectDir.path
@@ -64,7 +63,7 @@ tasks.register<Copy>("copyWasmJsToRoot") {
     }
 
     println("Copying wasmJs build output to wasmJsDist directory ...")
-    from("$buildDir/dist/wasmJs/developmentExecutable")
+    from("${layout.buildDirectory.get().asFile}/dist/wasmJs/developmentExecutable")
     into("${project.rootDir}/wasmJsDist")
 }
 
diff --git a/samples/firebaseApp/composeApp/build.gradle.kts b/samples/firebaseApp/composeApp/build.gradle.kts
index 1642b8f..8f0ed65 100644
--- a/samples/firebaseApp/composeApp/build.gradle.kts
+++ b/samples/firebaseApp/composeApp/build.gradle.kts
@@ -73,7 +73,7 @@ kotlin {
         androidMain.dependencies {
             implementation(libs.androidx.activityCompose)
 
-            implementation(platform("com.google.firebase:firebase-bom:33.9.0"))
+            implementation(project.dependencies.platform("com.google.firebase:firebase-bom:33.9.0"))
             implementation("com.google.firebase:firebase-config")
             implementation("com.google.firebase:firebase-analytics")
         }
@@ -86,7 +86,7 @@ kotlin {
 
 android {
     namespace = "sample.firebase.app"
-    compileSdk = 35
+    compileSdk = 36
 
     defaultConfig {
         minSdk = 21
diff --git a/samples/firebaseApp/iosApp/Podfile b/samples/firebaseApp/iosApp/Podfile
index ee52cfe..d070bd6 100644
--- a/samples/firebaseApp/iosApp/Podfile
+++ b/samples/firebaseApp/iosApp/Podfile
@@ -1,3 +1,5 @@
+source 'https://cdn.cocoapods.org'
+
 # Uncomment the next line to define a global platform for your project
 platform :ios, '17.0'
 
@@ -8,6 +10,7 @@ target 'iosApp' do
   # Pods for iosApp
   pod 'FirebaseAnalytics'
   pod 'FirebaseCore'
+  pod 'FirebaseCoreInternal'
   pod 'FirebaseRemoteConfig'
   pod 'ComposeAppFirebase', :path => '../composeApp'
 
diff --git a/samples/firebaseApp/iosApp/Podfile.lock b/samples/firebaseApp/iosApp/Podfile.lock
index 0fd680d..ace1577 100644
--- a/samples/firebaseApp/iosApp/Podfile.lock
+++ b/samples/firebaseApp/iosApp/Podfile.lock
@@ -103,6 +103,7 @@ DEPENDENCIES:
   - ComposeAppFirebase (from `../composeApp`)
   - FirebaseAnalytics
   - FirebaseCore
+  - FirebaseCoreInternal
   - FirebaseRemoteConfig
 
 SPEC REPOS:
@@ -139,6 +140,6 @@ SPEC CHECKSUMS:
   nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
 
-PODFILE CHECKSUM: 5cbc24ca3ba8944feef6c2a33e0372c1ede253cd
+PODFILE CHECKSUM: 628b086fe8609c66af2abc428d6d1201c0473a20
 
 COCOAPODS: 1.16.2
diff --git a/samples/firebaseApp/iosApp/iosApp.xcodeproj/project.pbxproj b/samples/firebaseApp/iosApp/iosApp.xcodeproj/project.pbxproj
index fca0a2e..d94c90c 100644
--- a/samples/firebaseApp/iosApp/iosApp.xcodeproj/project.pbxproj
+++ b/samples/firebaseApp/iosApp/iosApp.xcodeproj/project.pbxproj
@@ -91,7 +91,6 @@
 				A93A953329CC810C00F8E227 /* Sources */,
 				A93A953429CC810C00F8E227 /* Frameworks */,
 				8CCEDDE8C5C0D72D8B93E427 /* [CP] Embed Pods Frameworks */,
-				D51DC2605B5B7CCCAF8F1C6E /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -191,23 +190,6 @@
 			shellPath = /bin/sh;
 			shellScript = "echo uhuy\n";
 		};
-		D51DC2605B5B7CCCAF8F1C6E /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-resources-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			name = "[CP] Copy Pods Resources";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-resources-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
diff --git a/samples/routerApp/composeApp/build.gradle.kts b/samples/routerApp/composeApp/build.gradle.kts
index 8034829..1d94b88 100644
--- a/samples/routerApp/composeApp/build.gradle.kts
+++ b/samples/routerApp/composeApp/build.gradle.kts
@@ -16,7 +16,6 @@ kotlin {
     jvm()
     @OptIn(ExperimentalWasmDsl::class)
     wasmJs {
-        moduleName = "sampleRouterApp"
         browser {
             val rootDirPath = project.rootDir.path
             val projectDirPath = project.projectDir.path
@@ -52,6 +51,7 @@ kotlin {
             implementation(compose.foundation)
             implementation(compose.ui)
             implementation(compose.material)
+            implementation(compose.materialIconsExtended)
             implementation(projects.composeRemoteLayout)
             implementation(projects.composeRemoteLayoutRouter)
             implementation(projects.samples.sharedCompose)
@@ -69,7 +69,7 @@ kotlin {
 
 android {
     namespace = "router.app"
-    compileSdk = 35
+    compileSdk = 36
 
     defaultConfig {
         minSdk = 21
@@ -106,7 +106,7 @@ tasks.register<Copy>("copyWasmJsToRoot") {
     }
 
     println("Copying wasmJs build output to wasmJsDist directory ...")
-    from("$buildDir/dist/wasmJs/developmentExecutable")
+    from("${layout.buildDirectory.get().asFile}/dist/wasmJs/developmentExecutable")
     into(destFolder)
 }
 
diff --git a/samples/sharedCompose/build.gradle.kts b/samples/sharedCompose/build.gradle.kts
index 09e8691..8dd807e 100644
--- a/samples/sharedCompose/build.gradle.kts
+++ b/samples/sharedCompose/build.gradle.kts
@@ -18,7 +18,6 @@ kotlin {
     js { browser() }
     @OptIn(ExperimentalWasmDsl::class)
     wasmJs {
-        moduleName = "sharedCompose"
         browser {
             val rootDirPath = project.rootDir.path
             val projectDirPath = project.projectDir.path
@@ -61,7 +60,7 @@ kotlin {
 
 android {
     namespace = "sample.sharedcompose"
-    compileSdk = 35
+    compileSdk = 36
 
     defaultConfig {
         minSdk = 21
diff --git a/samples/simpleApp/composeApp/build.gradle.kts b/samples/simpleApp/composeApp/build.gradle.kts
index 1d87d78..ee0030f 100644
--- a/samples/simpleApp/composeApp/build.gradle.kts
+++ b/samples/simpleApp/composeApp/build.gradle.kts
@@ -49,7 +49,7 @@ kotlin {
 
 android {
     namespace = "sample.simple.app"
-    compileSdk = 35
+    compileSdk = 36
 
     defaultConfig {
         minSdk = 21