Merge branch 'refs/heads/master' into 638-ktorfit-gradle-plugin-not-c…

…ompatible-with-android-multiplatform-library-plugin
Foso · Aug 30, 2024 · eb9b5a5 · eb9b5a5
2 parents ded5f61 + 9ee3dac
commit eb9b5a5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/example/MultiplatformExample/androidApp/build.gradle.kts b/example/MultiplatformExample/androidApp/build.gradle.kts
@@ -11,6 +11,7 @@ android {
         targetSdk = 34
         versionCode = 1
         versionName = "1.0"
+        namespace = "com.example.myapplication.android"
     }
     buildTypes {
         getByName("release") {

diff --git a/example/MultiplatformExample/person/build.gradle.kts b/example/MultiplatformExample/person/build.gradle.kts
@@ -9,7 +9,7 @@ val ktorVersion = "2.3.11"
 
 kotlin {
     jvmToolchain(8)
-    targetHierarchy.default()
+    applyDefaultHierarchyTemplate()
 
     jvm()
     androidTarget()
@@ -49,6 +49,7 @@ android {
     defaultConfig {
         minSdk = 21
         targetSdk = 34
+        namespace = "com.example.person"
     }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_1_8

diff --git a/example/MultiplatformExample/shared/build.gradle.kts b/example/MultiplatformExample/shared/build.gradle.kts
@@ -78,6 +78,7 @@ android {
     defaultConfig {
         minSdk = 21
         targetSdk = 34
+        namespace = "com.example.ktorfittest"
     }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_1_8