From d477c3f8a6343c283a4cf9eec62aec32329290cb Mon Sep 17 00:00:00 2001 From: Boram Jeong Date: Tue, 26 Jan 2021 17:23:59 +0900 Subject: [PATCH 01/11] Swift Package Manager support --- Package.swift | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 Package.swift diff --git a/Package.swift b/Package.swift new file mode 100644 index 00000000..f3af0ee6 --- /dev/null +++ b/Package.swift @@ -0,0 +1,25 @@ +// swift-tools-version 5.3 +import PackageDescription + +let package = Package( + name: "PopupDialog", + platforms: [ + .iOS(.v10), + ], + products: [ + .library( + name: "PopupDialog", + targets: ["PopupDialog"]), + ], + dependencies: [ + // no dependencies + ], + targets: [ + .target( + name: "PopupDialog", + dependencies: []), + .testTarget( + name: "PopupDialogTests", + dependencies: ["PopupDialog"]), + ] +) From 83b919c057e8edf95cc40c60647beb302bd67b86 Mon Sep 17 00:00:00 2001 From: Boram Jeong Date: Tue, 26 Jan 2021 17:31:17 +0900 Subject: [PATCH 02/11] Swift Package Manager Support --- Package.swift | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Package.swift b/Package.swift index f3af0ee6..fafd5cc4 100644 --- a/Package.swift +++ b/Package.swift @@ -1,20 +1,23 @@ -// swift-tools-version 5.3 +// swift-tools-version:5.3 +// The swift-tools-version declares the minimum version of Swift required to build this package. + import PackageDescription let package = Package( name: "PopupDialog", - platforms: [ - .iOS(.v10), - ], products: [ + // Products define the executables and libraries a package produces, and make them visible to other packages. .library( name: "PopupDialog", targets: ["PopupDialog"]), ], dependencies: [ - // no dependencies + // Dependencies declare other packages that this package depends on. + // .package(url: /* package url */, from: "1.0.0"), ], targets: [ + // Targets are the basic building blocks of a package. A target can define a module or a test suite. + // Targets can depend on other targets in this package, and on products in packages this package depends on. .target( name: "PopupDialog", dependencies: []), From 4b2b15e3ec7dd27d93a63572853e7052dd72646b Mon Sep 17 00:00:00 2001 From: Boram Jeong Date: Tue, 26 Jan 2021 17:40:45 +0900 Subject: [PATCH 03/11] Swift Package Manager Support --- Package.swift | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Package.swift b/Package.swift index fafd5cc4..8c7fb719 100644 --- a/Package.swift +++ b/Package.swift @@ -20,9 +20,11 @@ let package = Package( // Targets can depend on other targets in this package, and on products in packages this package depends on. .target( name: "PopupDialog", - dependencies: []), + dependencies: [], + path: "PopupDialog/Classes"), .testTarget( name: "PopupDialogTests", - dependencies: ["PopupDialog"]), + dependencies: ["PopupDialog"], + path: "Tests"), ] ) From df7f95c8149d0f64ac8cf33e98e79f01d8e9e73d Mon Sep 17 00:00:00 2001 From: Boram Jeong Date: Tue, 26 Jan 2021 19:28:06 +0900 Subject: [PATCH 04/11] Swift Package Manager Support --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 8c7fb719..b2e0eb9d 100644 --- a/Package.swift +++ b/Package.swift @@ -13,7 +13,7 @@ let package = Package( ], dependencies: [ // Dependencies declare other packages that this package depends on. - // .package(url: /* package url */, from: "1.0.0"), + .package(url: "https://github.com/KyoheiG3/DynamicBlurView.git", from: "5.0.0"), ], targets: [ // Targets are the basic building blocks of a package. A target can define a module or a test suite. From ec5b2fd3e1a24002f521fff17232561051b088e2 Mon Sep 17 00:00:00 2001 From: Boram Jeong Date: Wed, 27 Jan 2021 00:27:08 +0900 Subject: [PATCH 05/11] Swift Package Manager support --- .../package.xcworkspace/contents.xcworkspacedata | 7 +++++++ Package.resolved | 16 ++++++++++++++++ Package.swift | 9 ++++++--- 3 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata create mode 100644 Package.resolved diff --git a/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata new file mode 100644 index 00000000..919434a6 --- /dev/null +++ b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/Package.resolved b/Package.resolved new file mode 100644 index 00000000..c0f5b27e --- /dev/null +++ b/Package.resolved @@ -0,0 +1,16 @@ +{ + "object": { + "pins": [ + { + "package": "DynamicBlurView", + "repositoryURL": "https://github.com/KyoheiG3/DynamicBlurView.git", + "state": { + "branch": null, + "revision": "fbf91352ff3defee8e1fc7525696404bc3740a86", + "version": "5.0.4" + } + } + ] + }, + "version": 1 +} diff --git a/Package.swift b/Package.swift index b2e0eb9d..e33288f8 100644 --- a/Package.swift +++ b/Package.swift @@ -5,15 +5,18 @@ import PackageDescription let package = Package( name: "PopupDialog", + platforms: [ + .iOS(.v10) + ], products: [ // Products define the executables and libraries a package produces, and make them visible to other packages. .library( name: "PopupDialog", - targets: ["PopupDialog"]), + targets: ["PopupDialog"]) ], dependencies: [ // Dependencies declare other packages that this package depends on. - .package(url: "https://github.com/KyoheiG3/DynamicBlurView.git", from: "5.0.0"), + .package(url: "https://github.com/KyoheiG3/DynamicBlurView.git", from: "5.0.0") ], targets: [ // Targets are the basic building blocks of a package. A target can define a module or a test suite. @@ -25,6 +28,6 @@ let package = Package( .testTarget( name: "PopupDialogTests", dependencies: ["PopupDialog"], - path: "Tests"), + path: "Tests") ] ) From b0a4161a31621b65bfdbd2c8b2c1eef8db702c9d Mon Sep 17 00:00:00 2001 From: Boram Jeong Date: Wed, 27 Jan 2021 00:35:39 +0900 Subject: [PATCH 06/11] Swift Package Manager support --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index e33288f8..a400e783 100644 --- a/Package.swift +++ b/Package.swift @@ -23,7 +23,7 @@ let package = Package( // Targets can depend on other targets in this package, and on products in packages this package depends on. .target( name: "PopupDialog", - dependencies: [], + dependencies: ["DynamicBlurView"], path: "PopupDialog/Classes"), .testTarget( name: "PopupDialogTests", From c7e3a66eea5724f897e1aa3e6ee6c3a16aca6f8e Mon Sep 17 00:00:00 2001 From: Boram Jeong Date: Wed, 27 Jan 2021 00:41:54 +0900 Subject: [PATCH 07/11] Swift Package Manager support --- Package.resolved | 16 ---------------- Package.swift | 2 +- 2 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 Package.resolved diff --git a/Package.resolved b/Package.resolved deleted file mode 100644 index c0f5b27e..00000000 --- a/Package.resolved +++ /dev/null @@ -1,16 +0,0 @@ -{ - "object": { - "pins": [ - { - "package": "DynamicBlurView", - "repositoryURL": "https://github.com/KyoheiG3/DynamicBlurView.git", - "state": { - "branch": null, - "revision": "fbf91352ff3defee8e1fc7525696404bc3740a86", - "version": "5.0.4" - } - } - ] - }, - "version": 1 -} diff --git a/Package.swift b/Package.swift index a400e783..92b731d1 100644 --- a/Package.swift +++ b/Package.swift @@ -16,7 +16,7 @@ let package = Package( ], dependencies: [ // Dependencies declare other packages that this package depends on. - .package(url: "https://github.com/KyoheiG3/DynamicBlurView.git", from: "5.0.0") + .package(url: "https://github.com/KyoheiG3/DynamicBlurView", from: "3.0.1") ], targets: [ // Targets are the basic building blocks of a package. A target can define a module or a test suite. From 15d68a900fb7c339c37a6a9ffb8493100c42d36f Mon Sep 17 00:00:00 2001 From: Boram Jeong Date: Wed, 27 Jan 2021 09:58:24 +0900 Subject: [PATCH 08/11] Swift Package Manager support --- Package.swift | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 92b731d1..ce8b1530 100644 --- a/Package.swift +++ b/Package.swift @@ -16,7 +16,10 @@ let package = Package( ], dependencies: [ // Dependencies declare other packages that this package depends on. - .package(url: "https://github.com/KyoheiG3/DynamicBlurView", from: "3.0.1") + .package( + name: "DynamicBlurView", + url: "https://github.com/KyoheiG3/DynamicBlurView", + from: "3.0.1") ], targets: [ // Targets are the basic building blocks of a package. A target can define a module or a test suite. From 8d5219515018040c145dbee9cdd5be7539be5175 Mon Sep 17 00:00:00 2001 From: Boram Jeong Date: Wed, 27 Jan 2021 10:08:49 +0900 Subject: [PATCH 09/11] Swift Package Manager support --- Package.resolved | 16 ++++++++++++++++ Package.swift | 5 +++-- 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 Package.resolved diff --git a/Package.resolved b/Package.resolved new file mode 100644 index 00000000..fe7b03b7 --- /dev/null +++ b/Package.resolved @@ -0,0 +1,16 @@ +{ + "object": { + "pins": [ + { + "package": "DynamicBlurView", + "repositoryURL": "https://github.com/KyoheiG3/DynamicBlurView", + "state": { + "branch": null, + "revision": "fbf91352ff3defee8e1fc7525696404bc3740a86", + "version": "5.0.4" + } + } + ] + }, + "version": 1 +} diff --git a/Package.swift b/Package.swift index ce8b1530..c0164477 100644 --- a/Package.swift +++ b/Package.swift @@ -19,7 +19,7 @@ let package = Package( .package( name: "DynamicBlurView", url: "https://github.com/KyoheiG3/DynamicBlurView", - from: "3.0.1") + from: "5.0.0") ], targets: [ // Targets are the basic building blocks of a package. A target can define a module or a test suite. @@ -27,7 +27,8 @@ let package = Package( .target( name: "PopupDialog", dependencies: ["DynamicBlurView"], - path: "PopupDialog/Classes"), + path: "PopupDialog/Classes", + exclude: ["Example"]), .testTarget( name: "PopupDialogTests", dependencies: ["PopupDialog"], From da9145c92a8710956bdfd4a70f1a1398f7317a95 Mon Sep 17 00:00:00 2001 From: Boram Jeong Date: Wed, 27 Jan 2021 10:32:15 +0900 Subject: [PATCH 10/11] Swift Package Manager support --- Package.resolved | 27 +++++++++++++++++++ Package.swift | 15 +++++++---- .../Classes/InteractiveTransition.swift | 1 + .../Classes/PopupDialogOverlayView.swift | 1 + 4 files changed, 39 insertions(+), 5 deletions(-) diff --git a/Package.resolved b/Package.resolved index fe7b03b7..018434ef 100644 --- a/Package.resolved +++ b/Package.resolved @@ -1,6 +1,24 @@ { "object": { "pins": [ + { + "package": "CwlCatchException", + "repositoryURL": "https://github.com/mattgallagher/CwlCatchException.git", + "state": { + "branch": null, + "revision": "f809deb30dc5c9d9b78c872e553261a61177721a", + "version": "2.0.0" + } + }, + { + "package": "CwlPreconditionTesting", + "repositoryURL": "https://github.com/mattgallagher/CwlPreconditionTesting.git", + "state": { + "branch": null, + "revision": "02b7a39a99c4da27abe03cab2053a9034379639f", + "version": "2.0.0" + } + }, { "package": "DynamicBlurView", "repositoryURL": "https://github.com/KyoheiG3/DynamicBlurView", @@ -9,6 +27,15 @@ "revision": "fbf91352ff3defee8e1fc7525696404bc3740a86", "version": "5.0.4" } + }, + { + "package": "Nimble", + "repositoryURL": "https://github.com/Quick/Nimble.git", + "state": { + "branch": null, + "revision": "e491a6731307bb23783bf664d003be9b2fa59ab5", + "version": "9.0.0" + } } ] }, diff --git a/Package.swift b/Package.swift index c0164477..c63552bc 100644 --- a/Package.swift +++ b/Package.swift @@ -19,19 +19,24 @@ let package = Package( .package( name: "DynamicBlurView", url: "https://github.com/KyoheiG3/DynamicBlurView", - from: "5.0.0") + from: "5.0.0"), + .package( + name: "Nimble", + url: "https://github.com/Quick/Nimble.git", + from: "9.0.0"), + .package( + path: "Example/iOSSnapshotTestCase") ], targets: [ // Targets are the basic building blocks of a package. A target can define a module or a test suite. // Targets can depend on other targets in this package, and on products in packages this package depends on. .target( name: "PopupDialog", - dependencies: ["DynamicBlurView"], - path: "PopupDialog/Classes", - exclude: ["Example"]), + dependencies: ["DynamicBlurView", "Nimble"], + path: "PopupDialog/Classes"), .testTarget( name: "PopupDialogTests", - dependencies: ["PopupDialog"], + dependencies: ["PopupDialog", "FBSnapshotTestCase"], path: "Tests") ] ) diff --git a/PopupDialog/Classes/InteractiveTransition.swift b/PopupDialog/Classes/InteractiveTransition.swift index 0f9f2f43..28182aa2 100644 --- a/PopupDialog/Classes/InteractiveTransition.swift +++ b/PopupDialog/Classes/InteractiveTransition.swift @@ -24,6 +24,7 @@ // import Foundation +import UIKit // Handles interactive transition triggered via pan gesture recognizer on dialog final internal class InteractiveTransition: UIPercentDrivenInteractiveTransition { diff --git a/PopupDialog/Classes/PopupDialogOverlayView.swift b/PopupDialog/Classes/PopupDialogOverlayView.swift index a1326c08..2999f2ad 100644 --- a/PopupDialog/Classes/PopupDialogOverlayView.swift +++ b/PopupDialog/Classes/PopupDialogOverlayView.swift @@ -24,6 +24,7 @@ // import Foundation +import UIKit import DynamicBlurView /// The (blurred) overlay view below the popup dialog From 39bece7c189e83737f402492223cb77a7d6f5251 Mon Sep 17 00:00:00 2001 From: Boram Jeong Date: Wed, 27 Jan 2021 10:35:36 +0900 Subject: [PATCH 11/11] Swift Package Manager support --- Package.resolved | 27 --------------------------- Package.swift | 8 ++++---- 2 files changed, 4 insertions(+), 31 deletions(-) diff --git a/Package.resolved b/Package.resolved index 018434ef..fe7b03b7 100644 --- a/Package.resolved +++ b/Package.resolved @@ -1,24 +1,6 @@ { "object": { "pins": [ - { - "package": "CwlCatchException", - "repositoryURL": "https://github.com/mattgallagher/CwlCatchException.git", - "state": { - "branch": null, - "revision": "f809deb30dc5c9d9b78c872e553261a61177721a", - "version": "2.0.0" - } - }, - { - "package": "CwlPreconditionTesting", - "repositoryURL": "https://github.com/mattgallagher/CwlPreconditionTesting.git", - "state": { - "branch": null, - "revision": "02b7a39a99c4da27abe03cab2053a9034379639f", - "version": "2.0.0" - } - }, { "package": "DynamicBlurView", "repositoryURL": "https://github.com/KyoheiG3/DynamicBlurView", @@ -27,15 +9,6 @@ "revision": "fbf91352ff3defee8e1fc7525696404bc3740a86", "version": "5.0.4" } - }, - { - "package": "Nimble", - "repositoryURL": "https://github.com/Quick/Nimble.git", - "state": { - "branch": null, - "revision": "e491a6731307bb23783bf664d003be9b2fa59ab5", - "version": "9.0.0" - } } ] }, diff --git a/Package.swift b/Package.swift index c63552bc..4251a440 100644 --- a/Package.swift +++ b/Package.swift @@ -22,9 +22,9 @@ let package = Package( from: "5.0.0"), .package( name: "Nimble", - url: "https://github.com/Quick/Nimble.git", - from: "9.0.0"), + path: "Example/Nimble"), .package( + name: "FBSnapshotTestCase", path: "Example/iOSSnapshotTestCase") ], targets: [ @@ -32,11 +32,11 @@ let package = Package( // Targets can depend on other targets in this package, and on products in packages this package depends on. .target( name: "PopupDialog", - dependencies: ["DynamicBlurView", "Nimble"], + dependencies: ["DynamicBlurView"], path: "PopupDialog/Classes"), .testTarget( name: "PopupDialogTests", - dependencies: ["PopupDialog", "FBSnapshotTestCase"], + dependencies: ["PopupDialog", "Nimble", "FBSnapshotTestCase"], path: "Tests") ] )