From 0a65f64e0139bf1d2d7058eda569784d2bb131b6 Mon Sep 17 00:00:00 2001 From: "J.J. Riemersma" Date: Sat, 6 Feb 2021 19:36:57 +0100 Subject: [PATCH 01/10] Create Package.swift --- Package.swift | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 Package.swift diff --git a/Package.swift b/Package.swift new file mode 100644 index 0000000..a346f6d --- /dev/null +++ b/Package.swift @@ -0,0 +1,13 @@ +import PackageDescription + +let package = Package( + name: "geofire_objc", + products: [ + .library(name: "geofire_objc", targets: ["geofire_objc"]) + ], + targets: [ + .target( + name: "GeoFire", + path: "GeoFire", + ] +) From 298e03d32c7a2e6e4f8225399d5d8111f475e821 Mon Sep 17 00:00:00 2001 From: "J.J. Riemersma" Date: Sat, 6 Feb 2021 19:43:18 +0100 Subject: [PATCH 02/10] Update Package.swift --- Package.swift | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Package.swift b/Package.swift index a346f6d..439045e 100644 --- a/Package.swift +++ b/Package.swift @@ -1,7 +1,11 @@ +// swift-tools-version:5.3 import PackageDescription let package = Package( name: "geofire_objc", + platforms: [ + .iOS(.v14) + ], products: [ .library(name: "geofire_objc", targets: ["geofire_objc"]) ], From ba7c3f74991a10effaa93536bf8dabcb876543ce Mon Sep 17 00:00:00 2001 From: "J.J. Riemersma" Date: Sat, 6 Feb 2021 19:58:07 +0100 Subject: [PATCH 03/10] Update Package.swift --- Package.swift | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/Package.swift b/Package.swift index 439045e..8d7d804 100644 --- a/Package.swift +++ b/Package.swift @@ -1,17 +1,25 @@ -// swift-tools-version:5.3 +// swift-tools-version:5.1 import PackageDescription let package = Package( - name: "geofire_objc", + name: "geofire-objc", platforms: [ - .iOS(.v14) + .iOS(.v14), ], products: [ - .library(name: "geofire_objc", targets: ["geofire_objc"]) + .library( + name: "GeoFire", + targets: ["GeoFire"]), + ], + dependencies: [ + // no dependencies ], targets: [ .target( name: "GeoFire", - path: "GeoFire", + dependencies: []), + .testTarget( + name: "GeoFireTests", + dependencies: ["GeoFire"]), ] ) From 68e5f6a06164257ea23c6b9d0ba8c1076352d6c5 Mon Sep 17 00:00:00 2001 From: "J.J. Riemersma" Date: Sat, 6 Feb 2021 19:59:45 +0100 Subject: [PATCH 04/10] Update Package.swift --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 8d7d804..1fad2eb 100644 --- a/Package.swift +++ b/Package.swift @@ -4,7 +4,7 @@ import PackageDescription let package = Package( name: "geofire-objc", platforms: [ - .iOS(.v14), + .iOS(.v13), ], products: [ .library( From f0010556af4f8c65aa890f687db5caf51ba71777 Mon Sep 17 00:00:00 2001 From: "J.J. Riemersma" Date: Sat, 6 Feb 2021 20:01:52 +0100 Subject: [PATCH 05/10] Update Package.swift --- Package.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/Package.swift b/Package.swift index 1fad2eb..bee0c96 100644 --- a/Package.swift +++ b/Package.swift @@ -18,6 +18,7 @@ let package = Package( .target( name: "GeoFire", dependencies: []), + path: "GeoFire" .testTarget( name: "GeoFireTests", dependencies: ["GeoFire"]), From 7a8992945a452b0b9dbe097c33368387da2f18f7 Mon Sep 17 00:00:00 2001 From: "J.J. Riemersma" Date: Sat, 6 Feb 2021 20:04:33 +0100 Subject: [PATCH 06/10] Update Package.swift --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index bee0c96..41a7eca 100644 --- a/Package.swift +++ b/Package.swift @@ -18,7 +18,7 @@ let package = Package( .target( name: "GeoFire", dependencies: []), - path: "GeoFire" + path: "GeoFire", .testTarget( name: "GeoFireTests", dependencies: ["GeoFire"]), From 865499f2ed8ed894d67619f87acbc2b7a96e855a Mon Sep 17 00:00:00 2001 From: "J.J. Riemersma" Date: Sat, 6 Feb 2021 20:09:21 +0100 Subject: [PATCH 07/10] Update Package.swift --- Package.swift | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Package.swift b/Package.swift index 41a7eca..d65b79d 100644 --- a/Package.swift +++ b/Package.swift @@ -17,8 +17,9 @@ let package = Package( targets: [ .target( name: "GeoFire", - dependencies: []), - path: "GeoFire", + dependencies: [], + path: "GeoFire" + ), .testTarget( name: "GeoFireTests", dependencies: ["GeoFire"]), From 675e5c68343eb1667c30ca5705d8b436999a92ca Mon Sep 17 00:00:00 2001 From: "J.J. Riemersma" Date: Sat, 6 Feb 2021 20:29:09 +0100 Subject: [PATCH 08/10] Update Package.swift --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index d65b79d..34c31f0 100644 --- a/Package.swift +++ b/Package.swift @@ -18,7 +18,7 @@ let package = Package( .target( name: "GeoFire", dependencies: [], - path: "GeoFire" + path: "GeoFire/implementation" ), .testTarget( name: "GeoFireTests", From 2927e533050df2514b6ec181f54cdca0f4067edc Mon Sep 17 00:00:00 2001 From: "J.J. Riemersma" Date: Sat, 6 Feb 2021 20:29:39 +0100 Subject: [PATCH 09/10] Update Package.swift --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 34c31f0..b7ad1bb 100644 --- a/Package.swift +++ b/Package.swift @@ -18,7 +18,7 @@ let package = Package( .target( name: "GeoFire", dependencies: [], - path: "GeoFire/implementation" + path: "GeoFire/Implementation" ), .testTarget( name: "GeoFireTests", From 3972491b26b3931ebe00cc796ef09392f98fbcdc Mon Sep 17 00:00:00 2001 From: "J.J. Riemersma" Date: Tue, 9 Feb 2021 19:03:51 +0100 Subject: [PATCH 10/10] (Unsuccesful) Attempt to add swift package manager functionality --- Package.swift | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/Package.swift b/Package.swift index b7ad1bb..a0744fd 100644 --- a/Package.swift +++ b/Package.swift @@ -1,27 +1,41 @@ -// swift-tools-version:5.1 +// swift-tools-version:5.3 import PackageDescription let package = Package( name: "geofire-objc", platforms: [ - .iOS(.v13), + .iOS(.v13) ], products: [ .library( name: "GeoFire", - targets: ["GeoFire"]), + targets: ["GeoFire"] + ) ], dependencies: [ - // no dependencies + .package( + name: "Firebase", + url: "https://github.com/firebase/firebase-ios-sdk.git", + "7.0.0" ..< "7.6.0" + ), + .package( + name: "FirebaseFirestore", + url: "https://github.com/firebase/firebase-ios-sdk.git", + .exact("1.19.0") + ) ], targets: [ .target( name: "GeoFire", - dependencies: [], + dependencies: [ + "Firebase", + "FirebaseFirestore" + ], path: "GeoFire/Implementation" ), .testTarget( name: "GeoFireTests", - dependencies: ["GeoFire"]), + dependencies: ["GeoFire"] + ) ] )