From 0c0446b56dbae85479231ace36f69c578fc428af Mon Sep 17 00:00:00 2001
From: Nikolay Igotti <olonho@users.noreply.github.com>
Date: Mon, 14 May 2018 07:15:10 -0700
Subject: [PATCH] Support Xcode 9.3.1, allow version check override (#1588)

---
 konan/konan.properties                        | 22 ++++++++++---------
 .../jetbrains/kotlin/konan/target/Apple.kt    |  6 +++--
 .../kotlin/konan/target/KonanProperties.kt    |  2 +-
 tools/scripts/update_xcode.sh                 |  6 +++--
 4 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/konan/konan.properties b/konan/konan.properties
index d392eb27867..0f285ede650 100644
--- a/konan/konan.properties
+++ b/konan/konan.properties
@@ -23,6 +23,8 @@ dependencyProfiles = default alt
 # Don't check dependencies on a server.
 # If true, dependency downloader will throw an exception if a dependency isn't found in konan.home.
 airplaneMode = false
+# if true, ignores Xcode version check.
+ignoreXcodeVersionCheck = false
 
 downloadingAttempts = 10
 downloadingAttemptIntervalMs = 3000
@@ -33,10 +35,10 @@ llvmVersion = 5.0.0
 
 # Mac OS X.
 llvmHome.macos_x64 = clang-llvm-5.0.0-darwin-macos
-targetToolchain.macos_x64 = target-toolchain-4-macos_x64
+targetToolchain.macos_x64 = target-toolchain-5-macos_x64
 
 arch.macos_x64 = x86_64
-targetSysRoot.macos_x64 = target-sysroot-4-macos_x64
+targetSysRoot.macos_x64 = target-sysroot-5-macos_x64
 libffiDir.macos_x64 = libffi-3.2.1-2-darwin-macos
 llvmLtoFlags.macos_x64 =
 llvmLtoOptFlags.macos_x64 = -O3 -function-sections
@@ -54,24 +56,24 @@ dependencies.macos_x64 = \
     libffi-3.2.1-2-darwin-macos \
     clang-llvm-5.0.0-darwin-macos
 
-target-sysroot-4-macos_x64.default = \
+target-sysroot-5-macos_x64.default = \
   remote:internal
 
-target-toolchain-4-macos_x64.default = \
+target-toolchain-5-macos_x64.default = \
   remote:internal
 
 # Apple iOS.
-targetToolchain.macos_x64-ios_arm64 = target-toolchain-4-macos_x64
+targetToolchain.macos_x64-ios_arm64 = target-toolchain-5-macos_x64
 dependencies.macos_x64-ios_arm64 = \
   libffi-3.2.1-2-darwin-ios \
   clang-llvm-5.0.0-darwin-macos
 
-target-sysroot-4-ios_arm64.default = \
+target-sysroot-5-ios_arm64.default = \
   remote:internal
 
 arch.ios_arm64 = arm64
 entrySelector.ios_arm64 = -alias _Konan_main _main
-targetSysRoot.ios_arm64 = target-sysroot-4-ios_arm64
+targetSysRoot.ios_arm64 = target-sysroot-5-ios_arm64
 libffiDir.ios_arm64 = libffi-3.2.1-2-darwin-ios
 llvmLtoFlags.ios_arm64 =
 llvmLtoOptFlags.ios_arm64 = -O3 -function-sections
@@ -86,17 +88,17 @@ osVersionMinFlagClang.ios_arm64 = -miphoneos-version-min
 osVersionMin.ios_arm64 = 8.0
 
 #  Apple iOS simulator.
-targetToolchain.macos_x64-ios_x64 = target-toolchain-4-macos_x64
+targetToolchain.macos_x64-ios_x64 = target-toolchain-5-macos_x64
 dependencies.macos_x64-ios_x64 = \
   libffi-3.2.1-1-darwin-ios_sim \
   clang-llvm-5.0.0-darwin-macos
 
-target-sysroot-4-ios_x64.default = \
+target-sysroot-5-ios_x64.default = \
   remote:internal
 
 arch.ios_x64 = x86_64
 entrySelector.ios_x64 = -alias _Konan_main _main
-targetSysRoot.ios_x64 = target-sysroot-4-ios_x64
+targetSysRoot.ios_x64 = target-sysroot-5-ios_x64
 libffiDir.ios_x64 = libffi-3.2.1-1-darwin-ios_sim
 llvmLtoFlags.ios_x64 =
 llvmLtoOptFlags.ios_x64 = -O3 -function-sections
diff --git a/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Apple.kt b/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Apple.kt
index 02204e46ab0..df953e0069a 100644
--- a/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Apple.kt
+++ b/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Apple.kt
@@ -56,8 +56,10 @@ class AppleConfigurablesImpl(
         properties.getProperty("useFixedXcodeVersion")?.let { requiredXcodeVersion ->
             val currentXcodeVersion = xcode.version
 
-            if (currentXcodeVersion != requiredXcodeVersion) {
-                error("expected Xcode version $requiredXcodeVersion, got $currentXcodeVersion")
+            if (properties.getProperty("ignoreXcodeVersionCheck") != "true" &&
+                    currentXcodeVersion != requiredXcodeVersion) {
+                error("expected Xcode version $requiredXcodeVersion, got $currentXcodeVersion, consider updating " +
+                        "Xcode or use \"ignoreXcodeVersionCheck\" variable in konan.properties")
             }
         }
 
diff --git a/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/KonanProperties.kt b/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/KonanProperties.kt
index 7023d8a1025..b912da8e48c 100644
--- a/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/KonanProperties.kt
+++ b/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/KonanProperties.kt
@@ -67,7 +67,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.3")
+    this.setProperty("useFixedXcodeVersion", "9.3.1")
     // TODO: it actually affects only resolution made in :dependencies,
     // that's why we assume that 'default' profile comes first (and check this above).
 }
diff --git a/tools/scripts/update_xcode.sh b/tools/scripts/update_xcode.sh
index aec5cb3b92b..68c493f72be 100755
--- a/tools/scripts/update_xcode.sh
+++ b/tools/scripts/update_xcode.sh
@@ -1,10 +1,12 @@
 #!/usr/bin/env bash
 
-KONAN_TOOLCHAIN_VERSION=4
-SDKS="macosx iphoneos iphonesimulator"
+KONAN_TOOLCHAIN_VERSION=5
+SDKS="macosx iphoneos iphonesimulator watchos watchsimulator"
 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
+TARBALL_watchos=target-sysroot-$KONAN_TOOLCHAIN_VERSION-watchos_arm32
+TARBALL_watchsimulator=target-sysroot-$KONAN_TOOLCHAIN_VERSION-watchos_x64
 TARBALL_xcode=target-toolchain-$KONAN_TOOLCHAIN_VERSION-macos_x64
 OUT=`pwd`