Merge branch 'release-2.0.3'

GyazSquare · Apr 23, 2018 · 7d91f58 · 7d91f58
2 parents 892bf0e + ce0ad9d
commit 7d91f58
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 13 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,8 @@
 language: objective-c
-osx_image: xcode9.2
+osx_image: xcode9.3
 xcode_project: GSLCrypto.xcodeproj
 xcode_scheme: GSLCrypto
-xcode_sdk: iphonesimulator11.2
+xcode_sdk: iphonesimulator11.3
 before_install:
 - gem install xcpretty
 script:

diff --git a/GSLCrypto.podspec b/GSLCrypto.podspec
@@ -1,11 +1,11 @@
 Pod::Spec.new do |s|
   s.name         = 'GSLCrypto'
-  s.version      = '2.0.2'
+  s.version      = '2.0.3'
   s.author       = 'GyazSquare'
   s.license      = { :type => 'MIT' }
   s.homepage     = 'https://github.com/GyazSquare/GSLCrypto'
-  s.source       = { :git => 'https://github.com/GyazSquare/GSLCrypto.git', :tag => 'v2.0.2' }
-  s.summary      = 'A simple digest library for iOS, OS X, watchOS and tvOS.'
+  s.source       = { :git => 'https://github.com/GyazSquare/GSLCrypto.git', :tag => 'v2.0.3' }
+  s.summary      = 'A simple digest library for iOS, macOS, watchOS and tvOS.'
   s.ios.deployment_target = '8.0'
   s.osx.deployment_target = '10.6'
   s.tvos.deployment_target = '9.0'

diff --git a/GSLCrypto.xcodeproj/project.pbxproj b/GSLCrypto.xcodeproj/project.pbxproj
@@ -150,7 +150,7 @@
 		D70D229A1AA2DC280050CD26 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 0930;
 				TargetAttributes = {
 					D70D22A11AA2DC280050CD26 = {
 						CreatedOnToolsVersion = 6.1.1;
@@ -228,12 +228,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = 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_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -278,12 +280,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = 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_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;

diff --git a/GSLCrypto.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/GSLCrypto.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +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>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/GSLCrypto.xcodeproj/xcshareddata/xcschemes/GSLCrypto.xcscheme b/GSLCrypto.xcodeproj/xcshareddata/xcschemes/GSLCrypto.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -40,7 +40,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -70,7 +69,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/README.md b/README.md
@@ -2,12 +2,12 @@
 
 [![Build Status](https://travis-ci.org/GyazSquare/GSLCrypto.svg?branch=master)](https://travis-ci.org/GyazSquare/GSLCrypto)
 
-GSLCrypto is a simple Objective-C digest library for iOS, OS X, watchOS and tvOS, which is based on the libSystem Common Crypto library.
+GSLCrypto is a simple Objective-C digest library for iOS, macOS, watchOS and tvOS, which is based on the libSystem Common Crypto library.
 
 ## Requirements
 
-* Xcode 9.2 or later
-* Base SDK: iOS 11.2 / OS X 10.13.2 / watchOS 4.2 / tvOS 11.2 or later
+* Xcode 9.3 or later
+* Base SDK: iOS 11.3 / macOS 10.13.4 / watchOS 4.3 / tvOS 11.3 or later
 * Deployment Target: iOS 8.0 / OS X 10.6 / watchOS 2.0 / tvOS 9.0 or later
 
 ## Installation

diff --git a/scripts/travis-run-tests.sh b/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 8 Plus \(11\.2\)[^+]*\[([[: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 \(11\.3\)[^+]*\[([[: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