Remove all macOS-10.15 related code (#7078)

This commit is contained in:
sergei-pyshnoi
2023-02-13 16:40:48 +01:00
committed by GitHub
parent 539b772d6b
commit 8767a6eb4e
21 changed files with 29 additions and 752 deletions

View File

@@ -97,10 +97,6 @@ done
# The Android Emulator uses the built-in Hypervisor.Framework by default, and falls back to using Intel HAXM if Hypervisor.Framework fails to initialize
# https://developer.android.com/studio/run/emulator-acceleration#vm-mac
# The installation doesn't work properly on macOS Big Sur, /dev/HAX is not created
if is_Catalina; then
chmod +x $ANDROID_HOME/extras/intel/Hardware_Accelerated_Execution_Manager/silent_install.sh
sudo $ANDROID_HOME/extras/intel/Hardware_Accelerated_Execution_Manager/silent_install.sh
fi
for addon_name in "${ANDROID_ADDON_LIST[@]}"
do

View File

@@ -9,20 +9,12 @@ brew_smart_install "sox"
# Big Sur doesn't support soundflower installation without user interaction https://github.com/mattingalls/Soundflower/releases/tag/2.0b2
# Install blackhole-2ch for Big Sur instead
if is_Catalina; then
echo "install soundflower"
brew install --cask soundflower
echo "set Soundflower (2ch) as input/output device"
SwitchAudioSource -s "Soundflower (2ch)" -t input
SwitchAudioSource -s "Soundflower (2ch)" -t output
else
echo "install blackhole-2ch"
brew_smart_install "blackhole-2ch"
echo "install blackhole-2ch"
brew_smart_install "blackhole-2ch"
echo "set BlackHole 2ch as input/output device"
SwitchAudioSource -s "BlackHole 2ch" -t input
SwitchAudioSource -s "BlackHole 2ch" -t output
fi
echo "set BlackHole 2ch as input/output device"
SwitchAudioSource -s "BlackHole 2ch" -t input
SwitchAudioSource -s "BlackHole 2ch" -t output
invoke_tests "System" "Audio Device"

View File

@@ -8,12 +8,6 @@ exportPath=$(echo /Library/Java/JavaVirtualMachines/graalvm-ce-java*/Contents/Ho
echo "Setting up GRAALVM_11_ROOT variable to ${exportPath}"
echo "export GRAALVM_11_ROOT=${exportPath}" >> "${HOME}/.bashrc"
# GraalVM not being signed and notarized yet on macOS Catalina
if is_Catalina; then
quarantinePath=$(echo /Library/Java/JavaVirtualMachines/graalvm-ce-java*)
sudo xattr -rd com.apple.quarantine $quarantinePath
fi
# Install Native Image
$exportPath/gu install native-image

View File

@@ -77,14 +77,6 @@ for jdkVendor in ${jdkVendors[@]}; do
done
done
# Big Sur or newer does not have these versions of Adopt.
# Also hardcode these versions as they only exist for Adopt
if is_Catalina; then
for adoptVersionToInstall in 12 13 14; do
createEnvironmentVariable ${adoptVersionToInstall} "Adopt"
done
fi
echo Installing Maven...
brew_smart_install "maven"

View File

@@ -8,9 +8,8 @@ psDownloadUrl=$(get_github_package_download_url "PowerShell/PowerShell" "contain
download_with_retries $psDownloadUrl "/tmp" "powershell.pkg"
# Work around the issue on macOS Big Sur 11.5 or higher for possible error message ("can't be opened because Apple cannot check it for malicious software") when installing the package
if ! is_Catalina; then
sudo xattr -rd com.apple.quarantine /tmp/powershell.pkg
fi
sudo xattr -rd com.apple.quarantine /tmp/powershell.pkg
sudo installer -pkg /tmp/powershell.pkg -target /

View File

@@ -3,7 +3,7 @@ source ~/utils/utils.sh
echo "Install SwiftLint"
# SwiftLint now requires Swift 5.6 or higher to build, and macOS 12 or higher to run https://github.com/realm/SwiftLint/releases/tag/0.49.0
if is_Less_Monterey; then
if is_BigSur; then
version="0.48.0"
else
version="latest"

View File

@@ -64,11 +64,6 @@ createBundleLink $CURRENT_SDK_SYMLINK "Current"
# Fix nuget in some mono versions because of known bugs
#
if is_Catalina; then
# Fix Mono issue with default nuget: https://github.com/mono/mono/issues/17637
installNuget "6.4.0" "5.3.1"
fi
# Creating UWP Shim to hack UWP build failure
createUWPShim