Merge pull request #26 from aryaxt/Swift3

aryaxt · web-flow · commit 79b3933baec7 · 2016-08-19T21:28:09.000-07:00
updated to swift 3.0
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,5 @@
+language: objective-c
+osx_image: xcode8
+
+script:
+- xcodebuild -project ScrollPager.xcodeproj -scheme ScrollPagerTests -destination 'platform=iOS Simulator,name=iPhone 6' test
diff --git a/ScrollPager.podspec b/ScrollPager.podspec
@@ -1,14 +1,14 @@
 Pod::Spec.new do |s|
     s.name = 'ScrollPager'
-    s.version = '0.7'
+    s.version = '0.8'
     s.summary = 'A fully featured scroll pager similar to the one in flipboard, fully configurable through storyboard'
     s.homepage = 'https://github.com/aryaxt/ScrollPager'
     s.license = {
       :type => 'MIT',
       :file => 'License.txt'
     }
     s.author = {'Aryan Ghassemi' => 'https://github.com/aryaxt/ScrollPager'}
-    s.source = {:git => 'https://github.com/aryaxt/ScrollPager.git', :tag => '0.7'}
+    s.source = {:git => 'https://github.com/aryaxt/ScrollPager.git', :tag => '0.8'}
     s.platform = :ios, '8.0'
     s.source_files = 'ScrollPager/Source/*.{swift}'
     s.framework = 'Foundation', 'UIKit'
diff --git a/ScrollPager.xcodeproj/project.pbxproj b/ScrollPager.xcodeproj/project.pbxproj
@@ -169,14 +169,17 @@
 			attributes = {
 				LastSwiftMigration = 0700;
 				LastSwiftUpdateCheck = 0700;
-				LastUpgradeCheck = 0700;
+				LastUpgradeCheck = 0800;
 				ORGANIZATIONNAME = "Aryan Ghassemi";
 				TargetAttributes = {
 					15F9717A1A9A86E400169B7E = {
 						CreatedOnToolsVersion = 6.1.1;
+						DevelopmentTeam = 24FGDP9KJW;
+						LastSwiftMigration = 0800;
 					};
 					15F9718F1A9A86E400169B7E = {
 						CreatedOnToolsVersion = 6.1.1;
+						LastSwiftMigration = 0800;
 						TestTargetID = 15F9717A1A9A86E400169B7E;
 					};
 				};
@@ -282,8 +285,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -292,6 +297,7 @@
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
@@ -326,15 +332,18 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -344,6 +353,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.1;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 			};
@@ -353,21 +363,25 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				DEVELOPMENT_TEAM = 24FGDP9KJW;
 				INFOPLIST_FILE = ScrollPager/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.aryaxt.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
 		15F9719C1A9A86E400169B7E /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				DEVELOPMENT_TEAM = 24FGDP9KJW;
 				INFOPLIST_FILE = ScrollPager/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.aryaxt.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};
@@ -387,6 +401,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.aryaxt.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ScrollPager.app/ScrollPager";
 			};
 			name = Debug;
@@ -403,6 +418,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.aryaxt.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ScrollPager.app/ScrollPager";
 			};
 			name = Release;
diff --git a/ScrollPager.xcodeproj/project.xcworkspace/xcshareddata/ScrollPager.xccheckout b/ScrollPager.xcodeproj/project.xcworkspace/xcshareddata/ScrollPager.xccheckout
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDESourceControlProjectFavoriteDictionaryKey</key>
+	<false/>
+	<key>IDESourceControlProjectIdentifier</key>
+	<string>FE30291C-AA8B-4552-A6D0-DEA9E5E44351</string>
+	<key>IDESourceControlProjectName</key>
+	<string>ScrollPager</string>
+	<key>IDESourceControlProjectOriginsDictionary</key>
+	<dict>
+		<key>203B8E4269EA117004AE3A2A717AF64DE226A9BC</key>
+		<string>https://github.com/aryaxt/ScrollPager.git</string>
+	</dict>
+	<key>IDESourceControlProjectPath</key>
+	<string>ScrollPager.xcodeproj</string>
+	<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
+	<dict>
+		<key>203B8E4269EA117004AE3A2A717AF64DE226A9BC</key>
+		<string>../..</string>
+	</dict>
+	<key>IDESourceControlProjectURL</key>
+	<string>https://github.com/aryaxt/ScrollPager.git</string>
+	<key>IDESourceControlProjectVersion</key>
+	<integer>111</integer>
+	<key>IDESourceControlProjectWCCIdentifier</key>
+	<string>203B8E4269EA117004AE3A2A717AF64DE226A9BC</string>
+	<key>IDESourceControlProjectWCConfigurations</key>
+	<array>
+		<dict>
+			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
+			<string>public.vcs.git</string>
+			<key>IDESourceControlWCCIdentifierKey</key>
+			<string>203B8E4269EA117004AE3A2A717AF64DE226A9BC</string>
+			<key>IDESourceControlWCCName</key>
+			<string>ScrollPager</string>
+		</dict>
+	</array>
+</dict>
+</plist>
diff --git a/ScrollPager.xcodeproj/xcshareddata/xcschemes/ScrollPager.xcscheme b/ScrollPager.xcodeproj/xcshareddata/xcschemes/ScrollPager.xcscheme
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0800"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "15F9717A1A9A86E400169B7E"
+               BuildableName = "ScrollPager.app"
+               BlueprintName = "ScrollPager"
+               ReferencedContainer = "container:ScrollPager.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "15F9718F1A9A86E400169B7E"
+               BuildableName = "ScrollPagerTests.xctest"
+               BlueprintName = "ScrollPagerTests"
+               ReferencedContainer = "container:ScrollPager.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "15F9718F1A9A86E400169B7E"
+               BuildableName = "ScrollPagerTests.xctest"
+               BlueprintName = "ScrollPagerTests"
+               ReferencedContainer = "container:ScrollPager.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "15F9717A1A9A86E400169B7E"
+            BuildableName = "ScrollPager.app"
+            BlueprintName = "ScrollPager"
+            ReferencedContainer = "container:ScrollPager.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 = "15F9717A1A9A86E400169B7E"
+            BuildableName = "ScrollPager.app"
+            BlueprintName = "ScrollPager"
+            ReferencedContainer = "container:ScrollPager.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "15F9717A1A9A86E400169B7E"
+            BuildableName = "ScrollPager.app"
+            BlueprintName = "ScrollPager"
+            ReferencedContainer = "container:ScrollPager.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/ScrollPager.xcodeproj/xcshareddata/xcschemes/ScrollPagerTests.xcscheme b/ScrollPager.xcodeproj/xcshareddata/xcschemes/ScrollPagerTests.xcscheme
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0800"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "15F9718F1A9A86E400169B7E"
+               BuildableName = "ScrollPagerTests.xctest"
+               BlueprintName = "ScrollPagerTests"
+               ReferencedContainer = "container:ScrollPager.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <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">
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/ScrollPager/AppDelegate.swift b/ScrollPager/AppDelegate.swift
@@ -14,30 +14,30 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 	var window: UIWindow?
 
 
-	func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
+	private func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
 		// Override point for customization after application launch.
 		return true
 	}
 
-	func applicationWillResignActive(application: UIApplication) {
+	private func applicationWillResignActive(application: UIApplication) {
 		// Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
 		// Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
 	}
 
-	func applicationDidEnterBackground(application: UIApplication) {
+	private func applicationDidEnterBackground(application: UIApplication) {
 		// Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
 		// If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
 	}
 
-	func applicationWillEnterForeground(application: UIApplication) {
+	private func applicationWillEnterForeground(application: UIApplication) {
 		// Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
 	}
 
-	func applicationDidBecomeActive(application: UIApplication) {
+	private func applicationDidBecomeActive(application: UIApplication) {
 		// Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
 	}
 
-	func applicationWillTerminate(application: UIApplication) {
+	private func applicationWillTerminate(application: UIApplication) {
 		// Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
 	}
 
diff --git a/ScrollPager/Source/ScrollPager.swift b/ScrollPager/Source/ScrollPager.swift
diff --git a/ScrollPager/ViewController.swift b/ScrollPager/ViewController.swift
diff --git a/ScrollPagerTests/ScrollPagerTests.swift b/ScrollPagerTests/ScrollPagerTests.swift

Original file line number	Diff line number	Diff line change
`@@ -14,30 +14,30 @@ class AppDelegate: UIResponder, UIApplicationDelegate {`
`14`	`14`	`var window: UIWindow?`
`15`	`15`
`16`	`16`
`17`		`- func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {`
	`17`	`+ private func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {`
`18`	`18`	`// Override point for customization after application launch.`
`19`	`19`	`return true`
`20`	`20`	`}`
`21`	`21`
`22`		`- func applicationWillResignActive(application: UIApplication) {`
	`22`	`+ private func applicationWillResignActive(application: UIApplication) {`
`23`	`23`	`// Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.`
`24`	`24`	`// Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.`
`25`	`25`	`}`
`26`	`26`
`27`		`- func applicationDidEnterBackground(application: UIApplication) {`
	`27`	`+ private func applicationDidEnterBackground(application: UIApplication) {`
`28`	`28`	`// Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.`
`29`	`29`	`// If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.`
`30`	`30`	`}`
`31`	`31`
`32`		`- func applicationWillEnterForeground(application: UIApplication) {`
	`32`	`+ private func applicationWillEnterForeground(application: UIApplication) {`
`33`	`33`	`// Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.`
`34`	`34`	`}`
`35`	`35`
`36`		`- func applicationDidBecomeActive(application: UIApplication) {`
	`36`	`+ private func applicationDidBecomeActive(application: UIApplication) {`
`37`	`37`	`// Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.`
`38`	`38`	`}`
`39`	`39`
`40`		`- func applicationWillTerminate(application: UIApplication) {`
	`40`	`+ private func applicationWillTerminate(application: UIApplication) {`
`41`	`41`	`// Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.`
`42`	`42`	`}`
`43`	`43`