Merge pull request #5 from tosbaha/master

Fixed project
NikolaKirev · Apr 12, 2018 · 5ec3876 · 5ec3876
2 parents f3e82bd + e1dcf9a
commit 5ec3876
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/OnboardExample/ViewController.swift b/OnboardExample/ViewController.swift
@@ -15,10 +15,12 @@ class ViewController: UIViewController {
 
     let pageTwo = OnboardPage(title: "Habit Entries",
                               imageName: "Onboarding2",
+                              // swiftlint:disable:next line_length
                               description: "For each of your habits an entry is created for every day you need to complete it.")
 
     let pageThree = OnboardPage(title: "Marking and Tracking",
                                 imageName: "Onboarding3",
+                                // swiftlint:disable:next line_length
                                 description: "By marking entries as Done you can track your progress on the path to success.")
 
     let pageFour = OnboardPage(title: "Notifications",
@@ -32,6 +34,7 @@ class ViewController: UIViewController {
 
     let pageFive = OnboardPage(title: "All Ready",
                                imageName: "Onboarding5",
+                               // swiftlint:disable:next line_length
                                description: "You are all set up and ready to use Habitat. Begin by adding your first habit.",
                                advanceButtonTitle: "Done")
 

diff --git a/OnboardKit.xcodeproj/project.pbxproj b/OnboardKit.xcodeproj/project.pbxproj
@@ -69,7 +69,7 @@
 		9437E2DB1F2392FD00E294BE /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		9437E2DE1F2392FD00E294BE /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		9437E2E01F2392FD00E294BE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		9449158A1F23D4D300191E79 /* OnboardKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OnboardKit.h; path = /Users/nikolakirev/Workspace/OnboardKit/Metadata/OnboardKit.h; sourceTree = "<absolute>"; };
+		9449158A1F23D4D300191E79 /* OnboardKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OnboardKit.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -250,6 +250,7 @@
 					9437E2AD1F238E7E00E294BE = {
 						CreatedOnToolsVersion = 8.3.3;
 						DevelopmentTeam = 5Z8M29P3V9;
+						LastSwiftMigration = 0920;
 						ProvisioningStyle = Automatic;
 					};
 					9437E2D11F2392FC00E294BE = {
@@ -553,7 +554,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.nikolakirev.OnboardKitTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -566,7 +568,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.nikolakirev.OnboardKitTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};

diff --git a/OnboardKit/OnboardPageViewController.swift b/OnboardKit/OnboardPageViewController.swift
@@ -184,7 +184,7 @@ internal final class OnboardPageViewController: UIViewController {
     advanceButton.setTitle(title, for: .normal)
   }
 
-  // MARK - User Actions
+  // MARK: - User Actions
   @objc fileprivate func actionTapped() {
     delegate?.pageViewController(self, actionTappedAt: pageIndex)
   }