Skip to content

Commit

Permalink
[RFR-441] Cleanup folder structure (#49)
Browse files Browse the repository at this point in the history
* [RFR-441] Move measuring-client to ui/cyface

* Cleanup ui/r4r folder structure

* Move test classes

* Cleanup folder structure

* Convert classes to Kotlin

* Move CapturingFragment

* Move notifications

* Convert dialogs

* Convert SyncButton

* Move Button listenre
  • Loading branch information
hb0 authored May 5, 2023
1 parent 56418b6 commit 8607dfe
Show file tree
Hide file tree
Showing 131 changed files with 1,254 additions and 1,390 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/gradle_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,6 @@ jobs:
# Executing build here on Ubuntu stack (1/10th costs of MacOS stack)
# Not using "gradle build" as we don't want to run the tests of all dependencies (e.g. backend)
- name: Assemble with Gradle
run: ./gradlew :measuring-client:assembleDebug
run: ./gradlew :ui:cyface:assembleDebug :ui:r4r:assembleDebug
- name: Test with Gradle
run: ./gradlew :measuring-client:testDebugUnitTest
run: ./gradlew :ui:cyface:testDebugUnitTest :ui:r4r:testDebugUnitTest
6 changes: 3 additions & 3 deletions .github/workflows/gradle_connected-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ jobs:
#- name: Assemble with Gradle
# run: ./gradlew assemble
#- name: Test with Gradle
# run: ./gradlew :measuring-client:test
# run: ./gradlew :ui:cyface:test :ui:r4r:test

# Add caching to speed up connected tests below (see `actions/android-emulator-runner`)
- name: Gradle cache
Expand Down Expand Up @@ -114,6 +114,6 @@ jobs:
# but this lead to `Timeout waiting for emulator` error
emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
disable-animations: true
script: ./gradlew :measuring-client:connectedDebugAndroidTest
script: ./gradlew :ui:cyface:connectedDebugAndroidTest
# To execute a single test class
#script: ./gradlew :measuring-client:connectedDebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.class=de.cyface.app.CapturingNotificationTest
#script: ./gradlew :ui:cyface:connectedDebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.class=de.cyface.app.CapturingNotificationTest
2 changes: 1 addition & 1 deletion .github/workflows/gradle_publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ jobs:
id: sign_app
uses: r0adkll/sign-android-release@v1
with:
releaseDirectory: measuring-client/build/outputs/bundle/release
releaseDirectory: ui/cyface/build/outputs/bundle/release
signingKeyBase64: ${{ secrets.SIGNING_KEY }}
alias: ${{ secrets.SIGNING_ALIAS }}
keyStorePassword: ${{ secrets.SIGNING_KEY_STORE_PASSWORD }}
Expand Down
2 changes: 1 addition & 1 deletion README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ See https://github.com/cyface-de/data-collector#release-a-new-version[Cyface Col
* `versionName` and `versionCode` in root `build.gradle` are automatically set by the CI
* Just tag the release and push the tag to Github
* After pushing the release tag the CI builds and signs the App Bundle automatically
* Checkout that build, copy the `measuring-client-release.aab` from the artifacts and upload it to Play Store
* Checkout that build, copy the `cyface-release.aab` from the artifacts and upload it to Play Store
* The tag is automatically marked as a 'new Release' on https://github.com/cyface-de/android-app/releases[Github]


Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ allprojects {
google()
mavenCentral()
gradlePluginPortal()
// Required by submodules: camera_service, energy_settings, measuring-client, backend
// Required by submodules: camera_service, energy_settings, ui, backend
maven {
url "https://maven.pkg.github.com/cyface-de/android-utils"
credentials {
Expand All @@ -143,7 +143,7 @@ allprojects {
}

// Generate a single reporting for all sub-modules (test results, lint, coverage, etc.)
// TODO does not work currently. measuring-client is unable to find dependencies with this applied.
// TODO does not work currently. ui is unable to find dependencies with this applied.
//apply plugin: 'android-reporting'

// Auto-generated by Android Studio
Expand Down

This file was deleted.

This file was deleted.

Loading

0 comments on commit 8607dfe

Please sign in to comment.