From 16acce08b9039aaecdb8f3bf372eea3b04fbc0d9 Mon Sep 17 00:00:00 2001 From: Erik Verbruggen Date: Wed, 10 Nov 2021 18:05:55 +0100 Subject: macOS: Use local socket to communicate with finder extension https://github.com/owncloud/client/issues/6343 --- .../OwnCloudFinderSync.xcodeproj/project.pbxproj | 36 ++++++++++++++++------ 1 file changed, 26 insertions(+), 10 deletions(-) (limited to 'shell_integration/MacOSX/OwnCloudFinderSync/OwnCloudFinderSync.xcodeproj') diff --git a/shell_integration/MacOSX/OwnCloudFinderSync/OwnCloudFinderSync.xcodeproj/project.pbxproj b/shell_integration/MacOSX/OwnCloudFinderSync/OwnCloudFinderSync.xcodeproj/project.pbxproj index 5d987c86f..efb88bb56 100644 --- a/shell_integration/MacOSX/OwnCloudFinderSync/OwnCloudFinderSync.xcodeproj/project.pbxproj +++ b/shell_integration/MacOSX/OwnCloudFinderSync/OwnCloudFinderSync.xcodeproj/project.pbxproj @@ -7,6 +7,8 @@ objects = { /* Begin PBXBuildFile section */ + 03559BDE2736D71B0008FD8E /* LineProcessorV1.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03559BDD2736D71B0008FD8E /* LineProcessorV1.swift */; }; + 03DB1B202733F6A70026E647 /* LocalSocketClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03DB1B1F2733F6A70026E647 /* LocalSocketClient.swift */; }; C2B573BA1B1CD91E00303B36 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = C2B573B91B1CD91E00303B36 /* main.m */; }; C2B573D21B1CD94B00303B36 /* main.m in Resources */ = {isa = PBXBuildFile; fileRef = C2B573B91B1CD91E00303B36 /* main.m */; }; C2B573DE1B1CD9CE00303B36 /* FinderSync.m in Sources */ = {isa = PBXBuildFile; fileRef = C2B573DD1B1CD9CE00303B36 /* FinderSync.m */; }; @@ -16,7 +18,6 @@ C2B573F51B1DAD6400303B36 /* ok.iconset in Resources */ = {isa = PBXBuildFile; fileRef = C2B573ED1B1DAD6400303B36 /* ok.iconset */; }; C2B573F71B1DAD6400303B36 /* sync.iconset in Resources */ = {isa = PBXBuildFile; fileRef = C2B573EF1B1DAD6400303B36 /* sync.iconset */; }; C2B573F91B1DAD6400303B36 /* warning.iconset in Resources */ = {isa = PBXBuildFile; fileRef = C2B573F11B1DAD6400303B36 /* warning.iconset */; }; - C2C932F01F0BFC6700C8BCB3 /* SyncClientProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = C2C932EF1F0BFC6700C8BCB3 /* SyncClientProxy.m */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -44,6 +45,9 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 03559BDD2736D71B0008FD8E /* LineProcessorV1.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LineProcessorV1.swift; sourceTree = ""; }; + 03DB1B1E2733F6A70026E647 /* FinderSyncExt-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "FinderSyncExt-Bridging-Header.h"; sourceTree = ""; }; + 03DB1B1F2733F6A70026E647 /* LocalSocketClient.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalSocketClient.swift; sourceTree = ""; }; C2B573B11B1CD91E00303B36 /* desktopclient.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = desktopclient.app; sourceTree = BUILT_PRODUCTS_DIR; }; C2B573B51B1CD91E00303B36 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; C2B573B91B1CD91E00303B36 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; @@ -57,8 +61,7 @@ C2B573ED1B1DAD6400303B36 /* ok.iconset */ = {isa = PBXFileReference; lastKnownFileType = folder.iconset; name = ok.iconset; path = ../../icons/nopadding/ok.iconset; sourceTree = SOURCE_ROOT; }; C2B573EF1B1DAD6400303B36 /* sync.iconset */ = {isa = PBXFileReference; lastKnownFileType = folder.iconset; name = sync.iconset; path = ../../icons/nopadding/sync.iconset; sourceTree = SOURCE_ROOT; }; C2B573F11B1DAD6400303B36 /* warning.iconset */ = {isa = PBXFileReference; lastKnownFileType = folder.iconset; name = warning.iconset; path = ../../icons/nopadding/warning.iconset; sourceTree = SOURCE_ROOT; }; - C2C932EE1F0BFC6700C8BCB3 /* SyncClientProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SyncClientProxy.h; sourceTree = ""; }; - C2C932EF1F0BFC6700C8BCB3 /* SyncClientProxy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SyncClientProxy.m; sourceTree = ""; }; + C2C932EE1F0BFC6700C8BCB3 /* SyncClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SyncClient.h; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -117,11 +120,13 @@ C2B573D81B1CD9CE00303B36 /* FinderSyncExt */ = { isa = PBXGroup; children = ( - C2C932EE1F0BFC6700C8BCB3 /* SyncClientProxy.h */, - C2C932EF1F0BFC6700C8BCB3 /* SyncClientProxy.m */, + C2C932EE1F0BFC6700C8BCB3 /* SyncClient.h */, C2B573DC1B1CD9CE00303B36 /* FinderSync.h */, C2B573DD1B1CD9CE00303B36 /* FinderSync.m */, C2B573D91B1CD9CE00303B36 /* Supporting Files */, + 03DB1B1F2733F6A70026E647 /* LocalSocketClient.swift */, + 03559BDD2736D71B0008FD8E /* LineProcessorV1.swift */, + 03DB1B1E2733F6A70026E647 /* FinderSyncExt-Bridging-Header.h */, ); path = FinderSyncExt; sourceTree = ""; @@ -195,6 +200,7 @@ C2B573D61B1CD9CE00303B36 = { CreatedOnToolsVersion = 6.3.1; DevelopmentTeam = 9B5WD74GWJ; + LastSwiftMigration = 1310; SystemCapabilities = { com.apple.ApplicationGroups.Mac = { enabled = 1; @@ -275,8 +281,9 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - C2C932F01F0BFC6700C8BCB3 /* SyncClientProxy.m in Sources */, + 03DB1B202733F6A70026E647 /* LocalSocketClient.swift in Sources */, C2B573DE1B1CD9CE00303B36 /* FinderSync.m in Sources */, + 03559BDE2736D71B0008FD8E /* LineProcessorV1.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -294,18 +301,21 @@ C2B573991B1CD88000303B36 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + MACOSX_DEPLOYMENT_TARGET = 10.12; }; name = Debug; }; C2B5739A1B1CD88000303B36 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + MACOSX_DEPLOYMENT_TARGET = 10.12; }; name = Release; }; C2B573CD1B1CD91E00303B36 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ALWAYS_SEARCH_USER_PATHS = NO; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; @@ -343,7 +353,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = desktopclient/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.12; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -355,6 +365,7 @@ C2B573CE1B1CD91E00303B36 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ALWAYS_SEARCH_USER_PATHS = NO; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; @@ -386,7 +397,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = desktopclient/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.12; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; @@ -434,7 +445,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = FinderSyncExt/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @executable_path/../../../../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.12; MTL_ENABLE_DEBUG_INFO = YES; OC_APPLICATION_NAME = ownCloud; OC_APPLICATION_REV_DOMAIN = com.owncloud.desktopclient; @@ -445,6 +456,9 @@ PROVISIONING_PROFILE = ""; SDKROOT = macosx; SKIP_INSTALL = YES; + SWIFT_OBJC_BRIDGING_HEADER = "FinderSyncExt/FinderSyncExt-Bridging-Header.h"; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -483,7 +497,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = FinderSyncExt/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @executable_path/../../../../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.12; MTL_ENABLE_DEBUG_INFO = NO; OC_APPLICATION_NAME = ownCloud; OC_APPLICATION_REV_DOMAIN = com.owncloud.desktopclient; @@ -493,6 +507,8 @@ PROVISIONING_PROFILE = ""; SDKROOT = macosx; SKIP_INSTALL = YES; + SWIFT_OBJC_BRIDGING_HEADER = "FinderSyncExt/FinderSyncExt-Bridging-Header.h"; + SWIFT_VERSION = 5.0; }; name = Release; }; -- cgit v1.2.3