From f7c65f9484bb7a4cf82e101d92a854d45def8675 Mon Sep 17 00:00:00 2001 From: Mustafa Date: Tue, 20 Mar 2018 11:25:02 +0300 Subject: [PATCH 1/4] Removed hardcoded path --- OnboardKit.xcodeproj/project.pbxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OnboardKit.xcodeproj/project.pbxproj b/OnboardKit.xcodeproj/project.pbxproj index 88fe86f..1fc1244 100644 --- 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 = ""; }; 9437E2DE1F2392FD00E294BE /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 9437E2E01F2392FD00E294BE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 9449158A1F23D4D300191E79 /* OnboardKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OnboardKit.h; path = /Users/nikolakirev/Workspace/OnboardKit/Metadata/OnboardKit.h; sourceTree = ""; }; + 9449158A1F23D4D300191E79 /* OnboardKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OnboardKit.h; path = OnboardKit.h; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ From 45f43ab502ad55c9b273292601eb6a9f29251e8d Mon Sep 17 00:00:00 2001 From: Mustafa Date: Tue, 20 Mar 2018 11:26:02 +0300 Subject: [PATCH 2/4] Swift update --- OnboardKit.xcodeproj/project.pbxproj | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/OnboardKit.xcodeproj/project.pbxproj b/OnboardKit.xcodeproj/project.pbxproj index 1fc1244..8c2663b 100644 --- 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 = ""; }; 9437E2DE1F2392FD00E294BE /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 9437E2E01F2392FD00E294BE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 9449158A1F23D4D300191E79 /* OnboardKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OnboardKit.h; path = OnboardKit.h; sourceTree = ""; }; + 9449158A1F23D4D300191E79 /* OnboardKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OnboardKit.h; sourceTree = ""; }; /* 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; }; From 158a9395050bbe3385b2d52a54d1738a898a6d1a Mon Sep 17 00:00:00 2001 From: Mustafa Date: Tue, 20 Mar 2018 11:33:23 +0300 Subject: [PATCH 3/4] Fixed Mark --- OnboardKit/OnboardPageViewController.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OnboardKit/OnboardPageViewController.swift b/OnboardKit/OnboardPageViewController.swift index 0171851..fbddcfd 100644 --- 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) } From e1dcf9a3e019c44a5772e7c7dc3967630625b464 Mon Sep 17 00:00:00 2001 From: Mustafa Date: Tue, 20 Mar 2018 11:38:31 +0300 Subject: [PATCH 4/4] Fix SwiftLint warnings --- OnboardExample/ViewController.swift | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OnboardExample/ViewController.swift b/OnboardExample/ViewController.swift index 9e108cb..c6a87c1 100644 --- 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")