From d59fe2dd82e3208062fd05ebdba53b031574f894 Mon Sep 17 00:00:00 2001 From: Mac Gallagher Date: Sun, 4 Aug 2019 13:00:52 -0700 Subject: [PATCH] add swift pm support --- Package.resolved | 25 ++++++++++++++ Package.swift | 33 +++++++++++++++++++ README.md | 5 ++- Shuffle.xcodeproj/project.pbxproj | 8 ++--- .../TestableNotificationCenter.swift | 0 .../TestablePanGestureRecognizer.swift | 0 .../TestableTapGestureRecognizer.swift | 0 .../SwipeCard/Mocks/MockCardAnimator.swift | 0 .../Mocks/MockCardLayoutProvider.swift | 0 .../Mocks/MockCardTransformProvider.swift | 0 .../Mocks/MockSwipeCardDelegate.swift | 0 .../Specs/CardAnimationOptionsSpec.swift | 0 .../SwipeCard/Specs/CardAnimatorSpec.swift | 0 .../Specs/CardLayoutProviderSpec.swift | 0 .../Specs/CardTransformProviderSpec.swift | 0 .../SwipeCard/Specs/SwipeCardSpec.swift | 0 .../SwipeCard/Specs/SwipeViewSpec.swift | 0 .../Testables/TestableCardAnimator.swift | 0 .../TestableCardTransformProvider.swift | 0 .../Testables/TestableSwipeCard.swift | 0 .../Testables/TestableSwipeView.swift | 0 .../Mocks/MockCardStackAnimator.swift | 0 .../Mocks/MockCardStackLayoutProvider.swift | 0 .../MockCardStackTransformProvider.swift | 0 .../Mocks/MockSwipeCardStackDataSource.swift | 0 .../Mocks/MockSwipeCardStackDelegate.swift | 0 .../Specs/CardStackLayoutProviderSpec.swift | 0 ...SwipeCardStackSpec+SwipeCardDelegate.swift | 0 .../Specs/SwipeCardStackSpec.swift | 0 .../Testables/TestableSwipeCardStack.swift | 0 30 files changed, 64 insertions(+), 7 deletions(-) create mode 100644 Package.resolved create mode 100644 Package.swift rename Tests/{Shuffle => ShuffleTests}/Shared/Testables/TestableNotificationCenter.swift (100%) rename Tests/{Shuffle => ShuffleTests}/Shared/Testables/TestablePanGestureRecognizer.swift (100%) rename Tests/{Shuffle => ShuffleTests}/Shared/Testables/TestableTapGestureRecognizer.swift (100%) rename Tests/{Shuffle => ShuffleTests}/SwipeCard/Mocks/MockCardAnimator.swift (100%) rename Tests/{Shuffle => ShuffleTests}/SwipeCard/Mocks/MockCardLayoutProvider.swift (100%) rename Tests/{Shuffle => ShuffleTests}/SwipeCard/Mocks/MockCardTransformProvider.swift (100%) rename Tests/{Shuffle => ShuffleTests}/SwipeCard/Mocks/MockSwipeCardDelegate.swift (100%) rename Tests/{Shuffle => ShuffleTests}/SwipeCard/Specs/CardAnimationOptionsSpec.swift (100%) rename Tests/{Shuffle => ShuffleTests}/SwipeCard/Specs/CardAnimatorSpec.swift (100%) rename Tests/{Shuffle => ShuffleTests}/SwipeCard/Specs/CardLayoutProviderSpec.swift (100%) rename Tests/{Shuffle => ShuffleTests}/SwipeCard/Specs/CardTransformProviderSpec.swift (100%) rename Tests/{Shuffle => ShuffleTests}/SwipeCard/Specs/SwipeCardSpec.swift (100%) rename Tests/{Shuffle => ShuffleTests}/SwipeCard/Specs/SwipeViewSpec.swift (100%) rename Tests/{Shuffle => ShuffleTests}/SwipeCard/Testables/TestableCardAnimator.swift (100%) rename Tests/{Shuffle => ShuffleTests}/SwipeCard/Testables/TestableCardTransformProvider.swift (100%) rename Tests/{Shuffle => ShuffleTests}/SwipeCard/Testables/TestableSwipeCard.swift (100%) rename Tests/{Shuffle => ShuffleTests}/SwipeCard/Testables/TestableSwipeView.swift (100%) rename Tests/{Shuffle => ShuffleTests}/SwipeCardStack/Mocks/MockCardStackAnimator.swift (100%) rename Tests/{Shuffle => ShuffleTests}/SwipeCardStack/Mocks/MockCardStackLayoutProvider.swift (100%) rename Tests/{Shuffle => ShuffleTests}/SwipeCardStack/Mocks/MockCardStackTransformProvider.swift (100%) rename Tests/{Shuffle => ShuffleTests}/SwipeCardStack/Mocks/MockSwipeCardStackDataSource.swift (100%) rename Tests/{Shuffle => ShuffleTests}/SwipeCardStack/Mocks/MockSwipeCardStackDelegate.swift (100%) rename Tests/{Shuffle => ShuffleTests}/SwipeCardStack/Specs/CardStackLayoutProviderSpec.swift (100%) rename Tests/{Shuffle => ShuffleTests}/SwipeCardStack/Specs/SwipeCardStackSpec+SwipeCardDelegate.swift (100%) rename Tests/{Shuffle => ShuffleTests}/SwipeCardStack/Specs/SwipeCardStackSpec.swift (100%) rename Tests/{Shuffle => ShuffleTests}/SwipeCardStack/Testables/TestableSwipeCardStack.swift (100%) diff --git a/Package.resolved b/Package.resolved new file mode 100644 index 00000000..9c4b5d95 --- /dev/null +++ b/Package.resolved @@ -0,0 +1,25 @@ +{ + "object": { + "pins": [ + { + "package": "Nimble", + "repositoryURL": "https://github.com/Quick/Nimble", + "state": { + "branch": null, + "revision": "f8657642dfdec9973efc79cc68bcef43a653a2bc", + "version": "8.0.2" + } + }, + { + "package": "Quick", + "repositoryURL": "https://github.com/Quick/Quick", + "state": { + "branch": null, + "revision": "94df9b449508344667e5afc7e80f8bcbff1e4c37", + "version": "2.1.0" + } + } + ] + }, + "version": 1 +} diff --git a/Package.swift b/Package.swift new file mode 100644 index 00000000..90259208 --- /dev/null +++ b/Package.swift @@ -0,0 +1,33 @@ +// swift-tools-version:5.0 +// The swift-tools-version declares the minimum version of Swift required to build this package. + +import PackageDescription + +let package = Package( + name: "Shuffle", + platforms: [ + .iOS(.v9) + ], + products: [ + .library( + name: "Shuffle", + targets: ["Shuffle"]), + ], + dependencies: [ + .package(url: "https://github.com/Quick/Quick", from: "2.1.0"), + .package(url: "https://github.com/Quick/Nimble", from: "8.0.2") + ], + targets: [ + .target( + name: "Shuffle", + dependencies: []), + .testTarget( + name: "ShuffleTests", + dependencies: [ + "Shuffle", + "Quick", + "Nimble" + ] + ) + ] +) diff --git a/README.md b/README.md index 5e9f2196..05fdc32b 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Swift 5 CocoaPods Carthage - +Swift Package Manager
Platform @@ -164,7 +164,6 @@ Shuffle is available through [Carthage](). github "mac-gallagher/Shuffle" - + ### Manual Download and drop the `Shuffle` directory into your project. diff --git a/Shuffle.xcodeproj/project.pbxproj b/Shuffle.xcodeproj/project.pbxproj index 4ec834dc..663ebc4d 100644 --- a/Shuffle.xcodeproj/project.pbxproj +++ b/Shuffle.xcodeproj/project.pbxproj @@ -223,7 +223,7 @@ AD0542BC2271397900B42353 /* Tests */ = { isa = PBXGroup; children = ( - AD18F0DD22B9F85E007BACE9 /* Shuffle */, + AD18F0DD22B9F85E007BACE9 /* ShuffleTests */, AD18F0E022B9F8D2007BACE9 /* Supporting Files */, ); path = Tests; @@ -279,14 +279,14 @@ path = Specs; sourceTree = ""; }; - AD18F0DD22B9F85E007BACE9 /* Shuffle */ = { + AD18F0DD22B9F85E007BACE9 /* ShuffleTests */ = { isa = PBXGroup; children = ( AD42DEB822D97DD6007A82E8 /* Shared */, ADCEAE2422A1B8D4002A5F82 /* SwipeCard */, ADEE86D822ADEC8500AAE7A1 /* SwipeCardStack */, ); - path = Shuffle; + path = ShuffleTests; sourceTree = ""; }; AD18F0DE22B9F874007BACE9 /* Shuffle */ = { @@ -436,7 +436,7 @@ AD18F0E122B9F957007BACE9 /* TinderExample */, AD72AC932270FC7C0083E735 /* Supporting Files */, ); - name = "Example for Shuffle"; + name = "Example for Shuffle"; path = Example; sourceTree = ""; }; diff --git a/Tests/Shuffle/Shared/Testables/TestableNotificationCenter.swift b/Tests/ShuffleTests/Shared/Testables/TestableNotificationCenter.swift similarity index 100% rename from Tests/Shuffle/Shared/Testables/TestableNotificationCenter.swift rename to Tests/ShuffleTests/Shared/Testables/TestableNotificationCenter.swift diff --git a/Tests/Shuffle/Shared/Testables/TestablePanGestureRecognizer.swift b/Tests/ShuffleTests/Shared/Testables/TestablePanGestureRecognizer.swift similarity index 100% rename from Tests/Shuffle/Shared/Testables/TestablePanGestureRecognizer.swift rename to Tests/ShuffleTests/Shared/Testables/TestablePanGestureRecognizer.swift diff --git a/Tests/Shuffle/Shared/Testables/TestableTapGestureRecognizer.swift b/Tests/ShuffleTests/Shared/Testables/TestableTapGestureRecognizer.swift similarity index 100% rename from Tests/Shuffle/Shared/Testables/TestableTapGestureRecognizer.swift rename to Tests/ShuffleTests/Shared/Testables/TestableTapGestureRecognizer.swift diff --git a/Tests/Shuffle/SwipeCard/Mocks/MockCardAnimator.swift b/Tests/ShuffleTests/SwipeCard/Mocks/MockCardAnimator.swift similarity index 100% rename from Tests/Shuffle/SwipeCard/Mocks/MockCardAnimator.swift rename to Tests/ShuffleTests/SwipeCard/Mocks/MockCardAnimator.swift diff --git a/Tests/Shuffle/SwipeCard/Mocks/MockCardLayoutProvider.swift b/Tests/ShuffleTests/SwipeCard/Mocks/MockCardLayoutProvider.swift similarity index 100% rename from Tests/Shuffle/SwipeCard/Mocks/MockCardLayoutProvider.swift rename to Tests/ShuffleTests/SwipeCard/Mocks/MockCardLayoutProvider.swift diff --git a/Tests/Shuffle/SwipeCard/Mocks/MockCardTransformProvider.swift b/Tests/ShuffleTests/SwipeCard/Mocks/MockCardTransformProvider.swift similarity index 100% rename from Tests/Shuffle/SwipeCard/Mocks/MockCardTransformProvider.swift rename to Tests/ShuffleTests/SwipeCard/Mocks/MockCardTransformProvider.swift diff --git a/Tests/Shuffle/SwipeCard/Mocks/MockSwipeCardDelegate.swift b/Tests/ShuffleTests/SwipeCard/Mocks/MockSwipeCardDelegate.swift similarity index 100% rename from Tests/Shuffle/SwipeCard/Mocks/MockSwipeCardDelegate.swift rename to Tests/ShuffleTests/SwipeCard/Mocks/MockSwipeCardDelegate.swift diff --git a/Tests/Shuffle/SwipeCard/Specs/CardAnimationOptionsSpec.swift b/Tests/ShuffleTests/SwipeCard/Specs/CardAnimationOptionsSpec.swift similarity index 100% rename from Tests/Shuffle/SwipeCard/Specs/CardAnimationOptionsSpec.swift rename to Tests/ShuffleTests/SwipeCard/Specs/CardAnimationOptionsSpec.swift diff --git a/Tests/Shuffle/SwipeCard/Specs/CardAnimatorSpec.swift b/Tests/ShuffleTests/SwipeCard/Specs/CardAnimatorSpec.swift similarity index 100% rename from Tests/Shuffle/SwipeCard/Specs/CardAnimatorSpec.swift rename to Tests/ShuffleTests/SwipeCard/Specs/CardAnimatorSpec.swift diff --git a/Tests/Shuffle/SwipeCard/Specs/CardLayoutProviderSpec.swift b/Tests/ShuffleTests/SwipeCard/Specs/CardLayoutProviderSpec.swift similarity index 100% rename from Tests/Shuffle/SwipeCard/Specs/CardLayoutProviderSpec.swift rename to Tests/ShuffleTests/SwipeCard/Specs/CardLayoutProviderSpec.swift diff --git a/Tests/Shuffle/SwipeCard/Specs/CardTransformProviderSpec.swift b/Tests/ShuffleTests/SwipeCard/Specs/CardTransformProviderSpec.swift similarity index 100% rename from Tests/Shuffle/SwipeCard/Specs/CardTransformProviderSpec.swift rename to Tests/ShuffleTests/SwipeCard/Specs/CardTransformProviderSpec.swift diff --git a/Tests/Shuffle/SwipeCard/Specs/SwipeCardSpec.swift b/Tests/ShuffleTests/SwipeCard/Specs/SwipeCardSpec.swift similarity index 100% rename from Tests/Shuffle/SwipeCard/Specs/SwipeCardSpec.swift rename to Tests/ShuffleTests/SwipeCard/Specs/SwipeCardSpec.swift diff --git a/Tests/Shuffle/SwipeCard/Specs/SwipeViewSpec.swift b/Tests/ShuffleTests/SwipeCard/Specs/SwipeViewSpec.swift similarity index 100% rename from Tests/Shuffle/SwipeCard/Specs/SwipeViewSpec.swift rename to Tests/ShuffleTests/SwipeCard/Specs/SwipeViewSpec.swift diff --git a/Tests/Shuffle/SwipeCard/Testables/TestableCardAnimator.swift b/Tests/ShuffleTests/SwipeCard/Testables/TestableCardAnimator.swift similarity index 100% rename from Tests/Shuffle/SwipeCard/Testables/TestableCardAnimator.swift rename to Tests/ShuffleTests/SwipeCard/Testables/TestableCardAnimator.swift diff --git a/Tests/Shuffle/SwipeCard/Testables/TestableCardTransformProvider.swift b/Tests/ShuffleTests/SwipeCard/Testables/TestableCardTransformProvider.swift similarity index 100% rename from Tests/Shuffle/SwipeCard/Testables/TestableCardTransformProvider.swift rename to Tests/ShuffleTests/SwipeCard/Testables/TestableCardTransformProvider.swift diff --git a/Tests/Shuffle/SwipeCard/Testables/TestableSwipeCard.swift b/Tests/ShuffleTests/SwipeCard/Testables/TestableSwipeCard.swift similarity index 100% rename from Tests/Shuffle/SwipeCard/Testables/TestableSwipeCard.swift rename to Tests/ShuffleTests/SwipeCard/Testables/TestableSwipeCard.swift diff --git a/Tests/Shuffle/SwipeCard/Testables/TestableSwipeView.swift b/Tests/ShuffleTests/SwipeCard/Testables/TestableSwipeView.swift similarity index 100% rename from Tests/Shuffle/SwipeCard/Testables/TestableSwipeView.swift rename to Tests/ShuffleTests/SwipeCard/Testables/TestableSwipeView.swift diff --git a/Tests/Shuffle/SwipeCardStack/Mocks/MockCardStackAnimator.swift b/Tests/ShuffleTests/SwipeCardStack/Mocks/MockCardStackAnimator.swift similarity index 100% rename from Tests/Shuffle/SwipeCardStack/Mocks/MockCardStackAnimator.swift rename to Tests/ShuffleTests/SwipeCardStack/Mocks/MockCardStackAnimator.swift diff --git a/Tests/Shuffle/SwipeCardStack/Mocks/MockCardStackLayoutProvider.swift b/Tests/ShuffleTests/SwipeCardStack/Mocks/MockCardStackLayoutProvider.swift similarity index 100% rename from Tests/Shuffle/SwipeCardStack/Mocks/MockCardStackLayoutProvider.swift rename to Tests/ShuffleTests/SwipeCardStack/Mocks/MockCardStackLayoutProvider.swift diff --git a/Tests/Shuffle/SwipeCardStack/Mocks/MockCardStackTransformProvider.swift b/Tests/ShuffleTests/SwipeCardStack/Mocks/MockCardStackTransformProvider.swift similarity index 100% rename from Tests/Shuffle/SwipeCardStack/Mocks/MockCardStackTransformProvider.swift rename to Tests/ShuffleTests/SwipeCardStack/Mocks/MockCardStackTransformProvider.swift diff --git a/Tests/Shuffle/SwipeCardStack/Mocks/MockSwipeCardStackDataSource.swift b/Tests/ShuffleTests/SwipeCardStack/Mocks/MockSwipeCardStackDataSource.swift similarity index 100% rename from Tests/Shuffle/SwipeCardStack/Mocks/MockSwipeCardStackDataSource.swift rename to Tests/ShuffleTests/SwipeCardStack/Mocks/MockSwipeCardStackDataSource.swift diff --git a/Tests/Shuffle/SwipeCardStack/Mocks/MockSwipeCardStackDelegate.swift b/Tests/ShuffleTests/SwipeCardStack/Mocks/MockSwipeCardStackDelegate.swift similarity index 100% rename from Tests/Shuffle/SwipeCardStack/Mocks/MockSwipeCardStackDelegate.swift rename to Tests/ShuffleTests/SwipeCardStack/Mocks/MockSwipeCardStackDelegate.swift diff --git a/Tests/Shuffle/SwipeCardStack/Specs/CardStackLayoutProviderSpec.swift b/Tests/ShuffleTests/SwipeCardStack/Specs/CardStackLayoutProviderSpec.swift similarity index 100% rename from Tests/Shuffle/SwipeCardStack/Specs/CardStackLayoutProviderSpec.swift rename to Tests/ShuffleTests/SwipeCardStack/Specs/CardStackLayoutProviderSpec.swift diff --git a/Tests/Shuffle/SwipeCardStack/Specs/SwipeCardStackSpec+SwipeCardDelegate.swift b/Tests/ShuffleTests/SwipeCardStack/Specs/SwipeCardStackSpec+SwipeCardDelegate.swift similarity index 100% rename from Tests/Shuffle/SwipeCardStack/Specs/SwipeCardStackSpec+SwipeCardDelegate.swift rename to Tests/ShuffleTests/SwipeCardStack/Specs/SwipeCardStackSpec+SwipeCardDelegate.swift diff --git a/Tests/Shuffle/SwipeCardStack/Specs/SwipeCardStackSpec.swift b/Tests/ShuffleTests/SwipeCardStack/Specs/SwipeCardStackSpec.swift similarity index 100% rename from Tests/Shuffle/SwipeCardStack/Specs/SwipeCardStackSpec.swift rename to Tests/ShuffleTests/SwipeCardStack/Specs/SwipeCardStackSpec.swift diff --git a/Tests/Shuffle/SwipeCardStack/Testables/TestableSwipeCardStack.swift b/Tests/ShuffleTests/SwipeCardStack/Testables/TestableSwipeCardStack.swift similarity index 100% rename from Tests/Shuffle/SwipeCardStack/Testables/TestableSwipeCardStack.swift rename to Tests/ShuffleTests/SwipeCardStack/Testables/TestableSwipeCardStack.swift