Merge pull request JonyFang#15 from JonyFang/develop

v1.1.1 Add Swift Demo & Fix typo

.gitignore

@@ -16,13 +16,13 @@ DerivedData/
 !default.mode2v3
 *.perspectivev3
 !default.perspectivev3
-*/xcuserdata/*
 
 ## Other
 *.moved-aside
 *.xccheckout
 *.xcuserstate
 *.xcscmblueprint
+*.xcuserdata
 
 ## Obj-C/Swift specific
 *.hmap
@@ -31,13 +31,12 @@ DerivedData/
 *.dSYM
 
 # CocoaPods
-Example/Pods/
-Example/Podfile.lock
-Example/FFPopup_Example.xcworkspace
+Demo/Pods/
+Demo/Podfile.lock
 
 # Carthage
-Example/Carthage/
-Example/Cartfile.resolved
+Demo/Carthage/
+Demo/Cartfile.resolved
 
 # fastlane
 fastlane/report.xml

.travis.yml

@@ -1,16 +1,14 @@
 language: objective-c
-osx_image: xcode10.1
+osx_image: xcode10.2
 
-xcode_workspace: Example/FFPopup_Example.xcworkspace
-xcode_project: FFPopup.xcodeproj
-xcode_scheme: FFPopup
-podfile: Example/Podfile
+xcode_workspace: FFPopup.xcworkspace
+podfile: Demo/Podfile
 
 before_install:
   - env
   - locale
-  - gem install cocoapods --no-rdoc --no-ri --no-document --quiet
-  - gem install xcpretty --no-rdoc --no-ri --no-document --quiet
+  - gem install cocoapods --no-document --quiet
+  - gem install xcpretty --no-document --quiet
   - pod --version
   - pod setup --silent > /dev/null
   - pod repo update --silent
@@ -24,14 +22,25 @@ script:
   - echo Check if the library described by the podspec can be built
   - pod lib lint --allow-warnings
 
+  - echo Build as static library
+  - xcodebuild build -workspace "$TRAVIS_XCODE_WORKSPACE" -scheme "FFPopup_Static" -sdk iphonesimulator PLATFORM_NAME=iphonesimulator -configuration Debug | xcpretty -c
+
   - echo Build as dynamic framework
-  - xcodebuild clean build -project "$TRAVIS_XCODE_PROJECT"  -scheme "$TRAVIS_XCODE_SCHEME" -sdk iphonesimulator PLATFORM_NAME=iphonesimulator -configuration Debug | xcpretty -c
+  - xcodebuild build -workspace "$TRAVIS_XCODE_WORKSPACE" -scheme "FFPopup" -sdk iphonesimulator PLATFORM_NAME=iphonesimulator -configuration Debug | xcpretty -c
+
+  - echo Build the Demo apps
+  - pod install --project-directory=Demo
+  - xcodebuild build -workspace "$TRAVIS_XCODE_WORKSPACE" -scheme "FFPopup_Objc" -configuration Debug -destination "name=iPhone XS" | xcpretty -c
+  - xcodebuild build -workspace "$TRAVIS_XCODE_WORKSPACE" -scheme "FFPopup_Swift" -configuration Debug -destination "name=iPhone XS" | xcpretty -c
 
-  - echo Build the Examples
-  - xcodebuild build -workspace "$TRAVIS_XCODE_WORKSPACE" -scheme "FFPopup_Example" -configuration Debug -destination 'name=iPhone X' | xcpretty -c
+  - echo Clean DerivedData
+  - rm -rf ~/Library/Developer/Xcode/DerivedData/
+  - mkdir DerivedData
 
 notifications:
   email: false
 
 after_success:
-  - bash <(curl -s https://codecov.io/bash)
+  - export PATH="/usr/local/opt/curl/bin:$PATH"
+  - curl --version
+  - bash <(curl -s https://codecov.io/bash) -D './DerivedData/iOS' -J '^FFPopup$' -c -X gcov -F ios

Example/FFPopup_Example.xcodeproj/xcshareddata/xcschemes/FFPopup_Example.xcscheme → Demo/FFPopup_Demo.xcodeproj/xcshareddata/xcschemes/FFPopup_Objc.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -15,9 +15,9 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "D3A5F72721AF790C005888D9"
-               BuildableName = "FFPopup_Example.app"
-               BlueprintName = "FFPopup_Example"
-               ReferencedContainer = "container:FFPopup_Example.xcodeproj">
+               BuildableName = "FFPopup_Objc.app"
+               BlueprintName = "FFPopup_Objc"
+               ReferencedContainer = "container:FFPopup_Demo.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -33,9 +33,9 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "D3A5F72721AF790C005888D9"
-            BuildableName = "FFPopup_Example.app"
-            BlueprintName = "FFPopup_Example"
-            ReferencedContainer = "container:FFPopup_Example.xcodeproj">
+            BuildableName = "FFPopup_Objc.app"
+            BlueprintName = "FFPopup_Objc"
+            ReferencedContainer = "container:FFPopup_Demo.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
       <AdditionalOptions>
@@ -56,17 +56,12 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "D3A5F72721AF790C005888D9"
-            BuildableName = "FFPopup_Example.app"
-            BlueprintName = "FFPopup_Example"
-            ReferencedContainer = "container:FFPopup_Example.xcodeproj">
+            BuildableName = "FFPopup_Objc.app"
+            BlueprintName = "FFPopup_Objc"
+            ReferencedContainer = "container:FFPopup_Demo.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
       <AdditionalOptions>
-         <AdditionalOption
-            key = "NSZombieEnabled"
-            value = "YES"
-            isEnabled = "YES">
-         </AdditionalOption>
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
@@ -80,9 +75,9 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "D3A5F72721AF790C005888D9"
-            BuildableName = "FFPopup_Example.app"
-            BlueprintName = "FFPopup_Example"
-            ReferencedContainer = "container:FFPopup_Example.xcodeproj">
+            BuildableName = "FFPopup_Objc.app"
+            BlueprintName = "FFPopup_Objc"
+            ReferencedContainer = "container:FFPopup_Demo.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
    </ProfileAction>

Demo/FFPopup_Demo.xcodeproj/xcshareddata/xcschemes/FFPopup_Swift.xcscheme

@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1020"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "D3160D0A2275AEA3000180F0"
+               BuildableName = "FFPopup_Swift.app"
+               BlueprintName = "FFPopup_Swift"
+               ReferencedContainer = "container:FFPopup_Demo.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D3160D0A2275AEA3000180F0"
+            BuildableName = "FFPopup_Swift.app"
+            BlueprintName = "FFPopup_Swift"
+            ReferencedContainer = "container:FFPopup_Demo.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D3160D0A2275AEA3000180F0"
+            BuildableName = "FFPopup_Swift.app"
+            BlueprintName = "FFPopup_Swift"
+            ReferencedContainer = "container:FFPopup_Demo.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D3160D0A2275AEA3000180F0"
+            BuildableName = "FFPopup_Swift.app"
+            BlueprintName = "FFPopup_Swift"
+            ReferencedContainer = "container:FFPopup_Demo.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

Example/FFPopup_Example.xcodeproj/xcuserdata/jonyfang.xcuserdatad/xcschemes/xcschememanagement.plist → Demo/FFPopup_Demo.xcodeproj/xcuserdata/jonyfang.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -4,14 +4,24 @@
 <dict>
 	<key>SchemeUserState</key>
 	<dict>
-		<key>FFPopup_Example.xcscheme_^#shared#^_</key>
+		<key>FFPopup_Objc.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>2</integer>
+		</dict>
+		<key>FFPopup_Swift.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
 			<integer>3</integer>
 		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>
 	<dict>
+		<key>D3160D0A2275AEA3000180F0</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
 		<key>D3A5F72721AF790C005888D9</key>
 		<dict>
 			<key>primary</key>

Example/FFPopup_Example/Classes/AppDelegate.h → Demo/FFPopup_Objc/Classes/AppDelegate.h

@@ -1,6 +1,6 @@
 //
 //  AppDelegate.h
-//  FFPopup_Example
+//  FFPopup_Objc
 //
 //  Created by JonyFang on 2018/11/29.
 //  Copyright © 2018年 JonyFang. All rights reserved.

Example/FFPopup_Example/Classes/AppDelegate.m → Demo/FFPopup_Objc/Classes/AppDelegate.m

@@ -1,6 +1,6 @@
 //
 //  AppDelegate.m
-//  FFPopup_Example
+//  FFPopup_Objc
 //
 //  Created by JonyFang on 2018/11/29.
 //  Copyright © 2018年 JonyFang. All rights reserved.

Example/FFPopup_Example/Classes/Controllers/FFHomeViewController.h → Demo/FFPopup_Objc/Classes/Controllers/FFHomeViewController.h

@@ -1,6 +1,6 @@
 //
 //  FFHomeViewController.h
-//  FFPopup_Example
+//  FFPopup_Objc
 //
 //  Created by JonyFang on 2018/11/29.
 //  Copyright © 2018年 JonyFang. All rights reserved.

Example/FFPopup_Example/Classes/Controllers/FFHomeViewController.m → Demo/FFPopup_Objc/Classes/Controllers/FFHomeViewController.m

@@ -1,6 +1,6 @@
 //
 //  FFHomeViewController.m
-//  FFPopup_Example
+//  FFPopup_Objc
 //
 //  Created by JonyFang on 2018/11/29.
 //  Copyright © 2018年 JonyFang. All rights reserved.
@@ -9,7 +9,6 @@
 #import "FFHomeViewController.h"
 #import "FFSelectionViewController.h"
 #import "BLCustomContentView.h"
-#import "FFPopup.h"
 #import "FFTableView.h"
 #import "FFSectionHeader.h"
 #import "FFHomeTableViewCell.h"
@@ -19,6 +18,8 @@
 #import "FFPopupModel.h"
 #import "FFPopupHelper.h"
 
+#import <FFPopup/FFPopup.h>
+
 #define K_SCREEN_WIDTH [[UIScreen mainScreen] bounds].size.width
 #define K_SCREEN_HEIGHT [[UIScreen mainScreen] bounds].size.height
 

Example/FFPopup_Example/Classes/Controllers/FFSelectionViewController.h → Demo/FFPopup_Objc/Classes/Controllers/FFSelectionViewController.h

@@ -1,6 +1,6 @@
 //
 //  FFSelectionViewController.h
-//  FFPopup_Example
+//  FFPopup_Objc
 //
 //  Created by JonyFang on 2018/11/29.
 //  Copyright © 2018年 JonyFang. All rights reserved.

Example/FFPopup_Example/Classes/Controllers/FFSelectionViewController.m → Demo/FFPopup_Objc/Classes/Controllers/FFSelectionViewController.m

@@ -1,6 +1,6 @@
 //
 //  FFSelectionViewController.m
-//  FFPopup_Example
+//  FFPopup_Objc
 //
 //  Created by JonyFang on 2018/11/29.
 //  Copyright © 2018年 JonyFang. All rights reserved.

Example/FFPopup_Example/Classes/Models/FFPopupModel.h → Demo/FFPopup_Objc/Classes/Models/FFPopupModel.h

@@ -1,6 +1,6 @@
 //
 //  FFPopupModel.h
-//  FFPopup_Example
+//  FFPopup_Objc
 //
 //  Created by JonyFang on 2018/12/11.
 //  Copyright © 2018年 JonyFang. All rights reserved.

Example/FFPopup_Example/Classes/Models/FFPopupModel.m → Demo/FFPopup_Objc/Classes/Models/FFPopupModel.m

@@ -1,6 +1,6 @@
 //
 //  FFPopupModel.m
-//  FFPopup_Example
+//  FFPopup_Objc
 //
 //  Created by JonyFang on 2018/12/11.
 //  Copyright © 2018年 JonyFang. All rights reserved.

Example/FFPopup_Example/Classes/Others/FFPopupHelper.h → Demo/FFPopup_Objc/Classes/Others/FFPopupHelper.h

@@ -1,6 +1,6 @@
 //
 //  FFPopupHelper.h
-//  FFPopup_Example
+//  FFPopup_Objc
 //
 //  Created by JonyFang on 2018/12/11.
 //  Copyright © 2018年 JonyFang. All rights reserved.

Example/FFPopup_Example/Classes/Others/FFPopupHelper.m → Demo/FFPopup_Objc/Classes/Others/FFPopupHelper.m

@@ -1,6 +1,6 @@
 //
 //  FFPopupHelper.m
-//  FFPopup_Example
+//  FFPopup_Objc
 //
 //  Created by JonyFang on 2018/12/11.
 //  Copyright © 2018年 JonyFang. All rights reserved.