diff --git a/.swift-version b/.swift-version index 389f774..8012ebb 100755 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -4.0 \ No newline at end of file +4.2 \ No newline at end of file diff --git a/BetterSegmentedControl.podspec b/BetterSegmentedControl.podspec index ccd5184..a49e6ba 100644 --- a/BetterSegmentedControl.podspec +++ b/BetterSegmentedControl.podspec @@ -1,6 +1,7 @@ Pod::Spec.new do |s| s.name = "BetterSegmentedControl" -s.version = "1.0" +s.version = "1.0.1" +s.swift_version = "4.2" s.summary = "An easy to use, customizable replacement for UISegmentedControl & UISwitch." s.description = <<-DESC BetterSegmentedControl is an easy to use, customizable replacement for UISegmentedControl and UISwitch written in Swift. @@ -8,10 +9,10 @@ DESC s.homepage = "https://github.com/gmarm/BetterSegmentedControl" s.license = 'MIT' s.author = { "George Marmaridis" => "gmarmas@gmail.com" } -s.source = { :git => "https://github.com/gmarm/BetterSegmentedControl.git", :tag => "1.0" } +s.source = { :git => "https://github.com/gmarm/BetterSegmentedControl.git", :tag => "1.0.1" } s.social_media_url = 'https://twitter.com/gmarmas' -s.platform = :ios, '8.0' -s.requires_arc = true -s.source_files = 'Pod/Classes/**/*' -s.frameworks = 'UIKit' +s.platform = :ios, '8.0' +s.requires_arc = true +s.source_files = 'Pod/Classes/**/*' +s.frameworks = 'UIKit' end diff --git a/Example/BetterSegmentedControl.xcodeproj/project.pbxproj b/Example/BetterSegmentedControl.xcodeproj/project.pbxproj index b434a9c..6bbf580 100644 --- a/Example/BetterSegmentedControl.xcodeproj/project.pbxproj +++ b/Example/BetterSegmentedControl.xcodeproj/project.pbxproj @@ -221,11 +221,11 @@ TargetAttributes = { 607FACCF1AFB9204008FA782 = { CreatedOnToolsVersion = 6.3.1; - LastSwiftMigration = 0900; + LastSwiftMigration = 1000; }; 607FACE41AFB9204008FA782 = { CreatedOnToolsVersion = 6.3.1; - LastSwiftMigration = 0900; + LastSwiftMigration = 1000; TestTargetID = 607FACCF1AFB9204008FA782; }; }; @@ -547,6 +547,7 @@ MODULE_NAME = ExampleApp; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -560,6 +561,7 @@ MODULE_NAME = ExampleApp; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 4.2; }; name = Release; }; @@ -577,6 +579,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 4.2; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/BetterSegmentedControl_Example.app/BetterSegmentedControl_Example"; }; name = Debug; @@ -591,6 +594,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 4.2; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/BetterSegmentedControl_Example.app/BetterSegmentedControl_Example"; }; name = Release; diff --git a/Example/BetterSegmentedControl/AppDelegate.swift b/Example/BetterSegmentedControl/AppDelegate.swift index 6cf6a96..c091b2d 100644 --- a/Example/BetterSegmentedControl/AppDelegate.swift +++ b/Example/BetterSegmentedControl/AppDelegate.swift @@ -13,7 +13,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { var window: UIWindow? - func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool { + func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { // Override point for customization after application launch. return true } diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj index 75af677..013fb5f 100644 --- a/Example/Pods/Pods.xcodeproj/project.pbxproj +++ b/Example/Pods/Pods.xcodeproj/project.pbxproj @@ -245,7 +245,7 @@ 14677B97796E5829B493FD2687EDC034 /* NMBExpectation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = NMBExpectation.swift; path = Sources/Nimble/Adapters/NMBExpectation.swift; sourceTree = ""; }; 148B6679E78C36099BFB3FD76D78E644 /* BeEmpty.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeEmpty.swift; path = Sources/Nimble/Matchers/BeEmpty.swift; sourceTree = ""; }; 1559B04D0A0908D0B2CBD56BBB28B68B /* Closures.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Closures.swift; path = Sources/Quick/Hooks/Closures.swift; sourceTree = ""; }; - 186308F703882768F3FCBF377E561E32 /* BetterSegmentedControl.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = BetterSegmentedControl.framework; path = BetterSegmentedControl.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 186308F703882768F3FCBF377E561E32 /* BetterSegmentedControl.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = BetterSegmentedControl.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 19A784CA722A96732C98AD90D456B057 /* NSBundle+CurrentTestBundle.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "NSBundle+CurrentTestBundle.swift"; path = "Sources/Quick/NSBundle+CurrentTestBundle.swift"; sourceTree = ""; }; 1A10CA2CE10CABB1119164ABB7983C09 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 1ACF4979F980AE7BE9E43A9E8F1AC5B2 /* iOSSnapshotTestCase-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "iOSSnapshotTestCase-umbrella.h"; sourceTree = ""; }; @@ -253,7 +253,7 @@ 1BADE371099EC9DB857F5E07E4452617 /* Callsite.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Callsite.swift; path = Sources/Quick/Callsite.swift; sourceTree = ""; }; 1E816EE964391BFF9842D1388A78B8B4 /* QuickConfiguration.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = QuickConfiguration.h; path = Sources/QuickObjectiveC/Configuration/QuickConfiguration.h; sourceTree = ""; }; 1F0876CEEFFEEDCC3A037588D9525BCB /* FBSnapshotTestCasePlatform.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FBSnapshotTestCasePlatform.h; path = FBSnapshotTestCase/FBSnapshotTestCasePlatform.h; sourceTree = ""; }; - 206F1D8D04786A87A264E96093ABCAC7 /* Nimble_Snapshots.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Nimble_Snapshots.framework; path = "Nimble-Snapshots.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + 206F1D8D04786A87A264E96093ABCAC7 /* Nimble_Snapshots.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Nimble_Snapshots.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 217AAC5A81A362025F5A6CC0738C0776 /* NimbleEnvironment.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = NimbleEnvironment.swift; path = Sources/Nimble/Adapters/NimbleEnvironment.swift; sourceTree = ""; }; 24458989CC6A099015C33CBEB0FB7C45 /* UIImage+Compare.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "UIImage+Compare.m"; path = "FBSnapshotTestCase/Categories/UIImage+Compare.m"; sourceTree = ""; }; 25611BA635D646EA87045AF5E8E32D30 /* Stringers.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Stringers.swift; path = Sources/Nimble/Utils/Stringers.swift; sourceTree = ""; }; @@ -265,7 +265,7 @@ 2ABDA60988E7886F8BF5144EDC20FE3E /* Nimble.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = Nimble.modulemap; sourceTree = ""; }; 2CE29548CBBA3D53D30440FB7F901134 /* IconSegment.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = IconSegment.swift; sourceTree = ""; }; 2CE88BD6CE6AE556B35F7E480A6C416B /* CwlPreconditionTesting.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CwlPreconditionTesting.h; path = Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/Mach/CwlPreconditionTesting.h; sourceTree = ""; }; - 2DF6BDE8BA28EDBB22965EB525C88CC6 /* mach_excServer.c */ = {isa = PBXFileReference; includeInIndex = 1; name = mach_excServer.c; path = Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlMachBadInstructionHandler/mach_excServer.c; sourceTree = ""; }; + 2DF6BDE8BA28EDBB22965EB525C88CC6 /* mach_excServer.c */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.c; name = mach_excServer.c; path = Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlMachBadInstructionHandler/mach_excServer.c; sourceTree = ""; }; 2E86F795C7C933A99C5C9496FCC0B770 /* BetterSegmentedControl-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "BetterSegmentedControl-dummy.m"; sourceTree = ""; }; 2F692638D5B6ED949CE079216C4801E8 /* ThrowAssertion.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ThrowAssertion.swift; path = Sources/Nimble/Matchers/ThrowAssertion.swift; sourceTree = ""; }; 30A35B91AECE18C148B2EF08668A959A /* iOSSnapshotTestCase.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = iOSSnapshotTestCase.xcconfig; sourceTree = ""; }; @@ -278,7 +278,7 @@ 3AB56AA5C1B8413632797F2FC9A8F1FA /* QuickTestSuite.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = QuickTestSuite.swift; path = Sources/Quick/QuickTestSuite.swift; sourceTree = ""; }; 3E1B4A7CFFB0408CCBBE81B34142F99D /* CwlCatchException.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CwlCatchException.swift; path = Carthage/Checkouts/CwlCatchException/Sources/CwlCatchException/CwlCatchException.swift; sourceTree = ""; }; 41171408E2E3D06C0648883986674B88 /* PrettySyntax.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PrettySyntax.swift; sourceTree = ""; }; - 417794C46E79755EE960AC779BF2C8B1 /* Pods_BetterSegmentedControl_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_BetterSegmentedControl_Example.framework; path = "Pods-BetterSegmentedControl_Example.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + 417794C46E79755EE960AC779BF2C8B1 /* Pods_BetterSegmentedControl_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_BetterSegmentedControl_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 420997D80CC221A6F29D48689F4B2672 /* BeginWith.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeginWith.swift; path = Sources/Nimble/Matchers/BeginWith.swift; sourceTree = ""; }; 436A479F6794F194062DACD90172747B /* FBSnapshotTestCase.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FBSnapshotTestCase.h; path = FBSnapshotTestCase/FBSnapshotTestCase.h; sourceTree = ""; }; 46801F7BF0316E9DD6EDB932B1690525 /* BeGreaterThanOrEqualTo.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeGreaterThanOrEqualTo.swift; path = Sources/Nimble/Matchers/BeGreaterThanOrEqualTo.swift; sourceTree = ""; }; @@ -290,7 +290,7 @@ 4FDE2C027B85DBA3BB2BE76D3F6A703A /* NMBStringify.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NMBStringify.h; path = Sources/NimbleObjectiveC/NMBStringify.h; sourceTree = ""; }; 5055CEBA7508A430D5EE9B95B9D57746 /* Quick-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Quick-prefix.pch"; sourceTree = ""; }; 50FBC47DA706DBF982E54AA5ACC39EC9 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.3.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; }; - 560B3766CB499216DBB497B953B64962 /* Nimble.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Nimble.framework; path = Nimble.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 560B3766CB499216DBB497B953B64962 /* Nimble.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Nimble.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 581F38D0E434215DD6454CC109A3D0D2 /* Contain.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Contain.swift; path = Sources/Nimble/Matchers/Contain.swift; sourceTree = ""; }; 58323FB6A770EBC573173A4E7A18C6A3 /* Pods-BetterSegmentedControl_Tests-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-BetterSegmentedControl_Tests-acknowledgements.markdown"; sourceTree = ""; }; 5AC753A9C07D1519AC774D2677A6A4D9 /* LabelSegment.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = LabelSegment.swift; sourceTree = ""; }; @@ -321,7 +321,7 @@ 7ADD71B22E02BDCB49B145A7D0E59333 /* SourceLocation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SourceLocation.swift; path = Sources/Nimble/Utils/SourceLocation.swift; sourceTree = ""; }; 7C7EE24A568EC7811B7B0ACC810C1262 /* Nimble-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Nimble-dummy.m"; sourceTree = ""; }; 7D01F067A0B5B9EB38D5E2E26DB54ABA /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 7D3D8996C385A200178BF3483D04D392 /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; path = README.md; sourceTree = ""; }; + 7D3D8996C385A200178BF3483D04D392 /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; 7D8BB57B53EC84685EC04B546D9D00EF /* NSString+C99ExtendedIdentifier.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "NSString+C99ExtendedIdentifier.swift"; path = "Sources/Quick/NSString+C99ExtendedIdentifier.swift"; sourceTree = ""; }; 7DAD9F3978550006A255E1D9B3DB5E46 /* EndWith.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = EndWith.swift; path = Sources/Nimble/Matchers/EndWith.swift; sourceTree = ""; }; 7E881BBAF896CC953424CC4A7098F278 /* Pods-BetterSegmentedControl_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-BetterSegmentedControl_Example.debug.xcconfig"; sourceTree = ""; }; @@ -340,7 +340,7 @@ 8F3A3E1B640F74EA344CF99547876807 /* SwiftSupport.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SwiftSupport.swift; path = FBSnapshotTestCase/SwiftSupport.swift; sourceTree = ""; }; 912E2CE7E53A84CD15A5D25DC13A3D68 /* SuiteHooks.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SuiteHooks.swift; path = Sources/Quick/Hooks/SuiteHooks.swift; sourceTree = ""; }; 9188129F4A8C3A6BA20D8A2613BF75F6 /* Pods-BetterSegmentedControl_Example-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-BetterSegmentedControl_Example-dummy.m"; sourceTree = ""; }; - 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; + 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; 94B1C48252FF295FAB2647EFCB56A7EB /* Nimble-Snapshots-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Nimble-Snapshots-prefix.pch"; sourceTree = ""; }; 97ADD15043FE01376B53E255C8B2778D /* Pods-BetterSegmentedControl_Tests-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-BetterSegmentedControl_Tests-umbrella.h"; sourceTree = ""; }; 97EECDD34BD99BE02481533B9CADDBC4 /* Pods-BetterSegmentedControl_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-BetterSegmentedControl_Example.release.xcconfig"; sourceTree = ""; }; @@ -354,12 +354,12 @@ 9F6CD1B97FDC668E69900AEC091AF7FA /* BeGreaterThan.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BeGreaterThan.swift; path = Sources/Nimble/Matchers/BeGreaterThan.swift; sourceTree = ""; }; 9F846F63619B9A65A5A4E30DEC497CC2 /* Pods-BetterSegmentedControl_Tests-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-BetterSegmentedControl_Tests-resources.sh"; sourceTree = ""; }; A19D07DDFFC6324C6299A8A8A2EA7F80 /* ExampleGroup.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExampleGroup.swift; path = Sources/Quick/ExampleGroup.swift; sourceTree = ""; }; - A335FE46B950222D021E316186354797 /* Quick.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Quick.framework; path = Quick.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + A335FE46B950222D021E316186354797 /* Quick.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Quick.framework; sourceTree = BUILT_PRODUCTS_DIR; }; A34B2B717CB13CC986BD060059985017 /* UIImage+Diff.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UIImage+Diff.h"; path = "FBSnapshotTestCase/Categories/UIImage+Diff.h"; sourceTree = ""; }; A3A73F228ACFE985C9093005D991FD13 /* UIImage+Snapshot.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UIImage+Snapshot.h"; path = "FBSnapshotTestCase/Categories/UIImage+Snapshot.h"; sourceTree = ""; }; A7A8159BE8767111A83C6EFEEDBD4C38 /* QCKDSL.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = QCKDSL.m; path = Sources/QuickObjectiveC/DSL/QCKDSL.m; sourceTree = ""; }; A9480A14573A31AC789BB98A7ED8929B /* DSL.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DSL.h; path = Sources/NimbleObjectiveC/DSL.h; sourceTree = ""; }; - ABDBF2333F8D169A0D0602ADBFDAD1D6 /* Pods_BetterSegmentedControl_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_BetterSegmentedControl_Tests.framework; path = "Pods-BetterSegmentedControl_Tests.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + ABDBF2333F8D169A0D0602ADBFDAD1D6 /* Pods_BetterSegmentedControl_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_BetterSegmentedControl_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; ACE8C71ABD0E79256D8C4239A6EB159D /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; AF6C65D921E057E4FEF9D6190EDA2ADC /* AsyncMatcherWrapper.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AsyncMatcherWrapper.swift; path = Sources/Nimble/Matchers/AsyncMatcherWrapper.swift; sourceTree = ""; }; B0E11E7ED2C441013BE6CCB60073C62A /* Quick-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Quick-umbrella.h"; sourceTree = ""; }; @@ -385,7 +385,7 @@ D22EFD2B32B44679097BAF206C14E3A5 /* Async.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Async.swift; path = Sources/Nimble/Utils/Async.swift; sourceTree = ""; }; D3A72134DF6A750D01677043120472CF /* Pods-BetterSegmentedControl_Example-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-BetterSegmentedControl_Example-acknowledgements.plist"; sourceTree = ""; }; D3A967B27ABAF3AC95605AF730401B40 /* FailureMessage.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = FailureMessage.swift; path = Sources/Nimble/FailureMessage.swift; sourceTree = ""; }; - D41A33AF991C0BA879222662A968C9E5 /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; path = LICENSE; sourceTree = ""; }; + D41A33AF991C0BA879222662A968C9E5 /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = LICENSE; sourceTree = ""; }; D4F71E9BBCD0DF713A0CE522F0EAF2C3 /* Nimble-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Nimble-prefix.pch"; sourceTree = ""; }; D5DA9DDBC9DFED1E9546394AC1125551 /* Quick.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = Quick.modulemap; sourceTree = ""; }; D65DF25385859147CDE4611DC12A9075 /* iOSSnapshotTestCase-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "iOSSnapshotTestCase-prefix.pch"; sourceTree = ""; }; @@ -398,7 +398,7 @@ DC65E9958C7B2609346ECA0B4EE21B48 /* URL+FileName.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "URL+FileName.swift"; path = "Sources/Quick/URL+FileName.swift"; sourceTree = ""; }; DCD817A438BF0C5DDF55AA1B300A2222 /* Options.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Options.swift; path = Pod/Classes/Options.swift; sourceTree = ""; }; DCF0C519451E9161D6E0216F488D997B /* CwlBadInstructionException.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CwlBadInstructionException.swift; path = Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlBadInstructionException.swift; sourceTree = ""; }; - DDAF84E385B8F45252A0D8141AB0322F /* BetterSegmentedControl.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; path = BetterSegmentedControl.podspec; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; + DDAF84E385B8F45252A0D8141AB0322F /* BetterSegmentedControl.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; path = BetterSegmentedControl.podspec; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; DFBAE86DBF6EE37DF266CC00B9BD3EF4 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; E153EA185B1C426CA4EED8D4B9FA62C4 /* Nimble-Snapshots.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Nimble-Snapshots.xcconfig"; sourceTree = ""; }; E1E04E7999904EE0DC6ECD1176F372CF /* World.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = World.swift; path = Sources/Quick/World.swift; sourceTree = ""; }; @@ -419,7 +419,7 @@ F0C7D36EF0C0769640A00E5EA94048F8 /* QCKDSL.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = QCKDSL.h; path = Sources/QuickObjectiveC/DSL/QCKDSL.h; sourceTree = ""; }; F150CAAEF44091F92BC7B63C7A1B6F8B /* Quick-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Quick-dummy.m"; sourceTree = ""; }; F210CF4D05DFF82101249662096E10E9 /* RaisesException.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = RaisesException.swift; path = Sources/Nimble/Matchers/RaisesException.swift; sourceTree = ""; }; - F3D64EE8CCDE41FD0EC50EB167DD57A1 /* FBSnapshotTestCase.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = FBSnapshotTestCase.framework; path = iOSSnapshotTestCase.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + F3D64EE8CCDE41FD0EC50EB167DD57A1 /* FBSnapshotTestCase.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FBSnapshotTestCase.framework; sourceTree = BUILT_PRODUCTS_DIR; }; F6DBBE84F3B8996BE0967640C585A704 /* BetterSegmentedControl-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "BetterSegmentedControl-umbrella.h"; sourceTree = ""; }; FA3B717D2788B50A330DE8D0CF94E76E /* CurrentTestCaseTracker.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = CurrentTestCaseTracker.swift; sourceTree = ""; }; FE7CD31A6C80B4B7607563D0D930C9A9 /* Quick.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = Quick.h; path = Sources/QuickObjectiveC/Quick.h; sourceTree = ""; }; @@ -547,7 +547,6 @@ 6603FC0FD5879BCD384EC38B86E29CD8 /* XCTestSuite+QuickTestSuiteBuilder.m */, 6E65F20F1CA284D3C58CA7B1739B9678 /* Support Files */, ); - name = Quick; path = Quick; sourceTree = ""; }; @@ -598,7 +597,6 @@ 59FD8B0E990FA1E91F9BD6102ED2D9D3 /* Support Files */, BE741998104147B808AC15165DF0F0EC /* SwiftSupport */, ); - name = iOSSnapshotTestCase; path = iOSSnapshotTestCase; sourceTree = ""; }; @@ -745,7 +743,6 @@ 04FB7745D3A2055A591ADCF9ECD0CFBD /* Core */, D2D46DA92A2C03E9CE3411034DE739F2 /* Support Files */, ); - name = "Nimble-Snapshots"; path = "Nimble-Snapshots"; sourceTree = ""; }; @@ -823,7 +820,6 @@ 7FEE58F99A03FFC439FD0F6DCB4B7D2F /* XCTestObservationCenter+Register.m */, 7DA3265562806323916CD6FE2AFB319E /* Support Files */, ); - name = Nimble; path = Nimble; sourceTree = ""; }; @@ -1113,6 +1109,11 @@ attributes = { LastSwiftUpdateCheck = 0930; LastUpgradeCheck = 0930; + TargetAttributes = { + 04F9CB62B8DA981D2A5C07A7292CC4FA = { + LastSwiftMigration = 1000; + }; + }; }; buildConfigurationList = 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */; compatibilityVersion = "Xcode 3.2"; @@ -1603,7 +1604,7 @@ SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; @@ -1792,7 +1793,7 @@ SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; diff --git a/Example/Tests/ReferenceImages/Tests/a_BetterSegmentedControl__when_initialized__as_example_2__renders_correctly@3x.png b/Example/Tests/ReferenceImages/Tests/a_BetterSegmentedControl__when_initialized__as_example_2__renders_correctly@3x.png index 8f85014..2e6669f 100644 Binary files a/Example/Tests/ReferenceImages/Tests/a_BetterSegmentedControl__when_initialized__as_example_2__renders_correctly@3x.png and b/Example/Tests/ReferenceImages/Tests/a_BetterSegmentedControl__when_initialized__as_example_2__renders_correctly@3x.png differ diff --git a/Example/Tests/ReferenceImages/Tests/a_BetterSegmentedControl__when_initialized__as_example_3__renders_correctly@3x.png b/Example/Tests/ReferenceImages/Tests/a_BetterSegmentedControl__when_initialized__as_example_3__renders_correctly@3x.png index d6a69fb..d53f8c4 100644 Binary files a/Example/Tests/ReferenceImages/Tests/a_BetterSegmentedControl__when_initialized__as_example_3__renders_correctly@3x.png and b/Example/Tests/ReferenceImages/Tests/a_BetterSegmentedControl__when_initialized__as_example_3__renders_correctly@3x.png differ diff --git a/Example/Tests/ReferenceImages/Tests/a_BetterSegmentedControl__when_initialized__as_example_4__renders_correctly@3x.png b/Example/Tests/ReferenceImages/Tests/a_BetterSegmentedControl__when_initialized__as_example_4__renders_correctly@3x.png index 182a593..bb81e4e 100644 Binary files a/Example/Tests/ReferenceImages/Tests/a_BetterSegmentedControl__when_initialized__as_example_4__renders_correctly@3x.png and b/Example/Tests/ReferenceImages/Tests/a_BetterSegmentedControl__when_initialized__as_example_4__renders_correctly@3x.png differ diff --git a/Example/Tests/ReferenceImages/Tests/a_BetterSegmentedControl__when_initialized__as_example_5__renders_correctly@3x.png b/Example/Tests/ReferenceImages/Tests/a_BetterSegmentedControl__when_initialized__as_example_5__renders_correctly@3x.png index ac95e02..2ad60d2 100644 Binary files a/Example/Tests/ReferenceImages/Tests/a_BetterSegmentedControl__when_initialized__as_example_5__renders_correctly@3x.png and b/Example/Tests/ReferenceImages/Tests/a_BetterSegmentedControl__when_initialized__as_example_5__renders_correctly@3x.png differ diff --git a/Example/Tests/ReferenceImages/Tests/a_BetterSegmentedControl__when_initialized__as_example_6__renders_correctly@3x.png b/Example/Tests/ReferenceImages/Tests/a_BetterSegmentedControl__when_initialized__as_example_6__renders_correctly@3x.png index 5f12ce6..bf7d9d3 100644 Binary files a/Example/Tests/ReferenceImages/Tests/a_BetterSegmentedControl__when_initialized__as_example_6__renders_correctly@3x.png and b/Example/Tests/ReferenceImages/Tests/a_BetterSegmentedControl__when_initialized__as_example_6__renders_correctly@3x.png differ diff --git a/Example/Tests/ReferenceImages/Tests/a_BetterSegmentedControl__when_initialized__as_example_6__renders_correctly_2@3x.png b/Example/Tests/ReferenceImages/Tests/a_BetterSegmentedControl__when_initialized__as_example_6__renders_correctly_2@3x.png index 4444c85..4a0d667 100644 Binary files a/Example/Tests/ReferenceImages/Tests/a_BetterSegmentedControl__when_initialized__as_example_6__renders_correctly_2@3x.png and b/Example/Tests/ReferenceImages/Tests/a_BetterSegmentedControl__when_initialized__as_example_6__renders_correctly_2@3x.png differ diff --git a/Example/Tests/ReferenceImages/Tests/a_BetterSegmentedControl__when_initialized__as_example_8__renders_correctly@3x.png b/Example/Tests/ReferenceImages/Tests/a_BetterSegmentedControl__when_initialized__as_example_8__renders_correctly@3x.png index ea44bc1..040e522 100644 Binary files a/Example/Tests/ReferenceImages/Tests/a_BetterSegmentedControl__when_initialized__as_example_8__renders_correctly@3x.png and b/Example/Tests/ReferenceImages/Tests/a_BetterSegmentedControl__when_initialized__as_example_8__renders_correctly@3x.png differ diff --git a/Pod/Classes/BetterSegmentedControl.swift b/Pod/Classes/BetterSegmentedControl.swift index cd400ae..88f9bf1 100644 --- a/Pod/Classes/BetterSegmentedControl.swift +++ b/Pod/Classes/BetterSegmentedControl.swift @@ -301,7 +301,7 @@ import Foundation delay: 0.0, usingSpringWithDamping: bouncesOnChange ? Animation.springDamping : 1.0, initialSpringVelocity: 0.0, - options: [UIViewAnimationOptions.beginFromCurrentState, UIViewAnimationOptions.curveEaseOut], + options: [UIView.AnimationOptions.beginFromCurrentState, UIView.AnimationOptions.curveEaseOut], animations: { () -> Void in self.moveIndicatorView()