diff --git a/konan/konan.properties b/konan/konan.properties
index 3b80525fa69..7a3c7eb76ed 100644
--- a/konan/konan.properties
+++ b/konan/konan.properties
@@ -43,12 +43,12 @@ llvmVersion.macos_x64 = 8.0.0
 
 # Mac OS X.
 llvmHome.macos_x64 = clang-llvm-apple-8.0.0-darwin-macos
-targetToolchain.macos_x64 = target-toolchain-10-macos_x64
+targetToolchain.macos_x64 = target-toolchain-xcode_11_4-macos_x64
 libffiDir.macos_x64 = libffi-3.2.1-3-darwin-macos
-additionalToolsDir.macos_x64 = xcode-addon-10-macos_x64
+additionalToolsDir.macos_x64 = xcode-addon-xcode_11_4-macos_x64
 
 arch.macos_x64 = x86_64
-targetSysRoot.macos_x64 = target-sysroot-10-macos_x64
+targetSysRoot.macos_x64 = target-sysroot-xcode_11_4-macos_x64
 
 clangFlags.macos_x64 = -cc1 -emit-obj -disable-llvm-passes -x ir
 clangNooptFlags.macos_x64 = -O1
@@ -56,7 +56,7 @@ clangOptFlags.macos_x64 = -O3
 clangDebugFlags.macos_x64 = -O0
 clangDynamicFlags.macos_x64 =
 
-linkerKonanFlags.macos_x64 = -lSystem -lc++ -lobjc -framework Foundation -sdk_version 10.15
+linkerKonanFlags.macos_x64 = -lSystem -lc++ -lobjc -framework Foundation -sdk_version 10.15.4
 linkerOptimizationFlags.macos_x64 = -dead_strip
 linkerNoDebugFlags.macos_x64 = -S
 linkerDynamicFlags.macos_x64 = -dylib
@@ -69,28 +69,28 @@ dependencies.macos_x64 = \
     lldb-2-macos \
     clang-llvm-apple-8.0.0-darwin-macos
 
-target-sysroot-10-macos_x64.default = \
+target-sysroot-xcode_11_4-macos_x64.default = \
   remote:internal
 
-target-toolchain-10-macos_x64.default = \
+target-toolchain-xcode_11_4-macos_x64.default = \
   remote:internal
 
-xcode-addon-10-macos_x64.default = \
+xcode-addon-xcode_11_4-macos_x64.default = \
   remote:internal
 
 
 # Apple's 32-bit iOS.
-targetToolchain.macos_x64-ios_arm32 = target-toolchain-10-macos_x64
+targetToolchain.macos_x64-ios_arm32 = target-toolchain-xcode_11_4-macos_x64
 dependencies.macos_x64-ios_arm32 = \
   libffi-3.2.1-3-darwin-macos \
   clang-llvm-apple-8.0.0-darwin-macos
 
-target-sysroot-10-ios_arm32.default = \
+target-sysroot-xcode_11_4-ios_arm32.default = \
   remote:internal
 
 arch.ios_arm32 = armv7
 # Shared with 64-bit version.
-targetSysRoot.ios_arm32 = target-sysroot-10-ios_arm64
+targetSysRoot.ios_arm32 = target-sysroot-xcode_11_4-ios_arm64
 
 clangFlags.ios_arm32 = -cc1 -emit-obj -disable-llvm-optzns -x ir
 clangNooptFlags.ios_arm32 = -O1
@@ -99,23 +99,23 @@ clangDebugFlags.ios_arm32 = -O0
 clangDynamicFlags.ios_arm32 =
 linkerNoDebugFlags.ios_arm32 = -S
 linkerDynamicFlags.ios_arm32 = -dylib
-linkerKonanFlags.ios_arm32 = -lSystem -lc++ -lobjc -framework Foundation -sdk_version 13.0
+linkerKonanFlags.ios_arm32 = -lSystem -lc++ -lobjc -framework Foundation -sdk_version 13.4
 linkerOptimizationFlags.ios_arm32 = -dead_strip
 osVersionMinFlagLd.ios_arm32 = -iphoneos_version_min
 osVersionMinFlagClang.ios_arm32 = -miphoneos-version-min
 osVersionMin.ios_arm32 = 9.0
 
 # Apple's 64-bit iOS.
-targetToolchain.macos_x64-ios_arm64 = target-toolchain-10-macos_x64
+targetToolchain.macos_x64-ios_arm64 = target-toolchain-xcode_11_4-macos_x64
 dependencies.macos_x64-ios_arm64 = \
   libffi-3.2.1-3-darwin-macos \
   clang-llvm-apple-8.0.0-darwin-macos
 
-target-sysroot-10-ios_arm64.default = \
+target-sysroot-xcode_11_4-ios_arm64.default = \
   remote:internal
 
 arch.ios_arm64 = arm64
-targetSysRoot.ios_arm64 = target-sysroot-10-ios_arm64
+targetSysRoot.ios_arm64 = target-sysroot-xcode_11_4-ios_arm64
 
 clangFlags.ios_arm64 = -cc1 -emit-obj -disable-llvm-passes -x ir
 clangNooptFlags.ios_arm64 = -O1
@@ -128,23 +128,23 @@ clangDynamicFlags.ios_arm64 =
 
 linkerNoDebugFlags.ios_arm64 = -S
 linkerDynamicFlags.ios_arm64 = -dylib
-linkerKonanFlags.ios_arm64 = -lSystem -lc++ -lobjc -framework Foundation -sdk_version 13.0
+linkerKonanFlags.ios_arm64 = -lSystem -lc++ -lobjc -framework Foundation -sdk_version 13.4
 linkerOptimizationFlags.ios_arm64 = -dead_strip
 osVersionMinFlagLd.ios_arm64 = -iphoneos_version_min
 osVersionMinFlagClang.ios_arm64 = -miphoneos-version-min
 osVersionMin.ios_arm64 = 9.0
 
 #  Apple's iOS simulator.
-targetToolchain.macos_x64-ios_x64 = target-toolchain-10-macos_x64
+targetToolchain.macos_x64-ios_x64 = target-toolchain-xcode_11_4-macos_x64
 dependencies.macos_x64-ios_x64 = \
   libffi-3.2.1-3-darwin-macos \
   clang-llvm-apple-8.0.0-darwin-macos
 
-target-sysroot-10-ios_x64.default = \
+target-sysroot-xcode_11_4-ios_x64.default = \
   remote:internal
 
 arch.ios_x64 = x86_64
-targetSysRoot.ios_x64 = target-sysroot-10-ios_x64
+targetSysRoot.ios_x64 = target-sysroot-xcode_11_4-ios_x64
 
 clangFlags.ios_x64 = -cc1 -emit-obj -disable-llvm-passes -x ir
 clangNooptFlags.ios_x64 = -O1
@@ -152,7 +152,7 @@ clangOptFlags.ios_x64 = -O3
 clangDebugFlags.ios_x64 = -O0
 clangDynamicFlags.ios_x64 =
 
-linkerKonanFlags.ios_x64 = -lSystem -lc++ -lobjc -framework Foundation -sdk_version 13.0
+linkerKonanFlags.ios_x64 = -lSystem -lc++ -lobjc -framework Foundation -sdk_version 13.4
 linkerOptimizationFlags.ios_x64 = -dead_strip
 linkerNoDebugFlags.ios_x64 = -S
 linkerDynamicFlags.ios_x64 = -dylib
@@ -161,16 +161,16 @@ osVersionMinFlagClang.ios_x64 = -mios-simulator-version-min
 osVersionMin.ios_x64 = 9.0
 
 #  Apple's tvOS simulator.
-targetToolchain.macos_x64-tvos_x64 = target-toolchain-10-macos_x64
+targetToolchain.macos_x64-tvos_x64 = target-toolchain-xcode_11_4-macos_x64
 dependencies.macos_x64-tvos_x64 = \
   libffi-3.2.1-3-darwin-macos \
   clang-llvm-apple-8.0.0-darwin-macos
 
-target-sysroot-10-tvos_x64.default = \
+target-sysroot-xcode_11_4-tvos_x64.default = \
   remote:internal
 
 arch.tvos_x64 = x86_64
-targetSysRoot.tvos_x64 = target-sysroot-10-tvos_x64
+targetSysRoot.tvos_x64 = target-sysroot-xcode_11_4-tvos_x64
 
 clangFlags.tvos_x64 = -cc1 -emit-obj -disable-llvm-passes -x ir
 clangNooptFlags.tvos_x64 = -O1
@@ -178,7 +178,7 @@ clangOptFlags.tvos_x64 = -O3
 clangDebugFlags.tvos_x64 = -O0
 clangDynamicFlags.tvos_x64 =
 
-linkerKonanFlags.tvos_x64 = -lSystem -lc++ -lobjc -framework Foundation -sdk_version 13.0
+linkerKonanFlags.tvos_x64 = -lSystem -lc++ -lobjc -framework Foundation -sdk_version 13.4
 linkerOptimizationFlags.tvos_x64 = -dead_strip
 linkerNoDebugFlags.tvos_x64 = -S
 linkerDynamicFlags.tvos_x64 = -dylib
@@ -187,16 +187,16 @@ osVersionMinFlagClang.tvos_x64 = -mtvos-simulator-version-min
 osVersionMin.tvos_x64 = 9.0
 
 # Apple's 64-bit tvOS.
-targetToolchain.macos_x64-tvos_arm64 = target-toolchain-10-macos_x64
+targetToolchain.macos_x64-tvos_arm64 = target-toolchain-xcode_11_4-macos_x64
 dependencies.macos_x64-tvos_arm64 = \
   libffi-3.2.1-3-darwin-macos \
   clang-llvm-apple-8.0.0-darwin-macos
 
-target-sysroot-10-tvos_arm64.default = \
+target-sysroot-xcode_11_4-tvos_arm64.default = \
   remote:internal
 
 arch.tvos_arm64 = arm64
-targetSysRoot.tvos_arm64 = target-sysroot-10-tvos_arm64
+targetSysRoot.tvos_arm64 = target-sysroot-xcode_11_4-tvos_arm64
 
 clangFlags.tvos_arm64 = -cc1 -emit-obj -disable-llvm-passes -x ir
 clangNooptFlags.tvos_arm64 = -O1
@@ -206,23 +206,23 @@ clangDynamicFlags.tvos_arm64 =
 
 linkerNoDebugFlags.tvos_arm64 = -S
 linkerDynamicFlags.tvos_arm64 = -dylib
-linkerKonanFlags.tvos_arm64 = -lSystem -lc++ -lobjc -framework Foundation -sdk_version 13.0
+linkerKonanFlags.tvos_arm64 = -lSystem -lc++ -lobjc -framework Foundation -sdk_version 13.4
 linkerOptimizationFlags.tvos_arm64 = -dead_strip
 osVersionMinFlagLd.tvos_arm64 = -tvos_version_min
 osVersionMinFlagClang.tvos_arm64 = -mtvos-version-min
 osVersionMin.tvos_arm64 = 9.0
 
 # watchOS armv7k
-targetToolchain.macos_x64-watchos_arm32 = target-toolchain-10-macos_x64
+targetToolchain.macos_x64-watchos_arm32 = target-toolchain-xcode_11_4-macos_x64
 dependencies.macos_x64-watchos_arm32 = \
   libffi-3.2.1-3-darwin-macos \
   clang-llvm-apple-8.0.0-darwin-macos
 
-target-sysroot-10-watchos_arm32.default = \
+target-sysroot-xcode_11_4-watchos_arm32.default = \
   remote:internal
 
 arch.watchos_arm32 = armv7k
-targetSysRoot.watchos_arm32 = target-sysroot-10-watchos_arm32
+targetSysRoot.watchos_arm32 = target-sysroot-xcode_11_4-watchos_arm32
 
 clangFlags.watchos_arm32 = -cc1 -emit-obj -disable-llvm-passes -x ir
 clangNooptFlags.watchos_arm32 = -O1
@@ -230,7 +230,7 @@ clangOptFlags.watchos_arm32 = -O3
 clangDebugFlags.watchos_arm32 = -O0
 clangDynamicFlags.watchos_arm32 =
 
-linkerKonanFlags.watchos_arm32 = -lSystem -lc++ -lobjc -framework Foundation -sdk_version 6.0
+linkerKonanFlags.watchos_arm32 = -lSystem -lc++ -lobjc -framework Foundation -sdk_version 6.2
 linkerOptimizationFlags.watchos_arm32 = -dead_strip
 linkerNoDebugFlags.watchos_arm32 = -S
 linkerDynamicFlags.watchos_arm32 = -dylib
@@ -239,16 +239,16 @@ osVersionMinFlagClang.watchos_arm32 = -mwatchos-version-min
 osVersionMin.watchos_arm32 = 5.0
 
 # watchOS arm64_32
-targetToolchain.macos_x64-watchos_arm64 = target-toolchain-10-macos_x64
+targetToolchain.macos_x64-watchos_arm64 = target-toolchain-xcode_11_4-macos_x64
 dependencies.macos_x64-watchos_arm64 = \
   libffi-3.2.1-3-darwin-macos \
   clang-llvm-apple-8.0.0-darwin-macos
 
-target-sysroot-10-watchos_arm64.default = \
+target-sysroot-xcode_11_4-watchos_arm64.default = \
   remote:internal
 
 arch.watchos_arm64 = arm64_32
-targetSysRoot.watchos_arm64 = target-sysroot-10-watchos_arm32
+targetSysRoot.watchos_arm64 = target-sysroot-xcode_11_4-watchos_arm32
 
 clangFlags.watchos_arm64 = -cc1 -emit-obj -disable-llvm-passes -x ir -mllvm -aarch64-watch-bitcode-compatibility \
   -mllvm -arm-bitcode-compatibility -mllvm -fast-isel=false -mllvm -global-isel=false
@@ -257,7 +257,7 @@ clangOptFlags.watchos_arm64 = -O3
 clangDebugFlags.watchos_arm64 = -O0
 clangDynamicFlags.watchos_arm64 =
 
-linkerKonanFlags.watchos_arm64 = -lSystem -lc++ -lobjc -framework Foundation -sdk_version 6.0
+linkerKonanFlags.watchos_arm64 = -lSystem -lc++ -lobjc -framework Foundation -sdk_version 6.2
 linkerOptimizationFlags.watchos_arm64 = -dead_strip
 linkerNoDebugFlags.watchos_arm64 = -S
 linkerDynamicFlags.watchos_arm64 = -dylib
@@ -266,16 +266,16 @@ osVersionMinFlagClang.watchos_arm64 = -mwatchos-version-min
 osVersionMin.watchos_arm64 = 5.0
 
 #  Apple's watchOS i386 simulator.
-targetToolchain.macos_x64-watchos_x86 = target-toolchain-10-macos_x64
+targetToolchain.macos_x64-watchos_x86 = target-toolchain-xcode_11_4-macos_x64
 dependencies.macos_x64-watchos_x86 = \
   libffi-3.2.1-3-darwin-macos \
   clang-llvm-apple-8.0.0-darwin-macos
 
-target-sysroot-10-watchos_x86.default = \
+target-sysroot-xcode_11_4-watchos_x86.default = \
   remote:internal
 
 arch.watchos_x86 = i386
-targetSysRoot.watchos_x86 = target-sysroot-10-watchos_x86
+targetSysRoot.watchos_x86 = target-sysroot-xcode_11_4-watchos_x86
 
 clangFlags.watchos_x86 = -cc1 -emit-obj -disable-llvm-passes -x ir
 clangNooptFlags.watchos_x86 = -O1
@@ -283,7 +283,7 @@ clangOptFlags.watchos_x86 = -O3
 clangDebugFlags.watchos_x86 = -O0
 clangDynamicFlags.watchos_x86 =
 
-linkerKonanFlags.watchos_x86 = -lSystem -lc++ -lobjc -framework Foundation -sdk_version 6.0
+linkerKonanFlags.watchos_x86 = -lSystem -lc++ -lobjc -framework Foundation -sdk_version 6.2
 linkerOptimizationFlags.watchos_x86 = -dead_strip
 linkerNoDebugFlags.watchos_x86 = -S
 linkerDynamicFlags.watchos_x86 = -dylib
diff --git a/platformLibs/src/platform/ios/ClassKit.def b/platformLibs/src/platform/ios/ClassKit.def
index c82eb0c25da..5353ec57966 100644
--- a/platformLibs/src/platform/ios/ClassKit.def
+++ b/platformLibs/src/platform/ios/ClassKit.def
@@ -1,4 +1,4 @@
-depends = CFNetwork CoreFoundation Foundation Security darwin posix
+depends = CFNetwork CoreFoundation CoreGraphics Foundation Security darwin posix
 language = Objective-C
 package = platform.ClassKit
 modules = ClassKit
diff --git a/tools/scripts/update_xcode.sh b/tools/scripts/update_xcode.sh
index 1ba331de329..16bc175af16 100755
--- a/tools/scripts/update_xcode.sh
+++ b/tools/scripts/update_xcode.sh
@@ -2,7 +2,7 @@
 set -e
 
 # "brew install coreutils" for grealpath.
-KONAN_TOOLCHAIN_VERSION=10
+KONAN_TOOLCHAIN_VERSION=xcode_11_4
 SDKS="macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator"
 TARBALL_macosx=target-sysroot-$KONAN_TOOLCHAIN_VERSION-macos_x64
 TARBALL_iphoneos=target-sysroot-$KONAN_TOOLCHAIN_VERSION-ios_arm64