Use RC API key for local development from local.xcconfig #4795
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,5 +22,9 @@ | |
| <key>NSAllowsArbitraryLoads</key> | ||
| <true/> | ||
| </dict> | ||
| <key>REVENUECAT_API_KEY</key> | ||
| <string>$(REVENUECAT_API_KEY)</string> | ||
| <key>REVENUECAT_PROXY_URL</key> | ||
| <string>$(REVENUECAT_PROXY_URL)</string> | ||
| </dict> | ||
| </plist> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,7 +16,10 @@ public struct Constants { | |
| /* | ||
| The API key for your app from the RevenueCat dashboard: https://app.revenuecat.com | ||
| This is the default used by `ConfigurationView` | ||
|
|
||
| To add your own API key for local development, add it in your local.xcconfig file like this: | ||
| REVENUECAT_API_KEY = your-api-key | ||
| */ | ||
| public static var apiKey: String { Bundle.main.object(forInfoDictionaryKey: "REVENUECAT_API_KEY") as? String ?? "" } | ||
|
|
||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,6 +22,8 @@ | |
| <key>NSAllowsArbitraryLoads</key> | ||
| <true/> | ||
| </dict> | ||
| <key>REVENUECAT_API_KEY</key> | ||
| <string>$(REVENUECAT_API_KEY)</string> | ||
| <key>UIApplicationSceneManifest</key> | ||
| <dict> | ||
| <key>UIApplicationSupportsMultipleScenes</key> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -162,6 +162,7 @@ | |
| 57ED6A83290891AF009580C6 /* ConfiguredPurchases.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConfiguredPurchases.swift; sourceTree = "<group>"; }; | ||
| 57ED6A85290893B6009580C6 /* Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Extensions.swift; sourceTree = "<group>"; }; | ||
| 57FA0F7C2908503B00E9EA1B /* PurchaseTester.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = PurchaseTester.entitlements; sourceTree = "<group>"; }; | ||
| 757594DC2D64AB8C001B06F5 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; }; | ||
| 773C13482CB58A6100219E42 /* Global.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Global.xcconfig; path = ../../../Global.xcconfig; sourceTree = "<group>"; }; | ||
| 773C13492CB58A7400219E42 /* Local.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Local.xcconfig; path = ../../../Local.xcconfig; sourceTree = "<group>"; }; | ||
| /* End PBXFileReference section */ | ||
|
|
@@ -298,6 +299,7 @@ | |
| 578DAA0A2947DD21001700FD /* PurchaseTesterWatchOS */ = { | ||
| isa = PBXGroup; | ||
| children = ( | ||
| 757594DC2D64AB8C001B06F5 /* Info.plist */, | ||
| 578DAA0B2947DD21001700FD /* PurchaseTesterWatchApp.swift */, | ||
| 578DAA0D2947DD21001700FD /* ContentView.swift */, | ||
| 578DAA0F2947DD21001700FD /* Assets.xcassets */, | ||
|
|
@@ -805,6 +807,7 @@ | |
| DEVELOPMENT_TEAM = 8SXR2327BM; | ||
| ENABLE_PREVIEWS = YES; | ||
| GENERATE_INFOPLIST_FILE = YES; | ||
| INFOPLIST_FILE = PurchaseTesterWatchOS/Info.plist; | ||
| INFOPLIST_KEY_CFBundleDisplayName = PurchaseTesterWatchOS; | ||
| INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown"; | ||
| INFOPLIST_KEY_WKCompanionAppBundleIdentifier = com.revenuecat.sampleapp; | ||
|
|
@@ -833,6 +836,7 @@ | |
| CURRENT_PROJECT_VERSION = 1; | ||
| ENABLE_PREVIEWS = YES; | ||
| GENERATE_INFOPLIST_FILE = YES; | ||
| INFOPLIST_FILE = PurchaseTesterWatchOS/Info.plist; | ||
| INFOPLIST_KEY_CFBundleDisplayName = PurchaseTesterWatchOS; | ||
| INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown"; | ||
| INFOPLIST_KEY_WKCompanionAppBundleIdentifier = com.revenuecat.sampleapp; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> | ||
| <plist version="1.0"> | ||
| <dict> | ||
| <key>REVENUECAT_API_KEY</key> | ||
| <string>$(REVENUECAT_API_KEY)</string> | ||
| </dict> | ||
| </plist> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,8 +13,7 @@ import RevenueCat | |
| struct ConfigurationView: View { | ||
|
|
||
| struct Data: Equatable, Codable { | ||
| var apiKey: String = Constants.apiKey | ||
| var proxy: String = "" | ||
| var storeKit2Enabled: Bool = true | ||
| var verificationMode: Configuration.EntitlementVerificationMode = .disabled | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -38,7 +38,7 @@ verify_no_included_apikeys() { | |
| "${SCRIPT_DIR}/../Examples/MagicWeather/MagicWeather/Constants.swift" | ||
| "${SCRIPT_DIR}/../Examples/MagicWeatherSwiftUI/Shared/Constants.swift" | ||
| "${SCRIPT_DIR}/../Tests/TestingApps/PurchaseTesterSwiftUI/Core/Constants.swift" | ||
|
There was a problem hiding this comment. Can we not get rid of all of these files, so we can get rid of the entire There was a problem hiding this comment. Well I see the utility of having then in the sense that someone might forget about the |
||
| "${SCRIPT_DIR}/../Tests/TestingApps/PaywallsTester/PaywallsTester/Config/ConfigItem.swift" | ||
| ) | ||
| FILES_STAGED=$(git diff --cached --name-only) | ||
| PATTERN="\"REVENUECAT_API_KEY\"" | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What do you think about removing this file and making the CI script create a
Local.xcconfigfile instead?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well, this file is still needed for the PaywallsTester app. I mean, not needed per se, but it's good to have a centralized place where we get the necessary variables from the info.plist.
Regarding having the CI script create a Local.xcconfig, I think that could totally work, yes. I'll open a separate PR for the CI changes related to this one 👍