From 40d6a8902ebe4fc0f069ca69de5246873aa93e72 Mon Sep 17 00:00:00 2001 From: JayShortway <29483617+JayShortway@users.noreply.github.com> Date: Fri, 11 Oct 2024 15:52:26 +0200 Subject: [PATCH] Local.xcconfig is read by PurchaseTester and PaywallsTester (#4367) --- Global.xcconfig | 4 +++- Local.xcconfig.SAMPLE | 2 ++ .../PaywallsTester.xcodeproj/project.pbxproj | 8 +++++++- .../PurchaseTester.xcodeproj/project.pbxproj | 8 +++++++- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/Global.xcconfig b/Global.xcconfig index 117b75277a..82d9180b92 100644 --- a/Global.xcconfig +++ b/Global.xcconfig @@ -19,7 +19,9 @@ // ====== // This file's main purpose is to be able to make Local.xcconfig an optional Configuration Settings file. Otherwise, // builds would fail if Local.xcconfig does not exist, which we don't want. Any local build options, such as enabling -// compiler flags, should be done in Local.xcconfig. See Local.xcconfig.SAMPLE on how to create Local.xcconfig. +// compiler flags, should be done in Local.xcconfig. See Local.xcconfig.SAMPLE on how to create Local.xcconfig. +// +// Note that this file is read by the RevenueCat, PurchaseTester and PaywallsTester projects. // ====== #include? "Local.xcconfig" diff --git a/Local.xcconfig.SAMPLE b/Local.xcconfig.SAMPLE index a5b4faf6ce..8417b3a96a 100644 --- a/Local.xcconfig.SAMPLE +++ b/Local.xcconfig.SAMPLE @@ -22,6 +22,8 @@ // or write new ones. // 3. If there's any new build setting you think others can benefit from, please update the // .SAMPLE file and open a pull request. +// +// Note that this file is read by the RevenueCat, PurchaseTester and PaywallsTester projects. // ====== // Uncomment to enable the PAYWALL_COMPONENTS flag. diff --git a/Tests/TestingApps/PaywallsTester/PaywallsTester.xcodeproj/project.pbxproj b/Tests/TestingApps/PaywallsTester/PaywallsTester.xcodeproj/project.pbxproj index 1d08769869..3bf18c548f 100644 --- a/Tests/TestingApps/PaywallsTester/PaywallsTester.xcodeproj/project.pbxproj +++ b/Tests/TestingApps/PaywallsTester/PaywallsTester.xcodeproj/project.pbxproj @@ -96,6 +96,8 @@ 4FCA01FA2A3A1CBD00B262C0 /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; }; 4FDF111F2A7270F3004F3680 /* SamplePaywallsList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SamplePaywallsList.swift; sourceTree = ""; }; 4FFD2A602AA154B4001F4B0C /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/Localizable.strings; sourceTree = ""; }; + 773C13462CB5865400219E42 /* Local.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Local.xcconfig; path = ../../../Local.xcconfig; sourceTree = ""; }; + 776D4CFF2CB5848F00A521B2 /* Global.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Global.xcconfig; path = ../../../Global.xcconfig; sourceTree = ""; }; 880B2AF12BEC2D62006B9393 /* Preprocessor.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = Preprocessor.sh; sourceTree = SOURCE_ROOT; }; 880B2AF32BEC35AA006B9393 /* Postprocessor.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = Postprocessor.sh; sourceTree = SOURCE_ROOT; }; 884A4DDD2C701F4100BD6B90 /* CompatibilityContentUnavailableView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CompatibilityContentUnavailableView.swift; sourceTree = ""; }; @@ -164,6 +166,8 @@ 4F6BED912A26A64200CD9322 = { isa = PBXGroup; children = ( + 776D4CFF2CB5848F00A521B2 /* Global.xcconfig */, + 773C13462CB5865400219E42 /* Local.xcconfig */, 4F4EE7D02A5731CF00D7EAE1 /* purchases-ios */, 4FC046BB2A572E3700A28BCF /* PaywallsTester */, 4F6BED9B2A26A64200CD9322 /* Products */, @@ -496,6 +500,7 @@ /* Begin XCBuildConfiguration section */ 4F6BEDA72A26A64300CD9322 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 776D4CFF2CB5848F00A521B2 /* Global.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -547,13 +552,14 @@ MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) DEBUG"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; }; name = Debug; }; 4F6BEDA82A26A64300CD9322 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 776D4CFF2CB5848F00A521B2 /* Global.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; diff --git a/Tests/TestingApps/PurchaseTesterSwiftUI/PurchaseTester.xcodeproj/project.pbxproj b/Tests/TestingApps/PurchaseTesterSwiftUI/PurchaseTester.xcodeproj/project.pbxproj index 5fd0e24cf5..3cddbcf083 100644 --- a/Tests/TestingApps/PurchaseTesterSwiftUI/PurchaseTester.xcodeproj/project.pbxproj +++ b/Tests/TestingApps/PurchaseTesterSwiftUI/PurchaseTester.xcodeproj/project.pbxproj @@ -162,6 +162,8 @@ 57ED6A83290891AF009580C6 /* ConfiguredPurchases.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConfiguredPurchases.swift; sourceTree = ""; }; 57ED6A85290893B6009580C6 /* Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Extensions.swift; sourceTree = ""; }; 57FA0F7C2908503B00E9EA1B /* PurchaseTester.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = PurchaseTester.entitlements; sourceTree = ""; }; + 773C13482CB58A6100219E42 /* Global.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Global.xcconfig; path = ../../../Global.xcconfig; sourceTree = ""; }; + 773C13492CB58A7400219E42 /* Local.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Local.xcconfig; path = ../../../Local.xcconfig; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -233,6 +235,8 @@ 2CD2C4E8278C9B01005D1CC2 = { isa = PBXGroup; children = ( + 773C13482CB58A6100219E42 /* Global.xcconfig */, + 773C13492CB58A7400219E42 /* Local.xcconfig */, 4FDA13862A33DBE300C45CFE /* PrivacyInfo.xcprivacy */, 57FA0F7C2908503B00E9EA1B /* PurchaseTester.entitlements */, 2C8C610D27CEBEF200F86F21 /* PurchaseTester-Info.plist */, @@ -570,6 +574,7 @@ /* Begin XCBuildConfiguration section */ 2CD2C51C278C9B02005D1CC2 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 773C13482CB58A6100219E42 /* Global.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -634,7 +639,7 @@ PROVISIONING_PROFILE_SPECIFIER = ""; "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore com.revenuecat.sampleapp"; "PROVISIONING_PROFILE_SPECIFIER[sdk=watchos*]" = "match Development com.revenuecat.sampleapp.watchkitapp"; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) DEBUG"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; TVOS_DEPLOYMENT_TARGET = 15.2; WATCHOS_DEPLOYMENT_TARGET = 8.0; @@ -643,6 +648,7 @@ }; 2CD2C51D278C9B02005D1CC2 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 773C13482CB58A6100219E42 /* Global.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES;