Merge branch 'release/v4.0.0'

.travis.yml

@@ -1,8 +1,8 @@
 language: objective-c
-osx_image: xcode10.1
+osx_image: xcode11.2
 xcode_project: GSLCrypto.xcodeproj
 xcode_scheme: GSLCrypto
-xcode_sdk: iphonesimulator12.1
+xcode_sdk: iphonesimulator13.2
 before_install:
 - gem install xcpretty
 script:

GSLCrypto.podspec

@@ -1,10 +1,10 @@
 Pod::Spec.new do |s|
   s.name         = 'GSLCrypto'
-  s.version      = '3.0.1'
+  s.version      = '4.0.0'
   s.author       = 'GyazSquare'
   s.license      = { :type => 'MIT' }
   s.homepage     = 'https://github.com/GyazSquare/GSLCrypto'
-  s.source       = { :git => 'https://github.com/GyazSquare/GSLCrypto.git', :tag => 'v3.0.1' }
+  s.source       = { :git => 'https://github.com/GyazSquare/GSLCrypto.git', :tag => 'v4.0.0' }
   s.summary      = 'A simple digest library for iOS, macOS, watchOS and tvOS.'
   s.ios.deployment_target = '8.0'
   s.osx.deployment_target = '10.6'

GSLCrypto.xcodeproj/project.pbxproj

@@ -150,7 +150,7 @@
 		D70D229A1AA2DC280050CD26 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0930;
+				LastUpgradeCheck = 1120;
 				TargetAttributes = {
 					D70D22A11AA2DC280050CD26 = {
 						CreatedOnToolsVersion = 6.1.1;
@@ -162,7 +162,7 @@
 			};
 			buildConfigurationList = D70D229D1AA2DC280050CD26 /* Build configuration list for PBXProject "GSLCrypto" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,

GSLCrypto.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict/>
+<dict>
+	<key>PreviewsEnabled</key>
+	<false/>
+</dict>
 </plist>

GSLCrypto.xcodeproj/xcshareddata/xcschemes/GSLCrypto.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1120"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -41,6 +41,15 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D70D22A11AA2DC280050CD26"
+            BuildableName = "libGSLCrypto.a"
+            BlueprintName = "GSLCrypto"
+            ReferencedContainer = "container:GSLCrypto.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -53,17 +62,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "D70D22A11AA2DC280050CD26"
-            BuildableName = "libGSLCrypto.a"
-            BlueprintName = "GSLCrypto"
-            ReferencedContainer = "container:GSLCrypto.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -84,8 +82,6 @@
             ReferencedContainer = "container:GSLCrypto.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

GSLCrypto/NSDataGSLCryptoAdditions.m

@@ -116,7 +116,7 @@ - (NSData *)gsl_HMACUsingAlgorithm:(GSLHMACAlgorithm)algorithm key:(NSData *)key
             break;
     }
     unsigned char data[length];
-    CCHmac(algorithm, key.bytes, key.length, self.bytes, self.length, data);
+    CCHmac((CCHmacAlgorithm)algorithm, key.bytes, key.length, self.bytes, self.length, data);
     return [NSData dataWithBytes:data length:length];
 }
 
@@ -150,7 +150,7 @@ - (nullable NSData *)gsl_cryptedDataWithOperation:(CCOperation)operation usingAl
         }
         return cryptedData;
     };
-    status = CCCryptorCreate(operation, algorithm, options, key.bytes, key.length, initializationVector.bytes, &cryptor);
+    status = CCCryptorCreate(operation, (CCAlgorithm)algorithm, (CCOptions)options, key.bytes, key.length, initializationVector.bytes, &cryptor);
     if (status != kCCSuccess) {
         return finallyBlock();
     }

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017-2018 GyazSquare Inc.
+Copyright (c) 2017-2019 GyazSquare Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -6,8 +6,8 @@ GSLCrypto is a simple Objective-C digest library for iOS, macOS, watchOS and tvO
 
 ## Requirements
 
-* Xcode 10.1 or later
-* Base SDK: iOS 12.1 / macOS 10.14.1 / watchOS 5.1 / tvOS 12.1 or later
+* Xcode 11.2 or later
+* Base SDK: iOS 13.2 / macOS 10.15 / watchOS 6.1 / tvOS 13.2 or later
 * Deployment Target: iOS 8.0 / OS X 10.6 / watchOS 2.0 / tvOS 9.0 or later
 
 ## Installation

scripts/travis-run-tests.sh

@@ -3,7 +3,7 @@
 set -ev
 set -o pipefail
 
-IOS_SIMULATOR_ID=`xcrun instruments -s devices 2>/dev/null | sed -n -E 's/^iPhone XR \(12\.1\)[^+]*\[([[:xdigit:]-]{36})\].*\(Simulator\)$/\1/p' | sed -n -e 1p`
+IOS_SIMULATOR_ID=`xcrun instruments -s devices 2>/dev/null | sed -n -E 's/^iPhone 11 Pro Max \(13\.2\.2\)[^+]*\[([[:xdigit:]-]{36})\].*\(Simulator\)$/\1/p' | sed -n -e 1p`
 
 if [ "${TRAVIS_XCODE_PROJECT-UNDEF}" != "UNDEF" ]; then
     xcodebuild -project ${TRAVIS_XCODE_PROJECT} -scheme ${TRAVIS_XCODE_SCHEME} -destination "id=${IOS_SIMULATOR_ID}" -sdk ${TRAVIS_XCODE_SDK} test