From 7ecbd48e180d3f8e83499b56ee1e6e9556d54bfa Mon Sep 17 00:00:00 2001 From: Davide De Rosa Date: Sat, 6 Nov 2021 22:15:57 +0100 Subject: [PATCH] Do some project cleanup - Update bundle - Merge old CFG_* variables - Drop useless Metal build settings - Fix package warning about case --- Config.xcconfig | 9 ++------- Gemfile.lock | 10 ++++----- Passepartout.xcodeproj/project.pbxproj | 28 ++++++++------------------ Passepartout/App/iOS/Info.plist | 2 +- Passepartout/App/macOS/Info.plist | 2 +- PassepartoutCore/Package.resolved | 2 +- PassepartoutCore/Package.swift | 2 +- 7 files changed, 19 insertions(+), 36 deletions(-) diff --git a/Config.xcconfig b/Config.xcconfig index 66be0e77..6f50015b 100644 --- a/Config.xcconfig +++ b/Config.xcconfig @@ -27,15 +27,10 @@ // https://help.apple.com/xcode/#/dev745c5c974 CFG_TEAM_ID = DTDYD63ZX9 -CFG_APP_IOS_ID = com.algoritmico.ios.Passepartout -//CFG_APP_MACOS_ID = com.algoritmico.macos.Passepartout -//CFG_APP_LAUNCHER_ID = com.algoritmico.macos.Passepartout.Launcher -CFG_APP_MACOS_ID = com.algoritmico.ios.Passepartout +CFG_APP_ID = com.algoritmico.ios.Passepartout CFG_APP_LAUNCHER_ID = com.algoritmico.ios.Passepartout.Launcher CFG_GROUP_ID = com.algoritmico.Passepartout -CFG_APPSTORE_IOS_ID = 1433648537 -//CFG_APPSTORE_MACOS_ID = 1433645014 -CFG_APPSTORE_MACOS_ID = 1433648537 +CFG_APPSTORE_ID = 1433648537 CFG_COPYRIGHT = Copyright © 2021 Davide De Rosa. All rights reserved. #include? "Secret.xcconfig" diff --git a/Gemfile.lock b/Gemfile.lock index a1489aa9..71287222 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -17,8 +17,8 @@ GEM artifactory (3.0.15) atomos (0.1.3) aws-eventstream (1.2.0) - aws-partitions (1.525.0) - aws-sdk-core (3.122.0) + aws-partitions (1.527.0) + aws-sdk-core (3.122.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) @@ -26,7 +26,7 @@ GEM aws-sdk-kms (1.51.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.105.0) + aws-sdk-s3 (1.105.1) aws-sdk-core (~> 3, >= 3.122.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) @@ -215,7 +215,7 @@ GEM naturally (2.2.1) netrc (0.11.0) optparse (0.1.1) - os (1.1.1) + os (1.1.4) plist (3.6.0) public_suffix (4.0.6) rake (13.0.6) @@ -241,7 +241,7 @@ GEM terminal-notifier (2.0.0) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) - trailblazer-option (0.1.1) + trailblazer-option (0.1.2) tty-cursor (0.7.1) tty-screen (0.8.1) tty-spinner (0.9.3) diff --git a/Passepartout.xcodeproj/project.pbxproj b/Passepartout.xcodeproj/project.pbxproj index e74a46df..08f8adbd 100644 --- a/Passepartout.xcodeproj/project.pbxproj +++ b/Passepartout.xcodeproj/project.pbxproj @@ -1268,9 +1268,7 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; - MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = "$(CFG_APP_MACOS_ID)"; + PRODUCT_BUNDLE_IDENTIFIER = "$(CFG_APP_ID)"; PRODUCT_NAME = Passepartout; PROVISIONING_PROFILE_SPECIFIER = "match Development com.algoritmico.ios.Passepartout macos"; SDKROOT = macosx; @@ -1295,8 +1293,7 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = "$(CFG_APP_MACOS_ID)"; + PRODUCT_BUNDLE_IDENTIFIER = "$(CFG_APP_ID)"; PRODUCT_NAME = Passepartout; PROVISIONING_PROFILE_SPECIFIER = "match Development com.algoritmico.ios.Passepartout macos"; SDKROOT = macosx; @@ -1319,9 +1316,7 @@ "@executable_path/../Frameworks", "@executable_path/../../../../Frameworks", ); - MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; - MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = "$(CFG_APP_MACOS_ID).Tunnel"; + PRODUCT_BUNDLE_IDENTIFIER = "$(CFG_APP_ID).Tunnel"; PRODUCT_NAME = PassepartoutTunnel; PROVISIONING_PROFILE_SPECIFIER = "match Development com.algoritmico.ios.Passepartout.Tunnel macos"; SDKROOT = macosx; @@ -1345,8 +1340,7 @@ "@executable_path/../Frameworks", "@executable_path/../../../../Frameworks", ); - MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = "$(CFG_APP_MACOS_ID).Tunnel"; + PRODUCT_BUNDLE_IDENTIFIER = "$(CFG_APP_ID).Tunnel"; PRODUCT_NAME = PassepartoutTunnel; PROVISIONING_PROFILE_SPECIFIER = "match Development com.algoritmico.ios.Passepartout.Tunnel macos"; SDKROOT = macosx; @@ -1411,7 +1405,6 @@ GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACOSX_DEPLOYMENT_TARGET = 10.15; - MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; @@ -1471,7 +1464,6 @@ GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACOSX_DEPLOYMENT_TARGET = 10.15; - MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-O"; @@ -1495,7 +1487,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = "$(CFG_APP_IOS_ID)"; + PRODUCT_BUNDLE_IDENTIFIER = "$(CFG_APP_ID)"; PRODUCT_NAME = Passepartout; PROVISIONING_PROFILE_SPECIFIER = "match Development com.algoritmico.ios.Passepartout"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -1517,7 +1509,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = "$(CFG_APP_IOS_ID)"; + PRODUCT_BUNDLE_IDENTIFIER = "$(CFG_APP_ID)"; PRODUCT_NAME = Passepartout; PROVISIONING_PROFILE_SPECIFIER = "match Development com.algoritmico.ios.Passepartout"; TARGETED_DEVICE_FAMILY = "1,2"; @@ -1541,8 +1533,6 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; - MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "$(CFG_APP_LAUNCHER_ID)"; PRODUCT_NAME = PassepartoutLauncher; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1569,7 +1559,6 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "$(CFG_APP_LAUNCHER_ID)"; PRODUCT_NAME = PassepartoutLauncher; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1592,8 +1581,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; - PRODUCT_BUNDLE_IDENTIFIER = "$(CFG_APP_IOS_ID).Tunnel"; + PRODUCT_BUNDLE_IDENTIFIER = "$(CFG_APP_ID).Tunnel"; PRODUCT_NAME = PassepartoutTunnel; PROVISIONING_PROFILE_SPECIFIER = "match Development com.algoritmico.ios.Passepartout.Tunnel"; SKIP_INSTALL = YES; @@ -1614,7 +1602,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = "$(CFG_APP_IOS_ID).Tunnel"; + PRODUCT_BUNDLE_IDENTIFIER = "$(CFG_APP_ID).Tunnel"; PRODUCT_NAME = PassepartoutTunnel; PROVISIONING_PROFILE_SPECIFIER = "match Development com.algoritmico.ios.Passepartout.Tunnel"; SKIP_INSTALL = YES; diff --git a/Passepartout/App/iOS/Info.plist b/Passepartout/App/iOS/Info.plist index 4f93a86c..95a7e56d 100644 --- a/Passepartout/App/iOS/Info.plist +++ b/Passepartout/App/iOS/Info.plist @@ -92,7 +92,7 @@ com.algoritmico.Passepartout.config appstore_id - $(CFG_APPSTORE_IOS_ID) + $(CFG_APPSTORE_ID) group_id group.$(CFG_GROUP_ID) diff --git a/Passepartout/App/macOS/Info.plist b/Passepartout/App/macOS/Info.plist index 29e4ba83..fa22fd89 100644 --- a/Passepartout/App/macOS/Info.plist +++ b/Passepartout/App/macOS/Info.plist @@ -67,7 +67,7 @@ appcenter_secret $(CFG_APPCENTER_SECRET) appstore_id - $(CFG_APPSTORE_MACOS_ID) + $(CFG_APPSTORE_ID) group_id $(CFG_TEAM_ID).group.$(CFG_GROUP_ID) diff --git a/PassepartoutCore/Package.resolved b/PassepartoutCore/Package.resolved index c9544ba6..c2e58c8a 100644 --- a/PassepartoutCore/Package.resolved +++ b/PassepartoutCore/Package.resolved @@ -6,7 +6,7 @@ "repositoryURL": "https://github.com/keeshux/convenience", "state": { "branch": null, - "revision": "5cee4740a365bde746f6bc7e0033cf57a71c2d99", + "revision": "347105ec0ce27cd4255acf9875fd60ad1f213801", "version": null } }, diff --git a/PassepartoutCore/Package.swift b/PassepartoutCore/Package.swift index f6cdd369..357bfcd7 100644 --- a/PassepartoutCore/Package.swift +++ b/PassepartoutCore/Package.swift @@ -22,7 +22,7 @@ let package = Package( // Dependencies declare other packages that this package depends on. // .package(url: /* package url */, from: "1.0.0"), .package(name: "TunnelKit", url: "https://github.com/passepartoutvpn/tunnelkit", .revision("d1f70171cb09c1e71e0f3cc23fccb7bb7a9a9d42")), - .package(name: "Convenience", url: "https://github.com/keeshux/convenience", .revision("5cee4740a365bde746f6bc7e0033cf57a71c2d99")), + .package(name: "Convenience", url: "https://github.com/keeshux/convenience", .revision("347105ec0ce27cd4255acf9875fd60ad1f213801")), .package(url: "https://github.com/Cocoanetics/Kvitto", from: "1.0.0") ], targets: [