From fb8d5382dc71538ec062a92d341b9f6ca7edd032 Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Sat, 6 Oct 2018 14:32:02 +0200 Subject: [PATCH] Move subsonic-api-image-loader module to core modules. --- .../subsonic-api-image-loader}/build.gradle | 0 .../loader/image/AvatarRequestHandlerTest.kt | 0 .../subsonic/loader/image/CommonFunctions.kt | 0 .../loader/image/CoverArtRequestHandlerTest.kt | 0 .../subsonic/loader/image/RequestCreatorTest.kt | 0 .../integrationTest/resources/Big_Buck_Bunny.jpeg | Bin .../src/main/AndroidManifest.xml | 0 .../subsonic/loader/image/AvatarRequestHandler.kt | 0 .../subsonic/loader/image/CoverArtRequestHandler.kt | 0 .../subsonic/loader/image/RequestCreator.kt | 0 .../subsonic/loader/image/SubsonicImageLoader.kt | 0 settings.gradle | 2 +- ultrasonic/build.gradle | 2 +- 13 files changed, 2 insertions(+), 2 deletions(-) rename {subsonic-api-image-loader => core/subsonic-api-image-loader}/build.gradle (100%) rename {subsonic-api-image-loader => core/subsonic-api-image-loader}/src/integrationTest/kotlin/org/moire/ultrasonic/subsonic/loader/image/AvatarRequestHandlerTest.kt (100%) rename {subsonic-api-image-loader => core/subsonic-api-image-loader}/src/integrationTest/kotlin/org/moire/ultrasonic/subsonic/loader/image/CommonFunctions.kt (100%) rename {subsonic-api-image-loader => core/subsonic-api-image-loader}/src/integrationTest/kotlin/org/moire/ultrasonic/subsonic/loader/image/CoverArtRequestHandlerTest.kt (100%) rename {subsonic-api-image-loader => core/subsonic-api-image-loader}/src/integrationTest/kotlin/org/moire/ultrasonic/subsonic/loader/image/RequestCreatorTest.kt (100%) rename {subsonic-api-image-loader => core/subsonic-api-image-loader}/src/integrationTest/resources/Big_Buck_Bunny.jpeg (100%) rename {subsonic-api-image-loader => core/subsonic-api-image-loader}/src/main/AndroidManifest.xml (100%) rename {subsonic-api-image-loader => core/subsonic-api-image-loader}/src/main/kotlin/org/moire/ultrasonic/subsonic/loader/image/AvatarRequestHandler.kt (100%) rename {subsonic-api-image-loader => core/subsonic-api-image-loader}/src/main/kotlin/org/moire/ultrasonic/subsonic/loader/image/CoverArtRequestHandler.kt (100%) rename {subsonic-api-image-loader => core/subsonic-api-image-loader}/src/main/kotlin/org/moire/ultrasonic/subsonic/loader/image/RequestCreator.kt (100%) rename {subsonic-api-image-loader => core/subsonic-api-image-loader}/src/main/kotlin/org/moire/ultrasonic/subsonic/loader/image/SubsonicImageLoader.kt (100%) diff --git a/subsonic-api-image-loader/build.gradle b/core/subsonic-api-image-loader/build.gradle similarity index 100% rename from subsonic-api-image-loader/build.gradle rename to core/subsonic-api-image-loader/build.gradle diff --git a/subsonic-api-image-loader/src/integrationTest/kotlin/org/moire/ultrasonic/subsonic/loader/image/AvatarRequestHandlerTest.kt b/core/subsonic-api-image-loader/src/integrationTest/kotlin/org/moire/ultrasonic/subsonic/loader/image/AvatarRequestHandlerTest.kt similarity index 100% rename from subsonic-api-image-loader/src/integrationTest/kotlin/org/moire/ultrasonic/subsonic/loader/image/AvatarRequestHandlerTest.kt rename to core/subsonic-api-image-loader/src/integrationTest/kotlin/org/moire/ultrasonic/subsonic/loader/image/AvatarRequestHandlerTest.kt diff --git a/subsonic-api-image-loader/src/integrationTest/kotlin/org/moire/ultrasonic/subsonic/loader/image/CommonFunctions.kt b/core/subsonic-api-image-loader/src/integrationTest/kotlin/org/moire/ultrasonic/subsonic/loader/image/CommonFunctions.kt similarity index 100% rename from subsonic-api-image-loader/src/integrationTest/kotlin/org/moire/ultrasonic/subsonic/loader/image/CommonFunctions.kt rename to core/subsonic-api-image-loader/src/integrationTest/kotlin/org/moire/ultrasonic/subsonic/loader/image/CommonFunctions.kt diff --git a/subsonic-api-image-loader/src/integrationTest/kotlin/org/moire/ultrasonic/subsonic/loader/image/CoverArtRequestHandlerTest.kt b/core/subsonic-api-image-loader/src/integrationTest/kotlin/org/moire/ultrasonic/subsonic/loader/image/CoverArtRequestHandlerTest.kt similarity index 100% rename from subsonic-api-image-loader/src/integrationTest/kotlin/org/moire/ultrasonic/subsonic/loader/image/CoverArtRequestHandlerTest.kt rename to core/subsonic-api-image-loader/src/integrationTest/kotlin/org/moire/ultrasonic/subsonic/loader/image/CoverArtRequestHandlerTest.kt diff --git a/subsonic-api-image-loader/src/integrationTest/kotlin/org/moire/ultrasonic/subsonic/loader/image/RequestCreatorTest.kt b/core/subsonic-api-image-loader/src/integrationTest/kotlin/org/moire/ultrasonic/subsonic/loader/image/RequestCreatorTest.kt similarity index 100% rename from subsonic-api-image-loader/src/integrationTest/kotlin/org/moire/ultrasonic/subsonic/loader/image/RequestCreatorTest.kt rename to core/subsonic-api-image-loader/src/integrationTest/kotlin/org/moire/ultrasonic/subsonic/loader/image/RequestCreatorTest.kt diff --git a/subsonic-api-image-loader/src/integrationTest/resources/Big_Buck_Bunny.jpeg b/core/subsonic-api-image-loader/src/integrationTest/resources/Big_Buck_Bunny.jpeg similarity index 100% rename from subsonic-api-image-loader/src/integrationTest/resources/Big_Buck_Bunny.jpeg rename to core/subsonic-api-image-loader/src/integrationTest/resources/Big_Buck_Bunny.jpeg diff --git a/subsonic-api-image-loader/src/main/AndroidManifest.xml b/core/subsonic-api-image-loader/src/main/AndroidManifest.xml similarity index 100% rename from subsonic-api-image-loader/src/main/AndroidManifest.xml rename to core/subsonic-api-image-loader/src/main/AndroidManifest.xml diff --git a/subsonic-api-image-loader/src/main/kotlin/org/moire/ultrasonic/subsonic/loader/image/AvatarRequestHandler.kt b/core/subsonic-api-image-loader/src/main/kotlin/org/moire/ultrasonic/subsonic/loader/image/AvatarRequestHandler.kt similarity index 100% rename from subsonic-api-image-loader/src/main/kotlin/org/moire/ultrasonic/subsonic/loader/image/AvatarRequestHandler.kt rename to core/subsonic-api-image-loader/src/main/kotlin/org/moire/ultrasonic/subsonic/loader/image/AvatarRequestHandler.kt diff --git a/subsonic-api-image-loader/src/main/kotlin/org/moire/ultrasonic/subsonic/loader/image/CoverArtRequestHandler.kt b/core/subsonic-api-image-loader/src/main/kotlin/org/moire/ultrasonic/subsonic/loader/image/CoverArtRequestHandler.kt similarity index 100% rename from subsonic-api-image-loader/src/main/kotlin/org/moire/ultrasonic/subsonic/loader/image/CoverArtRequestHandler.kt rename to core/subsonic-api-image-loader/src/main/kotlin/org/moire/ultrasonic/subsonic/loader/image/CoverArtRequestHandler.kt diff --git a/subsonic-api-image-loader/src/main/kotlin/org/moire/ultrasonic/subsonic/loader/image/RequestCreator.kt b/core/subsonic-api-image-loader/src/main/kotlin/org/moire/ultrasonic/subsonic/loader/image/RequestCreator.kt similarity index 100% rename from subsonic-api-image-loader/src/main/kotlin/org/moire/ultrasonic/subsonic/loader/image/RequestCreator.kt rename to core/subsonic-api-image-loader/src/main/kotlin/org/moire/ultrasonic/subsonic/loader/image/RequestCreator.kt diff --git a/subsonic-api-image-loader/src/main/kotlin/org/moire/ultrasonic/subsonic/loader/image/SubsonicImageLoader.kt b/core/subsonic-api-image-loader/src/main/kotlin/org/moire/ultrasonic/subsonic/loader/image/SubsonicImageLoader.kt similarity index 100% rename from subsonic-api-image-loader/src/main/kotlin/org/moire/ultrasonic/subsonic/loader/image/SubsonicImageLoader.kt rename to core/subsonic-api-image-loader/src/main/kotlin/org/moire/ultrasonic/subsonic/loader/image/SubsonicImageLoader.kt diff --git a/settings.gradle b/settings.gradle index 920ad785..5ddec4e9 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,7 +1,7 @@ include ':core:library' include ':core:domain' include ':subsonic-api' -include ':subsonic-api-image-loader' +include ':core:subsonic-api-image-loader' include ':core:cache' include ':core:menudrawer' include ':core:pulltorefresh' diff --git a/ultrasonic/build.gradle b/ultrasonic/build.gradle index e9bec200..edee1845 100644 --- a/ultrasonic/build.gradle +++ b/ultrasonic/build.gradle @@ -55,7 +55,7 @@ dependencies { implementation project(':core:library') implementation project(':core:domain') implementation project(':subsonic-api') - implementation project(':subsonic-api-image-loader') + implementation project(':core:subsonic-api-image-loader') implementation project(':core:cache') implementation androidSupport.support