Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 4 additions & 20 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,18 +38,10 @@ jobs:

- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Decode google-services.json
env:
DEBUG_GOOGLE_SERVICES_JSON_BASE64: ${{ secrets.DEBUG_GOOGLE_SERVICES_JSON_BASE64 }}
- name: Copy google-services.json
run: |
if [ -z "$DEBUG_GOOGLE_SERVICES_JSON_BASE64" ]; then
echo "DEBUG_GOOGLE_SERVICES_JSON_BASE64 is empty. Copying test-google-services.json."
echo "Copying test-google-services.json."
cp test-google-services.json app/google-services.json
else
echo "Decoding DEBUG_GOOGLE_SERVICES_JSON_BASE64."
echo $DEBUG_GOOGLE_SERVICES_JSON_BASE64 | base64 --decode > app/google-services.json
fi

- name: Apply Spotless
run: ./gradlew spotlessApply

Expand Down Expand Up @@ -133,18 +125,10 @@ jobs:

- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Decode google-services.json
env:
DEBUG_GOOGLE_SERVICES_JSON_BASE64: ${{ secrets.DEBUG_GOOGLE_SERVICES_JSON_BASE64 }}
- name: Change google-services.json
run: |
if [ -z "$DEBUG_GOOGLE_SERVICES_JSON_BASE64" ]; then
echo "DEBUG_GOOGLE_SERVICES_JSON_BASE64 is empty. Copying test-google-services.json."
echo "Copying test-google-services.json."
cp test-google-services.json app/google-services.json
else
echo "Decoding DEBUG_GOOGLE_SERVICES_JSON_BASE64."
echo $DEBUG_GOOGLE_SERVICES_JSON_BASE64 | base64 --decode > app/google-services.json
fi

- name: Build
run: ./gradlew assembleDebug assembleDebugAndroidTest

Expand Down
2 changes: 1 addition & 1 deletion app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ android {
compileSdk = libs.versions.compileSdk.get().toInt()

defaultConfig {
applicationId = "com.android.developers.androidify"
applicationId = "com.google.samples.apps.androidify"
minSdk = libs.versions.minSdk.get().toInt()
targetSdk = 36
versionCode = 3
Expand Down
2 changes: 1 addition & 1 deletion test-google-services.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"client_info": {
"mobilesdk_app_id": "APlaceholderAPIKeyWith-ThirtyNineCharsX",
"android_client_info": {
"package_name": "com.android.developers.androidify"
"package_name": "com.google.samples.apps.androidify"
}
},
"oauth_client": [],
Expand Down