Merge branch 'swift4'

satoshin21 · Oct 3, 2017 · 5aeaa65 · 5aeaa65
2 parents 33eeafe + 88186b2
commit 5aeaa65
Show file tree

Hide file tree

Showing 15 changed files with 85 additions and 39 deletions.
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-3.0
+4.0
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,4 @@
+language: swift
+xcode_project: Anima.xcodeproj # path to your xcodeproj folder
+xcode_scheme: Anima
+osx_image: xcode9
diff --git a/Anima.framework.zip b/Anima.framework.zip
diff --git a/Anima.podspec b/Anima.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name        = "Anima"
-  s.version     = "0.5.1"
+  s.version     = "0.8.0"
   s.authors     = { "satoshin21" => "satoshi.nagasaka21@gmail.com" }
   s.homepage    = "https://github.com/satoshin21/Anima"
   s.summary     = "Anima is swifty animation library."
@@ -12,7 +12,7 @@ Pod::Spec.new do |s|
   s.source   = { :git => "https://github.com/satoshin21/Anima.git", :tag => s.version.to_s }
   s.source_files = "Sources/*{.swift,.h}"
   s.pod_target_xcconfig =  {
-        'SWIFT_VERSION' => '3.0',
+        'SWIFT_VERSION' => '4.0',
   }
 	s.description      = <<-DESC
 	Anima is chainable Layer-Based Animation library for Swift3.

diff --git a/Anima.xcodeproj/project.pbxproj b/Anima.xcodeproj/project.pbxproj
@@ -204,16 +204,17 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0830;
-				LastUpgradeCheck = 0830;
+				LastUpgradeCheck = 0900;
 				ORGANIZATIONNAME = satoshin21;
 				TargetAttributes = {
 					63A950B81EAFAB6C007AFB34 = {
 						CreatedOnToolsVersion = 8.3.2;
-						LastSwiftMigration = 0830;
+						LastSwiftMigration = 0900;
 						ProvisioningStyle = Automatic;
 					};
 					63A950C71EAFAB92007AFB34 = {
 						CreatedOnToolsVersion = 8.3.2;
+						LastSwiftMigration = 0900;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -305,15 +306,21 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -359,15 +366,21 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -413,7 +426,8 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -433,7 +447,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = jp.hatenadiary.satoshin21.anima;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -446,7 +461,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = jp.hatenadiary.satoshin21.anima.example;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Debug;
@@ -460,7 +476,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = jp.hatenadiary.satoshin21.anima.example;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Release;

diff --git a/Anima.xcodeproj/xcshareddata/xcschemes/Anima.xcscheme b/Anima.xcodeproj/xcshareddata/xcschemes/Anima.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0830"
+   LastUpgradeVersion = "0900"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Example/AppDelegate.swift b/Example/AppDelegate.swift
@@ -19,7 +19,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         let navAppearance = UINavigationBar.appearance()
         navAppearance.tintColor = #colorLiteral(red: 1, green: 1, blue: 1, alpha: 1)
         navAppearance.barTintColor = .navigationBar
-        navAppearance.titleTextAttributes = [NSForegroundColorAttributeName: UIColor.white]
+        navAppearance.titleTextAttributes = [.foregroundColor: UIColor.white]
+        if #available(iOS 11.0, *) {
+            navAppearance.largeTitleTextAttributes = [.foregroundColor: UIColor.white]
+        }
         UITableView.appearance().backgroundColor = .background
 
         UIButton.appearance().tintColor = #colorLiteral(red: 1, green: 1, blue: 1, alpha: 1)

diff --git a/Example/Info.plist b/Example/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.5.1</string>
+	<string>0.8.0</string>
 	<key>CFBundleVersion</key>
 	<string>2</string>
 	<key>LSRequiresIPhoneOS</key>
@@ -30,11 +30,15 @@
 	<array>
 		<string>armv7</string>
 	</array>
+	<key>UIStatusBarStyle</key>
+	<string>UIStatusBarStyleLightContent</string>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+	<key>UIViewControllerBasedStatusBarAppearance</key>
+	<false/>
 </dict>
 </plist>
diff --git a/Example/LaunchScreen.storyboard b/Example/LaunchScreen.storyboard
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" 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="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -27,7 +28,7 @@
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="ItN-Sa-yTC" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="25d-Sm-6aQ"/>
-                            <constraint firstItem="xb3-aO-Qok" firstAttribute="top" secondItem="ItN-Sa-yTC" secondAttribute="bottom" id="KKu-Xn-1aR"/>
+                            <constraint firstAttribute="bottom" secondItem="ItN-Sa-yTC" secondAttribute="bottom" id="KKu-Xn-1aR"/>
                             <constraint firstAttribute="trailing" secondItem="ItN-Sa-yTC" secondAttribute="trailing" id="MV1-Wc-0Kf"/>
                             <constraint firstItem="ItN-Sa-yTC" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="eeM-u9-phC"/>
                         </constraints>

diff --git a/Example/Main.storyboard b/Example/Main.storyboard
@@ -1,19 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12120" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="445-NA-Fy1">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="445-NA-Fy1">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
         <capability name="Alignment constraints with different attributes" minToolsVersion="5.1"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
+    <customFonts key="customFonts">
+        <array key="AvenirNext.ttc">
+            <string>AvenirNext-Medium</string>
+        </array>
+    </customFonts>
     <scenes>
         <!--Spread View Controller-->
         <scene sceneID="ZeA-I6-iMZ">
             <objects>
-                <viewController id="445-NA-Fy1" customClass="SpreadViewController" customModule="AnimaExample" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController id="445-NA-Fy1" customClass="SpreadViewController" customModule="Anima_iOS_Example" customModuleProvider="target" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="k1x-2d-BKn"/>
                         <viewControllerLayoutGuide type="bottom" id="3xy-0S-Pzu"/>
@@ -98,7 +104,7 @@
                             <constraint firstItem="vv8-Ju-ZQJ" firstAttribute="leading" secondItem="f2h-2B-cEv" secondAttribute="leading" id="548-IC-bBZ"/>
                             <constraint firstItem="4hP-9I-wZp" firstAttribute="leading" secondItem="etB-e3-Tfe" secondAttribute="leading" id="HZi-Vd-Yxn"/>
                             <constraint firstItem="f2h-2B-cEv" firstAttribute="centerX" secondItem="etB-e3-Tfe" secondAttribute="centerX" id="IXK-PV-yVJ"/>
-                            <constraint firstItem="3xy-0S-Pzu" firstAttribute="top" secondItem="4hP-9I-wZp" secondAttribute="bottom" id="TA6-kI-dJ5"/>
+                            <constraint firstAttribute="bottom" secondItem="4hP-9I-wZp" secondAttribute="bottom" id="TA6-kI-dJ5"/>
                             <constraint firstItem="f2h-2B-cEv" firstAttribute="centerY" secondItem="etB-e3-Tfe" secondAttribute="centerY" id="USE-oV-YTi"/>
                             <constraint firstAttribute="trailing" secondItem="4hP-9I-wZp" secondAttribute="trailing" id="YwI-dd-LID"/>
                             <constraint firstItem="vv8-Ju-ZQJ" firstAttribute="top" secondItem="f2h-2B-cEv" secondAttribute="bottom" id="sIO-OX-SrF"/>
@@ -118,12 +124,12 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="qA5-7n-rj2" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="-1602" y="-160"/>
+            <point key="canvasLocation" x="-1602.4000000000001" y="-160.56971514242881"/>
         </scene>
         <!--Anima-->
         <scene sceneID="8Mr-78-r5z">
             <objects>
-                <tableViewController id="dGB-CO-b9H" customClass="AnimaListTableViewController" customModule="AnimaExample" customModuleProvider="target" sceneMemberID="viewController">
+                <tableViewController id="dGB-CO-b9H" customClass="AnimaListTableViewController" customModule="Anima_iOS_Example" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" id="MAl-e7-a4Q">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -159,7 +165,7 @@
         <!--Move-->
         <scene sceneID="9xL-MC-40e">
             <objects>
-                <viewController title="Move" id="fWU-Uc-ptY" customClass="MoveViewController" customModule="AnimaExample" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController title="Move" id="fWU-Uc-ptY" customClass="MoveViewController" customModule="Anima_iOS_Example" customModuleProvider="target" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="khn-ZG-eMO"/>
                         <viewControllerLayoutGuide type="bottom" id="yed-NE-FHT"/>
@@ -220,7 +226,7 @@
         <!--Size & AnchorPoint & Rotate-->
         <scene sceneID="cRR-20-KOV">
             <objects>
-                <viewController title="Size &amp; AnchorPoint &amp; Rotate" id="YJd-GJ-Od1" customClass="SizeAnimationViewController" customModule="AnimaExample" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController title="Size &amp; AnchorPoint &amp; Rotate" id="YJd-GJ-Od1" customClass="SizeAnimationViewController" customModule="Anima_iOS_Example" customModuleProvider="target" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="JnC-w4-b6S"/>
                         <viewControllerLayoutGuide type="bottom" id="tQF-NQ-g4H"/>
@@ -283,7 +289,7 @@
         <!--Move Path-->
         <scene sceneID="RxT-Ei-Igm">
             <objects>
-                <viewController title="Move Path" id="0Rq-PL-yym" customClass="MovePathAnimationViewController" customModule="AnimaExample" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController title="Move Path" id="0Rq-PL-yym" customClass="MovePathAnimationViewController" customModule="Anima_iOS_Example" customModuleProvider="target" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="nJd-8N-7Zm"/>
                         <viewControllerLayoutGuide type="bottom" id="cSB-TW-hWd"/>
@@ -326,7 +332,7 @@
         <!--Corner and Line-->
         <scene sceneID="rXC-rS-Ayj">
             <objects>
-                <viewController title="Corner and Line" id="M4N-UX-isq" customClass="CornerLineAnimationViewController" customModule="AnimaExample" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController title="Corner and Line" id="M4N-UX-isq" customClass="CornerLineAnimationViewController" customModule="Anima_iOS_Example" customModuleProvider="target" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="52v-lM-zZv"/>
                         <viewControllerLayoutGuide type="bottom" id="N2w-Lv-Vw8"/>
@@ -361,7 +367,7 @@
         <!--Pause And Resume-->
         <scene sceneID="KL2-8t-DVS">
             <objects>
-                <viewController title="Pause And Resume" id="CeF-6F-lkW" customClass="PauseResumeAnimationViewController" customModule="AnimaExample" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController title="Pause And Resume" id="CeF-6F-lkW" customClass="PauseResumeAnimationViewController" customModule="Anima_iOS_Example" customModuleProvider="target" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="RD8-c8-YxZ"/>
                         <viewControllerLayoutGuide type="bottom" id="Akt-rH-FzX"/>
@@ -408,8 +414,8 @@
         <scene sceneID="uVs-hQ-fXW">
             <objects>
                 <navigationController id="Gvu-ha-4Rg" sceneMemberID="viewController">
-                    <navigationBar key="navigationBar" contentMode="scaleToFill" id="4Jn-LX-S4D">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" largeTitles="YES" id="4Jn-LX-S4D">
+                        <rect key="frame" x="0.0" y="20" width="375" height="96"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <connections>

diff --git a/Example/MoveViewController.swift b/Example/MoveViewController.swift
@@ -32,7 +32,7 @@ class MoveViewController: UIViewController {
         // Dispose of any resources that can be recreated.
     }
 
-    func anywhereTapped(gesture: UITapGestureRecognizer) {
+    @objc func anywhereTapped(gesture: UITapGestureRecognizer) {
         let location = gesture.location(in: self.view)
 
         animaView.layer.anima

diff --git a/Example/SpreadViewController.swift b/Example/SpreadViewController.swift
@@ -66,6 +66,7 @@ class SpreadViewController: UIViewController {
             })
     }
 
+    @objc
     func segueList() {
         performSegue(withIdentifier: "segueList", sender: nil)
     }