��diff --git a/app_domain/build.gradle.kts b/app_domain/build.gradle.kts

index 3ee8ddc..7aee5c9 100644

--- a/app_domain/build.gradle.kts

+++ b/app_domain/build.gradle.kts

@@ -3,13 +3,20 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget

 

 plugins {

     alias(libs.plugins.kotlinMultiplatform)

-    alias(libs.plugins.androidLibrary)

+    alias(libs.plugins.androidMultiplatformLibrary)

 }

 

 kotlin {

-    androidTarget {

+    android {

+        namespace = "fr.delcey.mariage_wifino.domain"

+        compileSdk = 36

+

         compilerOptions {

-            jvmTarget.set(JvmTarget.JVM_21)

+            jvmTarget.set(JvmTarget.JVM_11)

+        }

+

+        androidResources {

+            enable = true

         }

     }

 

@@ -28,9 +35,3 @@ kotlin {

         }

     }

 }

-

-// For (even non-Android) Compose Previews

-android {

-    namespace = "fr.delcey.mariage_wifino"

-    compileSdk = 36

-}

diff --git a/app_ui/build.gradle.kts b/app_ui/build.gradle.kts

index ba5248e..55ca340 100644

--- a/app_ui/build.gradle.kts

+++ b/app_ui/build.gradle.kts

@@ -3,15 +3,22 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget

 

 plugins {

     alias(libs.plugins.kotlinMultiplatform)

-    alias(libs.plugins.androidLibrary)

+    alias(libs.plugins.androidMultiplatformLibrary)

     alias(libs.plugins.composeMultiplatform)

     alias(libs.plugins.composeCompiler)

 }

 

 kotlin {

-    androidTarget {

+    android {

+        namespace = "fr.delcey.mariage_wifino.ui"

+        compileSdk = 36

+

         compilerOptions {

-            jvmTarget.set(JvmTarget.JVM_21)

+            jvmTarget.set(JvmTarget.JVM_11)

+        }

+

+        androidResources {

+            enable = true

         }

     }

 

@@ -56,12 +63,6 @@ kotlin {

     }

 }

 

-// For (even non-Android) Compose Previews

-android {

-    namespace = "fr.delcey.mariage_wifino"

-    compileSdk = 36

-}

-

 composeCompiler {

     stabilityConfigurationFiles.addAll(

         rootProject.layout.projectDirectory.file("stability_config.conf"),

@@ -69,5 +70,5 @@ composeCompiler {

 }

 

 dependencies {

-    debugImplementation(libs.compose.ui.tooling)

+    androidRuntimeClasspath(libs.compose.ui.tooling)

 }

diff --git a/build.gradle.kts b/build.gradle.kts

index be3b335..9e06987 100644

--- a/build.gradle.kts

+++ b/build.gradle.kts

@@ -1,7 +1,7 @@

 plugins {

     // this is necessary to avoid the plugins to be loaded multiple times

     // in each subproject's classloader

-    alias(libs.plugins.androidLibrary) apply false

+    alias(libs.plugins.androidMultiplatformLibrary) apply false

     alias(libs.plugins.composeCompiler) apply false

     alias(libs.plugins.composeHotReload) apply false

     alias(libs.plugins.composeMultiplatform) apply false

diff --git a/design/build.gradle.kts b/design/build.gradle.kts

index 18a077a..47d12d7 100644

--- a/design/build.gradle.kts

+++ b/design/build.gradle.kts

@@ -3,15 +3,22 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget

 

 plugins {

     alias(libs.plugins.kotlinMultiplatform)

-    alias(libs.plugins.androidLibrary)

+    alias(libs.plugins.androidMultiplatformLibrary)

     alias(libs.plugins.composeMultiplatform)

     alias(libs.plugins.composeCompiler)

 }

 

 kotlin {

-    androidTarget {

+    android {

+        namespace = "fr.delcey.mariage_wifino.design"

+        compileSdk = 36

+

         compilerOptions {

-            jvmTarget.set(JvmTarget.JVM_21)

+            jvmTarget.set(JvmTarget.JVM_11)

+        }

+

+        androidResources {

+            enable = true

         }

     }

 

@@ -45,12 +52,6 @@ kotlin {

     }

 }

 

-// For (even non-Android) Compose Previews

-android {

-    namespace = "fr.delcey.mariage_wifino"

-    compileSdk = 36

-}

-

 compose {

     // see https://kotlinlang.org/docs/multiplatform/compose-multiplatform-resources-usage.html#customizing-accessor-class-generation

     resources {

@@ -67,5 +68,5 @@ composeCompiler {

 

 // For (even non-Android) Compose Previews

 dependencies {

-    debugImplementation(libs.compose.ui.tooling)

+    androidRuntimeClasspath(libs.compose.ui.tooling)

 }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml

index 06a6c09..9bd965b 100644

--- a/gradle/libs.versions.toml

+++ b/gradle/libs.versions.toml

@@ -1,5 +1,5 @@

 [versions]

-agp = "8.13.2"

+agp = "9.0.0"

 androidx-lifecycle = "2.10.0"

 androidx-navigation = "2.9.2"

 coil = "3.4.0"

@@ -46,7 +46,7 @@ ktor-server-netty = { module = "io.ktor:ktor-server-netty-jvm", version.ref = "k

 logback = { module = "ch.qos.logback:logback-classic", version.ref = "logback" }

 

 [plugins]

-androidLibrary = { id = "com.android.library", version.ref = "agp" }

+androidMultiplatformLibrary = { id = "com.android.kotlin.multiplatform.library", version.ref = "agp" }

 composeCompiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

 composeHotReload = { id = "org.jetbrains.compose.hot-reload", version.ref = "composeHotReload" }

 composeMultiplatform = { id = "org.jetbrains.compose", version.ref = "composeMultiplatform" }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties

index bb8e64e..2d53480 100644

--- a/gradle/wrapper/gradle-wrapper.properties

+++ b/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@

 #Thu Mar 26 15:15:46 CET 2026

 distributionBase=GRADLE_USER_HOME

 distributionPath=wrapper/dists

-distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip

+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip

 zipStoreBase=GRADLE_USER_HOME

 zipStorePath=wrapper/dists

diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts

index 4d82f9f..ea7dc0a 100644

--- a/shared/build.gradle.kts

+++ b/shared/build.gradle.kts

@@ -3,14 +3,21 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget

 

 plugins {

     alias(libs.plugins.kotlinMultiplatform)

-    alias(libs.plugins.androidLibrary)

+    alias(libs.plugins.androidMultiplatformLibrary)

     alias(libs.plugins.serialization)

 }

 

 kotlin {

-    androidTarget {

+    android {

+        namespace = "fr.delcey.mariage_wifino.shared"

+        compileSdk = 36

+

         compilerOptions {

-            jvmTarget.set(JvmTarget.JVM_21)

+            jvmTarget.set(JvmTarget.JVM_11)

+        }

+

+        androidResources {

+            enable = true

         }

     }

 

@@ -38,8 +45,3 @@ kotlin {

         }

     }

 }

-

-android {

-    namespace = "fr.delcey.mariage_wifino"

-    compileSdk = 36

-}

