diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index dd836b80b..f7ec0a105 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -44,31 +44,31 @@ jobs: with: arguments: testProdDebugUnitTest - ui-test: - runs-on: macos-latest - strategy: - matrix: - api-level: [24, 26, 28, 29, 30, 31] - steps: - - uses: actions/checkout@v2 - - name: set up JDK 11 - uses: actions/setup-java@v2 - with: - java-version: '11' - distribution: 'adopt' - cache: gradle - - name: Prepare - run: ./.github/prepare-workflow - - name: Validate Gradle wrapper - uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b - - name: run tests - uses: reactivecircus/android-emulator-runner@v2 - with: - api-level: ${{ matrix.api-level }} - arch: x86_64 - emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none - disable-animations: true - script: ./gradlew connectedProdDebugAndroidTest +# ui-test: +# runs-on: macos-latest +# strategy: +# matrix: +# api-level: [24, 26, 28, 29, 30, 31] +# steps: +# - uses: actions/checkout@v2 +# - name: set up JDK 11 +# uses: actions/setup-java@v2 +# with: +# java-version: '11' +# distribution: 'adopt' +# cache: gradle +# - name: Prepare +# run: ./.github/prepare-workflow +# - name: Validate Gradle wrapper +# uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b +# - name: run tests +# uses: reactivecircus/android-emulator-runner@v2 +# with: +# api-level: ${{ matrix.api-level }} +# arch: x86_64 +# emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none +# disable-animations: true +# script: ./gradlew connectedProdDebugAndroidTest lint: runs-on: ubuntu-latest diff --git a/habitica.properties.example b/habitica.properties.example new file mode 100644 index 000000000..dd5474b4d --- /dev/null +++ b/habitica.properties.example @@ -0,0 +1,10 @@ +# Habitica Server Port +# local instance +# PORT=3000 +PORT=80 +BASE_URL=https://habitica.com +STAGING_KEY= +ANDROID_TESTING_UUID= +APPLE_AUTH_CLIENT_ID= +DEBUG_USER_ID= +DEBUG_API_KEY= diff --git a/habitica.resources.example b/habitica.resources.example new file mode 100644 index 000000000..0e27e320f --- /dev/null +++ b/habitica.resources.example @@ -0,0 +1,4 @@ +fabric_key= +facebook_app_id= +amplitude_app_id= +application_ad_id= diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/data/repositories/UserRepository.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/data/repositories/UserRepository.kt index 8e1ce645a..dc785bcf4 100644 --- a/wearos/src/main/java/com/habitrpg/wearos/habitica/data/repositories/UserRepository.kt +++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/data/repositories/UserRepository.kt @@ -22,5 +22,8 @@ class UserRepository @Inject constructor(val apiClient: ApiClient, val localRepo suspend fun sleep() = apiClient.sleep() suspend fun revive() = apiClient.revive() - suspend fun runCron() = apiClient.runCron() + suspend fun runCron() { + apiClient.runCron() + retrieveUser() + } } \ No newline at end of file