Merge swift-5 into master

cbpowell · Apr 5, 2019 · b99235f · b99235f
2 parents 2e82fd4 + 2e41a4a
commit b99235f
Show file tree

Hide file tree

Showing 45 changed files with 273 additions and 4,479 deletions.
diff --git a/MarqueeLabel.podspec b/MarqueeLabel.podspec
@@ -1,28 +1,15 @@
 Pod::Spec.new do |s|
   s.name         = "MarqueeLabel"
-  s.version      = "3.2.1"
+  s.version      = "4.0.0"
   s.summary      = "A drop-in replacement for UILabel, which automatically adds a scrolling marquee effect when needed."
   s.homepage     = "https://github.com/cbpowell/MarqueeLabel"
   s.license      = { :type => 'MIT', :file => 'LICENSE' }
   s.author       = "Charles Powell"
   s.source       = { :git => "https://github.com/cbpowell/MarqueeLabel.git", :tag => s.version.to_s }
   s.frameworks   = 'UIKit', 'QuartzCore'
   s.requires_arc = true
-  s.ios.deployment_target = '6.0'
+  s.source_files = 'Sources/*.swift'
+  s.ios.deployment_target = '8.0'
   s.tvos.deployment_target = '9.0'
-
-  s.default_subspec = 'ObjC'
-  s.swift_version = '4.2'
-
-  s.subspec 'ObjC' do |ss|
-    ss.ios.deployment_target = '6.0'
-    ss.tvos.deployment_target = '9.0'
-    ss.source_files = 'Sources/**/*.{h,m}'
-  end
-
-  s.subspec 'Swift' do |ss|
-    ss.ios.deployment_target = '8.0'
-    ss.tvos.deployment_target = '9.0'
-    ss.source_files = 'Sources/**/*.swift'
-  end
+  s.swift_version = '5.0'
 end
diff --git a/MarqueeLabel.xcworkspace/contents.xcworkspacedata b/MarqueeLabel.xcworkspace/contents.xcworkspacedata
diff --git a/MarqueeLabel/AppDelegate.h b/MarqueeLabel/AppDelegate.h
diff --git a/MarqueeLabel/AppDelegate.m b/MarqueeLabel/AppDelegate.m
diff --git a/MarqueeLabelSwift/AppDelegate.swift → MarqueeLabel/AppDelegate.swift b/MarqueeLabelSwift/AppDelegate.swift → MarqueeLabel/AppDelegate.swift
diff --git a/...eLabelSwift/Assets.xcassets/Contents.json → MarqueeLabel/Assets.xcassets/Contents.json b/...eLabelSwift/Assets.xcassets/Contents.json → MarqueeLabel/Assets.xcassets/Contents.json
diff --git a/MarqueeLabel/Base.lproj/LaunchScreen.storyboard b/MarqueeLabel/Base.lproj/LaunchScreen.storyboard
@@ -1,8 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
+<?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">
+    <device id="retina6_1" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
@@ -14,9 +18,9 @@
                         <viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>

diff --git a/MarqueeLabel/Info.plist b/MarqueeLabel/Info.plist
@@ -6,6 +6,10 @@
 	<string>en</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIcons</key>
+	<dict/>
+	<key>CFBundleIcons~ipad</key>
+	<dict/>
 	<key>CFBundleIdentifier</key>
 	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>

diff --git a/MarqueeLabel/MLHeader.xib b/MarqueeLabel/MLHeader.xib
@@ -1,13 +1,17 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina5_9" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="MLHeader">
+        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="MLHeader" customModule="MarqueeLabelDemo" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="600" height="84"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
@@ -16,13 +20,13 @@
                     <subviews>
                         <view alpha="0.0" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xk6-CO-BR2">
                             <rect key="frame" x="0.0" y="83" width="600" height="1"/>
-                            <color key="backgroundColor" red="0.84851453639999996" green="0.84851453639999996" blue="0.84851453639999996" alpha="1" colorSpace="calibratedRGB"/>
+                            <color key="backgroundColor" red="0.84851453639999996" green="0.84851453639999996" blue="0.84851453639999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="1" id="Nq3-Oi-hSh"/>
                             </constraints>
                         </view>
                     </subviews>
-                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <constraints>
                         <constraint firstItem="xk6-CO-BR2" firstAttribute="leading" secondItem="8MD-La-fvn" secondAttribute="leading" id="4JL-XI-XVv"/>
                         <constraint firstItem="xk6-CO-BR2" firstAttribute="centerX" secondItem="8MD-La-fvn" secondAttribute="centerX" id="Hei-Jr-eOH"/>
@@ -31,19 +35,19 @@
                     </constraints>
                 </view>
                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="MarqueeLabel" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LAL-Mn-m5t">
-                    <rect key="frame" x="232" y="26" width="135" height="26"/>
+                    <rect key="frame" x="232.66666666666663" y="26" width="135" height="26"/>
                     <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="22"/>
-                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Table View" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xQ3-Kt-beb">
-                    <rect key="frame" x="317" y="48" width="50.5" height="13"/>
+                    <rect key="frame" x="317" y="48" width="50.666666666666686" height="13"/>
                     <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="11"/>
-                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
             </subviews>
-            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstItem="LAL-Mn-m5t" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="4ix-Dq-Uez"/>
                 <constraint firstItem="xQ3-Kt-beb" firstAttribute="top" secondItem="LAL-Mn-m5t" secondAttribute="bottom" constant="-4" id="TRv-ft-pyx"/>