From aad7e0bb423b8a20029860ccbcd9df214218bab4 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov Date: Thu, 29 Oct 2020 11:07:26 +0300 Subject: [PATCH] macOS software update week45 --- images/macos/provision/core/openjdk.sh | 2 +- images/macos/provision/core/python.sh | 4 ---- images/macos/toolsets/toolset-10.15.json | 4 ++-- images/macos/toolsets/toolset-11.0.json | 2 +- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/images/macos/provision/core/openjdk.sh b/images/macos/provision/core/openjdk.sh index c2b22bafa..afca628e8 100644 --- a/images/macos/provision/core/openjdk.sh +++ b/images/macos/provision/core/openjdk.sh @@ -35,7 +35,7 @@ JAVA_DEFAULT=$(get_toolset_value '.java.default') for JAVA_VERSION in "${JAVA_VERSIONS_LIST[@]}" do if [[ $JAVA_VERSION == "7" ]]; then - installAzulJDK "https://cdn.azul.com/zulu/bin/zulu7.40.0.15-ca-jdk7.0.272-macosx_x64.dmg" + installAzulJDK "https://cdn.azul.com/zulu/bin/zulu7.42.0.13-ca-jdk7.0.282-macosx_x64.dmg" else brew cask install "adoptopenjdk${JAVA_VERSION}" fi diff --git a/images/macos/provision/core/python.sh b/images/macos/provision/core/python.sh index 629220535..7dafd273f 100755 --- a/images/macos/provision/core/python.sh +++ b/images/macos/provision/core/python.sh @@ -6,11 +6,7 @@ echo "Installing Python Tooling" echo "Brew Installing Python 3" # Workaround to have both 3.8 & 3.9(which required by some brew formulas) in the system, but only 3.8 is linked -brew install python@3.8 brew install python@3.9 -brew unlink python@3.9 -brew unlink python@3.8 -brew link python@3.8 echo "Brew Installing Python 2" # Create local tap with formula due to python2 formula depreciation diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index e041c15e2..41fc166a0 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -2,7 +2,7 @@ "xcode": { "default": "12", "versions": [ - "12.2_beta", "12.1_GM_seed", "12", "11.7", "11.6", "11.5", "11.4.1", "11.4", "11.3.1", "11.2.1", "11.1", "11", "10.3" + "12.2_beta", "12.1", "12", "11.7", "11.6", "11.5", "11.4.1", "11.4", "11.3.1", "11.2.1", "11.1", "11", "10.3" ] }, "xamarin": { @@ -11,7 +11,7 @@ "6.12.0.93", "6.10.0.106", "6.8.0.123", "6.6.0.166", "6.4.0.208" ], "ios-versions": [ - "14.0.0.0", "13.20.2.2", "13.18.2.1", "13.16.0.13", "13.14.1.39", "13.10.0.21", "13.8.3.0", "13.6.0.12", "13.4.0.2", "13.2.0.47" + "14.2.0.12", "13.20.2.2", "13.18.2.1", "13.16.0.13", "13.14.1.39", "13.10.0.21", "13.8.3.0", "13.6.0.12", "13.4.0.2", "13.2.0.47" ], "mac-versions": [ "6.20.2.2", "6.18.3.2", "6.16.0.13", "6.14.1.39", "6.10.0.21", "6.8.3.0", "6.6.0.12", "6.4.0.2", "6.2.0.47" diff --git a/images/macos/toolsets/toolset-11.0.json b/images/macos/toolsets/toolset-11.0.json index cb14b3a0e..0d85f142a 100644 --- a/images/macos/toolsets/toolset-11.0.json +++ b/images/macos/toolsets/toolset-11.0.json @@ -11,7 +11,7 @@ "6.12.0.93" ], "ios-versions": [ - "14.0.0.0", "13.20.2.2" + "14.2.0.12", "13.20.2.2" ], "mac-versions": [ "6.20.2.2"