Merge branch 'release/v4.0.0'

GyazSquare · Nov 22, 2019 · ef11499 · ef11499
2 parents 29b89e8 + ef3c112
commit ef11499
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 33 deletions.
diff --git a/.swift-version b/.swift-version
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,8 @@
 language: swift
-osx_image: xcode10.2
+osx_image: xcode11.2
 xcode_project: InsetLabelExample/InsetLabelExample.xcodeproj
 xcode_scheme: InsetLabelExample
-xcode_sdk: iphonesimulator12.2
+xcode_sdk: iphonesimulator13.2
 before_install:
   - gem install xcpretty
 script:

diff --git a/InsetLabel.podspec b/InsetLabel.podspec
@@ -1,11 +1,12 @@
 Pod::Spec.new do |s|
   s.name         = 'InsetLabel'
-  s.version      = '3.1.0'
+  s.version      = '4.0.0'
   s.author       = 'GyazSquare'
   s.license      = { :type => 'MIT' }
   s.homepage     = 'https://github.com/GyazSquare/InsetLabel'
-  s.source       = { :git => 'https://github.com/GyazSquare/InsetLabel.git', :tag => 'v3.1.0' }
+  s.source       = { :git => 'https://github.com/GyazSquare/InsetLabel.git', :tag => 'v4.0.0' }
   s.summary      = 'A UILabel subclass supporting content insets written in Swift.'
+  s.swift_version = '4.2'
   s.ios.deployment_target = '8.0'
   s.tvos.deployment_target = '9.0'
   s.requires_arc = true

diff --git a/InsetLabelExample/InsetLabelExample/Base.lproj/LaunchScreen.storyboard b/InsetLabelExample/InsetLabelExample/Base.lproj/LaunchScreen.storyboard
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15510"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>

diff --git a/InsetLabelExample/InsetLabelExample/Base.lproj/Main.storyboard b/InsetLabelExample/InsetLabelExample/Base.lproj/Main.storyboard
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15510"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -14,47 +16,52 @@
                         <viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="x8G-sz-pEe">
-                                <rect key="frame" x="68.5" y="20" width="238" height="110"/>
+                                <rect key="frame" x="89" y="44" width="236" height="110"/>
                                 <subviews>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Content Insets:" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mf4-Ac-C57">
-                                        <rect key="frame" x="20" y="25" width="141" height="21"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" text="Content Insets:" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mf4-Ac-C57">
+                                        <rect key="frame" x="20" y="25" width="139" height="21"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                         <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                                         <nil key="highlightedColor"/>
                                     </label>
-                                    <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="bej-9A-JIb">
-                                        <rect key="frame" x="169" y="20" width="51" height="31"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                    <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="bej-9A-JIb">
+                                        <rect key="frame" x="167" y="20" width="51" height="31"/>
                                         <connections>
                                             <action selector="valueChanged:" destination="BYZ-38-t0r" eventType="valueChanged" id="ZaY-qI-HKQ"/>
                                         </connections>
                                     </switch>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Rounded Corners:" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AOo-aQ-1W4">
-                                        <rect key="frame" x="20" y="64" width="141" height="21"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" text="Rounded Corners:" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AOo-aQ-1W4">
+                                        <rect key="frame" x="20" y="64" width="139" height="21"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                         <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                                         <nil key="highlightedColor"/>
                                     </label>
-                                    <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="uJc-sE-uhE">
-                                        <rect key="frame" x="169" y="59" width="51" height="31"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                    <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="uJc-sE-uhE">
+                                        <rect key="frame" x="167" y="59" width="51" height="31"/>
                                         <connections>
                                             <action selector="valueChanged:" destination="BYZ-38-t0r" eventType="valueChanged" id="NNS-kH-0QE"/>
                                         </connections>
                                     </switch>
                                 </subviews>
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
-                                    <constraint firstAttribute="width" constant="238" id="068-Si-Rm5"/>
+                                    <constraint firstAttribute="trailing" secondItem="bej-9A-JIb" secondAttribute="trailing" constant="20" symbolic="YES" id="83F-By-hVq"/>
+                                    <constraint firstAttribute="trailing" secondItem="uJc-sE-uhE" secondAttribute="trailing" constant="20" symbolic="YES" id="F06-Rr-SQ2"/>
+                                    <constraint firstItem="bej-9A-JIb" firstAttribute="leading" secondItem="mf4-Ac-C57" secondAttribute="trailing" constant="8" symbolic="YES" id="IAu-lb-qnb"/>
+                                    <constraint firstItem="mf4-Ac-C57" firstAttribute="leading" secondItem="x8G-sz-pEe" secondAttribute="leading" constant="20" symbolic="YES" id="L8y-7G-UYt"/>
                                     <constraint firstAttribute="width" constant="236" id="Rzi-0d-Xsd"/>
+                                    <constraint firstItem="mf4-Ac-C57" firstAttribute="centerY" secondItem="bej-9A-JIb" secondAttribute="centerY" id="XWS-TN-Mqi"/>
+                                    <constraint firstItem="uJc-sE-uhE" firstAttribute="leading" secondItem="AOo-aQ-1W4" secondAttribute="trailing" constant="8" symbolic="YES" id="ayq-1J-ARm"/>
+                                    <constraint firstItem="AOo-aQ-1W4" firstAttribute="leading" secondItem="x8G-sz-pEe" secondAttribute="leading" constant="20" symbolic="YES" id="fpX-j9-VA8"/>
+                                    <constraint firstItem="bej-9A-JIb" firstAttribute="top" secondItem="x8G-sz-pEe" secondAttribute="top" constant="20" symbolic="YES" id="hxC-cQ-AhS"/>
+                                    <constraint firstItem="uJc-sE-uhE" firstAttribute="top" secondItem="bej-9A-JIb" secondAttribute="bottom" constant="8" symbolic="YES" id="jYS-eM-pWJ"/>
+                                    <constraint firstAttribute="bottom" secondItem="uJc-sE-uhE" secondAttribute="bottom" constant="20" symbolic="YES" id="lHM-Gv-aNR"/>
+                                    <constraint firstItem="uJc-sE-uhE" firstAttribute="centerYWithinMargins" secondItem="AOo-aQ-1W4" secondAttribute="centerY" id="qdY-Rf-xxh"/>
                                     <constraint firstAttribute="height" constant="110" id="qoT-vR-WdF"/>
-                                    <constraint firstAttribute="height" constant="110" id="wEP-N4-Hde"/>
                                     <constraint firstAttribute="width" constant="236" id="yGm-8V-4bF"/>
                                 </constraints>
                                 <variation key="default">
@@ -66,35 +73,35 @@
                                 </variation>
                             </view>
                             <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="U81-0h-xBd" customClass="GSLInsetLabel">
-                                <rect key="frame" x="168" y="130" width="39.5" height="19.5"/>
+                                <rect key="frame" x="187.5" y="154" width="39.5" height="19.5"/>
                                 <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                 <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BRm-mB-mbS" customClass="GSLInsetLabel">
-                                <rect key="frame" x="165.5" y="169.5" width="44" height="21.5"/>
+                                <rect key="frame" x="185" y="193.5" width="44" height="21.5"/>
                                 <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="18"/>
                                 <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ga3-dT-HdE" customClass="GSLInsetLabel">
-                                <rect key="frame" x="163" y="211" width="49" height="24"/>
+                                <rect key="frame" x="183" y="235" width="48" height="24"/>
                                 <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="20"/>
                                 <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9UX-MM-Wr6" customClass="GSLInsetLabel">
-                                <rect key="frame" x="160.5" y="255.5" width="54" height="26.5"/>
+                                <rect key="frame" x="181" y="279" width="52.5" height="26.5"/>
                                 <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="22"/>
                                 <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CZD-fc-ZZh" customClass="GSLInsetLabel">
-                                <rect key="frame" x="158.5" y="302" width="58.5" height="29"/>
+                                <rect key="frame" x="178.5" y="325.5" width="57" height="29"/>
                                 <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="24"/>
                                 <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -112,7 +119,9 @@
                             <constraint firstItem="Ga3-dT-HdE" firstAttribute="top" secondItem="BRm-mB-mbS" secondAttribute="bottom" constant="20" id="ZM1-q8-nnQ"/>
                             <constraint firstItem="9UX-MM-Wr6" firstAttribute="centerX" secondItem="8bC-Xf-vdC" secondAttribute="centerX" id="bVH-7g-DQl"/>
                             <constraint firstItem="CZD-fc-ZZh" firstAttribute="top" secondItem="9UX-MM-Wr6" secondAttribute="bottom" constant="20" id="gB0-nh-fTv"/>
+                            <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="x8G-sz-pEe" secondAttribute="trailing" constant="20" symbolic="YES" id="ojx-WL-HKI"/>
                             <constraint firstItem="BRm-mB-mbS" firstAttribute="top" secondItem="U81-0h-xBd" secondAttribute="bottom" constant="20" id="pg2-Vx-ssU"/>
+                            <constraint firstItem="x8G-sz-pEe" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="8bC-Xf-vdC" secondAttribute="leading" constant="20" symbolic="YES" id="tFc-1z-lbT"/>
                             <constraint firstItem="CZD-fc-ZZh" firstAttribute="centerX" secondItem="8bC-Xf-vdC" secondAttribute="centerX" id="vDs-lQ-fXW"/>
                             <constraint firstItem="Ga3-dT-HdE" firstAttribute="centerX" secondItem="8bC-Xf-vdC" secondAttribute="centerX" id="zPH-iY-Qg3"/>
                         </constraints>

diff --git a/README.md b/README.md
@@ -9,8 +9,8 @@ InsetLabel is a UILabel subclass supporting content insets written in Swift.
 
 ## Requirements
 
-* Xcode 10.2 (Swift 5.0) or later
-* Base SDK: iOS 12.2 / tvOS 12.2 or later
+* Xcode 11.2 (Swift 5.1) or later
+* Base SDK: iOS 13.2 / tvOS 13.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
@@ -3,7 +3,7 @@
 set -ev
 set -o pipefail
 
-IOS_SIMULATOR_ID=`xcrun instruments -s devices 2>/dev/null | sed -n -E 's/^iPhone Xʀ \(12\.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 11 Pro Max \(13\.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