Merge branch 'release-2.0.0'

.dir-locals.el

@@ -13,7 +13,7 @@
      (eval . (set (make-local-variable 'library-root)
                   (expand-file-name "GSLCrypto" project-dir)))))
  (objc-mode
-  . ((flycheck-objc-clang-xcrun-sdk . "iphoneos10.3")
+  . ((flycheck-objc-clang-xcrun-sdk . "iphoneos11.0")
      (flycheck-objc-clang-arc . t)
      (flycheck-objc-clang-modules . t)
      (flycheck-objc-clang-archs . ("arm64" "armv7"))

.travis.yml

@@ -1,8 +1,8 @@
 language: objective-c
-osx_image: xcode8.3
+osx_image: xcode9
 xcode_project: GSLCrypto.xcodeproj
 xcode_scheme: GSLCrypto
-xcode_sdk: iphonesimulator10.3
+xcode_sdk: iphonesimulator11.0
 before_install:
 - gem install xcpretty
 script:

GSLCrypto.podspec

@@ -1,10 +1,10 @@
 Pod::Spec.new do |s|
   s.name         = 'GSLCrypto'
-  s.version      = '1.1.0'
+  s.version      = '2.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 => 'v1.1.0' }
+  s.source       = { :git => 'https://github.com/GyazSquare/GSLCrypto.git', :tag => 'v2.0.0' }
   s.summary      = 'A simple digest library for iOS, OS X, watchOS and tvOS.'
   s.ios.deployment_target = '8.0'
   s.osx.deployment_target = '10.6'
@@ -17,6 +17,7 @@ Pod::Spec.new do |s|
   s.user_target_xcconfig = {
     'HEADER_SEARCH_PATHS' => '$(inherited) $(PODS_ROOT)/GSLCrypto/CommonCrypto'
   }
+  s.module_name = 'GSL'
   s.source_files = 'GSLCrypto/*.{h,m}'
   s.preserve_path = 'CommonCrypto/module.modulemap'
 end

GSLCrypto.xcodeproj/project.pbxproj

@@ -150,7 +150,7 @@
 		D70D229A1AA2DC280050CD26 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0810;
+				LastUpgradeCheck = 0900;
 				TargetAttributes = {
 					D70D22A11AA2DC280050CD26 = {
 						CreatedOnToolsVersion = 6.1.1;
@@ -224,14 +224,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -268,14 +274,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;

GSLCrypto.xcodeproj/xcshareddata/xcschemes/GSLCrypto.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0810"
+   LastUpgradeVersion = "0900"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -40,6 +40,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -69,6 +70,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

GSLCrypto/NSDataGSLCryptoAdditions.m

@@ -134,7 +134,7 @@ - (nullable NSData *)gsl_decryptedDataUsingAlgorithm:(GSLCryptoAlgorithm)algorit
 
 #pragma mark - Class extensions
 
-- (nullable NSData *)gsl_cryptedDataWithOperation:(CCOperation)operation usingAlgorithm:(GSLCryptoAlgorithm)algorithm options:(GSLCryptoOptions)options key:(nullable NSData *)key initializationVector:(nullable NSData *)initializationVector error:(NSError **)error {
+- (nullable NSData *)gsl_cryptedDataWithOperation:(CCOperation)operation usingAlgorithm:(GSLCryptoAlgorithm)algorithm options:(GSLCryptoOptions)options key:(nullable NSData *)key initializationVector:(nullable NSData *)initializationVector error:(NSError * __autoreleasing *)error {
     __block NSData *cryptedData = nil;
     __block CCCryptorRef cryptor = NULL;
     __block CCCryptorStatus status = kCCSuccess;

README.md

@@ -6,8 +6,8 @@ GSLCrypto is a simple Objective-C digest library for iOS, OS X, watchOS and tvOS
 
 ## Requirements
 
-* Xcode 8.3 or later
-* Base SDK: iOS 10.3 / OS X 10.12 / watchOS 3.2 / tvOS 10.2 or later
+* Xcode 9.0 or later
+* Base SDK: iOS 11.0 / OS X 10.13 / watchOS 4.0 / tvOS 11.0 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 | sed -n -E 's/^iPhone 7 Plus \(10\.3\)[^+]*\[([[:xdigit:]-]{36})\].*\(Simulator\)$/\1/p' | sed -n -e 1p`
+IOS_SIMULATOR_ID=`xcrun instruments -s devices 2>/dev/null | sed -n -E 's/^iPhone 8 Plus \(11\.0\)[^+]*\[([[: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