Merge pull request #5995 from grzesiek2010/modulenames

Fixed the module names for audiorecorder, audioclips and formstest
getodk · Mar 12, 2024 · 6c6c19d · 6c6c19d
2 parents 61b1d01 + 24bda08
commit 6c6c19d
Show file tree

Hide file tree

Showing 50 changed files with 9 additions and 9 deletions.
diff --git 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 → audio-clips/.gitignore b/audioclips/.gitignore → audio-clips/.gitignore
diff --git a/audioclips/build.gradle.kts → audio-clips/build.gradle.kts b/audioclips/build.gradle.kts → audio-clips/build.gradle.kts
diff --git a/audioclips/consumer-rules.pro → audio-clips/consumer-rules.pro b/audioclips/consumer-rules.pro → audio-clips/consumer-rules.pro
diff --git a/audioclips/src/main/AndroidManifest.xml → audio-clips/src/main/AndroidManifest.xml b/audioclips/src/main/AndroidManifest.xml → audio-clips/src/main/AndroidManifest.xml
diff --git a/.../collect/audioclips/AudioClipViewModel.kt → .../collect/audioclips/AudioClipViewModel.kt b/.../collect/audioclips/AudioClipViewModel.kt → .../collect/audioclips/AudioClipViewModel.kt
diff --git a/...n/java/org/odk/collect/audioclips/Clip.kt → ...n/java/org/odk/collect/audioclips/Clip.kt b/...n/java/org/odk/collect/audioclips/Clip.kt → ...n/java/org/odk/collect/audioclips/Clip.kt
diff --git a/...ect/audioclips/PlaybackFailedException.kt → ...ect/audioclips/PlaybackFailedException.kt b/...ect/audioclips/PlaybackFailedException.kt → ...ect/audioclips/PlaybackFailedException.kt
diff --git a/...lect/audioclips/AudioClipViewModelTest.kt → ...lect/audioclips/AudioClipViewModelTest.kt b/...lect/audioclips/AudioClipViewModelTest.kt → ...lect/audioclips/AudioClipViewModelTest.kt
diff --git a/audiorecorder/.gitignore → audio-recorder/.gitignore b/audiorecorder/.gitignore → audio-recorder/.gitignore
diff --git a/audiorecorder/build.gradle.kts → audio-recorder/build.gradle.kts b/audiorecorder/build.gradle.kts → audio-recorder/build.gradle.kts
diff --git a/audiorecorder/consumer-rules.pro → audio-recorder/consumer-rules.pro b/audiorecorder/consumer-rules.pro → audio-recorder/consumer-rules.pro
diff --git a/audiorecorder/src/main/AndroidManifest.xml → audio-recorder/src/main/AndroidManifest.xml b/audiorecorder/src/main/AndroidManifest.xml → audio-recorder/src/main/AndroidManifest.xml
diff --git a/.../odk/collect/audiorecorder/DaggerSetup.kt → .../odk/collect/audiorecorder/DaggerSetup.kt b/.../odk/collect/audiorecorder/DaggerSetup.kt → .../odk/collect/audiorecorder/DaggerSetup.kt
diff --git a/...ecorder/MediaRecorderRecordingResource.kt → ...ecorder/MediaRecorderRecordingResource.kt b/...ecorder/MediaRecorderRecordingResource.kt → ...ecorder/MediaRecorderRecordingResource.kt
diff --git a/...ollect/audiorecorder/recorder/Recorder.kt → ...ollect/audiorecorder/recorder/Recorder.kt b/...ollect/audiorecorder/recorder/Recorder.kt → ...ollect/audiorecorder/recorder/Recorder.kt
diff --git a/...diorecorder/recorder/RecordingResource.kt → ...diorecorder/recorder/RecordingResource.kt b/...diorecorder/recorder/RecordingResource.kt → ...diorecorder/recorder/RecordingResource.kt
diff --git a/...der/recorder/RecordingResourceRecorder.kt → ...der/recorder/RecordingResourceRecorder.kt b/...der/recorder/RecordingResourceRecorder.kt → ...der/recorder/RecordingResourceRecorder.kt
diff --git a/.../audiorecorder/recording/AudioRecorder.kt → .../audiorecorder/recording/AudioRecorder.kt b/.../audiorecorder/recording/AudioRecorder.kt → .../audiorecorder/recording/AudioRecorder.kt
diff --git a/...ecorder/recording/AudioRecorderFactory.kt → ...ecorder/recording/AudioRecorderFactory.kt b/...ecorder/recording/AudioRecorderFactory.kt → ...ecorder/recording/AudioRecorderFactory.kt
diff --git a/...ecorder/recording/AudioRecorderService.kt → ...ecorder/recording/AudioRecorderService.kt b/...ecorder/recording/AudioRecorderService.kt → ...ecorder/recording/AudioRecorderService.kt
diff --git a/...nternal/ForegroundServiceAudioRecorder.kt → ...nternal/ForegroundServiceAudioRecorder.kt b/...nternal/ForegroundServiceAudioRecorder.kt → ...nternal/ForegroundServiceAudioRecorder.kt
diff --git a/...RecordingForegroundServiceNotification.kt → ...RecordingForegroundServiceNotification.kt b/...RecordingForegroundServiceNotification.kt → ...RecordingForegroundServiceNotification.kt
diff --git a/...recording/internal/RecordingRepository.kt → ...recording/internal/RecordingRepository.kt b/...recording/internal/RecordingRepository.kt → ...recording/internal/RecordingRepository.kt
diff --git a/...recorder/testsupport/StubAudioRecorder.kt → ...recorder/testsupport/StubAudioRecorder.kt b/...recorder/testsupport/StubAudioRecorder.kt → ...recorder/testsupport/StubAudioRecorder.kt
diff --git a/...mediarecorder/AMRRecordingResourceTest.kt → ...mediarecorder/AMRRecordingResourceTest.kt b/...mediarecorder/AMRRecordingResourceTest.kt → ...mediarecorder/AMRRecordingResourceTest.kt
diff --git a/...recorder/RecordingResourceRecorderTest.kt → ...recorder/RecordingResourceRecorderTest.kt b/...recorder/RecordingResourceRecorderTest.kt → ...recorder/RecordingResourceRecorderTest.kt
diff --git a/...iorecorder/recording/AudioRecorderTest.kt → ...iorecorder/recording/AudioRecorderTest.kt b/...iorecorder/recording/AudioRecorderTest.kt → ...iorecorder/recording/AudioRecorderTest.kt
diff --git a/...ding/internal/AudioRecorderServiceTest.kt → ...ding/internal/AudioRecorderServiceTest.kt b/...ding/internal/AudioRecorderServiceTest.kt → ...ding/internal/AudioRecorderServiceTest.kt
diff --git a/...nal/ForegroundServiceAudioRecorderTest.kt → ...nal/ForegroundServiceAudioRecorderTest.kt b/...nal/ForegroundServiceAudioRecorderTest.kt → ...nal/ForegroundServiceAudioRecorderTest.kt
diff --git a/...rdingForegroundServiceNotificationTest.kt → ...rdingForegroundServiceNotificationTest.kt b/...rdingForegroundServiceNotificationTest.kt → ...rdingForegroundServiceNotificationTest.kt
diff --git a/...ect/audiorecorder/support/FakeRecorder.kt → ...ect/audiorecorder/support/FakeRecorder.kt b/...ect/audiorecorder/support/FakeRecorder.kt → ...ect/audiorecorder/support/FakeRecorder.kt
diff --git a/...der/testsupport/RobolectricApplication.kt → ...der/testsupport/RobolectricApplication.kt b/...der/testsupport/RobolectricApplication.kt → ...der/testsupport/RobolectricApplication.kt
diff --git a/...rder/testsupport/StubAudioRecorderTest.kt → ...rder/testsupport/StubAudioRecorderTest.kt b/...rder/testsupport/StubAudioRecorderTest.kt → ...rder/testsupport/StubAudioRecorderTest.kt
diff --git a/...src/test/resources/robolectric.properties → ...src/test/resources/robolectric.properties b/...src/test/resources/robolectric.properties → ...src/test/resources/robolectric.properties
diff --git 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 → forms-test/.gitignore b/formstest/.gitignore → forms-test/.gitignore
diff --git a/formstest/README.md → forms-test/README.md b/formstest/README.md → forms-test/README.md
diff --git a/formstest/build.gradle.kts → forms-test/build.gradle.kts b/formstest/build.gradle.kts → forms-test/build.gradle.kts
diff --git a/...org/odk/collect/formstest/FormFixtures.kt → ...org/odk/collect/formstest/FormFixtures.kt b/...org/odk/collect/formstest/FormFixtures.kt → ...org/odk/collect/formstest/FormFixtures.kt
diff --git a/...va/org/odk/collect/formstest/FormUtils.kt → ...va/org/odk/collect/formstest/FormUtils.kt b/...va/org/odk/collect/formstest/FormUtils.kt → ...va/org/odk/collect/formstest/FormUtils.kt
diff --git a/...ollect/formstest/FormsRepositoryTest.java → ...ollect/formstest/FormsRepositoryTest.java b/...ollect/formstest/FormsRepositoryTest.java → ...ollect/formstest/FormsRepositoryTest.java
diff --git a/...llect/formstest/InMemFormsRepository.java → ...llect/formstest/InMemFormsRepository.java b/...llect/formstest/InMemFormsRepository.java → ...llect/formstest/InMemFormsRepository.java
diff --git a/...t/formstest/InMemInstancesRepository.java → ...t/formstest/InMemInstancesRepository.java b/...t/formstest/InMemInstancesRepository.java → ...t/formstest/InMemInstancesRepository.java
diff --git a/...odk/collect/formstest/InstanceFixtures.kt → ...odk/collect/formstest/InstanceFixtures.kt b/...odk/collect/formstest/InstanceFixtures.kt → ...odk/collect/formstest/InstanceFixtures.kt
diff --git a/...rg/odk/collect/formstest/InstanceUtils.kt → ...rg/odk/collect/formstest/InstanceUtils.kt b/...rg/odk/collect/formstest/InstanceUtils.kt → ...rg/odk/collect/formstest/InstanceUtils.kt
diff --git a/...ct/formstest/InstancesRepositoryTest.java → ...ct/formstest/InstancesRepositoryTest.java b/...ct/formstest/InstancesRepositoryTest.java → ...ct/formstest/InstancesRepositoryTest.java
diff --git a/...t/formstest/InMemFormsRepositoryTest.java → ...t/formstest/InMemFormsRepositoryTest.java b/...t/formstest/InMemFormsRepositoryTest.java → ...t/formstest/InMemFormsRepositoryTest.java
diff --git a/...rmstest/InMemInstancesRepositoryTest.java → ...rmstest/InMemInstancesRepositoryTest.java b/...rmstest/InMemInstancesRepositoryTest.java → ...rmstest/InMemInstancesRepositoryTest.java
diff --git 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'