Skip to content

Commit

Permalink
Merge branch 'master' into anandwana001/3003/named-argument-added
Browse files Browse the repository at this point in the history
  • Loading branch information
anandwana001 committed Jan 15, 2025
2 parents fef03a5 + a0c1abf commit b54f5ce
Show file tree
Hide file tree
Showing 650 changed files with 16 additions and 17 deletions.
4 changes: 2 additions & 2 deletions .github/actions/submit-test/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,12 +132,12 @@ runs:
env:
GOOGLE_MAPS_KEY: ${{ inputs.google-maps-key }}
run: |
sed -E -i 's/("current_key": ")[[:alnum:]_-]+(")/\1'"$GOOGLE_MAPS_KEY"'\2/' ground/src/debug/local/google-services.json
sed -E -i 's/("current_key": ")[[:alnum:]_-]+(")/\1'"$GOOGLE_MAPS_KEY"'\2/' app/src/debug/local/google-services.json
- name: Move the local google-services.json
shell: bash
run: |
cp -r ground/src/debug/local/google-services.json ground/src/debug/
cp -r app/src/debug/local/google-services.json app/src/debug/
- name: Build projects and run instrumentation tests
uses: reactivecircus/android-emulator-runner@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ jobs:
run: |
curl -Os https://uploader.codecov.io/latest/linux/codecov
chmod +x codecov
./codecov --verbose upload-process --fail-on-error -t ${{ secrets.CODECOV_TOKEN }} -n 'service'-${{ github.run_id }} -F service -f ground/build/reports/jacoco/jacocoLocalDebugUnitTestReport/jacocoLocalDebugUnitTestReport.xml
./codecov --verbose upload-process --fail-on-error -t ${{ secrets.CODECOV_TOKEN }} -n 'service'-${{ github.run_id }} -F service -f app/build/reports/jacoco/jacocoLocalDebugUnitTestReport/jacocoLocalDebugUnitTestReport.xml
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.*
**/google-services.json
!ground/src/debug/local/google-services.json
!app/src/debug/local/google-services.json
!.gitignore
!gradle/

Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ either the commit message for your changes or in your pull request.
$ keytool -list -v -keystore "$HOME/.android/debug.keystore" -alias androiddebugkey -storepass android -keypass android
```
4. Download the config file for the Android app to `ground/src/debug/google-services.json`
4. Download the config file for the Android app to `app/src/debug/google-services.json`
### Set up Google Cloud Build (optional)
Expand Down Expand Up @@ -193,7 +193,7 @@ $ gcloud builds submit --config=cloudbuild.yaml --substitutions=_ANDROID_VERSION
java.lang.RuntimeException: Unable to get provider com.google.firebase.provider.FirebaseInitProvider: java.lang.IllegalArgumentException: Given String is empty or null
```
Solution: Ensure `ground/src/debug/google-services.json` exists and is valid, as per instructions in [Set up Firebase](#set-up-firebase). You may need to perform a clean build in Android Studio by going to Build -> Clean Project.
Solution: Ensure `app/src/debug/google-services.json` exists and is valid, as per instructions in [Set up Firebase](#set-up-firebase). You may need to perform a clean build in Android Studio by going to Build -> Clean Project.
* Gradle Build fails with "License for package Android SDK Platform ... not accepted":
Expand All @@ -207,4 +207,4 @@ $ gcloud builds submit --config=cloudbuild.yaml --substitutions=_ANDROID_VERSION
com.google.android.gms.common.api.ApiException: 10:
```
Solution: Run `./gradlew :ground:signingReport` in the terminal, and check if the 'SHA1' value of the current 'Build variants' type matches with your Firebase Project.
Solution: Run `./gradlew :app:signingReport` in the terminal, and check if the 'SHA1' value of the current 'Build variants' type matches with your Firebase Project.
2 changes: 1 addition & 1 deletion ground/build.gradle → app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def extractedGroundProtoPath = layout.buildDirectory.dir('extracted-ground-proto
// Extract API key from google-services.json for use with Google Maps SDK.
import groovy.json.JsonSlurper

def inputFile = new File("ground/src/debug/google-services.json")
def inputFile = new File("app/src/debug/google-services.json")
def json = inputFile.exists() ? new JsonSlurper().parseText(inputFile.text) : null
def googleMapsApiKey = json ? json.client[0].api_key[0].current_key : ''

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
</service>

<!--
The API key for Google Maps-based APIs defined in ground/secrets.properties.
The API key for Google Maps-based APIs defined in app/secrets.properties.
Note that the API key is linked to the encryption key used to sign the APK.
You need a different API key for each encryption key, including the release key that is used to
Expand Down
File renamed without changes
File renamed without changes
File renamed without changes.
Loading

0 comments on commit b54f5ce

Please sign in to comment.