From a6958f4c9b618e183258e49e689ca602139a42b9 Mon Sep 17 00:00:00 2001 From: Davide De Rosa Date: Wed, 26 Sep 2018 10:04:57 +0200 Subject: [PATCH] Default to 64-bit only - Raise platform targets. - Drop 32-bit OpenSSL targets. - Default to 1.1.0 --- OpenSSL-Apple.podspec.template | 4 ++-- assets/AppleTV/Info.plist | 2 +- assets/iPhone/Info.plist | 2 +- build-libssl.sh | 12 +++++++----- create-openssl-framework.sh | 8 ++++---- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/OpenSSL-Apple.podspec.template b/OpenSSL-Apple.podspec.template index 914c612..154f0c0 100644 --- a/OpenSSL-Apple.podspec.template +++ b/OpenSSL-Apple.podspec.template @@ -13,9 +13,9 @@ Pod::Spec.new do |s| ./create-openssl-framework.sh dynamic CMD - s.ios.deployment_target = "9.0" + s.ios.deployment_target = "11.0" s.ios.vendored_frameworks = "frameworks/iPhone/openssl.framework" - s.tvos.deployment_target = "9.0" + s.tvos.deployment_target = "11.0" s.tvos.vendored_frameworks = "frameworks/AppleTV/openssl.framework" s.osx.deployment_target = "10.11" s.osx.vendored_frameworks = "frameworks/MacOSX/openssl.framework" diff --git a/assets/AppleTV/Info.plist b/assets/AppleTV/Info.plist index 897ebbb..d18bc32 100644 --- a/assets/AppleTV/Info.plist +++ b/assets/AppleTV/Info.plist @@ -19,6 +19,6 @@ CFBundleVersion 1 MinimumOSVersion - 9.0 + 11.0 diff --git a/assets/iPhone/Info.plist b/assets/iPhone/Info.plist index 246ce20..d18bc32 100644 --- a/assets/iPhone/Info.plist +++ b/assets/iPhone/Info.plist @@ -19,6 +19,6 @@ CFBundleVersion 1 MinimumOSVersion - 8.0 + 11.0 diff --git a/build-libssl.sh b/build-libssl.sh index 6ca80e3..266c0a8 100755 --- a/build-libssl.sh +++ b/build-libssl.sh @@ -25,16 +25,18 @@ set -u # SCRIPT DEFAULTS # Default version in case no version is specified -DEFAULTVERSION="1.0.2l" +DEFAULTVERSION="1.1.0i" # Default (=full) set of architectures (OpenSSL <= 1.0.2) or targets (OpenSSL >= 1.1.0) to build -DEFAULTARCHS="ios_x86_64 ios_arm64 ios_armv7s ios_armv7 tv_x86_64 tv_arm64 mac_x86_64" -DEFAULTTARGETS="ios-sim-cross-x86_64 ios64-cross-arm64 ios-cross-armv7s ios-cross-armv7 tvos-sim-cross-x86_64 tvos64-cross-arm64 macos64-x86_64" +#DEFAULTARCHS="ios_x86_64 ios_arm64 ios_armv7s ios_armv7 tv_x86_64 tv_arm64 mac_x86_64" +#DEFAULTTARGETS="ios-sim-cross-x86_64 ios64-cross-arm64 ios-cross-armv7s ios-cross-armv7 tvos-sim-cross-x86_64 tvos64-cross-arm64 macos64-x86_64" +DEFAULTARCHS="ios_x86_64 ios_arm64 tv_x86_64 tv_arm64 mac_x86_64" +DEFAULTTARGETS="ios-sim-cross-x86_64 ios64-cross-arm64 tvos-sim-cross-x86_64 tvos64-cross-arm64 macos64-x86_64" # Minimum iOS/tvOS SDK version to build for MACOS_MIN_SDK_VERSION="10.11" -IOS_MIN_SDK_VERSION="8.0" -TVOS_MIN_SDK_VERSION="9.0" +IOS_MIN_SDK_VERSION="11.0" +TVOS_MIN_SDK_VERSION="11.0" # Init optional env variables (use available variable or default to empty string) CURL_OPTIONS="${CURL_OPTIONS:-}" diff --git a/create-openssl-framework.sh b/create-openssl-framework.sh index 09c5fcd..2b6f6f2 100755 --- a/create-openssl-framework.sh +++ b/create-openssl-framework.sh @@ -63,15 +63,15 @@ if [ $FWTYPE == "dynamic" ]; then SDK="${CROSS_TOP}/SDKs/${CROSS_SDK}" if [[ $PLATFORM == AppleTVSimulator* ]]; then - MIN_SDK="-tvos_simulator_version_min 9.0" + MIN_SDK="-tvos_simulator_version_min 11.0" elif [[ $PLATFORM == AppleTV* ]]; then - MIN_SDK="-tvos_version_min 9.0" + MIN_SDK="-tvos_version_min 11.0" elif [[ $PLATFORM == MacOSX* ]]; then MIN_SDK="-macosx_version_min 10.11" elif [[ $PLATFORM == iPhoneSimulator* ]]; then - MIN_SDK="-ios_simulator_version_min 8.0" + MIN_SDK="-ios_simulator_version_min 11.0" else - MIN_SDK="-ios_version_min 8.0" + MIN_SDK="-ios_version_min 11.0" fi #cd $TARGETDIR