Skip to content

Commit

Permalink
Merge branch 'release-2.0.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
gooichi committed Jan 1, 2018
2 parents 581dd04 + 04d145f commit 892bf0e
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .dir-locals.el
Expand Up @@ -13,7 +13,7 @@
(eval . (set (make-local-variable 'library-root)
(expand-file-name "GSLCrypto" project-dir)))))
(objc-mode
. ((flycheck-objc-clang-xcrun-sdk . "iphoneos11.1")
. ((flycheck-objc-clang-xcrun-sdk . "iphoneos")
(flycheck-objc-clang-arc . t)
(flycheck-objc-clang-modules . t)
(flycheck-objc-clang-archs . ("arm64" "armv7"))
Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
@@ -1,8 +1,8 @@
language: objective-c
osx_image: xcode9.1
osx_image: xcode9.2
xcode_project: GSLCrypto.xcodeproj
xcode_scheme: GSLCrypto
xcode_sdk: iphonesimulator11.1
xcode_sdk: iphonesimulator11.2
before_install:
- gem install xcpretty
script:
Expand Down
4 changes: 2 additions & 2 deletions GSLCrypto.podspec
@@ -1,10 +1,10 @@
Pod::Spec.new do |s|
s.name = 'GSLCrypto'
s.version = '2.0.1'
s.version = '2.0.2'
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.1' }
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.ios.deployment_target = '8.0'
s.osx.deployment_target = '10.6'
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2017 GyazSquare Inc.
Copyright (c) 2017-2018 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
Expand Down
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -6,8 +6,8 @@ GSLCrypto is a simple Objective-C digest library for iOS, OS X, watchOS and tvOS

## Requirements

* Xcode 9.1 or later
* Base SDK: iOS 11.1 / OS X 10.13.1 / watchOS 4.1 / tvOS 11.1 or later
* Xcode 9.2 or later
* Base SDK: iOS 11.2 / OS X 10.13.2 / watchOS 4.2 / tvOS 11.2 or later
* Deployment Target: iOS 8.0 / OS X 10.6 / watchOS 2.0 / tvOS 9.0 or later

## Installation
Expand Down
2 changes: 1 addition & 1 deletion scripts/travis-run-tests.sh
Expand Up @@ -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\.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 8 Plus \(11\.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
Expand Down

0 comments on commit 892bf0e

Please sign in to comment.