From 519ec9de7c1dc0a8526b2921ee6d9fe8b07bd3ce Mon Sep 17 00:00:00 2001
From: Davide De Rosa <keeshux@gmail.com>
Date: Sat, 14 Nov 2020 15:46:28 +0100
Subject: [PATCH] Update podspec to use XCFramework

Drop redundant template.
---
 OpenSSL-Apple.podspec          |  9 +++------
 OpenSSL-Apple.podspec.template | 27 ---------------------------
 2 files changed, 3 insertions(+), 33 deletions(-)
 delete mode 100755 OpenSSL-Apple.podspec.template

diff --git a/OpenSSL-Apple.podspec b/OpenSSL-Apple.podspec
index 40c32b8..f479379 100755
--- a/OpenSSL-Apple.podspec
+++ b/OpenSSL-Apple.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
     openssl_version   = "1.1.1h"
-    openssl_targets   = "ios-sim-cross-x86_64 ios64-cross-arm64 ios64-cross-arm64e macos64-x86_64 macos64-arm64 mac-catalyst-arm64"
-    script_version    = "7"
+    openssl_targets   = "ios-sim-cross-x86_64 ios-sim-cross-arm64 ios64-cross-arm64 ios64-cross-arm64e macos64-x86_64 macos64-arm64 mac-catalyst-x86_64 mac-catalyst-arm64"
+    script_version    = "8"
 
     s.name            = "OpenSSL-Apple"
     s.version         = "#{openssl_version}.#{script_version}"
@@ -18,10 +18,7 @@ Pod::Spec.new do |s|
     CMD
 
     s.ios.deployment_target         = "12.0"
-    s.ios.vendored_frameworks       = "frameworks/iPhone/openssl.framework"
-    s.ios.pod_target_xcconfig       = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }
-    s.ios.user_target_xcconfig      = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }
     s.osx.deployment_target         = "10.15"
-    s.osx.vendored_frameworks       = "frameworks/MacOSX/openssl.framework"
+    s.vendored_frameworks           = "frameworks/openssl.xcframework"
     s.requires_arc                  = false
 end
diff --git a/OpenSSL-Apple.podspec.template b/OpenSSL-Apple.podspec.template
deleted file mode 100755
index d4ea145..0000000
--- a/OpenSSL-Apple.podspec.template
+++ /dev/null
@@ -1,27 +0,0 @@
-Pod::Spec.new do |s|
-    openssl_version   = "%OPENSSL-VERSION%"
-    openssl_targets   = "ios-sim-cross-x86_64 ios64-cross-arm64 ios64-cross-arm64e macos64-x86_64 macos64-arm64 mac-catalyst-arm64"
-    script_version    = "7"
-
-    s.name            = "OpenSSL-Apple"
-    s.version         = "#{openssl_version}.#{script_version}"
-    s.summary         = "A script for compiling OpenSSL for Apple Devices"
-    s.authors         = "Felix Schulze", "Davide De Rosa", "Ezat Hashim"
-
-    s.homepage        = "https://github.com/keeshux/openssl-apple.git"
-    s.source          = { :git => s.homepage.to_s, :tag => "v#{script_version}" }
-    s.license         = { :type => 'Apache', :file => 'LICENSE' }
-
-    s.prepare_command = <<-CMD
-./build-libssl.sh --version="#{openssl_version}" --targets="#{openssl_targets}"
-./create-openssl-framework.sh dynamic
-    CMD
-
-    s.ios.deployment_target         = "12.0"
-    s.ios.vendored_frameworks       = "frameworks/iPhone/openssl.framework"
-    s.ios.pod_target_xcconfig       = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }
-    s.ios.user_target_xcconfig      = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }
-    s.osx.deployment_target         = "10.15"
-    s.osx.vendored_frameworks       = "frameworks/MacOSX/openssl.framework"
-    s.requires_arc                  = false
-end