move back to vpnlib

Author: ethanndickson

Coder Desktop/Coder Desktop/Coder_DesktopApp.swift

@@ -1,7 +1,7 @@
 import FluidMenuBarExtra
 import NetworkExtension
 import SwiftUI
-import FSLib
+import VPNLib
 
 @main
 struct DesktopApp: App {

Coder Desktop/FSLib/FileSyncDaemon.swift renamed to Coder Desktop/VPNLib/FileSync/FileSyncDaemon.swift

@@ -3,7 +3,7 @@
 // swift-format-ignore-file
 //
 // Generated by the protocol buffer compiler.
-// Source: Coder Desktop/FSLib/daemon.proto
+// Source: Coder Desktop/VPNLib/FileSync/daemon.proto
 //
 import GRPC
 import NIO

Coder Desktop/FSLib/daemon.grpc.swift renamed to Coder Desktop/VPNLib/FileSync/daemon.grpc.swift

@@ -3,7 +3,7 @@
 // swiftlint:disable all
 //
 // Generated by the Swift generator plugin for the protocol buffer compiler.
-// Source: Coder Desktop/FSLib/daemon.proto
+// Source: Coder Desktop/VPNLib/FileSync/daemon.proto
 //
 // For information on using the generated types, please see the documentation:
 //   https://github.com/apple/swift-protobuf/

Coder Desktop/FSLib/daemon.pb.swift renamed to Coder Desktop/VPNLib/FileSync/daemon.pb.swift

@@ -5,7 +5,6 @@ options:
     macOS: "14.0"
   xcodeVersion: "1600"
   minimumXcodeGenVersion: "2.42.0"
-  # Excldue `.proto` files from all build phases
   fileTypes:
     proto:
       buildPhase: none
@@ -160,8 +159,6 @@ targets:
         embed: true
       - target: VPNLib
         embed: true
-      - target: FSLib
-        embed: true
       - target: VPN
         embed: without-signing # Embed without signing.
       - package: FluidMenuBarExtra
@@ -265,6 +262,7 @@ targets:
       - package: SwiftProtobuf
       - package: SwiftProtobuf
         product: SwiftProtobufPluginLibrary
+      - package: GRPC
       - target: CoderSDK
         embed: false
 
@@ -283,27 +281,6 @@ targets:
         embed: false
       - package: Mocker
 
-  
-  FSLib:
-    type: framework
-    platform: macOS
-    sources:
-      - path: FSLib
-    settings:
-      base:
-        INFOPLIST_KEY_NSHumanReadableCopyright: ""
-        PRODUCT_NAME: "$(TARGET_NAME:c99extidentifier)"
-        SWIFT_EMIT_LOC_STRINGS: YES
-        GENERATE_INFOPLIST_FILE: YES
-        DYLIB_COMPATIBILITY_VERSION: 1
-        DYLIB_CURRENT_VERSION: 1
-        DYLIB_INSTALL_NAME_BASE: "@rpath"
-    dependencies:
-      - package: SwiftProtobuf
-      - package: SwiftProtobuf
-        product: SwiftProtobufPluginLibrary
-      - package: GRPC
-
   CoderSDK:
     type: framework
     platform: macOS

Coder Desktop/FSLib/daemon.proto renamed to Coder Desktop/VPNLib/FileSync/daemon.proto

@@ -48,11 +48,11 @@ $(XCPROJECT): $(PROJECT)/project.yml
 $(PROJECT)/VPNLib/vpn.pb.swift: $(PROJECT)/VPNLib/vpn.proto
 	protoc --swift_opt=Visibility=public --swift_out=. 'Coder Desktop/VPNLib/vpn.proto'
 
-$(PROJECT)/FSLib/daemon.pb.swift: $(PROJECT)/FSLib/daemon.proto
+$(PROJECT)/VPNLib/FileSync/daemon.pb.swift: $(PROJECT)/VPNLib/FileSync/daemon.proto
 	protoc \
 		--swift_out=.\
 		--grpc-swift_out=. \
-		'Coder Desktop/FSLib/daemon.proto'
+		'Coder Desktop/VPNLib/FileSync/daemon.proto'
 
 $(KEYCHAIN_FILE):
 	security create-keychain -p "" "$(APP_SIGNING_KEYCHAIN)"
@@ -136,7 +136,7 @@ clean/build:
 	rm -rf build/ release/ $$out
 
 .PHONY: proto
-proto: $(PROJECT)/VPNLib/vpn.pb.swift $(PROJECT)/FSLib/daemon.pb.swift ## Generate Swift files from protobufs
+proto: $(PROJECT)/VPNLib/vpn.pb.swift $(PROJECT)/VPNLib/FileSync/daemon.pb.swift ## Generate Swift files from protobufs
 
 .PHONY: help
 help: ## Show this help