Merge pull request #8 from Merseyside/develop

Remove local deps
Merseyside · Apr 19, 2022 · dda90b2 · dda90b2
2 parents 4117731 + f7e1153
commit dda90b2
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 12 deletions.
diff --git a/archy-android/build.gradle.kts b/archy-android/build.gradle.kts
@@ -26,7 +26,11 @@ android {
 
 kotlinConvention {
     debug = true
-    setCompilerArgs("-Xinline-classes", "-Xskip-prerelease-check")
+    setCompilerArgs(
+        "-Xinline-classes",
+        "-opt-in=kotlin.RequiresOptIn",
+        "-Xskip-prerelease-check"
+    )
 }
 
 val androidLibraries = listOf(

diff --git a/archy-core/build.gradle.kts b/archy-core/build.gradle.kts
@@ -29,18 +29,22 @@ kotlin {
     }
 
     ios()
-//    iosSimulatorArm64()
-//
-//    sourceSets {
-//        val iosMain by getting
-//        val iosSimulatorArm64Main by getting
-//        iosSimulatorArm64Main.dependsOn(iosMain)
-//    }
+    iosSimulatorArm64()
+
+    sourceSets {
+        val iosMain by getting
+        val iosSimulatorArm64Main by getting
+        iosSimulatorArm64Main.dependsOn(iosMain)
+    }
 }
 
 kotlinConvention {
     debug = true
-    setCompilerArgs("-Xinline-classes", "-Xskip-prerelease-check")
+    setCompilerArgs(
+        "-Xinline-classes",
+        "-opt-in=kotlin.RequiresOptIn",
+        "-Xskip-prerelease-check"
+    )
 }
 
 val mppLibs = listOf(

diff --git a/gradle.properties b/gradle.properties
@@ -20,8 +20,7 @@ android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
 
-build.localDependencies=false
-build.localAndroidDependencies=true
+build.localAndroidDependencies=false
 build.localKotlinExtLibrary=false
 
 kotlin.mpp.stability.nowarn=true

diff --git a/...-app/ios-app.xcworkspace/xcuserdata/ivansablin.xcuserdatad/UserInterfaceState.xcuserstate b/...-app/ios-app.xcworkspace/xcuserdata/ivansablin.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,7 +1,7 @@
 enableFeaturePreview("VERSION_CATALOGS")
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
-private val isLocalAndroidDependencies = true
+private val isLocalAndroidDependencies = false
 private val isLocalKotlinExtLibrary = false
 
 dependencyResolutionManagement {

diff --git a/utils-core/build.gradle.kts b/utils-core/build.gradle.kts
@@ -58,6 +58,7 @@ kotlinConvention {
     setCompilerArgs(
         "-Xinline-classes",
         "-Xskip-prerelease-check",
+        "-opt-in=kotlin.RequiresOptIn",
         "-Xbinary=memoryModel=experimental"
     )
 }