From 0179855f8bc2cbc837fc87c23cd8a6247a8c5e54 Mon Sep 17 00:00:00 2001 From: Guilherme Rambo Date: Thu, 25 May 2023 19:30:05 -0300 Subject: [PATCH 1/6] Using xcconfig for versioning, raised deployment target to macOS 12 --- ConfUIFoundation/Info.plist | 6 +-- PlayerUI/Info.plist | 8 ++-- TranscriptIndexingService/Info.plist | 6 +-- WWDC.xcodeproj/project.pbxproj | 55 ++++++++-------------------- WWDC/Info.plist | 6 +-- WWDC/Main.xcconfig | 8 ++++ WWDCAgent/Info.plist | 6 +-- WWDCAgentTestClient/Info.plist | 6 +-- 8 files changed, 41 insertions(+), 60 deletions(-) create mode 100644 WWDC/Main.xcconfig diff --git a/ConfUIFoundation/Info.plist b/ConfUIFoundation/Info.plist index cfbd5126..39123f0d 100644 --- a/ConfUIFoundation/Info.plist +++ b/ConfUIFoundation/Info.plist @@ -15,10 +15,10 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 7.4 + $(MARKETING_VERSION) CFBundleVersion - 1027 + $(CURRENT_PROJECT_VERSION) NSHumanReadableCopyright - Copyright © 2020 Guilherme Rambo. All rights reserved. + $(COPYRIGHT) diff --git a/PlayerUI/Info.plist b/PlayerUI/Info.plist index 4bc3d3e5..b2ba3a8e 100644 --- a/PlayerUI/Info.plist +++ b/PlayerUI/Info.plist @@ -15,12 +15,10 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 7.4 + $(MARKETING_VERSION) CFBundleVersion - 1027 + $(CURRENT_PROJECT_VERSION) NSHumanReadableCopyright - Copyright © 2017 Guilherme Rambo. All rights reserved. - NSPrincipalClass - + $(COPYRIGHT) diff --git a/TranscriptIndexingService/Info.plist b/TranscriptIndexingService/Info.plist index 60d56985..c8027217 100644 --- a/TranscriptIndexingService/Info.plist +++ b/TranscriptIndexingService/Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 7.4 + $(MARKETING_VERSION) CFBundleVersion - 1027 + $(CURRENT_PROJECT_VERSION) NSHumanReadableCopyright - Copyright © 2017 Guilherme Rambo. All rights reserved. + $(COPYRIGHT) XPCService ServiceType diff --git a/WWDC.xcodeproj/project.pbxproj b/WWDC.xcodeproj/project.pbxproj index 87e852bb..7ddfaa80 100644 --- a/WWDC.xcodeproj/project.pbxproj +++ b/WWDC.xcodeproj/project.pbxproj @@ -524,6 +524,8 @@ F4CCF93C265EC34400A69E62 /* WWDCAppPuppeteer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WWDCAppPuppeteer.swift; sourceTree = ""; }; F4CCF93E265EC58900A69E62 /* WWDCAppCommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WWDCAppCommand.swift; sourceTree = ""; }; F4CCF941265ED24500A69E62 /* AppCommandsReceiver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCommandsReceiver.swift; sourceTree = ""; }; + F4D0F0352A2012C700C74B50 /* VisualEffectDebugger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VisualEffectDebugger.m; sourceTree = ""; }; + F4D0F0382A20162200C74B50 /* Main.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Main.xcconfig; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -651,6 +653,7 @@ DD1879C324868EF700164AD1 /* WWDCRelease_iCloud.entitlements */, DDCE7ECF1EA7A1D300C7A3CA /* WWDC-Bridging-Header.h */, DD59106E1ECA0C2F003C32A4 /* WWDC.entitlements */, + F4D0F0372A20161400C74B50 /* Config */, F474DECA2673800000B28B31 /* SharePlay */, DD9301BE1EE3210F00BE724B /* Playback Support */, DD34A7991EC3CD4F00E0B575 /* Definitions */, @@ -1255,6 +1258,14 @@ name = TitleBar; sourceTree = ""; }; + F4D0F0372A20161400C74B50 /* Config */ = { + isa = PBXGroup; + children = ( + F4D0F0382A20162200C74B50 /* Main.xcconfig */, + ); + name = Config; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -1858,6 +1869,7 @@ /* Begin XCBuildConfiguration section */ DD36A4B91E478C6A00B2EA88 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = F4D0F0382A20162200C74B50 /* Main.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -1888,7 +1900,6 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "-"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1027; DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -1907,8 +1918,6 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 7.2; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; @@ -1916,12 +1925,12 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; SWIFT_VERSION = 5.0; - VERSIONING_SYSTEM = "apple-generic"; }; name = Debug; }; DD36A4BA1E478C6A00B2EA88 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = F4D0F0382A20162200C74B50 /* Main.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -1952,7 +1961,6 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "-"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1027; DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; @@ -1965,15 +1973,12 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 7.2; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-O"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; SWIFT_VERSION = 5.0; - VERSIONING_SYSTEM = "apple-generic"; }; name = Release; }; @@ -2041,6 +2046,7 @@ }; DD5910641ECA0C17003C32A4 /* Debug_iCloud */ = { isa = XCBuildConfiguration; + baseConfigurationReference = F4D0F0382A20162200C74B50 /* Main.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -2071,7 +2077,6 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "-"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1027; DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -2090,8 +2095,6 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 7.2; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; OTHER_SWIFT_FLAGS = "-D ICLOUD -D DEBUG"; @@ -2100,7 +2103,6 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; SWIFT_VERSION = 5.0; - VERSIONING_SYSTEM = "apple-generic"; }; name = Debug_iCloud; }; @@ -2138,6 +2140,7 @@ }; DD5910691ECA0C20003C32A4 /* Release_iCloud */ = { isa = XCBuildConfiguration; + baseConfigurationReference = F4D0F0382A20162200C74B50 /* Main.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -2168,7 +2171,6 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "-"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1027; DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; @@ -2181,8 +2183,6 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 7.2; MTL_ENABLE_DEBUG_INFO = NO; OTHER_SWIFT_FLAGS = "-D ICLOUD"; SDKROOT = macosx; @@ -2190,7 +2190,6 @@ SWIFT_OPTIMIZATION_LEVEL = "-O"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; SWIFT_VERSION = 5.0; - VERSIONING_SYSTEM = "apple-generic"; }; name = Release_iCloud; }; @@ -2233,7 +2232,6 @@ CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; @@ -2262,7 +2260,6 @@ SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; - VERSIONING_SYSTEM = "apple-generic"; }; name = Debug; }; @@ -2273,7 +2270,6 @@ CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; @@ -2302,7 +2298,6 @@ SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; - VERSIONING_SYSTEM = "apple-generic"; }; name = Debug_iCloud; }; @@ -2313,7 +2308,6 @@ CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; @@ -2340,7 +2334,6 @@ PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; - VERSIONING_SYSTEM = "apple-generic"; }; name = Release; }; @@ -2351,7 +2344,6 @@ CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; @@ -2378,7 +2370,6 @@ PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; - VERSIONING_SYSTEM = "apple-generic"; }; name = Release_iCloud; }; @@ -2523,7 +2514,6 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; - VERSIONING_SYSTEM = "apple-generic"; }; name = Debug; }; @@ -2558,7 +2548,6 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; - VERSIONING_SYSTEM = "apple-generic"; }; name = Debug_iCloud; }; @@ -2593,7 +2582,6 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; - VERSIONING_SYSTEM = "apple-generic"; }; name = Release; }; @@ -2628,7 +2616,6 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; - VERSIONING_SYSTEM = "apple-generic"; }; name = Release_iCloud; }; @@ -2642,7 +2629,6 @@ CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_ENTITLEMENTS = WWDCAgent/WWDCAgent.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; @@ -2680,7 +2666,6 @@ CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_ENTITLEMENTS = WWDCAgent/WWDCAgent.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; @@ -2718,7 +2703,6 @@ CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_ENTITLEMENTS = WWDCAgent/WWDCAgent.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; @@ -2754,7 +2738,6 @@ CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_ENTITLEMENTS = WWDCAgent/WWDCAgent.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; @@ -2789,7 +2772,6 @@ CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_ENTITLEMENTS = WWDCAgentTestClient/WWDCAgentTestClient.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; @@ -2805,7 +2787,6 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 11.3; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = io.wwdc.app.WWDCAgentTestClient; @@ -2823,7 +2804,6 @@ CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_ENTITLEMENTS = WWDCAgentTestClient/WWDCAgentTestClient.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; @@ -2839,7 +2819,6 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 11.3; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = io.wwdc.app.WWDCAgentTestClient; @@ -2857,7 +2836,6 @@ CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_ENTITLEMENTS = WWDCAgentTestClient/WWDCAgentTestClient.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; @@ -2873,7 +2851,6 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 11.3; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = io.wwdc.app.WWDCAgentTestClient; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -2890,7 +2867,6 @@ CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_ENTITLEMENTS = WWDCAgentTestClient/WWDCAgentTestClient.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; @@ -2906,7 +2882,6 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 11.3; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = io.wwdc.app.WWDCAgentTestClient; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/WWDC/Info.plist b/WWDC/Info.plist index bd8efe4a..5569d86b 100644 --- a/WWDC/Info.plist +++ b/WWDC/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 7.4 + $(MARKETING_VERSION) CFBundleURLTypes @@ -46,7 +46,7 @@ CFBundleVersion - 1027 + $(CURRENT_PROJECT_VERSION) GRBundleDesignContributorWebsite https://twitter.com/bcmn96 GRBundleIconCreatorWebsite @@ -77,7 +77,7 @@ NSCalendarsUsageDescription Calendar access allows you to add events directly from the app to help you plan your WWDC week. NSHumanReadableCopyright - Copyright © 2017 Guilherme Rambo. All rights reserved. + $(COPYRIGHT) NSMainStoryboardFile Main NSPrincipalClass diff --git a/WWDC/Main.xcconfig b/WWDC/Main.xcconfig new file mode 100644 index 00000000..b73f2107 --- /dev/null +++ b/WWDC/Main.xcconfig @@ -0,0 +1,8 @@ +MARKETING_VERSION = 7.4 +CURRENT_PROJECT_VERSION = 1030 + +MACOSX_DEPLOYMENT_TARGET = 12.0 + +VERSIONING_SYSTEM = apple-generic + +COPYRIGHT=© 2017-2023 Buddy Software LTD diff --git a/WWDCAgent/Info.plist b/WWDCAgent/Info.plist index 706971b9..77fece6d 100644 --- a/WWDCAgent/Info.plist +++ b/WWDCAgent/Info.plist @@ -17,15 +17,15 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 7.4 + $(MARKETING_VERSION) CFBundleVersion - 1027 + $(CURRENT_PROJECT_VERSION) LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) LSUIElement NSHumanReadableCopyright - Copyright © 2021 Guilherme Rambo. All rights reserved. + $(COPYRIGHT) NSMainStoryboardFile Main NSPrincipalClass diff --git a/WWDCAgentTestClient/Info.plist b/WWDCAgentTestClient/Info.plist index 28d3c6aa..f9d28d2a 100644 --- a/WWDCAgentTestClient/Info.plist +++ b/WWDCAgentTestClient/Info.plist @@ -17,13 +17,13 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 7.4 + $(MARKETING_VERSION) CFBundleVersion - 1027 + $(CURRENT_PROJECT_VERSION) LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSHumanReadableCopyright - Copyright © 2021 Guilherme Rambo. All rights reserved. + $(COPYRIGHT) NSMainStoryboardFile Main NSPrincipalClass From 89508604e0b19f7365027b1e34df99dfc5893f96 Mon Sep 17 00:00:00 2001 From: Guilherme Rambo Date: Mon, 29 May 2023 09:48:26 -0300 Subject: [PATCH 2/6] Removed incorrect file reference --- WWDC.xcodeproj/project.pbxproj | 1 - 1 file changed, 1 deletion(-) diff --git a/WWDC.xcodeproj/project.pbxproj b/WWDC.xcodeproj/project.pbxproj index 7ddfaa80..83ff59ce 100644 --- a/WWDC.xcodeproj/project.pbxproj +++ b/WWDC.xcodeproj/project.pbxproj @@ -524,7 +524,6 @@ F4CCF93C265EC34400A69E62 /* WWDCAppPuppeteer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WWDCAppPuppeteer.swift; sourceTree = ""; }; F4CCF93E265EC58900A69E62 /* WWDCAppCommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WWDCAppCommand.swift; sourceTree = ""; }; F4CCF941265ED24500A69E62 /* AppCommandsReceiver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCommandsReceiver.swift; sourceTree = ""; }; - F4D0F0352A2012C700C74B50 /* VisualEffectDebugger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VisualEffectDebugger.m; sourceTree = ""; }; F4D0F0382A20162200C74B50 /* Main.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Main.xcconfig; sourceTree = ""; }; /* End PBXFileReference section */ From 90c15d27a8689df423c5c0b0ce547e4a53fcf393 Mon Sep 17 00:00:00 2001 From: Guilherme Rambo Date: Mon, 29 May 2023 13:02:13 -0300 Subject: [PATCH 3/6] Adopt xcconfig, improve development experience for external contributors --- .gitignore | 3 +- WWDC.xcodeproj/project.pbxproj | 120 +++++++-------------------------- WWDC/Main.xcconfig | 6 ++ WWDC/OpenSource.xcconfig | 6 ++ bootstrap.sh | 7 +- teamid.sh | 20 ++++++ 6 files changed, 65 insertions(+), 97 deletions(-) create mode 100644 WWDC/OpenSource.xcconfig create mode 100755 teamid.sh diff --git a/.gitignore b/.gitignore index 255826fb..51ae9730 100644 --- a/.gitignore +++ b/.gitignore @@ -18,4 +18,5 @@ DerivedData generatechangelog.sh Pods/ Carthage -Provisioning \ No newline at end of file +Provisioning +TeamID.xcconfig \ No newline at end of file diff --git a/WWDC.xcodeproj/project.pbxproj b/WWDC.xcodeproj/project.pbxproj index 83ff59ce..f1062da5 100644 --- a/WWDC.xcodeproj/project.pbxproj +++ b/WWDC.xcodeproj/project.pbxproj @@ -491,6 +491,7 @@ DDF721E21ECA12FC0054C503 /* PIP.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PIP.framework; path = ../../../../../System/Library/PrivateFrameworks/PIP.framework; sourceTree = ""; }; DDFA10BE1EBEAAAD001DCF66 /* DownloadManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DownloadManager.swift; sourceTree = ""; }; DDFD6198247EE55200AD1CD7 /* main.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = main.swift; sourceTree = ""; }; + F42472B12A24D6AC00F68237 /* OpenSource.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = OpenSource.xcconfig; sourceTree = ""; }; F4749CE6265C005400062B83 /* WWDCAgent.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = WWDCAgent.app; sourceTree = BUILT_PRODUCTS_DIR; }; F4749CE8265C005500062B83 /* WWDCAgentAppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WWDCAgentAppDelegate.swift; sourceTree = ""; }; F4749CEC265C005500062B83 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; @@ -525,6 +526,7 @@ F4CCF93E265EC58900A69E62 /* WWDCAppCommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WWDCAppCommand.swift; sourceTree = ""; }; F4CCF941265ED24500A69E62 /* AppCommandsReceiver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCommandsReceiver.swift; sourceTree = ""; }; F4D0F0382A20162200C74B50 /* Main.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Main.xcconfig; sourceTree = ""; }; + F4F1C9A22A24FF50002C3709 /* TeamID.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = TeamID.xcconfig; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -1261,6 +1263,8 @@ isa = PBXGroup; children = ( F4D0F0382A20162200C74B50 /* Main.xcconfig */, + F4F1C9A22A24FF50002C3709 /* TeamID.xcconfig */, + F42472B12A24D6AC00F68237 /* OpenSource.xcconfig */, ); name = Config; sourceTree = ""; @@ -1868,7 +1872,7 @@ /* Begin XCBuildConfiguration section */ DD36A4B91E478C6A00B2EA88 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = F4D0F0382A20162200C74B50 /* Main.xcconfig */; + baseConfigurationReference = F42472B12A24D6AC00F68237 /* OpenSource.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -1897,7 +1901,6 @@ CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "-"; COPY_PHASE_STRIP = NO; DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; @@ -1929,7 +1932,7 @@ }; DD36A4BA1E478C6A00B2EA88 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = F4D0F0382A20162200C74B50 /* Main.xcconfig */; + baseConfigurationReference = F42472B12A24D6AC00F68237 /* OpenSource.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -1958,7 +1961,6 @@ CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "-"; COPY_PHASE_STRIP = NO; DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; @@ -1988,11 +1990,9 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = WWDC/WWDC.entitlements; - CODE_SIGN_IDENTITY = "-"; COMBINE_HIDPI_IMAGES = YES; DEAD_CODE_STRIPPING = YES; - DEVELOPMENT_TEAM = 8C7439RJLG; - ENABLE_HARDENED_RUNTIME = NO; + ENABLE_HARDENED_RUNTIME = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)", @@ -2004,9 +2004,8 @@ "@executable_path/../Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - PRODUCT_BUNDLE_IDENTIFIER = io.wwdc.app; + PRODUCT_BUNDLE_IDENTIFIER = "io.wwdc.app$(SAMPLE_CODE_DISAMBIGUATOR)"; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = "WWDC Debug 2019"; SWIFT_OBJC_BRIDGING_HEADER = "WWDC/WWDC-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; }; @@ -2019,12 +2018,10 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = WWDC/WWDC.entitlements; - CODE_SIGN_IDENTITY = "-"; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = YES; DEAD_CODE_STRIPPING = YES; - DEVELOPMENT_TEAM = 8C7439RJLG; - ENABLE_HARDENED_RUNTIME = NO; + ENABLE_HARDENED_RUNTIME = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)", @@ -2036,9 +2033,8 @@ "@executable_path/../Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - PRODUCT_BUNDLE_IDENTIFIER = io.wwdc.app; + PRODUCT_BUNDLE_IDENTIFIER = "io.wwdc.app$(SAMPLE_CODE_DISAMBIGUATOR)"; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = "WWDC Release 2019 B"; SWIFT_OBJC_BRIDGING_HEADER = "WWDC/WWDC-Bridging-Header.h"; }; name = Release; @@ -2074,7 +2070,6 @@ CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "-"; COPY_PHASE_STRIP = NO; DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; @@ -2112,11 +2107,8 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = WWDC/WWDCDebug_iCloud.entitlements; - CODE_SIGN_IDENTITY = "Apple Development"; - CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; DEAD_CODE_STRIPPING = YES; - DEVELOPMENT_TEAM = 8C7439RJLG; ENABLE_HARDENED_RUNTIME = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -2129,7 +2121,7 @@ "@executable_path/../Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - PRODUCT_BUNDLE_IDENTIFIER = io.wwdc.app; + PRODUCT_BUNDLE_IDENTIFIER = "io.wwdc.app$(SAMPLE_CODE_DISAMBIGUATOR)"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "WWDC/WWDC-Bridging-Header.h"; @@ -2168,7 +2160,6 @@ CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "-"; COPY_PHASE_STRIP = NO; DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; @@ -2199,12 +2190,9 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = WWDC/WWDCRelease_iCloud.entitlements; - CODE_SIGN_IDENTITY = "Apple Development"; - CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = YES; DEAD_CODE_STRIPPING = YES; - DEVELOPMENT_TEAM = ""; ENABLE_HARDENED_RUNTIME = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -2217,7 +2205,7 @@ "@executable_path/../Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - PRODUCT_BUNDLE_IDENTIFIER = io.wwdc.app; + PRODUCT_BUNDLE_IDENTIFIER = "io.wwdc.app$(SAMPLE_CODE_DISAMBIGUATOR)"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "WWDC/WWDC-Bridging-Header.h"; @@ -2231,12 +2219,9 @@ CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_WEAK = YES; - CODE_SIGN_IDENTITY = ""; - CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; DEAD_CODE_STRIPPING = YES; DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = ""; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1027; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -2269,12 +2254,9 @@ CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_WEAK = YES; - CODE_SIGN_IDENTITY = ""; - CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; DEAD_CODE_STRIPPING = YES; DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = ""; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1027; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -2307,12 +2289,9 @@ CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_WEAK = YES; - CODE_SIGN_IDENTITY = ""; - CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; DEAD_CODE_STRIPPING = YES; DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = ""; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1027; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -2343,12 +2322,9 @@ CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_WEAK = YES; - CODE_SIGN_IDENTITY = ""; - CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; DEAD_CODE_STRIPPING = YES; DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = ""; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1027; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -2377,12 +2353,9 @@ buildSettings = { CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_ENABLE_MODULES = YES; - CODE_SIGN_IDENTITY = "-"; - CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; DEAD_CODE_STRIPPING = YES; - DEVELOPMENT_TEAM = ""; - ENABLE_HARDENED_RUNTIME = NO; + ENABLE_HARDENED_RUNTIME = YES; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = TranscriptIndexingService/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( @@ -2391,7 +2364,7 @@ "@loader_path/../Frameworks", "@loader_path/../../../../Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = io.wwdc.app.TranscriptIndexingService; + PRODUCT_BUNDLE_IDENTIFIER = "io.wwdc.app.TranscriptIndexingService$(SAMPLE_CODE_DISAMBIGUATOR)"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; @@ -2405,11 +2378,8 @@ buildSettings = { CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_ENABLE_MODULES = YES; - CODE_SIGN_IDENTITY = "Mac Developer"; - CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; DEAD_CODE_STRIPPING = YES; - DEVELOPMENT_TEAM = 8C7439RJLG; ENABLE_HARDENED_RUNTIME = YES; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = TranscriptIndexingService/Info.plist; @@ -2419,7 +2389,7 @@ "@loader_path/../Frameworks", "@loader_path/../../../../Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = io.wwdc.app.TranscriptIndexingService; + PRODUCT_BUNDLE_IDENTIFIER = "io.wwdc.app.TranscriptIndexingService$(SAMPLE_CODE_DISAMBIGUATOR)"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; @@ -2433,12 +2403,9 @@ buildSettings = { CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_ENABLE_MODULES = YES; - CODE_SIGN_IDENTITY = "-"; - CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; DEAD_CODE_STRIPPING = YES; - DEVELOPMENT_TEAM = ""; - ENABLE_HARDENED_RUNTIME = NO; + ENABLE_HARDENED_RUNTIME = YES; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = TranscriptIndexingService/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( @@ -2447,7 +2414,7 @@ "@loader_path/../Frameworks", "@loader_path/../../../../Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = io.wwdc.app.TranscriptIndexingService; + PRODUCT_BUNDLE_IDENTIFIER = "io.wwdc.app.TranscriptIndexingService$(SAMPLE_CODE_DISAMBIGUATOR)"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; @@ -2460,11 +2427,8 @@ buildSettings = { CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_ENABLE_MODULES = YES; - CODE_SIGN_IDENTITY = "Mac Developer"; - CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; DEAD_CODE_STRIPPING = YES; - DEVELOPMENT_TEAM = 8C7439RJLG; ENABLE_HARDENED_RUNTIME = YES; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = TranscriptIndexingService/Info.plist; @@ -2474,7 +2438,7 @@ "@loader_path/../Frameworks", "@loader_path/../../../../Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = io.wwdc.app.TranscriptIndexingService; + PRODUCT_BUNDLE_IDENTIFIER = "io.wwdc.app.TranscriptIndexingService$(SAMPLE_CODE_DISAMBIGUATOR)"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; @@ -2486,11 +2450,9 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CODE_SIGN_IDENTITY = ""; COMBINE_HIDPI_IMAGES = YES; DEAD_CODE_STRIPPING = YES; DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = ""; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1027; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -2520,11 +2482,9 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CODE_SIGN_IDENTITY = ""; COMBINE_HIDPI_IMAGES = YES; DEAD_CODE_STRIPPING = YES; DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = ""; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1027; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -2554,11 +2514,9 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CODE_SIGN_IDENTITY = ""; COMBINE_HIDPI_IMAGES = YES; DEAD_CODE_STRIPPING = YES; DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = ""; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1027; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -2588,11 +2546,9 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CODE_SIGN_IDENTITY = ""; COMBINE_HIDPI_IMAGES = YES; DEAD_CODE_STRIPPING = YES; DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = ""; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1027; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -2629,12 +2585,9 @@ CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CODE_SIGN_ENTITLEMENTS = WWDCAgent/WWDCAgent.entitlements; - CODE_SIGN_IDENTITY = "Apple Development"; - CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_ASSET_PATHS = "\"WWDCAgent/Preview Content\""; - DEVELOPMENT_TEAM = 8C7439RJLG; ENABLE_HARDENED_RUNTIME = YES; ENABLE_PREVIEWS = YES; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -2646,7 +2599,7 @@ MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; OTHER_SWIFT_FLAGS = "-D DEBUG -D AGENT"; - PRODUCT_BUNDLE_IDENTIFIER = io.wwdc.app.WWDCAgent; + PRODUCT_BUNDLE_IDENTIFIER = "io.wwdc.app.WWDCAgent$(SAMPLE_CODE_DISAMBIGUATOR)"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_OBJC_BRIDGING_HEADER = "WWDCAgent/Util/WWDCAgent-Bridging-Header.h"; @@ -2666,12 +2619,9 @@ CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CODE_SIGN_ENTITLEMENTS = WWDCAgent/WWDCAgent.entitlements; - CODE_SIGN_IDENTITY = "Apple Development"; - CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_ASSET_PATHS = "\"WWDCAgent/Preview Content\""; - DEVELOPMENT_TEAM = 8C7439RJLG; ENABLE_HARDENED_RUNTIME = YES; ENABLE_PREVIEWS = YES; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -2683,7 +2633,7 @@ MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; OTHER_SWIFT_FLAGS = "-D ICLOUD -D DEBUG -D AGENT"; - PRODUCT_BUNDLE_IDENTIFIER = io.wwdc.app.WWDCAgent; + PRODUCT_BUNDLE_IDENTIFIER = "io.wwdc.app.WWDCAgent$(SAMPLE_CODE_DISAMBIGUATOR)"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_OBJC_BRIDGING_HEADER = "WWDCAgent/Util/WWDCAgent-Bridging-Header.h"; @@ -2703,12 +2653,9 @@ CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CODE_SIGN_ENTITLEMENTS = WWDCAgent/WWDCAgent.entitlements; - CODE_SIGN_IDENTITY = "Apple Development"; - CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_ASSET_PATHS = "\"WWDCAgent/Preview Content\""; - DEVELOPMENT_TEAM = 8C7439RJLG; ENABLE_HARDENED_RUNTIME = YES; ENABLE_PREVIEWS = YES; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -2719,7 +2666,7 @@ ); MTL_FAST_MATH = YES; OTHER_SWIFT_FLAGS = "-D AGENT"; - PRODUCT_BUNDLE_IDENTIFIER = io.wwdc.app.WWDCAgent; + PRODUCT_BUNDLE_IDENTIFIER = "io.wwdc.app.WWDCAgent$(SAMPLE_CODE_DISAMBIGUATOR)"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_OBJC_BRIDGING_HEADER = "WWDCAgent/Util/WWDCAgent-Bridging-Header.h"; @@ -2738,12 +2685,9 @@ CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CODE_SIGN_ENTITLEMENTS = WWDCAgent/WWDCAgent.entitlements; - CODE_SIGN_IDENTITY = "Apple Development"; - CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_ASSET_PATHS = "\"WWDCAgent/Preview Content\""; - DEVELOPMENT_TEAM = 8C7439RJLG; ENABLE_HARDENED_RUNTIME = YES; ENABLE_PREVIEWS = YES; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -2754,7 +2698,7 @@ ); MTL_FAST_MATH = YES; OTHER_SWIFT_FLAGS = "-D ICLOUD -D AGENT"; - PRODUCT_BUNDLE_IDENTIFIER = io.wwdc.app.WWDCAgent; + PRODUCT_BUNDLE_IDENTIFIER = "io.wwdc.app.WWDCAgent$(SAMPLE_CODE_DISAMBIGUATOR)"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_OBJC_BRIDGING_HEADER = "WWDCAgent/Util/WWDCAgent-Bridging-Header.h"; @@ -2772,12 +2716,9 @@ CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CODE_SIGN_ENTITLEMENTS = WWDCAgentTestClient/WWDCAgentTestClient.entitlements; - CODE_SIGN_IDENTITY = "Apple Development"; - CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_ASSET_PATHS = "\"WWDCAgentTestClient/Preview Content\""; - DEVELOPMENT_TEAM = 8C7439RJLG; ENABLE_HARDENED_RUNTIME = YES; ENABLE_PREVIEWS = YES; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -2788,7 +2729,7 @@ ); MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = io.wwdc.app.WWDCAgentTestClient; + PRODUCT_BUNDLE_IDENTIFIER = "io.wwdc.app.WWDCAgentTestClient$(SAMPLE_CODE_DISAMBIGUATOR)"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; }; @@ -2804,12 +2745,9 @@ CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CODE_SIGN_ENTITLEMENTS = WWDCAgentTestClient/WWDCAgentTestClient.entitlements; - CODE_SIGN_IDENTITY = "Apple Development"; - CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_ASSET_PATHS = "\"WWDCAgentTestClient/Preview Content\""; - DEVELOPMENT_TEAM = 8C7439RJLG; ENABLE_HARDENED_RUNTIME = YES; ENABLE_PREVIEWS = YES; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -2820,7 +2758,7 @@ ); MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = io.wwdc.app.WWDCAgentTestClient; + PRODUCT_BUNDLE_IDENTIFIER = "io.wwdc.app.WWDCAgentTestClient$(SAMPLE_CODE_DISAMBIGUATOR)"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; }; @@ -2836,12 +2774,9 @@ CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CODE_SIGN_ENTITLEMENTS = WWDCAgentTestClient/WWDCAgentTestClient.entitlements; - CODE_SIGN_IDENTITY = "Apple Development"; - CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_ASSET_PATHS = "\"WWDCAgentTestClient/Preview Content\""; - DEVELOPMENT_TEAM = 8C7439RJLG; ENABLE_HARDENED_RUNTIME = YES; ENABLE_PREVIEWS = YES; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -2851,7 +2786,7 @@ "@executable_path/../Frameworks", ); MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = io.wwdc.app.WWDCAgentTestClient; + PRODUCT_BUNDLE_IDENTIFIER = "io.wwdc.app.WWDCAgentTestClient$(SAMPLE_CODE_DISAMBIGUATOR)"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; }; @@ -2867,12 +2802,9 @@ CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CODE_SIGN_ENTITLEMENTS = WWDCAgentTestClient/WWDCAgentTestClient.entitlements; - CODE_SIGN_IDENTITY = "Apple Development"; - CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_ASSET_PATHS = "\"WWDCAgentTestClient/Preview Content\""; - DEVELOPMENT_TEAM = 8C7439RJLG; ENABLE_HARDENED_RUNTIME = YES; ENABLE_PREVIEWS = YES; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -2882,7 +2814,7 @@ "@executable_path/../Frameworks", ); MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = io.wwdc.app.WWDCAgentTestClient; + PRODUCT_BUNDLE_IDENTIFIER = "io.wwdc.app.WWDCAgentTestClient$(SAMPLE_CODE_DISAMBIGUATOR)"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; }; diff --git a/WWDC/Main.xcconfig b/WWDC/Main.xcconfig index b73f2107..56af22ed 100644 --- a/WWDC/Main.xcconfig +++ b/WWDC/Main.xcconfig @@ -1,3 +1,7 @@ +// If you see this error: "could not find included file 'TeamID.xcconfig' in search paths" +// Make sure you have run the bootstrap script from the project's root directory to set um signing for your team ID. +#include "TeamID.xcconfig" + MARKETING_VERSION = 7.4 CURRENT_PROJECT_VERSION = 1030 @@ -6,3 +10,5 @@ MACOSX_DEPLOYMENT_TARGET = 12.0 VERSIONING_SYSTEM = apple-generic COPYRIGHT=© 2017-2023 Buddy Software LTD + +CODE_SIGN_STYLE = Automatic diff --git a/WWDC/OpenSource.xcconfig b/WWDC/OpenSource.xcconfig new file mode 100644 index 00000000..1fc94bde --- /dev/null +++ b/WWDC/OpenSource.xcconfig @@ -0,0 +1,6 @@ +#include "Main.xcconfig" + +// Once you set your project's development team, +// you'll have a unique bundle identifier. This is because the bundle identifier +// is derived based on the 'SAMPLE_CODE_DISAMBIGUATOR' value. +SAMPLE_CODE_DISAMBIGUATOR=${DEVELOPMENT_TEAM} diff --git a/bootstrap.sh b/bootstrap.sh index e38a5b0c..a48175fc 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -3,6 +3,10 @@ if [[ ${CI} ]]; then echo -en '\033[33;1mBootstrap\033[0m travis_fold:start:bootstrap\\r' fi +echo "" + +./teamid.sh + lessThanOrEqual() { [ "$1" = "`echo -e "$1\n$2" | sort -V | head -n1`" ] } @@ -45,5 +49,4 @@ if ! $SWIFTLINT_INSTALLED || ! $SWIFTLINT_UPDATED; then fi fi -echo "All done" -xed . \ No newline at end of file +echo "All done" \ No newline at end of file diff --git a/teamid.sh b/teamid.sh new file mode 100755 index 00000000..b357cf87 --- /dev/null +++ b/teamid.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +TEAM_ID_FILE=WWDC/TeamID.xcconfig + +echo "What is your Apple Developer Team ID? (looks like 1A23BDCD)" +read TEAM_ID + +if [ -z "$TEAM_ID" ]; then + echo "You must enter a team id" + exit 1 +fi + +echo "// This file was automatically generated, do not edit directly." > $TEAM_ID_FILE +echo "" >> $TEAM_ID_FILE +echo "DEVELOPMENT_TEAM=$TEAM_ID" >> $TEAM_ID_FILE + +echo "" +echo "Successfully generated configuration at $TEAM_ID_FILE, you may now build the app using the \"WWDC\" target" +echo "You may need to close and re-open the project in Xcode if it's already open" +echo "" \ No newline at end of file From 3c9323065cf93a5e9d0a40102eb3e898fb56a80a Mon Sep 17 00:00:00 2001 From: Guilherme Rambo Date: Mon, 29 May 2023 13:07:13 -0300 Subject: [PATCH 4/6] Typo --- WWDC/Main.xcconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WWDC/Main.xcconfig b/WWDC/Main.xcconfig index 56af22ed..42d5cc76 100644 --- a/WWDC/Main.xcconfig +++ b/WWDC/Main.xcconfig @@ -1,5 +1,5 @@ // If you see this error: "could not find included file 'TeamID.xcconfig' in search paths" -// Make sure you have run the bootstrap script from the project's root directory to set um signing for your team ID. +// Make sure you have run the bootstrap script from the project's root directory to set up signing for your team ID. #include "TeamID.xcconfig" MARKETING_VERSION = 7.4 From 957a832a63426f852a7d8439a9b72629b158187d Mon Sep 17 00:00:00 2001 From: Guilherme Rambo Date: Mon, 29 May 2023 13:19:36 -0300 Subject: [PATCH 5/6] Allowing teamid script to receive ID as its first argument --- teamid.sh | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/teamid.sh b/teamid.sh index b357cf87..ce91495c 100755 --- a/teamid.sh +++ b/teamid.sh @@ -2,14 +2,20 @@ TEAM_ID_FILE=WWDC/TeamID.xcconfig -echo "What is your Apple Developer Team ID? (looks like 1A23BDCD)" -read TEAM_ID +if [ -z "$1" ]; then + echo "What is your Apple Developer Team ID? (looks like 1A23BDCD)" + read TEAM_ID -if [ -z "$TEAM_ID" ]; then - echo "You must enter a team id" - exit 1 + if [ -z "$TEAM_ID" ]; then + echo "You must enter a team id" + exit 1 + fi +else + TEAM_ID=$1 fi +echo "Setting team ID to $TEAM_ID" + echo "// This file was automatically generated, do not edit directly." > $TEAM_ID_FILE echo "" >> $TEAM_ID_FILE echo "DEVELOPMENT_TEAM=$TEAM_ID" >> $TEAM_ID_FILE From a0f6877ad437ab9bf8f9ddaee65888470b678382 Mon Sep 17 00:00:00 2001 From: Guilherme Rambo Date: Mon, 29 May 2023 13:36:56 -0300 Subject: [PATCH 6/6] Listing development team IDs in bootstrap script --- teamid.sh | 41 +++++++++++++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/teamid.sh b/teamid.sh index ce91495c..a66db9f1 100755 --- a/teamid.sh +++ b/teamid.sh @@ -2,18 +2,47 @@ TEAM_ID_FILE=WWDC/TeamID.xcconfig +function print_team_ids() { + echo "" + echo "FYI, here are the team IDs found in your Xcode preferences:" + echo "" + + XCODEPREFS="$HOME/Library/Preferences/com.apple.dt.Xcode.plist" + TEAM_KEYS=(`/usr/libexec/PlistBuddy -c "Print :IDEProvisioningTeams" "$XCODEPREFS" | perl -lne 'print $1 if /^ (\S*) =/'`) + + for KEY in $TEAM_KEYS + do + i=0 + while true ; do + NAME=$(/usr/libexec/PlistBuddy -c "Print :IDEProvisioningTeams:$KEY:$i:teamName" "$XCODEPREFS" 2>/dev/null) + TEAMID=$(/usr/libexec/PlistBuddy -c "Print :IDEProvisioningTeams:$KEY:$i:teamID" "$XCODEPREFS" 2>/dev/null) + + if [ $? -ne 0 ]; then + break + fi + + echo "$TEAMID - $NAME" + + i=$(($i + 1)) + done + done +} + if [ -z "$1" ]; then - echo "What is your Apple Developer Team ID? (looks like 1A23BDCD)" + print_team_ids + echo "" + echo "> What is your Apple Developer Team ID? (looks like 1A23BDCD)" read TEAM_ID - - if [ -z "$TEAM_ID" ]; then - echo "You must enter a team id" - exit 1 - fi else TEAM_ID=$1 fi +if [ -z "$TEAM_ID" ]; then + echo "You must enter a team id" + print_team_ids + exit 1 +fi + echo "Setting team ID to $TEAM_ID" echo "// This file was automatically generated, do not edit directly." > $TEAM_ID_FILE