Xcode 10.1 (#2286)

* Update to XCode 10.1.

* Bump ABI version.

README.md

@@ -12,7 +12,7 @@ without the need to ship an additional execution runtime.
 
 Prerequisites:
 *   install JDK for your platform, instead of JRE. The build requires ```tools.jar```, which is not included in JRE;
-*   on macOS install Xcode 10.0
+*   on macOS install Xcode 10.1
 *   on Fedora 26+ ```yum install ncurses-compat-libs``` may be needed
 
 To compile from sources use following steps:

konan/konan.properties

@@ -35,10 +35,10 @@ llvmVersion = 6.0.1
 
 # Mac OS X.
 llvmHome.macos_x64 = clang-llvm-6.0.1-darwin-macos
-targetToolchain.macos_x64 = target-toolchain-7-macos_x64
+targetToolchain.macos_x64 = target-toolchain-8-macos_x64
 
 arch.macos_x64 = x86_64
-targetSysRoot.macos_x64 = target-sysroot-7-macos_x64
+targetSysRoot.macos_x64 = target-sysroot-8-macos_x64
 libffiDir.macos_x64 = libffi-3.2.1-3-darwin-macos
 llvmLtoFlags.macos_x64 =
 llvmLtoOptFlags.macos_x64 = -O3 -function-sections
@@ -56,25 +56,25 @@ dependencies.macos_x64 = \
     libffi-3.2.1-3-darwin-macos \
     clang-llvm-6.0.1-darwin-macos
 
-target-sysroot-7-macos_x64.default = \
+target-sysroot-8-macos_x64.default = \
   remote:internal
 
-target-toolchain-7-macos_x64.default = \
+target-toolchain-8-macos_x64.default = \
   remote:internal
 
 # Apple's 32-bit iOS.
-targetToolchain.macos_x64-ios_arm32 = target-toolchain-7-macos_x64
+targetToolchain.macos_x64-ios_arm32 = target-toolchain-8-macos_x64
 dependencies.macos_x64-ios_arm32 = \
   libffi-3.2.1-3-darwin-ios \
   clang-llvm-6.0.1-darwin-macos
 
-target-sysroot-7-ios_arm32.default = \
+target-sysroot-8-ios_arm32.default = \
   remote:internal
 
 arch.ios_arm32 = armv7
 entrySelector.ios_arm32 = -alias _Konan_main _main
 # Shared with 64-bit version.
-targetSysRoot.ios_arm32 = target-sysroot-7-ios_arm64
+targetSysRoot.ios_arm32 = target-sysroot-8-ios_arm64
 libffiDir.ios_arm32 = libffi-3.2.1-3-darwin-ios
 llvmLtoFlags.ios_arm32 =
 llvmLtoOptFlags.ios_arm32 = -O3 -function-sections
@@ -89,17 +89,17 @@ osVersionMinFlagClang.ios_arm32 = -miphoneos-version-min
 osVersionMin.ios_arm32 = 9.0
 
 # Apple's 64-bit iOS.
-targetToolchain.macos_x64-ios_arm64 = target-toolchain-7-macos_x64
+targetToolchain.macos_x64-ios_arm64 = target-toolchain-8-macos_x64
 dependencies.macos_x64-ios_arm64 = \
   libffi-3.2.1-3-darwin-ios \
   clang-llvm-6.0.1-darwin-macos
 
-target-sysroot-7-ios_arm64.default = \
+target-sysroot-8-ios_arm64.default = \
   remote:internal
 
 arch.ios_arm64 = arm64
 entrySelector.ios_arm64 = -alias _Konan_main _main
-targetSysRoot.ios_arm64 = target-sysroot-7-ios_arm64
+targetSysRoot.ios_arm64 = target-sysroot-8-ios_arm64
 libffiDir.ios_arm64 = libffi-3.2.1-3-darwin-ios
 llvmLtoFlags.ios_arm64 =
 llvmLtoOptFlags.ios_arm64 = -O3 -function-sections
@@ -114,17 +114,17 @@ osVersionMinFlagClang.ios_arm64 = -miphoneos-version-min
 osVersionMin.ios_arm64 = 9.0
 
 #  Apple's iOS simulator.
-targetToolchain.macos_x64-ios_x64 = target-toolchain-7-macos_x64
+targetToolchain.macos_x64-ios_x64 = target-toolchain-8-macos_x64
 dependencies.macos_x64-ios_x64 = \
   libffi-3.2.1-2-darwin-ios_sim \
   clang-llvm-6.0.1-darwin-macos
 
-target-sysroot-7-ios_x64.default = \
+target-sysroot-8-ios_x64.default = \
   remote:internal
 
 arch.ios_x64 = x86_64
 entrySelector.ios_x64 = -alias _Konan_main _main
-targetSysRoot.ios_x64 = target-sysroot-7-ios_x64
+targetSysRoot.ios_x64 = target-sysroot-8-ios_x64
 libffiDir.ios_x64 = libffi-3.2.1-2-darwin-ios_sim
 llvmLtoFlags.ios_x64 =
 llvmLtoOptFlags.ios_x64 = -O3 -function-sections

shared/src/main/kotlin/org/jetbrains/kotlin/konan/KonanAbiVersion.kt

@@ -6,7 +6,7 @@ fun String.parseKonanAbiVersion(): KonanAbiVersion {
 
 data class KonanAbiVersion(val version: Int) {
     companion object {
-        val CURRENT = KonanAbiVersion(3)
+        val CURRENT = KonanAbiVersion(4)
     }
     override fun toString() = "$version"
 }

shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/KonanProperties.kt

@@ -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", "10.0")
+    this.setProperty("useFixedXcodeVersion", "10.1")
     // TODO: it actually affects only resolution made in :dependencies,
     // that's why we assume that 'default' profile comes first (and check this above).
 }

tools/scripts/update_xcode.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
-KONAN_TOOLCHAIN_VERSION=7
-SDKS="macosx iphoneos iphonesimulator watchos watchsimulator"
+KONAN_TOOLCHAIN_VERSION=8
+SDKS="macosx iphoneos iphonesimulator"
 TARBALL_macosx=target-sysroot-$KONAN_TOOLCHAIN_VERSION-macos_x64
 TARBALL_iphoneos=target-sysroot-$KONAN_TOOLCHAIN_VERSION-ios_arm64
 TARBALL_iphonesimulator=target-sysroot-$KONAN_TOOLCHAIN_VERSION-ios_x64