Merge branch 'release-3.0.0'

GyazSquare · Nov 30, 2018 · 446f2be · 446f2be
2 parents 7d91f58 + a7e89a2
commit 446f2be
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 42 deletions.
diff --git a/.dir-locals.el b/.dir-locals.el
@@ -1,17 +1,13 @@
 ;;; Directory Local Variables
 ;;; For more information see (info "(emacs) Directory Variables")
 
-((nil
-  . ((eval . (setenv "DEVELOPER_DIR"
-                     "/Applications/Xcode.app/Contents/Developer"))
-     (fill-column . 80)
-     (whitespace-style . (face lines indentation:space))
-     (eval . (set (make-local-variable 'project-dir)
-                  (file-name-directory
-                   (let ((d (dir-locals-find-file ".")))
-                     (if (stringp d) d (car d))))))
-     (eval . (set (make-local-variable 'library-root)
-                  (expand-file-name "GSLCrypto" project-dir)))))
+(("GSLCryptoTests"
+  . ((objc-mode
+      . ((eval . (add-to-list
+                  'flycheck-objc-clang-framework-paths
+                  (expand-file-name
+                   "Platforms/iPhoneOS.platform/Developer/Library/Frameworks"
+                   (getenv "DEVELOPER_DIR"))))))))
  (objc-mode
   . ((flycheck-objc-clang-xcrun-sdk . "iphoneos")
      (flycheck-objc-clang-arc . t)
@@ -20,10 +16,14 @@
      (flycheck-objc-clang-ios-version-min . "8.0")
      (eval . (set 'flycheck-objc-clang-include-paths
                       (list library-root)))))
- ("GSLCryptoTests"
-  . ((objc-mode
-      . ((eval . (add-to-list
-                  'flycheck-objc-clang-framework-paths
-                  (expand-file-name
-                   "Platforms/iPhoneOS.platform/Developer/Library/Frameworks"
-                   (getenv "DEVELOPER_DIR")))))))))
+ (nil
+  . ((eval . (setenv "DEVELOPER_DIR"
+                     "/Applications/Xcode.app/Contents/Developer"))
+     (fill-column . 80)
+     (whitespace-style . (face lines indentation:space))
+     (eval . (set (make-local-variable 'project-dir)
+                  (file-name-directory
+                   (let ((d (or (dir-locals-find-file ".") default-directory)))
+                     (if (stringp d) d (car d))))))
+     (eval . (set (make-local-variable 'library-root)
+                  (expand-file-name "GSLCrypto" project-dir))))))
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,8 @@
 language: objective-c
-osx_image: xcode9.3
+osx_image: xcode10.1
 xcode_project: GSLCrypto.xcodeproj
 xcode_scheme: GSLCrypto
-xcode_sdk: iphonesimulator11.3
+xcode_sdk: iphonesimulator12.1
 before_install:
 - gem install xcpretty
 script:

diff --git a/CommonCrypto/module.modulemap b/CommonCrypto/module.modulemap
diff --git a/GSLCrypto.podspec b/GSLCrypto.podspec
@@ -1,23 +1,16 @@
 Pod::Spec.new do |s|
   s.name         = 'GSLCrypto'
-  s.version      = '2.0.3'
+  s.version      = '3.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 => 'v2.0.3' }
+  s.source       = { :git => 'https://github.com/GyazSquare/GSLCrypto.git', :tag => 'v3.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'
   s.tvos.deployment_target = '9.0'
   s.watchos.deployment_target = '2.0'
   s.requires_arc = true
-  s.pod_target_xcconfig = {
-    'HEADER_SEARCH_PATHS' => '$(inherited) $(PODS_ROOT)/GSLCrypto/CommonCrypto'
-  }
-  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
diff --git a/GSLCrypto.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/GSLCrypto.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -0,0 +1,5 @@
+<?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/>
+</plist>
diff --git a/GSLCrypto/NSDataGSLCryptoAdditions.h b/GSLCrypto/NSDataGSLCryptoAdditions.h
@@ -3,13 +3,9 @@
 //  GSLCrypto
 //
 
-@import Foundation.NSData;
-
-#ifdef COCOAPODS
-@import CommonCrypto;
-#else
 #include <CommonCrypto/CommonCrypto.h>
-#endif
+
+@import Foundation.NSData;
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/README.md b/README.md
@@ -6,8 +6,8 @@ GSLCrypto is a simple Objective-C digest library for iOS, macOS, watchOS and tvO
 
 ## Requirements
 
-* Xcode 9.3 or later
-* Base SDK: iOS 11.3 / macOS 10.13.4 / watchOS 4.3 / tvOS 11.3 or later
+* Xcode 10.1 or later
+* Base SDK: iOS 12.1 / macOS 10.14.1 / watchOS 5.1 / tvOS 12.1 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 \(11\.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 XR \(12\.1\)[^+]*\[([[: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