Skip to content

Commit

Permalink
chore: simplify mock google-services.json workflow (meshtastic#1313)
Browse files Browse the repository at this point in the history
  • Loading branch information
andrekir authored Oct 14, 2024
1 parent fe56d25 commit 2050cd0
Show file tree
Hide file tree
Showing 5 changed files with 56 additions and 62 deletions.
2 changes: 2 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@

(Please delete all these tips and replace with your text)

- Before starting on some new big chunk of code, it it is optional but highly recommended to open an issue first to say "Hey, I think this idea X should be implemented and I'm starting work on it. My general plan is Y, any feedback is appreciated." This will allow other devs to potentially save you time by not accidentally duplicating work etc...
- Mention "#(issue)" in the description, when applicable
- Please do not check in files that don't have real changes
- Please do not reformat lines that you didn't have to change the code on
- If your other co-developers have comments on your PR please tweak as needed
- Do not use any external image service, just paste or drag and drop the image here and it will be uploaded automatically
- Please also enable "Allow edits by maintainers".
13 changes: 0 additions & 13 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,6 @@ jobs:
- name: Validate Gradle wrapper
uses: gradle/actions/wrapper-validation@v4

- name: Mock files for CI
run: |
rm ./app/google-services.json
cp ./app/google-services-example.json ./app/google-services.json
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
Expand Down Expand Up @@ -81,14 +76,6 @@ jobs:
with:
submodules: 'recursive'

- name: Validate Gradle wrapper
uses: gradle/actions/wrapper-validation@v4

- name: Mock files for CI
run: |
rm ./app/google-services.json
cp ./app/google-services-example.json ./app/google-services.json
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
Expand Down
8 changes: 0 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,6 @@ If you would like to develop this application we'd love your help! These build i

- Use Android Studio to build/debug
- Use "git submodule update --init --recursive" to pull in the various submodules we depend on
- There are a few config files which you'll need to copy from templates included in the project. Run
the following commands to do so:

```bash
rm ./app/google-services.json
cp ./app/google-services-example.json ./app/google-services.json
```

- Now you should be able to select "Run / Run" in the IDE and it will happily start running on your
phone or the emulator. Note: The emulators don't support bluetooth, so some features can not be
used in that environment.
Expand Down
40 changes: 0 additions & 40 deletions app/google-services-example.json

This file was deleted.

1 change: 0 additions & 1 deletion app/google-services.json

This file was deleted.

54 changes: 54 additions & 0 deletions app/google-services.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
{
"project_info": {
"project_number": "1111",
"firebase_url": "https://xxx.firebaseio.com",
"project_id": "xxx",
"storage_bucket": "xxx.appspot.com"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:xxx:android:1111",
"android_client_info": {
"package_name": "com.geeksville.mesh"
}
},
"oauth_client": [
{
"client_id": "111-xxx.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.geeksville.mesh"
}
},
{
"client_id": "111-xxx.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.geeksville.mesh"
}
},
{
"client_id": "111-xxx.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "APlaceholderAPIKeyWith-ThirtyNineCharsX"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": [
{
"client_id": "111-xxx.apps.googleusercontent.com",
"client_type": 3
}
]
}
}
}
],
"configuration_version": "1"
}

0 comments on commit 2050cd0

Please sign in to comment.