From aa0a1bdfb85818bf9d8ffab4b49d94e379575885 Mon Sep 17 00:00:00 2001
From: Nick Bourdakos <bourdakos1@gmail.com>
Date: Sun, 31 Mar 2024 21:36:38 -0400
Subject: [PATCH] Update Package.swift

---
 Package.resolved | 42 ++++++++++++++++++++----------------------
 Package.swift    | 19 +++++++++----------
 2 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/Package.resolved b/Package.resolved
index 677a6086..e659f389 100644
--- a/Package.resolved
+++ b/Package.resolved
@@ -1,25 +1,23 @@
 {
-  "object": {
-    "pins": [
-      {
-        "package": "abseil",
-        "repositoryURL": "https://github.com/bourdakos1/abseil-cpp-SwiftPM.git",
-        "state": {
-          "branch": "cxx17",
-          "revision": "a7042563d167160f56e614cd1e2a32616510d9ec",
-          "version": null
-        }
-      },
-      {
-        "package": "BoringSSL-GRPC",
-        "repositoryURL": "https://github.com/firebase/boringssl-SwiftPM.git",
-        "state": {
-          "branch": null,
-          "revision": "734a8247442fde37df4364c21f6a0085b6a36728",
-          "version": "0.7.2"
-        }
+  "pins" : [
+    {
+      "identity" : "abseil-cpp-swiftpm",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/bourdakos1/abseil-cpp-SwiftPM.git",
+      "state" : {
+        "branch" : "cxx17-test",
+        "revision" : "df22baef6992ac19219337c2a59a4c759fc92c0f"
       }
-    ]
-  },
-  "version": 1
+    },
+    {
+      "identity" : "boringssl-swiftpm",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/firebase/boringssl-SwiftPM.git",
+      "state" : {
+        "revision" : "734a8247442fde37df4364c21f6a0085b6a36728",
+        "version" : "0.7.2"
+      }
+    }
+  ],
+  "version" : 2
 }
diff --git a/Package.swift b/Package.swift
index 41d7d78b..5ae888ef 100644
--- a/Package.swift
+++ b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.5
+// swift-tools-version:5.7
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 import PackageDescription
 
@@ -13,23 +13,22 @@ let package = Package(
   products: [
     // Products define the executables and libraries a package produces, and make them visible to other packages.
     .library(
-      name: "NearbyCoreAdapter",
-      targets: ["NearbyCoreAdapter"]
+      name: "NearbyConnections",
+      targets: ["NearbyConnections"]
     ),
     .library(
-      name: "NearbyConnections",
+      name: "NearbyConnectionsDynamic",
+      type: .dynamic,
       targets: ["NearbyConnections"]
     ),
   ],
   dependencies: [
     // Dependencies declare other packages that this package depends on.
     .package(
-      name: "abseil",
       url: "https://github.com/bourdakos1/abseil-cpp-SwiftPM.git",
-      branch: "cxx17"
+      branch: "cxx17-test"
     ),
     .package(
-      name: "BoringSSL-GRPC",
       url: "https://github.com/firebase/boringssl-SwiftPM.git",
       "0.7.1"..<"0.8.0"
     ),
@@ -172,8 +171,8 @@ let package = Package(
       name: "ukey2",
       dependencies: [
         "protobuf",
-        .product(name: "abseil", package: "abseil"),
-        .product(name: "openssl_grpc", package: "BoringSSL-GRPC"),
+        .product(name: "AbseilCXX17", package: "abseil-cpp-SwiftPM"),
+        .product(name: "openssl_grpc", package: "boringssl-SwiftPM", moduleAliases: ["NearbySSL": "openssl_grpc"]),
       ],
       path: "third_party/ukey2",
       exclude: [
@@ -362,7 +361,7 @@ let package = Package(
         "smhasher",
         "ukey2",
         "protobuf",
-        .product(name: "abseil", package: "abseil"),
+        .product(name: "AbseilCXX17", package: "abseil-cpp-SwiftPM"),
       ],
       path: ".",
       exclude: [