Skip to content

Commit

Permalink
Merge branch 'release-2.0.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
gooichi committed Nov 10, 2017
2 parents 0c8affe + 027fa81 commit 107eb23
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .dir-locals.el
Expand Up @@ -11,7 +11,7 @@
(let ((d (dir-locals-find-file ".")))
(if (stringp d) d (car d))))))))
(swift-mode
. ((flycheck-swift3-xcrun-sdk . "iphoneos11.0")
. ((flycheck-swift3-xcrun-sdk . "iphoneos11.1")
(flycheck-swift3-target . "arm64-apple-ios8")
(eval . (set (make-local-variable 'library-root)
(expand-file-name "InsetLabel" project-dir)))
Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
@@ -1,8 +1,8 @@
language: objective-c
osx_image: xcode9
osx_image: xcode9.1
xcode_project: InsetLabelExample/InsetLabelExample.xcodeproj
xcode_scheme: InsetLabelExample
xcode_sdk: iphonesimulator11.0
xcode_sdk: iphonesimulator11.1
before_install:
- gem install xcpretty
script:
Expand Down
4 changes: 2 additions & 2 deletions InsetLabel.podspec
@@ -1,10 +1,10 @@
Pod::Spec.new do |s|
s.name = 'InsetLabel'
s.version = '2.0.0'
s.version = '2.0.1'
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.0' }
s.source = { :git => 'https://github.com/GyazSquare/InsetLabel.git', :tag => 'v2.0.1' }
s.summary = 'A UILabel subclass supporting content insets written in Swift.'
s.ios.deployment_target = '8.0'
s.tvos.deployment_target = '9.0'
Expand Down
6 changes: 3 additions & 3 deletions InsetLabel/InsetLabel.swift
Expand Up @@ -7,7 +7,7 @@ import UIKit.UILabel
@IBDesignable
@objc(GSLInsetLabel)
open class InsetLabel: UILabel {

// MARK: Properties

open var contentInsets: UIEdgeInsets = .zero {
Expand Down Expand Up @@ -80,9 +80,9 @@ open class InsetLabel: UILabel {
let newRect = UIEdgeInsetsInsetRect(rect, contentInsets)
super.drawText(in: newRect)
}

// MARK: UIView (UIViewHierarchy)

override open func layoutSubviews() {
super.layoutSubviews()
preferredMaxLayoutWidth = frame.width - (contentInsetsLeft + contentInsetsRight)
Expand Down
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -9,8 +9,8 @@ InsetLabel is a UILabel subclass supporting content insets written in Swift.

## Requirements

* Xcode 9 (Swift 4.0) or later
* Base SDK: iOS 11.0 / tvOS 11.0 or later
* Xcode 9.1 (Swift 4.0) or later
* Base SDK: iOS 11.1 / tvOS 11.1 or later
* Deployment Target: iOS 8.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\.0\)[^+]*\[([[: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\.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
Expand Down

0 comments on commit 107eb23

Please sign in to comment.