Skip to content

Commit 9e8338d

Browse files
authored
Merge pull request #2843 from wmathurin/dev
Adding back SalesforceSDK's bootconfig.xml
2 parents df788c2 + c422f29 commit 9e8338d

3 files changed

Lines changed: 8 additions & 1 deletion

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,6 @@ shared/test/test_credentials.json
2323
shared/test/ui_test_config.json
2424
**/bootconfig.xml
2525
!libs/test/**/bootconfig.xml
26+
!libs/SalesforceSDK/**/bootconfig.xml
2627
native/NativeSampleApps/AuthFlowTester/src/main/assets/
2728
.vscode/

install.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ apply_bootconfig_paths() {
4949

5050
BOOTCONFIG_SAMPLE="shared/bootconfig.xml.sample"
5151
BOOTCONFIG_XML_PATHS=(
52-
"libs/SalesforceSDK/res/values/bootconfig.xml"
5352
"native/NativeSampleApps/RestExplorer/res/values/bootconfig.xml"
5453
"native/NativeSampleApps/AuthFlowTester/src/main/res/values/bootconfig.xml"
5554
"native/NativeSampleApps/ConfiguredApp/res/values/bootconfig.xml"
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
3+
<resources>
4+
<string name="remoteAccessConsumerKey">__CONSUMER_KEY__</string>
5+
<string name="oauthRedirectURI">__REDIRECT_URI__</string>
6+
<string-array name="oauthScopes"></string-array>
7+
</resources>

0 commit comments

Comments
 (0)