From 13af9338ae6364e4fc3f3072a89b7ca998623f31 Mon Sep 17 00:00:00 2001 From: Davide De Rosa Date: Sun, 3 Jan 2021 17:52:51 +0100 Subject: [PATCH] Share some resources across targets --- TunnelKit-macOS/Info.plist | 24 -------- TunnelKit.xcodeproj/project.pbxproj | 56 ++++--------------- {TunnelKit-iOS => TunnelKit}/Info.plist | 0 TunnelKitTests-macOS/Info.plist | 22 -------- .../Info.plist | 0 5 files changed, 10 insertions(+), 92 deletions(-) delete mode 100644 TunnelKit-macOS/Info.plist rename {TunnelKit-iOS => TunnelKit}/Info.plist (100%) delete mode 100644 TunnelKitTests-macOS/Info.plist rename {TunnelKitTests-iOS => TunnelKitTests}/Info.plist (100%) diff --git a/TunnelKit-macOS/Info.plist b/TunnelKit-macOS/Info.plist deleted file mode 100644 index a5ae6f9..0000000 --- a/TunnelKit-macOS/Info.plist +++ /dev/null @@ -1,24 +0,0 @@ - - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.1.0 - CFBundleVersion - $(CURRENT_PROJECT_VERSION) - NSPrincipalClass - - - diff --git a/TunnelKit.xcodeproj/project.pbxproj b/TunnelKit.xcodeproj/project.pbxproj index c38662c..dc1ff18 100644 --- a/TunnelKit.xcodeproj/project.pbxproj +++ b/TunnelKit.xcodeproj/project.pbxproj @@ -429,13 +429,11 @@ 0E500EA522493B5B00CAE560 /* tunnelbear.enc.1.key */ = {isa = PBXFileReference; lastKnownFileType = text; path = tunnelbear.enc.1.key; sourceTree = ""; }; 0E58BF5522411F37006FB157 /* LZO.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LZO.h; sourceTree = ""; }; 0E58BF5822411FEF006FB157 /* LZO.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LZO.m; sourceTree = ""; }; - 0E6479DD212EAC96008E6888 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 0E6479E0212EACD6008E6888 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 0E749F612178911C00BB2701 /* pia-2048.pem */ = {isa = PBXFileReference; lastKnownFileType = text; path = "pia-2048.pem"; sourceTree = ""; }; 0E7F3F69246ABA0F006BE77F /* IPHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IPHeader.swift; sourceTree = ""; }; 0E85A25B202CCA3D0059E9F9 /* TunnelKitHost.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = TunnelKitHost.entitlements; sourceTree = ""; }; 0EA82A232190B220007960EB /* TunnelKitTests-macOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "TunnelKitTests-macOS.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; - 0EA82A272190B220007960EB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 0EAC57312494277A00D0FCE0 /* OpenVPNProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OpenVPNProvider.swift; sourceTree = ""; }; 0EAC57322494277A00D0FCE0 /* MockVPNProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MockVPNProvider.swift; sourceTree = ""; }; 0EAC57332494277A00D0FCE0 /* VPNStatus.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VPNStatus.swift; sourceTree = ""; }; @@ -568,6 +566,7 @@ 0E23B3D52297451700304C30 /* OpenVPN */, 0E23B3D62297452B00304C30 /* LZO */, 0E23B3D72297452E00304C30 /* Core */, + 0E11089E1F77B9E800A92462 /* Info.plist */, 0E749F612178911C00BB2701 /* pia-2048.pem */, 0E011F832196E25400BA59EE /* pia-hungary.ovpn */, 0ECEB11A2252CDAD00E9E551 /* tunnelbear.crt */, @@ -598,11 +597,7 @@ isa = PBXGroup; children = ( 0E17D7FB1F730D9F009EE129 /* TunnelKit */, - 0E6479DC212EAC96008E6888 /* TunnelKit-iOS */, - 0E6479DE212EAC96008E6888 /* TunnelKit-macOS */, 0E11089B1F77B9E800A92462 /* TunnelKitTests */, - 0EA82A2E2190B261007960EB /* TunnelKitTests-iOS */, - 0EA82A242190B220007960EB /* TunnelKitTests-macOS */, 0E1108AA1F77B9F900A92462 /* TunnelKitHost */, 0E17D7FA1F730D9F009EE129 /* Products */, 4A8A97836BAB183DA0A91902 /* Pods */, @@ -625,6 +620,7 @@ 0E17D7FB1F730D9F009EE129 /* TunnelKit */ = { isa = PBXGroup; children = ( + 0E6479E0212EACD6008E6888 /* Info.plist */, 0E17D8041F730DDD009EE129 /* Sources */, ); path = TunnelKit; @@ -788,38 +784,6 @@ path = lib; sourceTree = ""; }; - 0E6479DC212EAC96008E6888 /* TunnelKit-iOS */ = { - isa = PBXGroup; - children = ( - 0E6479E0212EACD6008E6888 /* Info.plist */, - ); - path = "TunnelKit-iOS"; - sourceTree = ""; - }; - 0E6479DE212EAC96008E6888 /* TunnelKit-macOS */ = { - isa = PBXGroup; - children = ( - 0E6479DD212EAC96008E6888 /* Info.plist */, - ); - path = "TunnelKit-macOS"; - sourceTree = ""; - }; - 0EA82A242190B220007960EB /* TunnelKitTests-macOS */ = { - isa = PBXGroup; - children = ( - 0EA82A272190B220007960EB /* Info.plist */, - ); - path = "TunnelKitTests-macOS"; - sourceTree = ""; - }; - 0EA82A2E2190B261007960EB /* TunnelKitTests-iOS */ = { - isa = PBXGroup; - children = ( - 0E11089E1F77B9E800A92462 /* Info.plist */, - ); - path = "TunnelKitTests-iOS"; - sourceTree = ""; - }; 0EAC57302494277A00D0FCE0 /* Manager */ = { isa = PBXGroup; children = ( @@ -1690,7 +1654,7 @@ baseConfigurationReference = 3DE692CD2FA087ED390CB9C6 /* Pods-TunnelKit-TunnelKitTests-iOS.debug.xcconfig */; buildSettings = { DEVELOPMENT_TEAM = DTDYD63ZX9; - INFOPLIST_FILE = "TunnelKitTests-iOS/Info.plist"; + INFOPLIST_FILE = TunnelKitTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -1704,7 +1668,7 @@ baseConfigurationReference = 82499AC779944BE0D1CA651C /* Pods-TunnelKit-TunnelKitTests-iOS.release.xcconfig */; buildSettings = { DEVELOPMENT_TEAM = DTDYD63ZX9; - INFOPLIST_FILE = "TunnelKitTests-iOS/Info.plist"; + INFOPLIST_FILE = TunnelKitTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -1882,7 +1846,7 @@ DYLIB_CURRENT_VERSION = 825; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; - INFOPLIST_FILE = "$(SRCROOT)/TunnelKit-iOS/Info.plist"; + INFOPLIST_FILE = TunnelKit/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.algoritmico.apple.TunnelKit; @@ -1907,7 +1871,7 @@ DYLIB_CURRENT_VERSION = 825; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; - INFOPLIST_FILE = "$(SRCROOT)/TunnelKit-iOS/Info.plist"; + INFOPLIST_FILE = TunnelKit/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.algoritmico.apple.TunnelKit; @@ -1932,7 +1896,7 @@ DYLIB_CURRENT_VERSION = 825; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_VERSION = A; - INFOPLIST_FILE = "$(SRCROOT)/TunnelKit-macOS/Info.plist"; + INFOPLIST_FILE = TunnelKit/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.algoritmico.apple.TunnelKit; @@ -1956,7 +1920,7 @@ DYLIB_CURRENT_VERSION = 825; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_VERSION = A; - INFOPLIST_FILE = "$(SRCROOT)/TunnelKit-macOS/Info.plist"; + INFOPLIST_FILE = TunnelKit/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.algoritmico.apple.TunnelKit; @@ -1977,7 +1941,7 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; DEVELOPMENT_TEAM = DTDYD63ZX9; - INFOPLIST_FILE = "TunnelKitTests-macOS/Info.plist"; + INFOPLIST_FILE = TunnelKitTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; @@ -1997,7 +1961,7 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; DEVELOPMENT_TEAM = DTDYD63ZX9; - INFOPLIST_FILE = "TunnelKitTests-macOS/Info.plist"; + INFOPLIST_FILE = TunnelKitTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; MTL_FAST_MATH = YES; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/TunnelKit-iOS/Info.plist b/TunnelKit/Info.plist similarity index 100% rename from TunnelKit-iOS/Info.plist rename to TunnelKit/Info.plist diff --git a/TunnelKitTests-macOS/Info.plist b/TunnelKitTests-macOS/Info.plist deleted file mode 100644 index d9fff86..0000000 --- a/TunnelKitTests-macOS/Info.plist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - BNDL - CFBundleShortVersionString - 3.2.0 - CFBundleVersion - 1 - - diff --git a/TunnelKitTests-iOS/Info.plist b/TunnelKitTests/Info.plist similarity index 100% rename from TunnelKitTests-iOS/Info.plist rename to TunnelKitTests/Info.plist