From cfe73f68dc897392316f455e7776225ba74c0150 Mon Sep 17 00:00:00 2001 From: Peter Lindberg Date: Fri, 30 Jun 2023 15:03:26 +0200 Subject: [PATCH 1/6] Bump deploy target to iOS 11 --- IDZSwiftCommonCrypto.xcodeproj/project.pbxproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/IDZSwiftCommonCrypto.xcodeproj/project.pbxproj b/IDZSwiftCommonCrypto.xcodeproj/project.pbxproj index 1fd91b8..42eea6c 100644 --- a/IDZSwiftCommonCrypto.xcodeproj/project.pbxproj +++ b/IDZSwiftCommonCrypto.xcodeproj/project.pbxproj @@ -991,6 +991,7 @@ FRAMEWORK_SEARCH_PATHS = ""; INFOPLIST_FILE = IDZSwiftCommonCrypto/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.iosdeveloperzone.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = IDZSwiftCommonCrypto; @@ -1012,6 +1013,7 @@ FRAMEWORK_SEARCH_PATHS = ""; INFOPLIST_FILE = IDZSwiftCommonCrypto/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.iosdeveloperzone.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = IDZSwiftCommonCrypto; From 3cd12dd4f1938b471ac65c6632735701b2a749da Mon Sep 17 00:00:00 2001 From: Peter Lindberg Date: Fri, 30 Jun 2023 15:37:32 +0200 Subject: [PATCH 2/6] Bump deploy target for project, not target --- IDZSwiftCommonCrypto.xcodeproj/project.pbxproj | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/IDZSwiftCommonCrypto.xcodeproj/project.pbxproj b/IDZSwiftCommonCrypto.xcodeproj/project.pbxproj index 42eea6c..5a6a913 100644 --- a/IDZSwiftCommonCrypto.xcodeproj/project.pbxproj +++ b/IDZSwiftCommonCrypto.xcodeproj/project.pbxproj @@ -912,7 +912,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -969,7 +969,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; @@ -991,7 +991,6 @@ FRAMEWORK_SEARCH_PATHS = ""; INFOPLIST_FILE = IDZSwiftCommonCrypto/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.iosdeveloperzone.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = IDZSwiftCommonCrypto; @@ -1013,7 +1012,6 @@ FRAMEWORK_SEARCH_PATHS = ""; INFOPLIST_FILE = IDZSwiftCommonCrypto/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.iosdeveloperzone.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = IDZSwiftCommonCrypto; From d8adbd943b0e0fffbdf713e6a9c094da75024785 Mon Sep 17 00:00:00 2001 From: iosdevzone Date: Sat, 19 Aug 2023 15:04:07 -0700 Subject: [PATCH 3/6] Attempt to get CocoaPods build working. --- Gemfile.lock | 45 ------------------- IDZSwiftCommonCrypto.podspec | 8 ++-- .../project.pbxproj | 8 ++-- Makefile | 2 +- 4 files changed, 9 insertions(+), 54 deletions(-) delete mode 100644 Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index b252471..0000000 --- a/Gemfile.lock +++ /dev/null @@ -1,45 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - CFPropertyList (3.0.0) - activesupport (4.2.11.1) - i18n (~> 0.7) - minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) - tzinfo (~> 1.1) - atomos (0.1.3) - claide (1.0.2) - clamp (1.3.0) - colored2 (3.1.2) - concurrent-ruby (1.1.5) - i18n (0.9.5) - concurrent-ruby (~> 1.0) - mini_portile2 (2.4.0) - minitest (5.11.3) - nanaimo (0.2.6) - nokogiri (1.10.8) - mini_portile2 (~> 2.4.0) - slather (2.4.7) - CFPropertyList (>= 2.2, < 4) - activesupport (>= 4.0.2, < 5) - clamp (~> 1.3) - nokogiri (~> 1.8) - xcodeproj (~> 1.7) - thread_safe (0.3.6) - tzinfo (1.2.5) - thread_safe (~> 0.1) - xcodeproj (1.8.1) - CFPropertyList (>= 2.3.3, < 4.0) - atomos (~> 0.1.3) - claide (>= 1.0.2, < 2.0) - colored2 (~> 3.1) - nanaimo (~> 0.2.6) - -PLATFORMS - ruby - -DEPENDENCIES - slather - -BUNDLED WITH - 2.0.1 diff --git a/IDZSwiftCommonCrypto.podspec b/IDZSwiftCommonCrypto.podspec index 6a2076a..de47cad 100644 --- a/IDZSwiftCommonCrypto.podspec +++ b/IDZSwiftCommonCrypto.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = "IDZSwiftCommonCrypto" - s.version = "0.13.0" + s.version = "0.16.0" s.summary = "A wrapper for Apple's Common Crypto library written in Swift." s.homepage = "https://github.com/iosdevzone/IDZSwiftCommonCrypto" @@ -9,9 +9,9 @@ Pod::Spec.new do |s| s.author = { "iOSDevZone" => "idz@iosdeveloperzone.com" } s.social_media_url = "http://twitter.com/iOSDevZone" - s.osx.deployment_target = '10.11' - s.ios.deployment_target = '9.0' - s.tvos.deployment_target = '9.0' + s.osx.deployment_target = '10.13' + s.ios.deployment_target = '11.0' + s.tvos.deployment_target = '11.0' s.watchos.deployment_target = '5.1' s.source = { :git => "https://github.com/iosdevzone/IDZSwiftCommonCrypto.git", :tag => s.version.to_s } diff --git a/IDZSwiftCommonCrypto.xcodeproj/project.pbxproj b/IDZSwiftCommonCrypto.xcodeproj/project.pbxproj index 0ab0903..48359ad 100644 --- a/IDZSwiftCommonCrypto.xcodeproj/project.pbxproj +++ b/IDZSwiftCommonCrypto.xcodeproj/project.pbxproj @@ -1225,7 +1225,7 @@ SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 9.1; + TVOS_DEPLOYMENT_TARGET = 11.0; }; name = Debug; }; @@ -1250,7 +1250,7 @@ SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 9.1; + TVOS_DEPLOYMENT_TARGET = 11.0; }; name = Release; }; @@ -1265,7 +1265,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; SWIFT_VERSION = 5.0; - TVOS_DEPLOYMENT_TARGET = 9.1; + TVOS_DEPLOYMENT_TARGET = 11; }; name = Debug; }; @@ -1281,7 +1281,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; SWIFT_VERSION = 5.0; - TVOS_DEPLOYMENT_TARGET = 9.1; + TVOS_DEPLOYMENT_TARGET = 11.0; }; name = Release; }; diff --git a/Makefile b/Makefile index aaee43b..8bdffa1 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ REPO=IDZPodspecs NAME=IDZSwiftCommonCrypto -IOS_VERSION=9.2 +IOS_VERSION=11 PG=README.playground RSRC_DIR=$(PG)/Resources From 65ddb38fe6d74aba0db67dfd34b9ca55ec49b295 Mon Sep 17 00:00:00 2001 From: iosdevzone Date: Sat, 19 Aug 2023 15:11:30 -0700 Subject: [PATCH 4/6] Fix warning related to StreamCryptor.Options.None --- IDZSwiftCommonCrypto/StreamCryptor.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IDZSwiftCommonCrypto/StreamCryptor.swift b/IDZSwiftCommonCrypto/StreamCryptor.swift index e0cccce..0050479 100644 --- a/IDZSwiftCommonCrypto/StreamCryptor.swift +++ b/IDZSwiftCommonCrypto/StreamCryptor.swift @@ -237,7 +237,7 @@ open class StreamCryptor } /// No options - public static let None = Options(rawValue: 0) + public static let None : Options = [] /// Use padding. Needed unless the input is a integral number of blocks long. public static var PKCS7Padding = Options(rawValue:kCCOptionPKCS7Padding) /// Electronic Code Book Mode. Don't use this. From 47f9747d12137cd59d783ab376e3ccab7206319b Mon Sep 17 00:00:00 2001 From: iosdevzone Date: Sat, 19 Aug 2023 15:25:52 -0700 Subject: [PATCH 5/6] Clean up warnings to get pod to validate. --- IDZSwiftCommonCrypto.podspec | 2 +- IDZSwiftCommonCrypto/Utilities.swift | 4 ++-- Makefile | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/IDZSwiftCommonCrypto.podspec b/IDZSwiftCommonCrypto.podspec index de47cad..ca00d96 100644 --- a/IDZSwiftCommonCrypto.podspec +++ b/IDZSwiftCommonCrypto.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = "IDZSwiftCommonCrypto" - s.version = "0.16.0" + s.version = "0.16.1" s.summary = "A wrapper for Apple's Common Crypto library written in Swift." s.homepage = "https://github.com/iosdevzone/IDZSwiftCommonCrypto" diff --git a/IDZSwiftCommonCrypto/Utilities.swift b/IDZSwiftCommonCrypto/Utilities.swift index c555081..b45115a 100644 --- a/IDZSwiftCommonCrypto/Utilities.swift +++ b/IDZSwiftCommonCrypto/Utilities.swift @@ -94,7 +94,7 @@ public func arrayFrom(string : String) -> [UInt8] public func dataFrom(hexString: String) -> Data { let a = arrayFrom(hexString: hexString) - return Data(bytes: UnsafePointer(a), count:a.count) + return Data(a) } /// @@ -105,7 +105,7 @@ public func dataFrom(hexString: String) -> Data /// public func dataFrom(byteArray : [UInt8]) -> Data { - return Data(bytes: UnsafePointer(byteArray), count:byteArray.count) + return Data(byteArray) } /// diff --git a/Makefile b/Makefile index 8bdffa1..c1817e7 100644 --- a/Makefile +++ b/Makefile @@ -39,6 +39,10 @@ clean: push_tags: git push origin --tags +# Lint the pod locally +lint_lib: + pod lib lint --verbose ${NAME}.podspec --sources=https://github.com/iosdevzone/IDZPodspecs.git + # Lint the podspec lint_pod: pod spec lint --verbose ${NAME}.podspec --sources=https://github.com/iosdevzone/IDZPodspecs.git From 90e5ec0877c6192e3efb975f02ff11fd5938fc1e Mon Sep 17 00:00:00 2001 From: idz Date: Thu, 23 Nov 2023 14:24:54 -0800 Subject: [PATCH 6/6] Update LICENSE Update copyright years. --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 1b8b0f8..7e65254 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2014 idz +Copyright (c) 2014-2023 idz Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal