From b27a32fe5e99a03395802069958c178dbd1c5a11 Mon Sep 17 00:00:00 2001 From: Goichi Hirakawa Date: Mon, 13 Nov 2017 20:03:35 +0900 Subject: [PATCH 1/5] Fix indent --- InsetLabel.podspec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/InsetLabel.podspec b/InsetLabel.podspec index f380539..a7d8522 100644 --- a/InsetLabel.podspec +++ b/InsetLabel.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.summary = 'A UILabel subclass supporting content insets written in Swift.' s.ios.deployment_target = '8.0' s.tvos.deployment_target = '9.0' - s.requires_arc = true - s.module_name = 'GSL' - s.source_files = 'InsetLabel/*.{swift}' + s.requires_arc = true + s.module_name = 'GSL' + s.source_files = 'InsetLabel/*.{swift}' end From baa0ad456f4160889c5cac32b41dea7a68872bd7 Mon Sep 17 00:00:00 2001 From: Goichi Hirakawa Date: Sun, 31 Dec 2017 19:27:30 +0900 Subject: [PATCH 2/5] refs #20 Add support for Xcode 9.2 --- .dir-locals.el | 2 +- .travis.yml | 6 +++--- README.md | 4 ++-- scripts/travis-run-tests.sh | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.dir-locals.el b/.dir-locals.el index 047daf6..1f3fc5d 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -11,7 +11,7 @@ (let ((d (dir-locals-find-file "."))) (if (stringp d) d (car d)))))))) (swift-mode - . ((flycheck-swift3-xcrun-sdk . "iphoneos11.1") + . ((flycheck-swift3-xcrun-sdk . "iphoneos") (flycheck-swift3-target . "arm64-apple-ios8") (eval . (set (make-local-variable 'library-root) (expand-file-name "InsetLabel" project-dir))) diff --git a/.travis.yml b/.travis.yml index ad71810..97942b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,8 @@ -language: objective-c -osx_image: xcode9.1 +language: swift +osx_image: xcode9.2 xcode_project: InsetLabelExample/InsetLabelExample.xcodeproj xcode_scheme: InsetLabelExample -xcode_sdk: iphonesimulator11.1 +xcode_sdk: iphonesimulator11.2 before_install: - gem install xcpretty script: diff --git a/README.md b/README.md index 1f29b0a..5ac4f8d 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,8 @@ InsetLabel is a UILabel subclass supporting content insets written in Swift. ## Requirements -* Xcode 9.1 (Swift 4.0) or later -* Base SDK: iOS 11.1 / tvOS 11.1 or later +* Xcode 9.2 (Swift 4.0) or later +* Base SDK: iOS 11.2 / tvOS 11.2 or later * Deployment Target: iOS 8.0 / tvOS 9.0 or later ## Installation diff --git a/scripts/travis-run-tests.sh b/scripts/travis-run-tests.sh index 9459ae5..71d2de4 100755 --- 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\.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 From 6209bc05080d3c5eba009c39561093efc3716399 Mon Sep 17 00:00:00 2001 From: Goichi Hirakawa Date: Sun, 31 Dec 2017 19:44:09 +0900 Subject: [PATCH 3/5] refs #20 Fix "language" --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 97942b4..1f58bc7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -language: swift +language: objective-c osx_image: xcode9.2 xcode_project: InsetLabelExample/InsetLabelExample.xcodeproj xcode_scheme: InsetLabelExample From 09c5fe992544f093b9f27183c93ca96bb0c0e5cd Mon Sep 17 00:00:00 2001 From: Goichi Hirakawa Date: Sun, 31 Dec 2017 20:40:19 +0900 Subject: [PATCH 4/5] refs #22 Update the copyright year --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index ea72ae3..db81eec 100644 --- a/LICENSE +++ b/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 From 5797d316ed0b48d5262db40fefdb4d0eecab89a8 Mon Sep 17 00:00:00 2001 From: Goichi Hirakawa Date: Sun, 31 Dec 2017 21:31:06 +0900 Subject: [PATCH 5/5] refs #45 Update version to v2.0.2 --- InsetLabel.podspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/InsetLabel.podspec b/InsetLabel.podspec index a7d8522..1b96ac8 100644 --- a/InsetLabel.podspec +++ b/InsetLabel.podspec @@ -1,10 +1,10 @@ Pod::Spec.new do |s| s.name = 'InsetLabel' - s.version = '2.0.1' + s.version = '2.0.2' s.author = 'GyazSquare' s.license = { :type => 'MIT' } s.homepage = 'https://github.com/GyazSquare/InsetLabel' - s.source = { :git => 'https://github.com/GyazSquare/InsetLabel.git', :tag => 'v2.0.1' } + s.source = { :git => 'https://github.com/GyazSquare/InsetLabel.git', :tag => 'v2.0.2' } s.summary = 'A UILabel subclass supporting content insets written in Swift.' s.ios.deployment_target = '8.0' s.tvos.deployment_target = '9.0'