Move subsonic-api module to core modules.

ultrasonic · Oct 7, 2018 · 44fa1b1 · 44fa1b1
1 parent fb8d538
commit 44fa1b1
Show file tree

Hide file tree

Showing 180 changed files with 3 additions and 5 deletions.
diff --git a/core/subsonic-api-image-loader/build.gradle b/core/subsonic-api-image-loader/build.gradle
@@ -8,7 +8,7 @@ android {
 
 dependencies {
     api project(':core:domain')
-    api project(':subsonic-api')
+    api project(':core:subsonic-api')
     api(other.picasso) {
         exclude group: "com.android.support"
     }

diff --git a/subsonic-api/build.gradle → core/subsonic-api/build.gradle b/subsonic-api/build.gradle → core/subsonic-api/build.gradle
diff --git a/...ltrasonic/api/subsonic/CommonFunctions.kt → ...ltrasonic/api/subsonic/CommonFunctions.kt b/...ltrasonic/api/subsonic/CommonFunctions.kt → ...ltrasonic/api/subsonic/CommonFunctions.kt
diff --git a/...trasonic/api/subsonic/GetStreamUrlTest.kt → ...trasonic/api/subsonic/GetStreamUrlTest.kt b/...trasonic/api/subsonic/GetStreamUrlTest.kt → ...trasonic/api/subsonic/GetStreamUrlTest.kt
diff --git a/...nic/api/subsonic/SubsonicAPIClientTest.kt → ...nic/api/subsonic/SubsonicAPIClientTest.kt b/...nic/api/subsonic/SubsonicAPIClientTest.kt → ...nic/api/subsonic/SubsonicAPIClientTest.kt
diff --git a/...subsonic/SubsonicApiAddChatMessageTest.kt → ...subsonic/SubsonicApiAddChatMessageTest.kt b/...subsonic/SubsonicApiAddChatMessageTest.kt → ...subsonic/SubsonicApiAddChatMessageTest.kt
diff --git a/...subsonic/SubsonicApiCreateBookmarkTest.kt → ...subsonic/SubsonicApiCreateBookmarkTest.kt b/...subsonic/SubsonicApiCreateBookmarkTest.kt → ...subsonic/SubsonicApiCreateBookmarkTest.kt
diff --git a/...subsonic/SubsonicApiCreatePlaylistTest.kt → ...subsonic/SubsonicApiCreatePlaylistTest.kt b/...subsonic/SubsonicApiCreatePlaylistTest.kt → ...subsonic/SubsonicApiCreatePlaylistTest.kt
diff --git a/...pi/subsonic/SubsonicApiCreateShareTest.kt → ...pi/subsonic/SubsonicApiCreateShareTest.kt b/...pi/subsonic/SubsonicApiCreateShareTest.kt → ...pi/subsonic/SubsonicApiCreateShareTest.kt
diff --git a/...subsonic/SubsonicApiDeleteBookmarkTest.kt → ...subsonic/SubsonicApiDeleteBookmarkTest.kt b/...subsonic/SubsonicApiDeleteBookmarkTest.kt → ...subsonic/SubsonicApiDeleteBookmarkTest.kt
diff --git a/...subsonic/SubsonicApiDeletePlaylistTest.kt → ...subsonic/SubsonicApiDeletePlaylistTest.kt b/...subsonic/SubsonicApiDeletePlaylistTest.kt → ...subsonic/SubsonicApiDeletePlaylistTest.kt
diff --git a/...pi/subsonic/SubsonicApiDeleteShareTest.kt → ...pi/subsonic/SubsonicApiDeleteShareTest.kt b/...pi/subsonic/SubsonicApiDeleteShareTest.kt → ...pi/subsonic/SubsonicApiDeleteShareTest.kt
diff --git a/...nic/api/subsonic/SubsonicApiErrorsTest.kt → ...nic/api/subsonic/SubsonicApiErrorsTest.kt b/...nic/api/subsonic/SubsonicApiErrorsTest.kt → ...nic/api/subsonic/SubsonicApiErrorsTest.kt
diff --git a/.../subsonic/SubsonicApiGetAlbumList2Test.kt → .../subsonic/SubsonicApiGetAlbumList2Test.kt b/.../subsonic/SubsonicApiGetAlbumList2Test.kt → .../subsonic/SubsonicApiGetAlbumList2Test.kt
diff --git a/...nic/SubsonicApiGetAlbumListRequestTest.kt → ...nic/SubsonicApiGetAlbumListRequestTest.kt b/...nic/SubsonicApiGetAlbumListRequestTest.kt → ...nic/SubsonicApiGetAlbumListRequestTest.kt
diff --git a/...c/api/subsonic/SubsonicApiGetAlbumTest.kt → ...c/api/subsonic/SubsonicApiGetAlbumTest.kt b/...c/api/subsonic/SubsonicApiGetAlbumTest.kt → ...c/api/subsonic/SubsonicApiGetAlbumTest.kt
diff --git a/.../api/subsonic/SubsonicApiGetArtistTest.kt → .../api/subsonic/SubsonicApiGetArtistTest.kt b/.../api/subsonic/SubsonicApiGetArtistTest.kt → .../api/subsonic/SubsonicApiGetArtistTest.kt
diff --git a/...api/subsonic/SubsonicApiGetArtistsTest.kt → ...api/subsonic/SubsonicApiGetArtistsTest.kt b/...api/subsonic/SubsonicApiGetArtistsTest.kt → ...api/subsonic/SubsonicApiGetArtistsTest.kt
diff --git a/.../api/subsonic/SubsonicApiGetAvatarTest.kt → .../api/subsonic/SubsonicApiGetAvatarTest.kt b/.../api/subsonic/SubsonicApiGetAvatarTest.kt → .../api/subsonic/SubsonicApiGetAvatarTest.kt
diff --git a/...i/subsonic/SubsonicApiGetBookmarksTest.kt → ...i/subsonic/SubsonicApiGetBookmarksTest.kt b/...i/subsonic/SubsonicApiGetBookmarksTest.kt → ...i/subsonic/SubsonicApiGetBookmarksTest.kt
diff --git a/...ubsonic/SubsonicApiGetChatMessagesTest.kt → ...ubsonic/SubsonicApiGetChatMessagesTest.kt b/...ubsonic/SubsonicApiGetChatMessagesTest.kt → ...ubsonic/SubsonicApiGetChatMessagesTest.kt
diff --git a/...pi/subsonic/SubsonicApiGetCoverArtTest.kt → ...pi/subsonic/SubsonicApiGetCoverArtTest.kt b/...pi/subsonic/SubsonicApiGetCoverArtTest.kt → ...pi/subsonic/SubsonicApiGetCoverArtTest.kt
diff --git a/.../api/subsonic/SubsonicApiGetGenresTest.kt → .../api/subsonic/SubsonicApiGetGenresTest.kt b/.../api/subsonic/SubsonicApiGetGenresTest.kt → .../api/subsonic/SubsonicApiGetGenresTest.kt
diff --git a/...api/subsonic/SubsonicApiGetIndexesTest.kt → ...api/subsonic/SubsonicApiGetIndexesTest.kt b/...api/subsonic/SubsonicApiGetIndexesTest.kt → ...api/subsonic/SubsonicApiGetIndexesTest.kt
diff --git a/...api/subsonic/SubsonicApiGetLicenseTest.kt → ...api/subsonic/SubsonicApiGetLicenseTest.kt b/...api/subsonic/SubsonicApiGetLicenseTest.kt → ...api/subsonic/SubsonicApiGetLicenseTest.kt
diff --git a/.../api/subsonic/SubsonicApiGetLyricsTest.kt → .../api/subsonic/SubsonicApiGetLyricsTest.kt b/.../api/subsonic/SubsonicApiGetLyricsTest.kt → .../api/subsonic/SubsonicApiGetLyricsTest.kt
diff --git a/...sonic/SubsonicApiGetMusicDirectoryTest.kt → ...sonic/SubsonicApiGetMusicDirectoryTest.kt b/...sonic/SubsonicApiGetMusicDirectoryTest.kt → ...sonic/SubsonicApiGetMusicDirectoryTest.kt
diff --git a/...ubsonic/SubsonicApiGetMusicFoldersTest.kt → ...ubsonic/SubsonicApiGetMusicFoldersTest.kt b/...ubsonic/SubsonicApiGetMusicFoldersTest.kt → ...ubsonic/SubsonicApiGetMusicFoldersTest.kt
diff --git a/...pi/subsonic/SubsonicApiGetPlaylistTest.kt → ...pi/subsonic/SubsonicApiGetPlaylistTest.kt b/...pi/subsonic/SubsonicApiGetPlaylistTest.kt → ...pi/subsonic/SubsonicApiGetPlaylistTest.kt
diff --git a/...i/subsonic/SubsonicApiGetPlaylistsTest.kt → ...i/subsonic/SubsonicApiGetPlaylistsTest.kt b/...i/subsonic/SubsonicApiGetPlaylistsTest.kt → ...i/subsonic/SubsonicApiGetPlaylistsTest.kt
diff --git a/...pi/subsonic/SubsonicApiGetPodcastsTest.kt → ...pi/subsonic/SubsonicApiGetPodcastsTest.kt b/...pi/subsonic/SubsonicApiGetPodcastsTest.kt → ...pi/subsonic/SubsonicApiGetPodcastsTest.kt
diff --git a/...subsonic/SubsonicApiGetRandomSongsTest.kt → ...subsonic/SubsonicApiGetRandomSongsTest.kt b/...subsonic/SubsonicApiGetRandomSongsTest.kt → ...subsonic/SubsonicApiGetRandomSongsTest.kt
diff --git a/.../api/subsonic/SubsonicApiGetSharesTest.kt → .../api/subsonic/SubsonicApiGetSharesTest.kt b/.../api/subsonic/SubsonicApiGetSharesTest.kt → .../api/subsonic/SubsonicApiGetSharesTest.kt
diff --git a/...ubsonic/SubsonicApiGetSongsByGenreTest.kt → ...ubsonic/SubsonicApiGetSongsByGenreTest.kt b/...ubsonic/SubsonicApiGetSongsByGenreTest.kt → ...ubsonic/SubsonicApiGetSongsByGenreTest.kt
diff --git a/...pi/subsonic/SubsonicApiGetStarred2Test.kt → ...pi/subsonic/SubsonicApiGetStarred2Test.kt b/...pi/subsonic/SubsonicApiGetStarred2Test.kt → ...pi/subsonic/SubsonicApiGetStarred2Test.kt
diff --git a/...api/subsonic/SubsonicApiGetStarredTest.kt → ...api/subsonic/SubsonicApiGetStarredTest.kt b/...api/subsonic/SubsonicApiGetStarredTest.kt → ...api/subsonic/SubsonicApiGetStarredTest.kt
diff --git a/...ic/api/subsonic/SubsonicApiGetUserTest.kt → ...ic/api/subsonic/SubsonicApiGetUserTest.kt b/...ic/api/subsonic/SubsonicApiGetUserTest.kt → ...ic/api/subsonic/SubsonicApiGetUserTest.kt
diff --git a/.../subsonic/SubsonicApiGetVideosListTest.kt → .../subsonic/SubsonicApiGetVideosListTest.kt b/.../subsonic/SubsonicApiGetVideosListTest.kt → .../subsonic/SubsonicApiGetVideosListTest.kt
diff --git a/...subsonic/SubsonicApiJukeboxControlTest.kt → ...subsonic/SubsonicApiJukeboxControlTest.kt b/...subsonic/SubsonicApiJukeboxControlTest.kt → ...subsonic/SubsonicApiJukeboxControlTest.kt
diff --git a/...c/api/subsonic/SubsonicApiPasswordTest.kt → ...c/api/subsonic/SubsonicApiPasswordTest.kt b/...c/api/subsonic/SubsonicApiPasswordTest.kt → ...c/api/subsonic/SubsonicApiPasswordTest.kt
diff --git a/...pi/subsonic/SubsonicApiPingRequestTest.kt → ...pi/subsonic/SubsonicApiPingRequestTest.kt b/...pi/subsonic/SubsonicApiPingRequestTest.kt → ...pi/subsonic/SubsonicApiPingRequestTest.kt
diff --git a/...asonic/api/subsonic/SubsonicApiSSLTest.kt → ...asonic/api/subsonic/SubsonicApiSSLTest.kt b/...asonic/api/subsonic/SubsonicApiSSLTest.kt → ...asonic/api/subsonic/SubsonicApiSSLTest.kt
diff --git a/...c/api/subsonic/SubsonicApiScrobbleTest.kt → ...c/api/subsonic/SubsonicApiScrobbleTest.kt b/...c/api/subsonic/SubsonicApiScrobbleTest.kt → ...c/api/subsonic/SubsonicApiScrobbleTest.kt
diff --git a/...nic/api/subsonic/SubsonicApiSearchTest.kt → ...nic/api/subsonic/SubsonicApiSearchTest.kt b/...nic/api/subsonic/SubsonicApiSearchTest.kt → ...nic/api/subsonic/SubsonicApiSearchTest.kt
diff --git a/...pi/subsonic/SubsonicApiSearchThreeTest.kt → ...pi/subsonic/SubsonicApiSearchThreeTest.kt b/...pi/subsonic/SubsonicApiSearchThreeTest.kt → ...pi/subsonic/SubsonicApiSearchThreeTest.kt
diff --git a/.../api/subsonic/SubsonicApiSearchTwoTest.kt → .../api/subsonic/SubsonicApiSearchTwoTest.kt b/.../api/subsonic/SubsonicApiSearchTwoTest.kt → .../api/subsonic/SubsonicApiSearchTwoTest.kt
diff --git a/...sonic/api/subsonic/SubsonicApiStarTest.kt → ...sonic/api/subsonic/SubsonicApiStarTest.kt b/...sonic/api/subsonic/SubsonicApiStarTest.kt → ...sonic/api/subsonic/SubsonicApiStarTest.kt
diff --git a/...nic/api/subsonic/SubsonicApiStreamTest.kt → ...nic/api/subsonic/SubsonicApiStreamTest.kt b/...nic/api/subsonic/SubsonicApiStreamTest.kt → ...nic/api/subsonic/SubsonicApiStreamTest.kt
diff --git a/...nic/api/subsonic/SubsonicApiUnstarTest.kt → ...nic/api/subsonic/SubsonicApiUnstarTest.kt b/...nic/api/subsonic/SubsonicApiUnstarTest.kt → ...nic/api/subsonic/SubsonicApiUnstarTest.kt
diff --git a/...subsonic/SubsonicApiUpdatePlaylistTest.kt → ...subsonic/SubsonicApiUpdatePlaylistTest.kt b/...subsonic/SubsonicApiUpdatePlaylistTest.kt → ...subsonic/SubsonicApiUpdatePlaylistTest.kt
diff --git a/...pi/subsonic/SubsonicApiUpdateShareTest.kt → ...pi/subsonic/SubsonicApiUpdateShareTest.kt b/...pi/subsonic/SubsonicApiUpdateShareTest.kt → ...pi/subsonic/SubsonicApiUpdateShareTest.kt
diff --git a/...sonic/interceptors/BaseInterceptorTest.kt → ...sonic/interceptors/BaseInterceptorTest.kt b/...sonic/interceptors/BaseInterceptorTest.kt → ...sonic/interceptors/BaseInterceptorTest.kt
diff --git a/...nterceptors/PasswordHexInterceptorTest.kt → ...nterceptors/PasswordHexInterceptorTest.kt b/...nterceptors/PasswordHexInterceptorTest.kt → ...nterceptors/PasswordHexInterceptorTest.kt
diff --git a/...nterceptors/PasswordMD5InterceptorTest.kt → ...nterceptors/PasswordMD5InterceptorTest.kt b/...nterceptors/PasswordMD5InterceptorTest.kt → ...nterceptors/PasswordMD5InterceptorTest.kt
diff --git a/...nterceptors/RangeHeaderInterceptorTest.kt → ...nterceptors/RangeHeaderInterceptorTest.kt b/...nterceptors/RangeHeaderInterceptorTest.kt → ...nterceptors/RangeHeaderInterceptorTest.kt
diff --git a/...ic/interceptors/VersionInterceptorTest.kt → ...ic/interceptors/VersionInterceptorTest.kt b/...ic/interceptors/VersionInterceptorTest.kt → ...ic/interceptors/VersionInterceptorTest.kt
diff --git a/...c/api/subsonic/rules/MockWebServerRule.kt → ...c/api/subsonic/rules/MockWebServerRule.kt b/...c/api/subsonic/rules/MockWebServerRule.kt → ...c/api/subsonic/rules/MockWebServerRule.kt
diff --git a/.../resources/error_first_generic_error.json → .../resources/error_first_generic_error.json b/.../resources/error_first_generic_error.json → .../resources/error_first_generic_error.json
diff --git a/...egrationTest/resources/generic_error.json → ...egrationTest/resources/generic_error.json b/...egrationTest/resources/generic_error.json → ...egrationTest/resources/generic_error.json
diff --git a/...onTest/resources/get_album_list_2_ok.json → ...onTest/resources/get_album_list_2_ok.json b/...onTest/resources/get_album_list_2_ok.json → ...onTest/resources/get_album_list_2_ok.json
diff --git a/...tionTest/resources/get_album_list_ok.json → ...tionTest/resources/get_album_list_ok.json b/...tionTest/resources/get_album_list_ok.json → ...tionTest/resources/get_album_list_ok.json
diff --git a/...tegrationTest/resources/get_album_ok.json → ...tegrationTest/resources/get_album_ok.json b/...tegrationTest/resources/get_album_ok.json → ...tegrationTest/resources/get_album_ok.json
diff --git a/...egrationTest/resources/get_artist_ok.json → ...egrationTest/resources/get_artist_ok.json b/...egrationTest/resources/get_artist_ok.json → ...egrationTest/resources/get_artist_ok.json
diff --git a/...grationTest/resources/get_artists_ok.json → ...grationTest/resources/get_artists_ok.json b/...grationTest/resources/get_artists_ok.json → ...grationTest/resources/get_artists_ok.json
diff --git a/...ationTest/resources/get_bookmarks_ok.json → ...ationTest/resources/get_bookmarks_ok.json b/...ationTest/resources/get_bookmarks_ok.json → ...ationTest/resources/get_bookmarks_ok.json
diff --git a/...nTest/resources/get_chat_messages_ok.json → ...nTest/resources/get_chat_messages_ok.json b/...nTest/resources/get_chat_messages_ok.json → ...nTest/resources/get_chat_messages_ok.json
diff --git a/...egrationTest/resources/get_genres_ok.json → ...egrationTest/resources/get_genres_ok.json b/...egrationTest/resources/get_genres_ok.json → ...egrationTest/resources/get_genres_ok.json
diff --git a/...grationTest/resources/get_indexes_ok.json → ...grationTest/resources/get_indexes_ok.json b/...grationTest/resources/get_indexes_ok.json → ...grationTest/resources/get_indexes_ok.json
diff --git a/...egrationTest/resources/get_lyrics_ok.json → ...egrationTest/resources/get_lyrics_ok.json b/...egrationTest/resources/get_lyrics_ok.json → ...egrationTest/resources/get_lyrics_ok.json
diff --git a/...est/resources/get_music_directory_ok.json → ...est/resources/get_music_directory_ok.json b/...est/resources/get_music_directory_ok.json → ...est/resources/get_music_directory_ok.json
diff --git a/...nTest/resources/get_music_folders_ok.json → ...nTest/resources/get_music_folders_ok.json b/...nTest/resources/get_music_folders_ok.json → ...nTest/resources/get_music_folders_ok.json
diff --git a/...rationTest/resources/get_playlist_ok.json → ...rationTest/resources/get_playlist_ok.json b/...rationTest/resources/get_playlist_ok.json → ...rationTest/resources/get_playlist_ok.json
diff --git a/...ationTest/resources/get_playlists_ok.json → ...ationTest/resources/get_playlists_ok.json b/...ationTest/resources/get_playlists_ok.json → ...ationTest/resources/get_playlists_ok.json
diff --git a/...rationTest/resources/get_podcasts_ok.json → ...rationTest/resources/get_podcasts_ok.json b/...rationTest/resources/get_podcasts_ok.json → ...rationTest/resources/get_podcasts_ok.json
diff --git a/...onTest/resources/get_random_songs_ok.json → ...onTest/resources/get_random_songs_ok.json b/...onTest/resources/get_random_songs_ok.json → ...onTest/resources/get_random_songs_ok.json
diff --git a/...egrationTest/resources/get_shares_ok.json → ...egrationTest/resources/get_shares_ok.json b/...egrationTest/resources/get_shares_ok.json → ...egrationTest/resources/get_shares_ok.json
diff --git a/...Test/resources/get_songs_by_genre_ok.json → ...Test/resources/get_songs_by_genre_ok.json b/...Test/resources/get_songs_by_genre_ok.json → ...Test/resources/get_songs_by_genre_ok.json
diff --git a/...ationTest/resources/get_starred_2_ok.json → ...ationTest/resources/get_starred_2_ok.json b/...ationTest/resources/get_starred_2_ok.json → ...ationTest/resources/get_starred_2_ok.json
diff --git a/...grationTest/resources/get_starred_ok.json → ...grationTest/resources/get_starred_ok.json b/...grationTest/resources/get_starred_ok.json → ...grationTest/resources/get_starred_ok.json
diff --git a/...ntegrationTest/resources/get_user_ok.json → ...ntegrationTest/resources/get_user_ok.json b/...ntegrationTest/resources/get_user_ok.json → ...ntegrationTest/resources/get_user_ok.json
diff --git a/...egrationTest/resources/get_videos_ok.json → ...egrationTest/resources/get_videos_ok.json b/...egrationTest/resources/get_videos_ok.json → ...egrationTest/resources/get_videos_ok.json
diff --git a/...atible_client_protocol_version_error.json → ...atible_client_protocol_version_error.json b/...atible_client_protocol_version_error.json → ...atible_client_protocol_version_error.json
diff --git a/...atible_server_protocol_version_error.json → ...atible_server_protocol_version_error.json b/...atible_server_protocol_version_error.json → ...atible_server_protocol_version_error.json
diff --git a/...esources/jukebox_control_playlist_ok.json → ...esources/jukebox_control_playlist_ok.json b/...esources/jukebox_control_playlist_ok.json → ...esources/jukebox_control_playlist_ok.json
diff --git a/.../resources/jukebox_control_status_ok.json → .../resources/jukebox_control_status_ok.json b/.../resources/jukebox_control_status_ok.json → .../resources/jukebox_control_status_ok.json
diff --git a/...integrationTest/resources/license_ok.json → ...integrationTest/resources/license_ok.json b/...integrationTest/resources/license_ok.json → ...integrationTest/resources/license_ok.json
diff --git a/...Test/resources/non_subsonic_response.json → ...Test/resources/non_subsonic_response.json b/...Test/resources/non_subsonic_response.json → ...Test/resources/non_subsonic_response.json
diff --git a/...rc/integrationTest/resources/ping_ok.json → ...rc/integrationTest/resources/ping_ok.json b/...rc/integrationTest/resources/ping_ok.json → ...rc/integrationTest/resources/ping_ok.json
diff --git a/...ationTest/resources/ping_ok_utf8_bom.json → ...ationTest/resources/ping_ok_utf8_bom.json b/...ationTest/resources/ping_ok_utf8_bom.json → ...ationTest/resources/ping_ok_utf8_bom.json
diff --git a/...equest_data_not_found_error_response.json → ...equest_data_not_found_error_response.json b/...equest_data_not_found_error_response.json → ...equest_data_not_found_error_response.json
diff --git a/...s/requested_data_was_not_found_error.json → ...s/requested_data_was_not_found_error.json b/...s/requested_data_was_not_found_error.json → ...s/requested_data_was_not_found_error.json
diff --git a/...sources/required_param_missing_error.json → ...sources/required_param_missing_error.json b/...sources/required_param_missing_error.json → ...sources/required_param_missing_error.json
diff --git a/...ources/reversed_tokens_generic_error.json → ...ources/reversed_tokens_generic_error.json b/...ources/reversed_tokens_generic_error.json → ...ources/reversed_tokens_generic_error.json
diff --git a/...integrationTest/resources/search2_ok.json → ...integrationTest/resources/search2_ok.json b/...integrationTest/resources/search2_ok.json → ...integrationTest/resources/search2_ok.json
diff --git a/...integrationTest/resources/search3_ok.json → ...integrationTest/resources/search3_ok.json b/...integrationTest/resources/search3_ok.json → ...integrationTest/resources/search3_ok.json
diff --git a/.../integrationTest/resources/search_ok.json → .../integrationTest/resources/search_ok.json b/.../integrationTest/resources/search_ok.json → .../integrationTest/resources/search_ok.json
diff --git a/...integrationTest/resources/self-signed.p12 → ...integrationTest/resources/self-signed.p12 b/...integrationTest/resources/self-signed.p12 → ...integrationTest/resources/self-signed.p12
diff --git a/...integrationTest/resources/self-signed.pem → ...integrationTest/resources/self-signed.pem b/...integrationTest/resources/self-signed.pem → ...integrationTest/resources/self-signed.pem
diff --git a/...en_auth_not_supported_for_ldap_error.json → ...en_auth_not_supported_for_ldap_error.json b/...en_auth_not_supported_for_ldap_error.json → ...en_auth_not_supported_for_ldap_error.json
diff --git a/...resources/trial_period_is_over_error.json → ...resources/trial_period_is_over_error.json b/...resources/trial_period_is_over_error.json → ...resources/trial_period_is_over_error.json
diff --git a/...ationTest/resources/unexpected_error.json → ...ationTest/resources/unexpected_error.json b/...ationTest/resources/unexpected_error.json → ...ationTest/resources/unexpected_error.json
diff --git a/...r_not_authorized_for_operation_error.json → ...r_not_authorized_for_operation_error.json b/...r_not_authorized_for_operation_error.json → ...r_not_authorized_for_operation_error.json
diff --git a/...additional_json_object_generic_error.json → ...additional_json_object_generic_error.json b/...additional_json_object_generic_error.json → ...additional_json_object_generic_error.json
diff --git a/...ources/without_message_generic_error.json → ...ources/without_message_generic_error.json b/...ources/without_message_generic_error.json → ...ources/without_message_generic_error.json
diff --git a/...ces/wrong_username_or_password_error.json → ...ces/wrong_username_or_password_error.json b/...ces/wrong_username_or_password_error.json → ...ces/wrong_username_or_password_error.json
diff --git a/.../api/subsonic/ApiNotSupportedException.kt → .../api/subsonic/ApiNotSupportedException.kt b/.../api/subsonic/ApiNotSupportedException.kt → .../api/subsonic/ApiNotSupportedException.kt
diff --git a/...ic/api/subsonic/ApiVersionCheckWrapper.kt → ...ic/api/subsonic/ApiVersionCheckWrapper.kt b/...ic/api/subsonic/ApiVersionCheckWrapper.kt → ...ic/api/subsonic/ApiVersionCheckWrapper.kt
diff --git a/...rasonic/api/subsonic/SubsonicAPIClient.kt → ...rasonic/api/subsonic/SubsonicAPIClient.kt b/...rasonic/api/subsonic/SubsonicAPIClient.kt → ...rasonic/api/subsonic/SubsonicAPIClient.kt
diff --git a/...nic/api/subsonic/SubsonicAPIDefinition.kt → ...nic/api/subsonic/SubsonicAPIDefinition.kt b/...nic/api/subsonic/SubsonicAPIDefinition.kt → ...nic/api/subsonic/SubsonicAPIDefinition.kt
diff --git a/...sonic/api/subsonic/SubsonicAPIVersions.kt → ...sonic/api/subsonic/SubsonicAPIVersions.kt b/...sonic/api/subsonic/SubsonicAPIVersions.kt → ...sonic/api/subsonic/SubsonicAPIVersions.kt
diff --git a/...i/subsonic/SubsonicClientConfiguration.kt → ...i/subsonic/SubsonicClientConfiguration.kt b/...i/subsonic/SubsonicClientConfiguration.kt → ...i/subsonic/SubsonicClientConfiguration.kt
diff --git a/.../ultrasonic/api/subsonic/SubsonicError.kt → .../ultrasonic/api/subsonic/SubsonicError.kt b/.../ultrasonic/api/subsonic/SubsonicError.kt → .../ultrasonic/api/subsonic/SubsonicError.kt
diff --git a/...onic/api/subsonic/di/SubsonicApiModule.kt → ...onic/api/subsonic/di/SubsonicApiModule.kt b/...onic/api/subsonic/di/SubsonicApiModule.kt → ...onic/api/subsonic/di/SubsonicApiModule.kt
diff --git a/.../api/subsonic/interceptors/PasswordExt.kt → .../api/subsonic/interceptors/PasswordExt.kt b/.../api/subsonic/interceptors/PasswordExt.kt → .../api/subsonic/interceptors/PasswordExt.kt
diff --git a/...ic/interceptors/PasswordHexInterceptor.kt → ...ic/interceptors/PasswordHexInterceptor.kt b/...ic/interceptors/PasswordHexInterceptor.kt → ...ic/interceptors/PasswordHexInterceptor.kt
diff --git a/...ic/interceptors/PasswordMD5Interceptor.kt → ...ic/interceptors/PasswordMD5Interceptor.kt b/...ic/interceptors/PasswordMD5Interceptor.kt → ...ic/interceptors/PasswordMD5Interceptor.kt
diff --git a/.../interceptors/ProxyPasswordInterceptor.kt → .../interceptors/ProxyPasswordInterceptor.kt b/.../interceptors/ProxyPasswordInterceptor.kt → .../interceptors/ProxyPasswordInterceptor.kt
diff --git a/...ic/interceptors/RangeHeaderInterceptor.kt → ...ic/interceptors/RangeHeaderInterceptor.kt b/...ic/interceptors/RangeHeaderInterceptor.kt → ...ic/interceptors/RangeHeaderInterceptor.kt
diff --git a/...bsonic/interceptors/VersionInterceptor.kt → ...bsonic/interceptors/VersionInterceptor.kt b/...bsonic/interceptors/VersionInterceptor.kt → ...bsonic/interceptors/VersionInterceptor.kt
diff --git a/...e/ultrasonic/api/subsonic/models/Album.kt → ...e/ultrasonic/api/subsonic/models/Album.kt b/...e/ultrasonic/api/subsonic/models/Album.kt → ...e/ultrasonic/api/subsonic/models/Album.kt
diff --git a/...onic/api/subsonic/models/AlbumListType.kt → ...onic/api/subsonic/models/AlbumListType.kt b/...onic/api/subsonic/models/AlbumListType.kt → ...onic/api/subsonic/models/AlbumListType.kt
diff --git a/.../ultrasonic/api/subsonic/models/Artist.kt → .../ultrasonic/api/subsonic/models/Artist.kt b/.../ultrasonic/api/subsonic/models/Artist.kt → .../ultrasonic/api/subsonic/models/Artist.kt
diff --git a/...ltrasonic/api/subsonic/models/Bookmark.kt → ...ltrasonic/api/subsonic/models/Bookmark.kt b/...ltrasonic/api/subsonic/models/Bookmark.kt → ...ltrasonic/api/subsonic/models/Bookmark.kt
diff --git a/...asonic/api/subsonic/models/ChatMessage.kt → ...asonic/api/subsonic/models/ChatMessage.kt b/...asonic/api/subsonic/models/ChatMessage.kt → ...asonic/api/subsonic/models/ChatMessage.kt
diff --git a/...e/ultrasonic/api/subsonic/models/Genre.kt → ...e/ultrasonic/api/subsonic/models/Genre.kt b/...e/ultrasonic/api/subsonic/models/Genre.kt → ...e/ultrasonic/api/subsonic/models/Genre.kt
diff --git a/...e/ultrasonic/api/subsonic/models/Index.kt → ...e/ultrasonic/api/subsonic/models/Index.kt b/...e/ultrasonic/api/subsonic/models/Index.kt → ...e/ultrasonic/api/subsonic/models/Index.kt
diff --git a/...ultrasonic/api/subsonic/models/Indexes.kt → ...ultrasonic/api/subsonic/models/Indexes.kt b/...ultrasonic/api/subsonic/models/Indexes.kt → ...ultrasonic/api/subsonic/models/Indexes.kt
diff --git a/...onic/api/subsonic/models/JukeboxAction.kt → ...onic/api/subsonic/models/JukeboxAction.kt b/...onic/api/subsonic/models/JukeboxAction.kt → ...onic/api/subsonic/models/JukeboxAction.kt
diff --git a/...onic/api/subsonic/models/JukeboxStatus.kt → ...onic/api/subsonic/models/JukeboxStatus.kt b/...onic/api/subsonic/models/JukeboxStatus.kt → ...onic/api/subsonic/models/JukeboxStatus.kt
diff --git a/...ultrasonic/api/subsonic/models/License.kt → ...ultrasonic/api/subsonic/models/License.kt b/...ultrasonic/api/subsonic/models/License.kt → ...ultrasonic/api/subsonic/models/License.kt
diff --git a/.../ultrasonic/api/subsonic/models/Lyrics.kt → .../ultrasonic/api/subsonic/models/Lyrics.kt b/.../ultrasonic/api/subsonic/models/Lyrics.kt → .../ultrasonic/api/subsonic/models/Lyrics.kt
diff --git a/...nic/api/subsonic/models/MusicDirectory.kt → ...nic/api/subsonic/models/MusicDirectory.kt b/...nic/api/subsonic/models/MusicDirectory.kt → ...nic/api/subsonic/models/MusicDirectory.kt
diff --git a/...pi/subsonic/models/MusicDirectoryChild.kt → ...pi/subsonic/models/MusicDirectoryChild.kt b/...pi/subsonic/models/MusicDirectoryChild.kt → ...pi/subsonic/models/MusicDirectoryChild.kt
diff --git a/...asonic/api/subsonic/models/MusicFolder.kt → ...asonic/api/subsonic/models/MusicFolder.kt b/...asonic/api/subsonic/models/MusicFolder.kt → ...asonic/api/subsonic/models/MusicFolder.kt
diff --git a/...ltrasonic/api/subsonic/models/Playlist.kt → ...ltrasonic/api/subsonic/models/Playlist.kt b/...ltrasonic/api/subsonic/models/Playlist.kt → ...ltrasonic/api/subsonic/models/Playlist.kt
diff --git a/...nic/api/subsonic/models/PodcastChannel.kt → ...nic/api/subsonic/models/PodcastChannel.kt b/...nic/api/subsonic/models/PodcastChannel.kt → ...nic/api/subsonic/models/PodcastChannel.kt
diff --git a/...sonic/api/subsonic/models/SearchResult.kt → ...sonic/api/subsonic/models/SearchResult.kt b/...sonic/api/subsonic/models/SearchResult.kt → ...sonic/api/subsonic/models/SearchResult.kt
diff --git a/.../api/subsonic/models/SearchThreeResult.kt → .../api/subsonic/models/SearchThreeResult.kt b/.../api/subsonic/models/SearchThreeResult.kt → .../api/subsonic/models/SearchThreeResult.kt
diff --git a/...ic/api/subsonic/models/SearchTwoResult.kt → ...ic/api/subsonic/models/SearchTwoResult.kt b/...ic/api/subsonic/models/SearchTwoResult.kt → ...ic/api/subsonic/models/SearchTwoResult.kt
diff --git a/...e/ultrasonic/api/subsonic/models/Share.kt → ...e/ultrasonic/api/subsonic/models/Share.kt b/...e/ultrasonic/api/subsonic/models/Share.kt → ...e/ultrasonic/api/subsonic/models/Share.kt
diff --git a/...re/ultrasonic/api/subsonic/models/User.kt → ...re/ultrasonic/api/subsonic/models/User.kt b/...re/ultrasonic/api/subsonic/models/User.kt → ...re/ultrasonic/api/subsonic/models/User.kt
diff --git a/...pi/subsonic/response/BookmarksResponse.kt → ...pi/subsonic/response/BookmarksResponse.kt b/...pi/subsonic/response/BookmarksResponse.kt → ...pi/subsonic/response/BookmarksResponse.kt
diff --git a/...subsonic/response/ChatMessagesResponse.kt → ...subsonic/response/ChatMessagesResponse.kt b/...subsonic/response/ChatMessagesResponse.kt → ...subsonic/response/ChatMessagesResponse.kt
diff --git a/...c/api/subsonic/response/GenresResponse.kt → ...c/api/subsonic/response/GenresResponse.kt b/...c/api/subsonic/response/GenresResponse.kt → ...c/api/subsonic/response/GenresResponse.kt
diff --git a/...ubsonic/response/GetAlbumList2Response.kt → ...ubsonic/response/GetAlbumList2Response.kt b/...ubsonic/response/GetAlbumList2Response.kt → ...ubsonic/response/GetAlbumList2Response.kt
diff --git a/...subsonic/response/GetAlbumListResponse.kt → ...subsonic/response/GetAlbumListResponse.kt b/...subsonic/response/GetAlbumListResponse.kt → ...subsonic/response/GetAlbumListResponse.kt
diff --git a/...api/subsonic/response/GetAlbumResponse.kt → ...api/subsonic/response/GetAlbumResponse.kt b/...api/subsonic/response/GetAlbumResponse.kt → ...api/subsonic/response/GetAlbumResponse.kt
diff --git a/...pi/subsonic/response/GetArtistResponse.kt → ...pi/subsonic/response/GetArtistResponse.kt b/...pi/subsonic/response/GetArtistResponse.kt → ...pi/subsonic/response/GetArtistResponse.kt
diff --git a/...i/subsonic/response/GetArtistsResponse.kt → ...i/subsonic/response/GetArtistsResponse.kt b/...i/subsonic/response/GetArtistsResponse.kt → ...i/subsonic/response/GetArtistsResponse.kt
diff --git a/...i/subsonic/response/GetIndexesResponse.kt → ...i/subsonic/response/GetIndexesResponse.kt b/...i/subsonic/response/GetIndexesResponse.kt → ...i/subsonic/response/GetIndexesResponse.kt
diff --git a/...pi/subsonic/response/GetLyricsResponse.kt → ...pi/subsonic/response/GetLyricsResponse.kt b/...pi/subsonic/response/GetLyricsResponse.kt → ...pi/subsonic/response/GetLyricsResponse.kt
diff --git a/...nic/response/GetMusicDirectoryResponse.kt → ...nic/response/GetMusicDirectoryResponse.kt b/...nic/response/GetMusicDirectoryResponse.kt → ...nic/response/GetMusicDirectoryResponse.kt
diff --git a/.../subsonic/response/GetPlaylistResponse.kt → .../subsonic/response/GetPlaylistResponse.kt b/.../subsonic/response/GetPlaylistResponse.kt → .../subsonic/response/GetPlaylistResponse.kt
diff --git a/...subsonic/response/GetPlaylistsResponse.kt → ...subsonic/response/GetPlaylistsResponse.kt b/...subsonic/response/GetPlaylistsResponse.kt → ...subsonic/response/GetPlaylistsResponse.kt
diff --git a/.../subsonic/response/GetPodcastsResponse.kt → .../subsonic/response/GetPodcastsResponse.kt b/.../subsonic/response/GetPodcastsResponse.kt → .../subsonic/response/GetPodcastsResponse.kt
diff --git a/...bsonic/response/GetRandomSongsResponse.kt → ...bsonic/response/GetRandomSongsResponse.kt b/...bsonic/response/GetRandomSongsResponse.kt → ...bsonic/response/GetRandomSongsResponse.kt
diff --git a/...sonic/response/GetSongsByGenreResponse.kt → ...sonic/response/GetSongsByGenreResponse.kt b/...sonic/response/GetSongsByGenreResponse.kt → ...sonic/response/GetSongsByGenreResponse.kt
diff --git a/...i/subsonic/response/GetStarredResponse.kt → ...i/subsonic/response/GetStarredResponse.kt b/...i/subsonic/response/GetStarredResponse.kt → ...i/subsonic/response/GetStarredResponse.kt
diff --git a/...ubsonic/response/GetStarredTwoResponse.kt → ...ubsonic/response/GetStarredTwoResponse.kt b/...ubsonic/response/GetStarredTwoResponse.kt → ...ubsonic/response/GetStarredTwoResponse.kt
diff --git a/.../api/subsonic/response/GetUserResponse.kt → .../api/subsonic/response/GetUserResponse.kt b/.../api/subsonic/response/GetUserResponse.kt → .../api/subsonic/response/GetUserResponse.kt
diff --git a/.../api/subsonic/response/JukeboxResponse.kt → .../api/subsonic/response/JukeboxResponse.kt b/.../api/subsonic/response/JukeboxResponse.kt → .../api/subsonic/response/JukeboxResponse.kt
diff --git a/.../api/subsonic/response/LicenseResponse.kt → .../api/subsonic/response/LicenseResponse.kt b/.../api/subsonic/response/LicenseResponse.kt → .../api/subsonic/response/LicenseResponse.kt
diff --git a/...subsonic/response/MusicFoldersResponse.kt → ...subsonic/response/MusicFoldersResponse.kt b/...subsonic/response/MusicFoldersResponse.kt → ...subsonic/response/MusicFoldersResponse.kt
diff --git a/...c/api/subsonic/response/SearchResponse.kt → ...c/api/subsonic/response/SearchResponse.kt b/...c/api/subsonic/response/SearchResponse.kt → ...c/api/subsonic/response/SearchResponse.kt
diff --git a/.../subsonic/response/SearchThreeResponse.kt → .../subsonic/response/SearchThreeResponse.kt b/.../subsonic/response/SearchThreeResponse.kt → .../subsonic/response/SearchThreeResponse.kt
diff --git a/...pi/subsonic/response/SearchTwoResponse.kt → ...pi/subsonic/response/SearchTwoResponse.kt b/...pi/subsonic/response/SearchTwoResponse.kt → ...pi/subsonic/response/SearchTwoResponse.kt
diff --git a/...c/api/subsonic/response/SharesResponse.kt → ...c/api/subsonic/response/SharesResponse.kt b/...c/api/subsonic/response/SharesResponse.kt → ...c/api/subsonic/response/SharesResponse.kt
diff --git a/...c/api/subsonic/response/StreamResponse.kt → ...c/api/subsonic/response/StreamResponse.kt b/...c/api/subsonic/response/StreamResponse.kt → ...c/api/subsonic/response/StreamResponse.kt
diff --git a/...api/subsonic/response/SubsonicResponse.kt → ...api/subsonic/response/SubsonicResponse.kt b/...api/subsonic/response/SubsonicResponse.kt → ...api/subsonic/response/SubsonicResponse.kt
diff --git a/...c/api/subsonic/response/VideosResponse.kt → ...c/api/subsonic/response/VideosResponse.kt b/...c/api/subsonic/response/VideosResponse.kt → ...c/api/subsonic/response/VideosResponse.kt
diff --git a/...pi/subsonic/ApiVersionCheckWrapperTest.kt → ...pi/subsonic/ApiVersionCheckWrapperTest.kt b/...pi/subsonic/ApiVersionCheckWrapperTest.kt → ...pi/subsonic/ApiVersionCheckWrapperTest.kt
diff --git a/...ic/SubsonicAPIVersionsDeserializerTest.kt → ...ic/SubsonicAPIVersionsDeserializerTest.kt b/...ic/SubsonicAPIVersionsDeserializerTest.kt → ...ic/SubsonicAPIVersionsDeserializerTest.kt
diff --git a/...c/api/subsonic/SubsonicAPIVersionsTest.kt → ...c/api/subsonic/SubsonicAPIVersionsTest.kt b/...c/api/subsonic/SubsonicAPIVersionsTest.kt → ...c/api/subsonic/SubsonicAPIVersionsTest.kt
diff --git a/...erceptors/ProxyPasswordInterceptorTest.kt → ...erceptors/ProxyPasswordInterceptorTest.kt b/...erceptors/ProxyPasswordInterceptorTest.kt → ...erceptors/ProxyPasswordInterceptorTest.kt
diff --git a/.../api/subsonic/models/AlbumListTypeTest.kt → .../api/subsonic/models/AlbumListTypeTest.kt b/.../api/subsonic/models/AlbumListTypeTest.kt → .../api/subsonic/models/AlbumListTypeTest.kt
diff --git a/...rasonic/api/subsonic/models/StatusTest.kt → ...rasonic/api/subsonic/models/StatusTest.kt b/...rasonic/api/subsonic/models/StatusTest.kt → ...rasonic/api/subsonic/models/StatusTest.kt
diff --git a/...i/subsonic/response/StreamResponseTest.kt → ...i/subsonic/response/StreamResponseTest.kt b/...i/subsonic/response/StreamResponseTest.kt → ...i/subsonic/response/StreamResponseTest.kt
diff --git a/settings.gradle b/settings.gradle
@@ -1,6 +1,6 @@
 include ':core:library'
 include ':core:domain'
-include ':subsonic-api'
+include ':core:subsonic-api'
 include ':core:subsonic-api-image-loader'
 include ':core:cache'
 include ':core:menudrawer'

diff --git a/subsonic-api/.gitignore b/subsonic-api/.gitignore
diff --git a/ultrasonic/build.gradle b/ultrasonic/build.gradle
@@ -54,7 +54,7 @@ dependencies {
     implementation project(':core:pulltorefresh')
     implementation project(':core:library')
     implementation project(':core:domain')
-    implementation project(':subsonic-api')
+    implementation project(':core:subsonic-api')
     implementation project(':core:subsonic-api-image-loader')
     implementation project(':core:cache')