diff --git a/.github/actions/submit-test/action.yml b/.github/actions/submit-test/action.yml index fa6f959f7f..4145499adb 100644 --- a/.github/actions/submit-test/action.yml +++ b/.github/actions/submit-test/action.yml @@ -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 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 35f5a528e0..5df5f6af1f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 diff --git a/.gitignore b/.gitignore index 170cfb7629..e2b2b62410 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ .* **/google-services.json -!ground/src/debug/local/google-services.json +!app/src/debug/local/google-services.json !.gitignore !gradle/ diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e3f1de6381..32b20b651b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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) @@ -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": @@ -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. \ No newline at end of file + 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. \ No newline at end of file diff --git a/ground/build.gradle b/app/build.gradle similarity index 99% rename from ground/build.gradle rename to app/build.gradle index a4d925b6a6..202c648d89 100644 --- a/ground/build.gradle +++ b/app/build.gradle @@ -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 : '' diff --git a/ground/proguard-rules.pro b/app/proguard-rules.pro similarity index 100% rename from ground/proguard-rules.pro rename to app/proguard-rules.pro diff --git a/ground/schemas/com.google.android.ground.persistence.local.room.LocalDatabase/120.json b/app/schemas/com.google.android.ground.persistence.local.room.LocalDatabase/120.json similarity index 100% rename from ground/schemas/com.google.android.ground.persistence.local.room.LocalDatabase/120.json rename to app/schemas/com.google.android.ground.persistence.local.room.LocalDatabase/120.json diff --git a/ground/schemas/com.google.android.ground.persistence.local.room.LocalDatabase/121.json b/app/schemas/com.google.android.ground.persistence.local.room.LocalDatabase/121.json similarity index 100% rename from ground/schemas/com.google.android.ground.persistence.local.room.LocalDatabase/121.json rename to app/schemas/com.google.android.ground.persistence.local.room.LocalDatabase/121.json diff --git a/ground/src/androidTest/java/com/google/android/ground/BaseMainActivityTest.kt b/app/src/androidTest/java/com/google/android/ground/BaseMainActivityTest.kt similarity index 100% rename from ground/src/androidTest/java/com/google/android/ground/BaseMainActivityTest.kt rename to app/src/androidTest/java/com/google/android/ground/BaseMainActivityTest.kt diff --git a/ground/src/androidTest/java/com/google/android/ground/CustomTestRunner.kt b/app/src/androidTest/java/com/google/android/ground/CustomTestRunner.kt similarity index 100% rename from ground/src/androidTest/java/com/google/android/ground/CustomTestRunner.kt rename to app/src/androidTest/java/com/google/android/ground/CustomTestRunner.kt diff --git a/ground/src/androidTest/java/com/google/android/ground/DataBindingIdlingResource.kt b/app/src/androidTest/java/com/google/android/ground/DataBindingIdlingResource.kt similarity index 100% rename from ground/src/androidTest/java/com/google/android/ground/DataBindingIdlingResource.kt rename to app/src/androidTest/java/com/google/android/ground/DataBindingIdlingResource.kt diff --git a/ground/src/androidTest/java/com/google/android/ground/SetPreferencesRule.kt b/app/src/androidTest/java/com/google/android/ground/SetPreferencesRule.kt similarity index 100% rename from ground/src/androidTest/java/com/google/android/ground/SetPreferencesRule.kt rename to app/src/androidTest/java/com/google/android/ground/SetPreferencesRule.kt diff --git a/ground/src/androidTest/java/com/google/android/ground/TestAuthenticationModule.kt b/app/src/androidTest/java/com/google/android/ground/TestAuthenticationModule.kt similarity index 100% rename from ground/src/androidTest/java/com/google/android/ground/TestAuthenticationModule.kt rename to app/src/androidTest/java/com/google/android/ground/TestAuthenticationModule.kt diff --git a/ground/src/androidTest/java/com/google/android/ground/TestLocalDatabaseModule.kt b/app/src/androidTest/java/com/google/android/ground/TestLocalDatabaseModule.kt similarity index 100% rename from ground/src/androidTest/java/com/google/android/ground/TestLocalDatabaseModule.kt rename to app/src/androidTest/java/com/google/android/ground/TestLocalDatabaseModule.kt diff --git a/ground/src/androidTest/java/com/google/android/ground/TestRemoteStorageModule.kt b/app/src/androidTest/java/com/google/android/ground/TestRemoteStorageModule.kt similarity index 100% rename from ground/src/androidTest/java/com/google/android/ground/TestRemoteStorageModule.kt rename to app/src/androidTest/java/com/google/android/ground/TestRemoteStorageModule.kt diff --git a/ground/src/androidTest/java/com/google/android/ground/TestSharedPreferencesModule.kt b/app/src/androidTest/java/com/google/android/ground/TestSharedPreferencesModule.kt similarity index 100% rename from ground/src/androidTest/java/com/google/android/ground/TestSharedPreferencesModule.kt rename to app/src/androidTest/java/com/google/android/ground/TestSharedPreferencesModule.kt diff --git a/ground/src/androidTest/java/com/google/android/ground/TestWorkManagerModule.kt b/app/src/androidTest/java/com/google/android/ground/TestWorkManagerModule.kt similarity index 100% rename from ground/src/androidTest/java/com/google/android/ground/TestWorkManagerModule.kt rename to app/src/androidTest/java/com/google/android/ground/TestWorkManagerModule.kt diff --git a/ground/src/debug/AndroidManifest.xml b/app/src/debug/AndroidManifest.xml similarity index 100% rename from ground/src/debug/AndroidManifest.xml rename to app/src/debug/AndroidManifest.xml diff --git a/ground/src/debug/ic_launcher-playstore.png b/app/src/debug/ic_launcher-playstore.png similarity index 100% rename from ground/src/debug/ic_launcher-playstore.png rename to app/src/debug/ic_launcher-playstore.png diff --git a/ground/src/debug/java/com/google/android/ground/HiltTestActivity.kt b/app/src/debug/java/com/google/android/ground/HiltTestActivity.kt similarity index 100% rename from ground/src/debug/java/com/google/android/ground/HiltTestActivity.kt rename to app/src/debug/java/com/google/android/ground/HiltTestActivity.kt diff --git a/ground/src/debug/local/google-services.json b/app/src/debug/local/google-services.json similarity index 100% rename from ground/src/debug/local/google-services.json rename to app/src/debug/local/google-services.json diff --git a/ground/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from ground/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml rename to app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/ground/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from ground/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/ground/src/debug/res/mipmap-hdpi/ic_launcher.png b/app/src/debug/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from ground/src/debug/res/mipmap-hdpi/ic_launcher.png rename to app/src/debug/res/mipmap-hdpi/ic_launcher.png diff --git a/ground/src/debug/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/debug/res/mipmap-hdpi/ic_launcher_foreground.png similarity index 100% rename from ground/src/debug/res/mipmap-hdpi/ic_launcher_foreground.png rename to app/src/debug/res/mipmap-hdpi/ic_launcher_foreground.png diff --git a/ground/src/debug/res/mipmap-hdpi/ic_launcher_round.png b/app/src/debug/res/mipmap-hdpi/ic_launcher_round.png similarity index 100% rename from ground/src/debug/res/mipmap-hdpi/ic_launcher_round.png rename to app/src/debug/res/mipmap-hdpi/ic_launcher_round.png diff --git a/ground/src/debug/res/mipmap-mdpi/ic_launcher.png b/app/src/debug/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from ground/src/debug/res/mipmap-mdpi/ic_launcher.png rename to app/src/debug/res/mipmap-mdpi/ic_launcher.png diff --git a/ground/src/debug/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/debug/res/mipmap-mdpi/ic_launcher_foreground.png similarity index 100% rename from ground/src/debug/res/mipmap-mdpi/ic_launcher_foreground.png rename to app/src/debug/res/mipmap-mdpi/ic_launcher_foreground.png diff --git a/ground/src/debug/res/mipmap-mdpi/ic_launcher_round.png b/app/src/debug/res/mipmap-mdpi/ic_launcher_round.png similarity index 100% rename from ground/src/debug/res/mipmap-mdpi/ic_launcher_round.png rename to app/src/debug/res/mipmap-mdpi/ic_launcher_round.png diff --git a/ground/src/debug/res/mipmap-xhdpi/ic_launcher.png b/app/src/debug/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from ground/src/debug/res/mipmap-xhdpi/ic_launcher.png rename to app/src/debug/res/mipmap-xhdpi/ic_launcher.png diff --git a/ground/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.png similarity index 100% rename from ground/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.png rename to app/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.png diff --git a/ground/src/debug/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/debug/res/mipmap-xhdpi/ic_launcher_round.png similarity index 100% rename from ground/src/debug/res/mipmap-xhdpi/ic_launcher_round.png rename to app/src/debug/res/mipmap-xhdpi/ic_launcher_round.png diff --git a/ground/src/debug/res/mipmap-xxhdpi/ic_launcher.png b/app/src/debug/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from ground/src/debug/res/mipmap-xxhdpi/ic_launcher.png rename to app/src/debug/res/mipmap-xxhdpi/ic_launcher.png diff --git a/ground/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.png similarity index 100% rename from ground/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.png rename to app/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.png diff --git a/ground/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png similarity index 100% rename from ground/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png rename to app/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png diff --git a/ground/src/debug/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from ground/src/debug/res/mipmap-xxxhdpi/ic_launcher.png rename to app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/ground/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.png similarity index 100% rename from ground/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.png rename to app/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.png diff --git a/ground/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png similarity index 100% rename from ground/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png rename to app/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png diff --git a/ground/src/debug/res/values/ic_launcher_background.xml b/app/src/debug/res/values/ic_launcher_background.xml similarity index 100% rename from ground/src/debug/res/values/ic_launcher_background.xml rename to app/src/debug/res/values/ic_launcher_background.xml diff --git a/ground/src/debug/resources/jacoco-agent.properties b/app/src/debug/resources/jacoco-agent.properties similarity index 100% rename from ground/src/debug/resources/jacoco-agent.properties rename to app/src/debug/resources/jacoco-agent.properties diff --git a/ground/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml similarity index 97% rename from ground/src/main/AndroidManifest.xml rename to app/src/main/AndroidManifest.xml index aab89bebf8..49e68bec58 100644 --- a/ground/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -47,7 +47,7 @@