Skip to content

Commit 9d9ae55

Browse files
tal-mital-mi
committed
APP: Keys & CI Update
1 parent 4b5b53e commit 9d9ae55

File tree

6 files changed

+54
-66
lines changed

6 files changed

+54
-66
lines changed

‎.github/workflows/bits&bytes_develop_debug.yml‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,22 +34,18 @@ jobs:
3434
run: |
3535
sed -i '/signingConfigs {/,/}/c\signingConfigs {\n\n getByName("debug") {\n keyAlias = "${{ secrets.BITS_N_BYTES_DEBUG_KEY_ALIAS }}"\n keyPassword = "${{ secrets.BITS_N_BYTES_DEBUG_KEY_PASSWORD }}"\n storeFile = file("keystore/debug")\n storePassword = "${{ secrets.BITS_N_BYTES_DEBUG_STORE_PASSWORD }}"\n }\n' app/build.gradle.kts
3636
37-
- name: Comment out updateAppKeys dependency
37+
- name: Change API key in demo keys.xml
3838
run: |
39-
sed -i 's/dependsOn("updateAppKeys")/\/\/ dependsOn("updateAppKeys")/' app/build.gradle.kts
39+
sed -i 's|<string name="com.sap.cxcdc.apikey">.*</string>|<string name="com.sap.cxcdc.apikey">${{ secrets.BITS_N_BYTES_DEMO_API_KEY }}</string>|' app/src/main/res/values/keys.xml
4040
41-
- name: Change API key in demo strings.xml
41+
- name: Change API key in variant keys.xml
4242
run: |
43-
sed -i 's|<string name="com.sap.cxcdc.apikey">.*</string>|<string name="com.sap.cxcdc.apikey">${{ secrets.BITS_N_BYTES_DEMO_API_KEY }}</string>|' app/src/main/res/values/strings.xml
43+
sed -i 's|<string name="com.sap.cxcdc.apikey">.*</string>|<string name="com.sap.cxcdc.apikey">${{ secrets.BITS_N_BYTES_DEMO_API_KEY }}</string>|' app/src/variant/res/values/keys.xml
4444
45-
- name: Change API key in variant strings.xml
46-
run: |
47-
sed -i 's|<string name="com.sap.cxcdc.apikey">.*</string>|<string name="com.sap.cxcdc.apikey">${{ secrets.BITS_N_BYTES_DEMO_API_KEY }}</string>|' app/src/main/res/values/strings.xml
48-
49-
- name: Create file for google-services.json
45+
- name: Create file for google-services.json (Demo)
5046
run: cat app/google-services.json | base64
5147

52-
- name: Populate google-services.json
48+
- name: Populate google-services.json (Demo)
5349
env:
5450
DATA: ${{ secrets.GOOGLE_SERVICES_JSON }}
5551
run: echo $DATA > app/google-services.json

‎app/build.gradle.kts‎

Lines changed: 5 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
import java.io.FileNotFoundException
2+
import java.nio.file.Files
3+
import java.nio.file.StandardCopyOption
4+
15
plugins {
26
alias(libs.plugins.android.application)
37
alias(libs.plugins.kotlin.android)
@@ -85,28 +89,6 @@ android {
8589
}
8690

8791
namespace = "com.sap.cdc.bitsnbytes"
88-
89-
tasks.register("updateAppKeys") {
90-
doLast {
91-
val demoApiKey = project.findProperty("bitsNbytes_demo_apiKey") ?: "none"
92-
val variantApiKey = project.findProperty("bitsNbytes_variant_apKey") ?: "none"
93-
val stringsXmlPathDemo = "src/main/res/values/strings.xml"
94-
val stringsXmlPathVariant = "src/variant/res/values/strings.xml"
95-
exec {
96-
commandLine("sh", "-c", "gsed -i \"s|<string name=\\\"com.sap.cxcdc.apikey\\\">.*</string>|<string name=\\\"com.sap.cxcdc.apikey\\\">$demoApiKey</string>|\" $stringsXmlPathDemo")
97-
}
98-
99-
exec {
100-
commandLine("sh", "-c", "gsed -i \"s|<string name=\\\"com.sap.cxcdc.apikey\\\">.*</string>|<string name=\\\"com.sap.cxcdc.apikey\\\">$variantApiKey</string>|\" $stringsXmlPathVariant")
101-
}
102-
}
103-
}
104-
105-
tasks.whenTaskAdded {
106-
if (name == "assembleDemoDebug" || name == "assembleVariantDebug") {
107-
dependsOn("updateAppKeys")
108-
}
109-
}
11092
}
11193

11294
dependencies {
@@ -137,6 +119,6 @@ dependencies {
137119
implementation(libs.bundles.credentials)
138120
implementation(libs.googleid)
139121

140-
implementation(libs.firebase.bom)
122+
implementation(platform(libs.firebase.bom))
141123

142124
}

‎app/src/main/res/values/keys.xml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
4+
<!-- SDK configuration -->
5+
<string name="com.sap.cxcdc.apikey">API_KEY_HERE</string>
6+
<string name="com.sap.cxcdc.domain">us1.gigya.com</string>
7+
8+
<!-- Facebook provider configuration -->
9+
<string name="facebook_app_id">FB_APP_ID_HERE</string>
10+
<string name="fb_login_protocol_scheme">FB_LOGIN_PROTOCOL_SCHEME_HERE</string>
11+
<string name="facebook_client_token">FB_CLIENT_TOKEN_HERE</string>
12+
13+
<!-- Google provider configuration -->
14+
<string name="google_server_client_id">GOOGLE_WEB_CLIENT_ID_HERE</string>
15+
16+
<!-- Line provider configuration -->
17+
<string name="line_channel_id">LINE_CHANNEL_ID_HERE</string>
18+
19+
<!-- WeChat provider configuration -->
20+
<string name="wechat_app_id">WECHAT_APP_ID_HERE</string>
21+
22+
</resources>

‎app/src/main/res/values/strings.xml‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,6 @@
11
<resources>
22
<string name="app_name">Bits n Bytes</string>
33

4-
<!-- SDK configuration -->
5-
<string name="com.sap.cxcdc.apikey">4_IRlvtosgJirDR_W_dfr3pg</string>
6-
<string name="com.sap.cxcdc.domain">us1.gigya.com</string>
7-
8-
<!-- Social providers configuration-->
9-
<string name="facebook_app_id">FB_APP_ID_HERE</string>
10-
<string name="fb_login_protocol_scheme">FB_LOGIN_PROTOCOL_SCHEME_HERE</string>
11-
<string name="facebook_client_token">FB_CLIENT_TOKEN_HERE</string>
12-
13-
<string name="line_channel_id">LINE_CHANNEL_ID_HERE</string>
14-
15-
<string name="wechat_app_id">WECHAT_APP_ID_HERE</string>
16-
17-
<string name="google_server_client_id">GOOGLE_WEB_CLIENT_ID_HERE</string>
18-
194
<!-- App string resources -->
205
<string name="home">Bits \u0026 Bytes</string>
216
<string name="search">Search</string>
@@ -33,7 +18,6 @@
3318

3419
<string name="home_img_macbook_content_description">Macbook image</string>
3520

36-
3721
<string name="resolve_link_account">Resolve Link Account\n</string>
3822
<string name="email_sign_in">email_sign_in</string>
3923

‎app/src/variant/res/values/keys.xml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
4+
<!-- SDK configuration -->
5+
<string name="com.sap.cxcdc.apikey">API_KEY_HERE</string>
6+
<string name="com.sap.cxcdc.domain">us1.gigya.com</string>
7+
8+
<!-- Facebook provider configuration -->
9+
<string name="facebook_app_id">FB_APP_ID_HERE</string>
10+
<string name="fb_login_protocol_scheme">FB_LOGIN_PROTOCOL_SCHEME_HERE</string>
11+
<string name="facebook_client_token">FB_CLIENT_TOKEN_HERE</string>
12+
13+
<!-- Google provider configuration -->
14+
<string name="google_server_client_id">GOOGLE_WEB_CLIENT_ID_HERE</string>
15+
16+
<!-- Line provider configuration -->
17+
<string name="line_channel_id">LINE_CHANNEL_ID_HERE</string>
18+
19+
<!-- WeChat provider configuration -->
20+
<string name="wechat_app_id">WECHAT_APP_ID_HERE</string>
21+
</resources>

‎app/src/variant/res/values/strings.xml‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,4 @@
11
<resources>
22

3-
<!-- SDK configuration -->
4-
<string name="com.sap.cxcdc.apikey">4_PveUmyjGz6-be6K2mc31_Q</string>
5-
<string name="com.sap.cxcdc.domain">us1.gigya.com</string>
6-
7-
<!-- Social providers configuration -->
8-
<string name="facebook_app_id">FB_APP_ID_HERE</string>
9-
<string name="fb_login_protocol_scheme">FB_LOGIN_PROTOCOL_SCHEME_HERE</string>
10-
<string name="facebook_client_token">FB_CLIENT_TOKEN_HERE</string>
11-
12-
<string name="line_channel_id">LINE_CHANNEL_ID_HERE</string>
13-
14-
<string name="wechat_app_id">WECHAT_APP_ID_HERE</string>
15-
16-
<string name="google_server_client_id">GOOGLE_WEB_CLIENT_ID_HERE</string>
17-
<string name="resolve_link_account">Resolve Link Account\n</string>
18-
<string name="email_sign_in">email_sign_in</string>
19-
203

214
</resources>

0 commit comments

Comments
 (0)