Fix Package.swift and remove protoc from github actions

PiperOrigin-RevId: 856459928

.github/workflows/validate.yaml

@@ -28,8 +28,6 @@ jobs:
       uses: actions/checkout@v6
       with:
         submodules: true
-    - name: setup protobuf
-      uses: ./.github/actions/swift-protobuf
     - name: Build
       run: swift build
 
@@ -40,8 +38,6 @@ jobs:
     - uses: actions/checkout@v6
       with:
         submodules: true
-    - name: setup protobuf
-      uses: ./.github/actions/swift-protobuf
     - name: Test
       run: swift test
 

Package.resolved

@@ -3,10 +3,10 @@
     {
       "identity" : "abseil-cpp-swiftpm",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/bourdakos1/abseil-cpp-SwiftPM.git",
+      "location" : "https://github.com/firebase/abseil-cpp-SwiftPM.git",
       "state" : {
-        "branch" : "cxx17-test",
-        "revision" : "f2c56293ba0c7dc4fed62c38dfea5c5c2d632166"
+        "branch" : "main",
+        "revision" : "1c50c2cd0bffe5a03cde6fe17129334dcf05071b"
       }
     },
     {

Package.swift

@@ -74,13 +74,13 @@ let package = Package(
       sources: [
         "ukey2/src/securemessage/src/securemessage",
         "ukey2/src/main/cpp/src/securegcm",
-        "ukey2/protoc_out",
+        "compiled_proto",
       ],
       publicHeadersPath: "include",
       cSettings: [
         .headerSearchPath("ukey2/"),
-        .headerSearchPath("ukey2/protoc_out/"),
-        .headerSearchPath("ukey2/protoc_out/src/main/proto"),
+        .headerSearchPath("compiled_proto/"),
+        .headerSearchPath("compiled_proto/src/main/proto"),
       ]
     ),
     .target(
@@ -94,7 +94,7 @@ let package = Package(
       dependencies: [
         .product(name: "abseil", package: "abseil-cpp-SwiftPM"),
       ],
-      path: "google-protobuf/third_party/utf8_range",
+      path: "third_party/protobuf/third_party/utf8_range",
       sources: [
         "utf8_validity.h",
         "utf8_range.h",
@@ -110,7 +110,7 @@ let package = Package(
       dependencies: [
         "protobuf-utf8",
       ],
-      path: "google-protobuf/src",
+      path: "third_party/protobuf/src",
       exclude: [
         "google/protobuf/bridge",
         "google/protobuf/compiler",
@@ -535,7 +535,7 @@ let package = Package(
         "internal/platform/medium_environment.cc",
       ],
       sources: [
-        "protoc_out",
+        "compiled_proto",
         "connections",
         "internal",
         "proto",
@@ -543,10 +543,9 @@ let package = Package(
       publicHeadersPath: "connections",
       cSettings: [
         .headerSearchPath("./"),
-        .headerSearchPath("protoc_out/"),
+        .headerSearchPath("compiled_proto/"),
         .headerSearchPath("third_party/ukey2/ukey2/"),
-        .headerSearchPath("third_party/ukey2/ukey2/protoc_out/"),
-        .headerSearchPath("third_party/ukey2/ukey2/protoc_out/src/main/proto"),
+        .headerSearchPath("third_party/ukey2/compiled_proto/src/main/proto"),
         .define("NO_WEBRTC"),
       ]
     ),
@@ -563,7 +562,7 @@ let package = Package(
       publicHeadersPath: "connections/c",
       cSettings: [
         .headerSearchPath("./"),
-        .headerSearchPath("protoc_out/"),
+        .headerSearchPath("compiled_proto/"),
         .define("NO_WEBRTC"),
       ]
     ),
@@ -576,7 +575,7 @@ let package = Package(
       publicHeadersPath: "connections/swift/NearbyCoreAdapter/Sources/Public",
       cSettings: [
         .headerSearchPath("./"),
-        .headerSearchPath("protoc_out/"),
+        .headerSearchPath("compiled_proto/"),
         .define("NO_WEBRTC"),
       ]
     ),