diff --git a/.circleci/test_modules.txt b/.circleci/test_modules.txt index e1d92308272..9aaf86bdc08 100644 --- a/.circleci/test_modules.txt +++ b/.circleci/test_modules.txt @@ -1,10 +1,10 @@ shared -formstest +forms-test androidshared async strings -audioclips -audiorecorder +audio-clips +audio-recorder projects location geo diff --git a/audioclips/.gitignore b/audio-clips/.gitignore similarity index 100% rename from audioclips/.gitignore rename to audio-clips/.gitignore diff --git a/audioclips/build.gradle.kts b/audio-clips/build.gradle.kts similarity index 100% rename from audioclips/build.gradle.kts rename to audio-clips/build.gradle.kts diff --git a/audioclips/consumer-rules.pro b/audio-clips/consumer-rules.pro similarity index 100% rename from audioclips/consumer-rules.pro rename to audio-clips/consumer-rules.pro diff --git a/audioclips/src/main/AndroidManifest.xml b/audio-clips/src/main/AndroidManifest.xml similarity index 100% rename from audioclips/src/main/AndroidManifest.xml rename to audio-clips/src/main/AndroidManifest.xml diff --git a/audioclips/src/main/java/org/odk/collect/audioclips/AudioClipViewModel.kt b/audio-clips/src/main/java/org/odk/collect/audioclips/AudioClipViewModel.kt similarity index 100% rename from audioclips/src/main/java/org/odk/collect/audioclips/AudioClipViewModel.kt rename to audio-clips/src/main/java/org/odk/collect/audioclips/AudioClipViewModel.kt diff --git a/audioclips/src/main/java/org/odk/collect/audioclips/Clip.kt b/audio-clips/src/main/java/org/odk/collect/audioclips/Clip.kt similarity index 100% rename from audioclips/src/main/java/org/odk/collect/audioclips/Clip.kt rename to audio-clips/src/main/java/org/odk/collect/audioclips/Clip.kt diff --git a/audioclips/src/main/java/org/odk/collect/audioclips/PlaybackFailedException.kt b/audio-clips/src/main/java/org/odk/collect/audioclips/PlaybackFailedException.kt similarity index 100% rename from audioclips/src/main/java/org/odk/collect/audioclips/PlaybackFailedException.kt rename to audio-clips/src/main/java/org/odk/collect/audioclips/PlaybackFailedException.kt diff --git a/audioclips/src/test/java/org/odk/collect/audioclips/AudioClipViewModelTest.kt b/audio-clips/src/test/java/org/odk/collect/audioclips/AudioClipViewModelTest.kt similarity index 100% rename from audioclips/src/test/java/org/odk/collect/audioclips/AudioClipViewModelTest.kt rename to audio-clips/src/test/java/org/odk/collect/audioclips/AudioClipViewModelTest.kt diff --git a/audiorecorder/.gitignore b/audio-recorder/.gitignore similarity index 100% rename from audiorecorder/.gitignore rename to audio-recorder/.gitignore diff --git a/audiorecorder/build.gradle.kts b/audio-recorder/build.gradle.kts similarity index 100% rename from audiorecorder/build.gradle.kts rename to audio-recorder/build.gradle.kts diff --git a/audiorecorder/consumer-rules.pro b/audio-recorder/consumer-rules.pro similarity index 100% rename from audiorecorder/consumer-rules.pro rename to audio-recorder/consumer-rules.pro diff --git a/audiorecorder/src/main/AndroidManifest.xml b/audio-recorder/src/main/AndroidManifest.xml similarity index 100% rename from audiorecorder/src/main/AndroidManifest.xml rename to audio-recorder/src/main/AndroidManifest.xml diff --git a/audiorecorder/src/main/java/org/odk/collect/audiorecorder/DaggerSetup.kt b/audio-recorder/src/main/java/org/odk/collect/audiorecorder/DaggerSetup.kt similarity index 100% rename from audiorecorder/src/main/java/org/odk/collect/audiorecorder/DaggerSetup.kt rename to audio-recorder/src/main/java/org/odk/collect/audiorecorder/DaggerSetup.kt diff --git a/audiorecorder/src/main/java/org/odk/collect/audiorecorder/mediarecorder/MediaRecorderRecordingResource.kt b/audio-recorder/src/main/java/org/odk/collect/audiorecorder/mediarecorder/MediaRecorderRecordingResource.kt similarity index 100% rename from audiorecorder/src/main/java/org/odk/collect/audiorecorder/mediarecorder/MediaRecorderRecordingResource.kt rename to audio-recorder/src/main/java/org/odk/collect/audiorecorder/mediarecorder/MediaRecorderRecordingResource.kt diff --git a/audiorecorder/src/main/java/org/odk/collect/audiorecorder/recorder/Recorder.kt b/audio-recorder/src/main/java/org/odk/collect/audiorecorder/recorder/Recorder.kt similarity index 100% rename from audiorecorder/src/main/java/org/odk/collect/audiorecorder/recorder/Recorder.kt rename to audio-recorder/src/main/java/org/odk/collect/audiorecorder/recorder/Recorder.kt diff --git a/audiorecorder/src/main/java/org/odk/collect/audiorecorder/recorder/RecordingResource.kt b/audio-recorder/src/main/java/org/odk/collect/audiorecorder/recorder/RecordingResource.kt similarity index 100% rename from audiorecorder/src/main/java/org/odk/collect/audiorecorder/recorder/RecordingResource.kt rename to audio-recorder/src/main/java/org/odk/collect/audiorecorder/recorder/RecordingResource.kt diff --git a/audiorecorder/src/main/java/org/odk/collect/audiorecorder/recorder/RecordingResourceRecorder.kt b/audio-recorder/src/main/java/org/odk/collect/audiorecorder/recorder/RecordingResourceRecorder.kt similarity index 100% rename from audiorecorder/src/main/java/org/odk/collect/audiorecorder/recorder/RecordingResourceRecorder.kt rename to audio-recorder/src/main/java/org/odk/collect/audiorecorder/recorder/RecordingResourceRecorder.kt diff --git a/audiorecorder/src/main/java/org/odk/collect/audiorecorder/recording/AudioRecorder.kt b/audio-recorder/src/main/java/org/odk/collect/audiorecorder/recording/AudioRecorder.kt similarity index 100% rename from audiorecorder/src/main/java/org/odk/collect/audiorecorder/recording/AudioRecorder.kt rename to audio-recorder/src/main/java/org/odk/collect/audiorecorder/recording/AudioRecorder.kt diff --git a/audiorecorder/src/main/java/org/odk/collect/audiorecorder/recording/AudioRecorderFactory.kt b/audio-recorder/src/main/java/org/odk/collect/audiorecorder/recording/AudioRecorderFactory.kt similarity index 100% rename from audiorecorder/src/main/java/org/odk/collect/audiorecorder/recording/AudioRecorderFactory.kt rename to audio-recorder/src/main/java/org/odk/collect/audiorecorder/recording/AudioRecorderFactory.kt diff --git a/audiorecorder/src/main/java/org/odk/collect/audiorecorder/recording/AudioRecorderService.kt b/audio-recorder/src/main/java/org/odk/collect/audiorecorder/recording/AudioRecorderService.kt similarity index 100% rename from audiorecorder/src/main/java/org/odk/collect/audiorecorder/recording/AudioRecorderService.kt rename to audio-recorder/src/main/java/org/odk/collect/audiorecorder/recording/AudioRecorderService.kt diff --git a/audiorecorder/src/main/java/org/odk/collect/audiorecorder/recording/internal/ForegroundServiceAudioRecorder.kt b/audio-recorder/src/main/java/org/odk/collect/audiorecorder/recording/internal/ForegroundServiceAudioRecorder.kt similarity index 100% rename from audiorecorder/src/main/java/org/odk/collect/audiorecorder/recording/internal/ForegroundServiceAudioRecorder.kt rename to audio-recorder/src/main/java/org/odk/collect/audiorecorder/recording/internal/ForegroundServiceAudioRecorder.kt diff --git a/audiorecorder/src/main/java/org/odk/collect/audiorecorder/recording/internal/RecordingForegroundServiceNotification.kt b/audio-recorder/src/main/java/org/odk/collect/audiorecorder/recording/internal/RecordingForegroundServiceNotification.kt similarity index 100% rename from audiorecorder/src/main/java/org/odk/collect/audiorecorder/recording/internal/RecordingForegroundServiceNotification.kt rename to audio-recorder/src/main/java/org/odk/collect/audiorecorder/recording/internal/RecordingForegroundServiceNotification.kt diff --git a/audiorecorder/src/main/java/org/odk/collect/audiorecorder/recording/internal/RecordingRepository.kt b/audio-recorder/src/main/java/org/odk/collect/audiorecorder/recording/internal/RecordingRepository.kt similarity index 100% rename from audiorecorder/src/main/java/org/odk/collect/audiorecorder/recording/internal/RecordingRepository.kt rename to audio-recorder/src/main/java/org/odk/collect/audiorecorder/recording/internal/RecordingRepository.kt diff --git a/audiorecorder/src/main/java/org/odk/collect/audiorecorder/testsupport/StubAudioRecorder.kt b/audio-recorder/src/main/java/org/odk/collect/audiorecorder/testsupport/StubAudioRecorder.kt similarity index 100% rename from audiorecorder/src/main/java/org/odk/collect/audiorecorder/testsupport/StubAudioRecorder.kt rename to audio-recorder/src/main/java/org/odk/collect/audiorecorder/testsupport/StubAudioRecorder.kt diff --git a/audiorecorder/src/test/java/org/odk/collect/audiorecorder/mediarecorder/AMRRecordingResourceTest.kt b/audio-recorder/src/test/java/org/odk/collect/audiorecorder/mediarecorder/AMRRecordingResourceTest.kt similarity index 100% rename from audiorecorder/src/test/java/org/odk/collect/audiorecorder/mediarecorder/AMRRecordingResourceTest.kt rename to audio-recorder/src/test/java/org/odk/collect/audiorecorder/mediarecorder/AMRRecordingResourceTest.kt diff --git a/audiorecorder/src/test/java/org/odk/collect/audiorecorder/recorder/RecordingResourceRecorderTest.kt b/audio-recorder/src/test/java/org/odk/collect/audiorecorder/recorder/RecordingResourceRecorderTest.kt similarity index 100% rename from audiorecorder/src/test/java/org/odk/collect/audiorecorder/recorder/RecordingResourceRecorderTest.kt rename to audio-recorder/src/test/java/org/odk/collect/audiorecorder/recorder/RecordingResourceRecorderTest.kt diff --git a/audiorecorder/src/test/java/org/odk/collect/audiorecorder/recording/AudioRecorderTest.kt b/audio-recorder/src/test/java/org/odk/collect/audiorecorder/recording/AudioRecorderTest.kt similarity index 100% rename from audiorecorder/src/test/java/org/odk/collect/audiorecorder/recording/AudioRecorderTest.kt rename to audio-recorder/src/test/java/org/odk/collect/audiorecorder/recording/AudioRecorderTest.kt diff --git a/audiorecorder/src/test/java/org/odk/collect/audiorecorder/recording/internal/AudioRecorderServiceTest.kt b/audio-recorder/src/test/java/org/odk/collect/audiorecorder/recording/internal/AudioRecorderServiceTest.kt similarity index 100% rename from audiorecorder/src/test/java/org/odk/collect/audiorecorder/recording/internal/AudioRecorderServiceTest.kt rename to audio-recorder/src/test/java/org/odk/collect/audiorecorder/recording/internal/AudioRecorderServiceTest.kt diff --git a/audiorecorder/src/test/java/org/odk/collect/audiorecorder/recording/internal/ForegroundServiceAudioRecorderTest.kt b/audio-recorder/src/test/java/org/odk/collect/audiorecorder/recording/internal/ForegroundServiceAudioRecorderTest.kt similarity index 100% rename from audiorecorder/src/test/java/org/odk/collect/audiorecorder/recording/internal/ForegroundServiceAudioRecorderTest.kt rename to audio-recorder/src/test/java/org/odk/collect/audiorecorder/recording/internal/ForegroundServiceAudioRecorderTest.kt diff --git a/audiorecorder/src/test/java/org/odk/collect/audiorecorder/recording/internal/RecordingForegroundServiceNotificationTest.kt b/audio-recorder/src/test/java/org/odk/collect/audiorecorder/recording/internal/RecordingForegroundServiceNotificationTest.kt similarity index 100% rename from audiorecorder/src/test/java/org/odk/collect/audiorecorder/recording/internal/RecordingForegroundServiceNotificationTest.kt rename to audio-recorder/src/test/java/org/odk/collect/audiorecorder/recording/internal/RecordingForegroundServiceNotificationTest.kt diff --git a/audiorecorder/src/test/java/org/odk/collect/audiorecorder/support/FakeRecorder.kt b/audio-recorder/src/test/java/org/odk/collect/audiorecorder/support/FakeRecorder.kt similarity index 100% rename from audiorecorder/src/test/java/org/odk/collect/audiorecorder/support/FakeRecorder.kt rename to audio-recorder/src/test/java/org/odk/collect/audiorecorder/support/FakeRecorder.kt diff --git a/audiorecorder/src/test/java/org/odk/collect/audiorecorder/testsupport/RobolectricApplication.kt b/audio-recorder/src/test/java/org/odk/collect/audiorecorder/testsupport/RobolectricApplication.kt similarity index 100% rename from audiorecorder/src/test/java/org/odk/collect/audiorecorder/testsupport/RobolectricApplication.kt rename to audio-recorder/src/test/java/org/odk/collect/audiorecorder/testsupport/RobolectricApplication.kt diff --git a/audiorecorder/src/test/java/org/odk/collect/audiorecorder/testsupport/StubAudioRecorderTest.kt b/audio-recorder/src/test/java/org/odk/collect/audiorecorder/testsupport/StubAudioRecorderTest.kt similarity index 100% rename from audiorecorder/src/test/java/org/odk/collect/audiorecorder/testsupport/StubAudioRecorderTest.kt rename to audio-recorder/src/test/java/org/odk/collect/audiorecorder/testsupport/StubAudioRecorderTest.kt diff --git a/audiorecorder/src/test/resources/robolectric.properties b/audio-recorder/src/test/resources/robolectric.properties similarity index 100% rename from audiorecorder/src/test/resources/robolectric.properties rename to audio-recorder/src/test/resources/robolectric.properties diff --git a/collect_app/build.gradle b/collect_app/build.gradle index 47a36851679..d6371510c47 100644 --- a/collect_app/build.gradle +++ b/collect_app/build.gradle @@ -238,9 +238,9 @@ dependencies { implementation project(':material') implementation project(':async') implementation project(':analytics') - implementation project(':audioclips') + implementation project(':audio-clips') implementation project(':forms') - implementation project(':audiorecorder') + implementation project(':audio-recorder') implementation project(':projects') implementation project(':location') implementation project(':geo') @@ -339,7 +339,7 @@ dependencies { implementation Dependencies.splashscreen - testImplementation project(':formstest') + testImplementation project(':forms-test') // Testing-only dependencies testImplementation Dependencies.junit diff --git a/formstest/.gitignore b/forms-test/.gitignore similarity index 100% rename from formstest/.gitignore rename to forms-test/.gitignore diff --git a/formstest/README.md b/forms-test/README.md similarity index 100% rename from formstest/README.md rename to forms-test/README.md diff --git a/formstest/build.gradle.kts b/forms-test/build.gradle.kts similarity index 100% rename from formstest/build.gradle.kts rename to forms-test/build.gradle.kts diff --git a/formstest/src/main/java/org/odk/collect/formstest/FormFixtures.kt b/forms-test/src/main/java/org/odk/collect/formstest/FormFixtures.kt similarity index 100% rename from formstest/src/main/java/org/odk/collect/formstest/FormFixtures.kt rename to forms-test/src/main/java/org/odk/collect/formstest/FormFixtures.kt diff --git a/formstest/src/main/java/org/odk/collect/formstest/FormUtils.kt b/forms-test/src/main/java/org/odk/collect/formstest/FormUtils.kt similarity index 100% rename from formstest/src/main/java/org/odk/collect/formstest/FormUtils.kt rename to forms-test/src/main/java/org/odk/collect/formstest/FormUtils.kt diff --git a/formstest/src/main/java/org/odk/collect/formstest/FormsRepositoryTest.java b/forms-test/src/main/java/org/odk/collect/formstest/FormsRepositoryTest.java similarity index 100% rename from formstest/src/main/java/org/odk/collect/formstest/FormsRepositoryTest.java rename to forms-test/src/main/java/org/odk/collect/formstest/FormsRepositoryTest.java diff --git a/formstest/src/main/java/org/odk/collect/formstest/InMemFormsRepository.java b/forms-test/src/main/java/org/odk/collect/formstest/InMemFormsRepository.java similarity index 100% rename from formstest/src/main/java/org/odk/collect/formstest/InMemFormsRepository.java rename to forms-test/src/main/java/org/odk/collect/formstest/InMemFormsRepository.java diff --git a/formstest/src/main/java/org/odk/collect/formstest/InMemInstancesRepository.java b/forms-test/src/main/java/org/odk/collect/formstest/InMemInstancesRepository.java similarity index 100% rename from formstest/src/main/java/org/odk/collect/formstest/InMemInstancesRepository.java rename to forms-test/src/main/java/org/odk/collect/formstest/InMemInstancesRepository.java diff --git a/formstest/src/main/java/org/odk/collect/formstest/InstanceFixtures.kt b/forms-test/src/main/java/org/odk/collect/formstest/InstanceFixtures.kt similarity index 100% rename from formstest/src/main/java/org/odk/collect/formstest/InstanceFixtures.kt rename to forms-test/src/main/java/org/odk/collect/formstest/InstanceFixtures.kt diff --git a/formstest/src/main/java/org/odk/collect/formstest/InstanceUtils.kt b/forms-test/src/main/java/org/odk/collect/formstest/InstanceUtils.kt similarity index 100% rename from formstest/src/main/java/org/odk/collect/formstest/InstanceUtils.kt rename to forms-test/src/main/java/org/odk/collect/formstest/InstanceUtils.kt diff --git a/formstest/src/main/java/org/odk/collect/formstest/InstancesRepositoryTest.java b/forms-test/src/main/java/org/odk/collect/formstest/InstancesRepositoryTest.java similarity index 100% rename from formstest/src/main/java/org/odk/collect/formstest/InstancesRepositoryTest.java rename to forms-test/src/main/java/org/odk/collect/formstest/InstancesRepositoryTest.java diff --git a/formstest/src/test/java/org/odk/collect/formstest/InMemFormsRepositoryTest.java b/forms-test/src/test/java/org/odk/collect/formstest/InMemFormsRepositoryTest.java similarity index 100% rename from formstest/src/test/java/org/odk/collect/formstest/InMemFormsRepositoryTest.java rename to forms-test/src/test/java/org/odk/collect/formstest/InMemFormsRepositoryTest.java diff --git a/formstest/src/test/java/org/odk/collect/formstest/InMemInstancesRepositoryTest.java b/forms-test/src/test/java/org/odk/collect/formstest/InMemInstancesRepositoryTest.java similarity index 100% rename from formstest/src/test/java/org/odk/collect/formstest/InMemInstancesRepositoryTest.java rename to forms-test/src/test/java/org/odk/collect/formstest/InMemInstancesRepositoryTest.java diff --git a/settings.gradle b/settings.gradle index 3d340523d42..28910d469b2 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,12 +1,12 @@ include ':projects' -include ':formstest' +include ':forms-test' include ':shared' include ':forms' include ':analytics' include ':androidshared' -include ':audiorecorder' +include ':audio-recorder' include ':test-shared' -include ':audioclips' +include ':audio-clips' include ':strings' include ':async' include ':collect_app'