azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to Xcode 10.0 (#2078)

Browse Source 
* Update to Xcode 10.0

* Promote iOS version to 9.0
This commit is contained in:
Nikolay Igotti
2018-09-18 13:51:48 +03:00
committed by GitHub
parent 866f137317
commit 0165e96b8e
4 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ClangArgs.kt
+2 -2
View File
@@ -59,10 +59,10 @@ class ClangArgs(private val configurables: Configurables) : Configurables by con
listOf("-stdlib=libc++", "-arch", "armv7", "-isysroot", absoluteTargetSysRoot, "-miphoneos-version-min=9.0.0")
KonanTarget.IOS_ARM64 ->
listOf("-stdlib=libc++", "-arch", "arm64", "-isysroot", absoluteTargetSysRoot, "-miphoneos-version-min=8.0.0")
listOf("-stdlib=libc++", "-arch", "arm64", "-isysroot", absoluteTargetSysRoot, "-miphoneos-version-min=9.0.0")
KonanTarget.IOS_X64 ->
listOf("-stdlib=libc++", "-isysroot", absoluteTargetSysRoot, "-miphoneos-version-min=8.0.0")
listOf("-stdlib=libc++", "-isysroot", absoluteTargetSysRoot, "-miphoneos-version-min=9.0.0")
KonanTarget.ANDROID_ARM32 ->
listOf("-target", targetArg!!,
shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/KonanProperties.kt
+1 -1
View File
@@ -69,7 +69,7 @@ fun Properties.keepOnlyDefaultProfiles() {
// Force build to use only 'default' profile:
this.setProperty(DEPENDENCY_PROFILES_KEY, "default")
// Force build to use fixed Xcode version:
this.setProperty("useFixedXcodeVersion", "9.4.1")
this.setProperty("useFixedXcodeVersion", "10.0")
// TODO: it actually affects only resolution made in :dependencies,
// that's why we assume that 'default' profile comes first (and check this above).
}