wbrawner/PeopleInSpace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

m1 related changes

Browse source
This commit is contained in:
John O'Reilly 2021-12-10 14:31:20 +00:00
parent 5fc45a8043
commit 7a77b35f80
6 changed files with 31 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle.kts
View file

@ -20,7 +20,7 @@ buildscript {
classpath(shadow)
classpath(kotlinter)
classpath(gradleVersionsPlugin)
val kmpNativeCoroutinesVersion = if (kotlinVersion == "1.6.0") "0.9.0-new-mm" else "0.8.0"
val kmpNativeCoroutinesVersion = if (kotlinVersion == "1.6.0") "0.9.0" else "0.8.0"
classpath("com.rickclephas.kmp:kmp-nativecoroutines-gradle-plugin:$kmpNativeCoroutinesVersion")
}
}

8
buildSrc/src/main/java/Dependencies.kt
View file

@ -3,9 +3,9 @@ object Versions {
const val androidCompileSdk = 31
const val androidTargetSdk = androidCompileSdk
const val kotlinCoroutines = "1.5.1-new-mm-dev2"
const val koin = "3.1.2"
const val ktor = "1.6.2-native-mm-eap-196"
const val kotlinCoroutines = "1.5.2-native-mt"
const val koin = "3.1.4"
const val ktor = "1.6.5"
const val kotlinxSerialization = "1.3.0"
const val kotlinxHtmlJs = "0.7.3"
@ -20,7 +20,7 @@ object Versions {
const val mockito = "3.11.2"
const val robolectric = "4.6.1"
const val sqlDelight = "1.5.2"
const val sqlDelight = "1.5.3"
const val shadow = "7.0.0"
const val kotlinterGradle = "3.4.5"

14
common/build.gradle.kts
View file

@ -1,4 +1,5 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
plugins {
kotlin("multiplatform")
@ -40,15 +41,14 @@ android {
}
kotlin {
val sdkName: String? = System.getenv("SDK_NAME")
val isiOSDevice = sdkName.orEmpty().startsWith("iphoneos")
if (isiOSDevice) {
iosArm64("iOS")
} else {
iosX64("iOS")
val iosTarget: (String, KotlinNativeTarget.() -> Unit) -> KotlinNativeTarget = when {
System.getenv("SDK_NAME")?.startsWith("iphoneos") == true -> ::iosArm64
System.getenv("NATIVE_ARCH")?.startsWith("arm") == true -> ::iosSimulatorArm64 // available to KT 1.5.30
else -> ::iosX64
}
iosTarget("iOS") {}
val sdkName: String? = System.getenv("SDK_NAME")
val isWatchOSDevice = sdkName.orEmpty().startsWith("watchos")
if (isWatchOSDevice) {
watchosArm64("watch")

4
gradle.properties
View file

@ -26,5 +26,5 @@ xcodeproj=./ios/PeopleInSpaceSwiftUI
# Kotlin/Native clients can override this through updating common.podspec
kotlinVersion=1.5.31
kotlin.native.binary.memoryModel=experimental
kotlin.native.binary.freezing=disabled
#kotlin.native.binary.memoryModel=experimental
#kotlin.native.binary.freezing=disabled

2
ios/PeopleInSpaceSwiftUI/PeopleInSpaceSwiftUI.xcodeproj/xcuserdata/joreilly.xcuserdatad/xcschemes/xcschememanagement.plist
View file

@ -12,7 +12,7 @@
<key>PeopleInSpaceWidgetExtension.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>6</integer>
<integer>3</integer>
</dict>
</dict>
</dict>

17
ios/PeopleInSpaceSwiftUI/Pods/Pods.xcodeproj/xcuserdata/joreilly.xcuserdatad/xcschemes/xcschememanagement.plist generated
View file

@ -11,6 +11,11 @@
<key>orderHint</key>
<integer>1</integer>
</dict>
<key>KMPNativeCoroutinesCombine.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>2</integer>
</dict>
<key>KMPNativeCoroutinesCore.xcscheme</key>
<dict>
<key>isShown</key>
@ -18,12 +23,17 @@
<key>orderHint</key>
<integer>2</integer>
</dict>
<key>KMPNativeCoroutinesCore.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>4</integer>
</dict>
<key>Pods-PeopleInSpaceSwiftUI.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>3</integer>
<integer>1</integer>
</dict>
<key>Pods-PeopleInSpaceWidgetExtension.xcscheme</key>
<dict>
@ -32,6 +42,11 @@
<key>orderHint</key>
<integer>4</integer>
</dict>
<key>Pods-PeopleInSpaceWidgetExtension.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>6</integer>
</dict>
<key>common.xcscheme</key>
<dict>
<key>isShown</key>