[SHARED] Add diffrent variants in SharedConfig for iOS x64 and arm64

moallemi · moallemi · commit 2fc51591cc66 · 2020-09-26T10:09:20.000+02:00
diff --git a/shared/buildKonfig.gradle b/shared/buildKonfig.gradle
@@ -1,5 +1,6 @@
 buildkonfig {
     packageName = "me.moallemi.kmpshowcase.shared"
+    objectName = "SharedConfig"
     
     // default config is required
     defaultConfigs {
@@ -10,9 +11,13 @@ buildkonfig {
         android {
             buildConfigField 'STRING', 'API_BASE_URL', getProperty('KMP_SHOWCASE_API_BASE_URL_ANDROID', 'http://10.0.2.2:9090')
         }
-        
-        ios {
-            buildConfigField 'STRING', 'API_BASE_URL', getProperty('KMP_SHOWCASE_API_BASE_URL_IOS', 'http://127.0.0.1:9090')
+
+        iosX64 {
+            buildConfigField 'STRING', 'API_BASE_URL', getProperty('KMP_SHOWCASE_API_BASE_URL_IOS_X64', 'http://localhost:9090')
+        }
+
+        iosArm64 {
+            buildConfigField 'STRING', 'API_BASE_URL', getProperty('KMP_SHOWCASE_API_BASE_URL_IOS_ARM64', 'http://localhost:9090')
         }
     }
 }
diff --git a/shared/src/androidMain/kotlin/me/moallemi/kmpshowcase/shared/network/api/KmpShowcaseApi.kt b/shared/src/androidMain/kotlin/me/moallemi/kmpshowcase/shared/network/api/KmpShowcaseApi.kt
@@ -1,5 +1,5 @@
 package me.moallemi.kmpshowcase.shared.network.api
 
-import me.moallemi.kmpshowcase.shared.BuildKonfig
+import me.moallemi.kmpshowcase.shared.SharedConfig
 
-actual val API_BASE_URL: String = BuildKonfig.API_BASE_URL
+actual val API_BASE_URL: String = SharedConfig.API_BASE_URL
diff --git a/shared/src/iosMain/kotlin/me/moallemi/kmpshowcase/shared/network/api/KmpShowcaseApi.kt b/shared/src/iosMain/kotlin/me/moallemi/kmpshowcase/shared/network/api/KmpShowcaseApi.kt
@@ -1,5 +1,5 @@
 package me.moallemi.kmpshowcase.shared.network.api
 
-import me.moallemi.kmpshowcase.shared.BuildKonfig
+import me.moallemi.kmpshowcase.shared.SharedConfig
 
-actual val API_BASE_URL: String = BuildKonfig.API_BASE_URL
+actual val API_BASE_URL: String = SharedConfig.API_BASE_URL
diff --git a/shared/src/jsMain/kotlin/me/moallemi/kmpshowcase/shared/network/api/KmpShowcaseApi.kt b/shared/src/jsMain/kotlin/me/moallemi/kmpshowcase/shared/network/api/KmpShowcaseApi.kt
@@ -1,5 +1,5 @@
 package me.moallemi.kmpshowcase.shared.network.api
 
-import me.moallemi.kmpshowcase.shared.BuildKonfig
+import me.moallemi.kmpshowcase.shared.SharedConfig
 
-actual val API_BASE_URL: String = BuildKonfig.API_BASE_URL
+actual val API_BASE_URL: String = SharedConfig.API_BASE_URL

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`buildkonfig {`
`2`	`2`	`packageName = "me.moallemi.kmpshowcase.shared"`
	`3`	`+ objectName = "SharedConfig"`
`3`	`4`
`4`	`5`	`// default config is required`
`5`	`6`	`defaultConfigs {`
`@@ -10,9 +11,13 @@ buildkonfig {`
`10`	`11`	`android {`
`11`	`12`	`buildConfigField 'STRING', 'API_BASE_URL', getProperty('KMP_SHOWCASE_API_BASE_URL_ANDROID', 'http://10.0.2.2:9090')`
`12`	`13`	`}`
`13`		`-`
`14`		`- ios {`
`15`		`- buildConfigField 'STRING', 'API_BASE_URL', getProperty('KMP_SHOWCASE_API_BASE_URL_IOS', 'http://127.0.0.1:9090')`
	`14`	`+`
	`15`	`+ iosX64 {`
	`16`	`+ buildConfigField 'STRING', 'API_BASE_URL', getProperty('KMP_SHOWCASE_API_BASE_URL_IOS_X64', 'http://localhost:9090')`
	`17`	`+ }`
	`18`	`+`
	`19`	`+ iosArm64 {`
	`20`	`+ buildConfigField 'STRING', 'API_BASE_URL', getProperty('KMP_SHOWCASE_API_BASE_URL_IOS_ARM64', 'http://localhost:9090')`
`16`	`21`	`}`
`17`	`22`	`}`
`18`	`23`	`}`