合并分支

LoongerTao · Mar 4, 2019 · 4fc2bc7 · 4fc2bc7
2 parents da45928 + 8f8193e
commit 4fc2bc7
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 2 deletions.
diff --git a/Example/Example/Base.lproj/LaunchScreen.storyboard b/Example/Example/Base.lproj/LaunchScreen.storyboard
@@ -18,7 +18,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Copyright © 2018 Gxdy. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jqh-Ii-ZTg">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Copyright © 2018-2019 Gxdy. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jqh-Ii-ZTg">
                                 <rect key="frame" x="16" y="626" width="343" height="21"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="12"/>
@@ -27,7 +27,7 @@
                                 <color key="shadowColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <size key="shadowOffset" width="0.0" height="0.0"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="TLTransitions V1.4.4" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0g7-JW-aWb">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="TLTransitions V1.4.5" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0g7-JW-aWb">
                                 <rect key="frame" x="16" y="201" width="343" height="82"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" name="MarkerFelt-Thin" family="Marker Felt" pointSize="36"/>

diff --git a/TLTransitions/1.4.5/TLTransitions.podspec b/TLTransitions/1.4.5/TLTransitions.podspec
@@ -0,0 +1,42 @@
+Pod::Spec.new do |s|
+  s.name         = 'TLTransitions'
+  s.version      = '1.4.5'
+  s.license      = 'MIT'
+  s.ios.deployment_target = '8.0'
+  s.platform     = :ios, '8.0'
+  s.summary      = 'Fast implement transitions for view or viewController'
+  s.homepage     = 'https://github.com/LoongerTao/TLTransitions'
+  s.author       = { 'LoongerTao' => '495285195@qq.com' }
+  s.requires_arc = true
+  s.source       = { :git => 'https://github.com/LoongerTao/TLTransitions.git', :tag => s.version }
+  s.public_header_files = 'TLTransitions/TLTransitions.h'
+  s.source_files = 'TLTransitions/TLTransitions.h'
+
+
+
+  s.subspec 'Config' do |cfg|
+      cfg.source_files = 'TLTransitions/Config/*.{h,m}'
+      cfg.ios.frameworks = 'UIKit'
+  end
+
+  s.subspec 'TransitionView' do |tv|
+      tv.source_files = 'TLTransitions/TransitionView/*.{h,m}'
+      tv.dependency 'TLTransitions/Config'
+  end
+
+
+
+  s.subspec 'TransitionController' do |tc|
+      tc.source_files = 'TLTransitions/TransitionController/*.{h,m}'
+      tc.dependency 'TLTransitions/Config' 
+
+      tc.subspec 'Animator' do |anm|
+          anm.source_files = 'TLTransitions/TransitionController/Animator/*.{h,m}'
+          anm.dependency 'TLTransitions/Config'
+      end
+  end
+end
+
+# 
+# 
+# 错误：xcodebuild: Returned an unsuccessful exit code. 一般是有头文件相互依赖，pod检测通不过