Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/2843 #2949

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 4 additions & 4 deletions .github/actions/submit-test/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ name: Submit to survey
inputs:
android-repository:
description: 'ground-android repository under test'
default: google/ground-android
default: groundplatform/ground-android

platform-repository:
description: 'ground-platform repository under test (if applicable)'
default: google/ground-platform
default: groundplatform/ground-platform

use-repo-data:
description: 'Whether to use the local repository emulator data or not'
Expand Down Expand Up @@ -130,11 +130,11 @@ runs:
- name: Replace Google Maps API key
shell: bash
env:
GOOGLE_MAPS_KEY: ${{ inputs.google-maps-key }}
GOOGLE_MAPS_KEY: ${{ inputs.groundplatform-maps-key }}
run: |
sed -E -i 's/("current_key": ")[[:alnum:]_-]+(")/\1'"$GOOGLE_MAPS_KEY"'\2/' ground/src/debug/local/google-services.json

- name: Move the local google-services.json
- name: Move the local groundplatform-services.json
shell: bash
run: |
cp -r ground/src/debug/local/google-services.json ground/src/debug/
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
timeout-minutes: 10
steps:
- name: Run create-test
uses: google/ground-platform/.github/actions/create-test@master
uses: groundplatform/ground-platform/.github/actions/create-test@master
with:
upload-artifacts: true

Expand All @@ -61,6 +61,6 @@ jobs:
timeout-minutes: 10
steps:
- name: Run verify-test
uses: google/ground-platform/.github/actions/verify-test@master
uses: groundplatform/ground-platform/.github/actions/verify-test@master
with:
use-repo-data: false
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ either the commit message for your changes or in your pull request.

https://console.firebase.google.com/

2. Add a new Android app with package name `com.google.android.ground`.
2. Add a new Android app with package name `org.groundplatform.android`.

3. Add the debug SHA-1 of your device.

Expand Down
12 changes: 6 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -37,21 +37,21 @@ buildscript {
dependencies {
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$navigationVersion"
classpath 'com.android.tools.build:gradle:8.3.2'
classpath 'com.google.gms:google-services:4.4.2'
classpath 'com.groundplatform.gms:groundplatform-services:4.4.2'
classpath "de.sharpmind:gitversioner:0.6.3"

// Performance Monitoring plugin: https://firebase.google.com/docs/perf-mon
classpath 'com.google.firebase:perf-plugin:1.4.2'
classpath 'com.groundplatform.firebase:perf-plugin:1.4.2'

// Crashlytics plugin
classpath 'com.google.firebase:firebase-crashlytics-gradle:3.0.2'
classpath 'com.groundplatform.firebase:firebase-crashlytics-gradle:3.0.2'

// Kotlin
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlinVersion"

// OSS Licenses Plugin
classpath 'com.google.android.gms:oss-licenses-plugin:0.10.6'
classpath 'com.groundplatform.android.gms:oss-licenses-plugin:0.10.6'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand All @@ -62,9 +62,9 @@ plugins {
id "org.jetbrains.kotlin.android" version "$kotlinVersion" apply false
id "org.jetbrains.kotlin.plugin.serialization" version "$kotlinVersion"
id "com.ncorti.ktfmt.gradle" version "0.20.0"
id "com.google.dagger.hilt.android" version "$hiltVersion" apply false
id "com.groundplatform.dagger.hilt.android" version "$hiltVersion" apply false
id "io.gitlab.arturbosch.detekt" version "1.23.5"
id "com.google.protobuf" version '0.9.4' apply false
id "com.groundplatform.protobuf" version '0.9.4' apply false
}

allprojects {
Expand Down
4 changes: 2 additions & 2 deletions config/jacoco/jacoco.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ tasks.register('jacocoLocalDebugUnitTestReport', JacocoReport) {
html.required = true
}
classDirectories.from = fileTree(
dir: 'build/intermediates/classes/localDebug/transformLocalDebugClassesWithAsm/dirs/com/google/android/ground',
dir: 'build/intermediates/classes/localDebug/transformLocalDebugClassesWithAsm/dirs/com/groundplatform/android/ground',
excludes: [
'**/databinding/*',
'**/local/room/dao/*',
Expand Down Expand Up @@ -108,6 +108,6 @@ tasks.register('jacocoLocalDebugUnitTestReport', JacocoReport) {
'**/util/AsyncSingletonProvider*',
]
)
sourceDirectories.from = files('src/main/java/com/google/android/ground')
sourceDirectories.from = files('src/main/java/com/groundplatform/android/ground')
executionData.from = files('build/jacoco/testLocalDebugUnitTest.exec')
}
4 changes: 2 additions & 2 deletions e2eTest/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ plugins {

android {
targetProjectPath ':ground'
namespace 'com.google.android.ground.e2etest'
namespace 'com.groundplatform.android.ground.e2etest'
compileSdk rootProject.androidCompileSdk

defaultConfig {
Expand Down Expand Up @@ -73,7 +73,7 @@ dependencies {
implementation "androidx.test:runner:1.6.1"
implementation "androidx.test:rules:1.6.1"
implementation "androidx.test.uiautomator:uiautomator:2.3.0"
implementation 'com.google.truth:truth:1.4.2'
implementation 'com.groundplatform.truth:truth:1.4.2'
implementation "junit:junit:$junitVersion"
implementation project(':ground')
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.google.android.ground.e2etest
package org.groundplatform.android.e2etest

import android.content.Context
import android.content.Intent
Expand All @@ -25,8 +25,8 @@ import androidx.test.uiautomator.By
import androidx.test.uiautomator.BySelector
import androidx.test.uiautomator.UiDevice
import androidx.test.uiautomator.Until
import com.google.android.ground.e2etest.TestConfig.LONG_TIMEOUT
import com.google.android.ground.e2etest.TestConfig.SHORT_TIMEOUT
import org.groundplatform.android.e2etest.TestConfig.LONG_TIMEOUT
import org.groundplatform.android.e2etest.TestConfig.SHORT_TIMEOUT
import kotlin.reflect.KClass

interface AutomatorRunner {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.google.android.ground.e2etest
package org.groundplatform.android.e2etest

import android.util.Log
import android.widget.Button
Expand All @@ -30,14 +30,14 @@ import androidx.test.uiautomator.By
import androidx.test.uiautomator.Direction
import androidx.test.uiautomator.UiDevice
import androidx.test.uiautomator.Until
import com.google.android.ground.R
import com.google.android.ground.e2etest.TestConfig.GROUND_PACKAGE
import com.google.android.ground.e2etest.TestConfig.LONG_TIMEOUT
import com.google.android.ground.e2etest.TestConfig.SHORT_TIMEOUT
import com.google.android.ground.e2etest.TestConfig.TEST_SURVEY_IDENTIFIER
import com.google.android.ground.e2etest.TestConfig.TEST_SURVEY_LOI_TASK_INDEX
import com.google.android.ground.e2etest.TestConfig.TEST_SURVEY_TASKS_ADHOC
import com.google.android.ground.model.task.Task
import org.groundplatform.android.R
import org.groundplatform.android.e2etest.TestConfig.GROUND_PACKAGE
import org.groundplatform.android.e2etest.TestConfig.LONG_TIMEOUT
import org.groundplatform.android.e2etest.TestConfig.SHORT_TIMEOUT
import org.groundplatform.android.e2etest.TestConfig.TEST_SURVEY_IDENTIFIER
import org.groundplatform.android.e2etest.TestConfig.TEST_SURVEY_LOI_TASK_INDEX
import org.groundplatform.android.e2etest.TestConfig.TEST_SURVEY_TASKS_ADHOC
import org.groundplatform.android.model.task.Task
import java.io.IOException
import junit.framework.TestCase.fail
import org.junit.Rule
Expand Down Expand Up @@ -250,7 +250,7 @@ class SurveyRunnerTest : AutomatorRunner {
}

private fun clickLocationLock() {
waitClickGone(By.res("com.google.android.ground", "location_lock_btn"), timeout = LONG_TIMEOUT)
waitClickGone(By.res("com.groundplatform.android.ground", "location_lock_btn"), timeout = LONG_TIMEOUT)
}

private fun setLoiName() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.google.android.ground.e2etest
package org.groundplatform.android.e2etest

import com.google.android.ground.model.task.Task
import org.groundplatform.android.model.task.Task

object TestConfig {
const val LONG_TIMEOUT = 30000L
const val SHORT_TIMEOUT = 10000L
const val GROUND_PACKAGE = "com.google.android.ground"
const val GROUND_PACKAGE = "com.groundplatform.android.ground"
val TEST_SURVEY_TASKS_ADHOC =
listOf(
Task.Type.CAPTURE_LOCATION,
Expand Down
Loading