From 8bb97ef956a8bbf5f0bbfc5f3082a3923e41a2aa Mon Sep 17 00:00:00 2001 From: markpokornycos Date: Tue, 5 Apr 2022 10:46:50 -0600 Subject: [PATCH 1/8] changes version to 0.1 --- AsyncNetworkService.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AsyncNetworkService.xcodeproj/project.pbxproj b/AsyncNetworkService.xcodeproj/project.pbxproj index 8ad438a..b854514 100644 --- a/AsyncNetworkService.xcodeproj/project.pbxproj +++ b/AsyncNetworkService.xcodeproj/project.pbxproj @@ -560,7 +560,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.0; + MARKETING_VERSION = 0.1; PRODUCT_BUNDLE_IDENTIFIER = com.robotsandpencils.AsyncNetworkService; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; @@ -589,7 +589,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.0; + MARKETING_VERSION = 0.1; PRODUCT_BUNDLE_IDENTIFIER = com.robotsandpencils.AsyncNetworkService; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; From d40b2a45379a94a9eb7cde192bf5c9fd72fb6b4e Mon Sep 17 00:00:00 2001 From: markpokornycos Date: Tue, 5 Apr 2022 12:17:50 -0600 Subject: [PATCH 2/8] adds package manifest --- .../contents.xcworkspacedata | 7 ++++++ AsyncNetworkService.xcodeproj/project.pbxproj | 2 ++ Package.swift | 25 +++++++++++++++++++ 3 files changed, 34 insertions(+) create mode 100644 .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata create mode 100644 Package.swift diff --git a/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..919434a --- /dev/null +++ b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/AsyncNetworkService.xcodeproj/project.pbxproj b/AsyncNetworkService.xcodeproj/project.pbxproj index b854514..70b2959 100644 --- a/AsyncNetworkService.xcodeproj/project.pbxproj +++ b/AsyncNetworkService.xcodeproj/project.pbxproj @@ -50,6 +50,7 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 8347924927FCBCC100AFDDF3 /* Package.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Package.swift; sourceTree = ""; }; E8A9142C279B2D3800095A98 /* AsyncNetworkService.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = AsyncNetworkService.framework; sourceTree = BUILT_PRODUCTS_DIR; }; E8A9142F279B2D3800095A98 /* AsyncNetworkService.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AsyncNetworkService.h; sourceTree = ""; }; E8A91430279B2D3800095A98 /* AsyncNetworkService.docc */ = {isa = PBXFileReference; lastKnownFileType = folder.documentationcatalog; path = AsyncNetworkService.docc; sourceTree = ""; }; @@ -113,6 +114,7 @@ E8A91422279B2D3800095A98 = { isa = PBXGroup; children = ( + 8347924927FCBCC100AFDDF3 /* Package.swift */, E8A9142E279B2D3800095A98 /* AsyncNetworkService */, E8A9143A279B2D3800095A98 /* AsyncNetworkServiceTests */, E8A91468279B3C8800095A98 /* AsyncNetworkServiceExample */, diff --git a/Package.swift b/Package.swift new file mode 100644 index 0000000..aee8a26 --- /dev/null +++ b/Package.swift @@ -0,0 +1,25 @@ +// swift-tools-version:5.5 +import PackageDescription + +let package = Package( + name: "AsyncNetworkService", + products: [ + .library( + name: "AsyncNetworkService", + targets: ["AsyncNetworkService"] + ) + ], + dependencies: [ + .package(url: URL(string: "https://github.com/AliSoftware/OHHTTPStubs.git")!, from: "9.0.0") + ], + targets: [ + .target( + name: "AsyncNetworkService", + dependencies: ["OHHTTPStubs"] + ), + .testTarget( + name: "AsyncNetworkServiceTests", + dependencies: ["OHHTTPStubs", "OHHTTPStubsSwift"] + ) + ] +) From 5dae7395f9362177187ca4d85d02374ebbf7c4c7 Mon Sep 17 00:00:00 2001 From: markpokornycos Date: Tue, 5 Apr 2022 12:26:30 -0600 Subject: [PATCH 3/8] changes dependency url to a string --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index aee8a26..aa580d2 100644 --- a/Package.swift +++ b/Package.swift @@ -10,7 +10,7 @@ let package = Package( ) ], dependencies: [ - .package(url: URL(string: "https://github.com/AliSoftware/OHHTTPStubs.git")!, from: "9.0.0") + .package(url: "https://github.com/AliSoftware/OHHTTPStubs.git", from: "9.0.0") ], targets: [ .target( From 1e8f55cf26ceb723ae5c879cc2ce5fb4df5a963d Mon Sep 17 00:00:00 2001 From: markpokornycos Date: Tue, 5 Apr 2022 13:11:19 -0600 Subject: [PATCH 4/8] removes OHHTTPStubsSwift dependency from package manifest --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index aa580d2..aff8b9f 100644 --- a/Package.swift +++ b/Package.swift @@ -19,7 +19,7 @@ let package = Package( ), .testTarget( name: "AsyncNetworkServiceTests", - dependencies: ["OHHTTPStubs", "OHHTTPStubsSwift"] + dependencies: ["OHHTTPStubs"] ) ] ) From 5a6b6c0b1b8f3ad5b4f3bab61aae9fc95d6df9fd Mon Sep 17 00:00:00 2001 From: markpokornycos Date: Tue, 5 Apr 2022 13:32:00 -0600 Subject: [PATCH 5/8] adds source paths for targets --- Package.swift | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Package.swift b/Package.swift index aff8b9f..76eda78 100644 --- a/Package.swift +++ b/Package.swift @@ -15,11 +15,13 @@ let package = Package( targets: [ .target( name: "AsyncNetworkService", - dependencies: ["OHHTTPStubs"] + dependencies: ["OHHTTPStubs"], + path: "[PackageRoot]/AsyncNetworkService" ), .testTarget( name: "AsyncNetworkServiceTests", - dependencies: ["OHHTTPStubs"] + dependencies: ["OHHTTPStubs"], + path: "[PackageRoot]/AsyncNetworkServiceTests" ) ] ) From fc87cc93a79c9ae7e66a2fad6dbe41d36807135b Mon Sep 17 00:00:00 2001 From: markpokornycos Date: Tue, 5 Apr 2022 13:34:55 -0600 Subject: [PATCH 6/8] reform the custom path to target files --- Package.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Package.swift b/Package.swift index 76eda78..abe1222 100644 --- a/Package.swift +++ b/Package.swift @@ -16,12 +16,12 @@ let package = Package( .target( name: "AsyncNetworkService", dependencies: ["OHHTTPStubs"], - path: "[PackageRoot]/AsyncNetworkService" + path: "./AsyncNetworkService" ), .testTarget( name: "AsyncNetworkServiceTests", dependencies: ["OHHTTPStubs"], - path: "[PackageRoot]/AsyncNetworkServiceTests" + path: "./AsyncNetworkServiceTests" ) ] ) From 33587e84d37788be16f93bceb8de774b7caa6c9a Mon Sep 17 00:00:00 2001 From: markpokornycos Date: Tue, 5 Apr 2022 13:41:29 -0600 Subject: [PATCH 7/8] adds iOS & macOS platforms --- Package.swift | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Package.swift b/Package.swift index abe1222..0be384b 100644 --- a/Package.swift +++ b/Package.swift @@ -3,6 +3,10 @@ import PackageDescription let package = Package( name: "AsyncNetworkService", + platforms: [ + .iOS(.v13), + .macOS(.v10_15) + ], products: [ .library( name: "AsyncNetworkService", From b0bef33743d560b860030a55f524758eca0c189a Mon Sep 17 00:00:00 2001 From: markpokornycos Date: Tue, 5 Apr 2022 14:32:46 -0600 Subject: [PATCH 8/8] removes OHHTTPStubs from the AsyncNetworkService target in the manifest --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 0be384b..2dc3778 100644 --- a/Package.swift +++ b/Package.swift @@ -19,7 +19,7 @@ let package = Package( targets: [ .target( name: "AsyncNetworkService", - dependencies: ["OHHTTPStubs"], + dependencies: [], path: "./AsyncNetworkService" ), .testTarget(