diff --git a/README.md b/README.md index 87cd402..964db8a 100644 --- a/README.md +++ b/README.md @@ -10,15 +10,17 @@ RxVolley is modified Volley. Removed the HttpClient, and support RxJava. If you are building with Gradle, simply add the following line to the ```dependencies``` section of your ```build.gradle``` file: ->implementation 'com.kymjs.rxvolley:rxvolley:3.0.0' +latest version numbers: [![](https://jitpack.io/v/kymjs/RxVolley.svg)](https://jitpack.io/#kymjs/RxVolley) + +>implementation 'com.github.kymjs.rxvolley:rxvolley:3.0.0' > >// If use okhttp function ->implementation 'com.kymjs.rxvolley:okhttp3:3.0.0' +>implementation 'com.github.kymjs.rxvolley:okhttp3:3.0.0' >//or okhttp2 ->implementation 'com.kymjs.rxvolley:okhttp:3.0.0' +>implementation 'com.github.kymjs.rxvolley:okhttp:3.0.0' > >// If use image-loader function ->implementation 'com.kymjs.rxvolley:bitmapcore:3.0.0' +>implementation 'com.github.kymjs.rxvolley:image:3.0.0' ## Getting Started diff --git a/Readme_zh.md b/Readme_zh.md index 900b8ab..75b3b4b 100755 --- a/Readme_zh.md +++ b/Readme_zh.md @@ -12,30 +12,39 @@ ## 依赖 +最新RXVolley版本号为：[![](https://jitpack.io/v/kymjs/RxVolley.svg)](https://jitpack.io/#kymjs/RxVolley) -使用RxVolley，需要在你的`build.gradle`文件中加入 +使用RxVolley，需要在你的根`build.gradle`文件中加入 ``` -implementation 'com.kymjs.rxvolley:rxvolley:3.0.0' +allprojects { + repositories { + maven { url 'https://jitpack.io' } + } +} +``` + +对应的模块`build.gradle`中引入依赖： + +``` +implementation 'com.github.kymjs.rxvolley:rxvolley:3.0.0' ``` 如果你还想使用OKhttp来替代默认的```HttpUrlconnection```，需要加入 ``` -implementation 'com.kymjs.rxvolley:okhttp3:3.0.0' +implementation 'com.github.kymjs.rxvolley:okhttp3:3.0.0' //或者 okhttp2（二选一） -implementation 'com.kymjs.rxvolley:okhttp:3.0.0' +implementation 'com.github.kymjs.rxvolley:okhttp:3.0.0' ``` 如果你想使用RxVolley的图片加载功能(复用http模块可以有效减少apk大小)，需要加入 ``` -implementation 'com.kymjs.rxvolley:bitmapcore:3.0.0' +implementation 'com.github.kymjs.rxvolley:image:3.0.0' ``` -使用 RxVolley 做网络请求 - ## 简洁实现 ``` diff --git a/RxVolley/rxvolley/.gitignore b/RxVolley/rxvolley/.gitignore deleted file mode 100644 index 796b96d..0000000 --- a/RxVolley/rxvolley/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/RxVolley/settings.gradle b/RxVolley/settings.gradle deleted file mode 100644 index 253ef17..0000000 --- a/RxVolley/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -include ':app', ':rxvolley', ':bitmapcore', ':okhttp', ':okhttp3' diff --git a/RxVolley/app/.gitignore b/app/.gitignore similarity index 100% rename from RxVolley/app/.gitignore rename to app/.gitignore diff --git a/RxVolley/app/build.gradle b/app/build.gradle similarity index 81% rename from RxVolley/app/build.gradle rename to app/build.gradle index bf60c79..d42d198 100644 --- a/RxVolley/app/build.gradle +++ b/app/build.gradle @@ -35,11 +35,14 @@ dependencies { implementation 'io.reactivex.rxjava3:rxandroid:3.0.0' implementation 'com.squareup.okhttp3:okhttp:3.14.9' implementation 'androidx.appcompat:appcompat:1.3.1' - implementation 'com.kymjs.core:common:1.0.10' + implementation 'com.github.kymjs:common:2.0.0' implementation 'com.google.code.gson:gson:2.8.8' - implementation project(':bitmapcore') + implementation project(':image') implementation project(':okhttp3') implementation project(':rxvolley') +// implementation 'com.github.kymjs.rxvolley:rxvolley:3.0.0' +// implementation 'com.github.kymjs.rxvolley:okhttp3:3.0.0' +// implementation 'com.github.kymjs.rxvolley:image:3.0.0' debugImplementation 'junit:junit:4.12' } diff --git a/RxVolley/app/proguard-rules.pro b/app/proguard-rules.pro similarity index 100% rename from RxVolley/app/proguard-rules.pro rename to app/proguard-rules.pro diff --git a/RxVolley/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml similarity index 100% rename from RxVolley/app/src/main/AndroidManifest.xml rename to app/src/main/AndroidManifest.xml diff --git a/RxVolley/app/src/main/java/com/kymjs/rxvolley/demo/ImageLoadTestActivity.java b/app/src/main/java/com/kymjs/rxvolley/demo/ImageLoadTestActivity.java similarity index 100% rename from RxVolley/app/src/main/java/com/kymjs/rxvolley/demo/ImageLoadTestActivity.java rename to app/src/main/java/com/kymjs/rxvolley/demo/ImageLoadTestActivity.java diff --git a/RxVolley/app/src/main/java/com/kymjs/rxvolley/demo/MainActivity.java b/app/src/main/java/com/kymjs/rxvolley/demo/MainActivity.java similarity index 100% rename from RxVolley/app/src/main/java/com/kymjs/rxvolley/demo/MainActivity.java rename to app/src/main/java/com/kymjs/rxvolley/demo/MainActivity.java diff --git a/RxVolley/app/src/main/java/com/kymjs/rxvolley/demo/ParamsTestActivity.java b/app/src/main/java/com/kymjs/rxvolley/demo/ParamsTestActivity.java similarity index 100% rename from RxVolley/app/src/main/java/com/kymjs/rxvolley/demo/ParamsTestActivity.java rename to app/src/main/java/com/kymjs/rxvolley/demo/ParamsTestActivity.java diff --git a/RxVolley/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml similarity index 100% rename from RxVolley/app/src/main/res/layout/activity_main.xml rename to app/src/main/res/layout/activity_main.xml diff --git a/RxVolley/app/src/main/res/layout/activity_rxloadimage_test.xml b/app/src/main/res/layout/activity_rxloadimage_test.xml similarity index 100% rename from RxVolley/app/src/main/res/layout/activity_rxloadimage_test.xml rename to app/src/main/res/layout/activity_rxloadimage_test.xml diff --git a/RxVolley/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from RxVolley/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/RxVolley/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from RxVolley/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/RxVolley/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from RxVolley/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/RxVolley/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from RxVolley/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/RxVolley/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from RxVolley/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/RxVolley/app/src/main/res/values-w820dp/dimens.xml b/app/src/main/res/values-w820dp/dimens.xml similarity index 100% rename from RxVolley/app/src/main/res/values-w820dp/dimens.xml rename to app/src/main/res/values-w820dp/dimens.xml diff --git a/RxVolley/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml similarity index 100% rename from RxVolley/app/src/main/res/values/colors.xml rename to app/src/main/res/values/colors.xml diff --git a/RxVolley/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml similarity index 100% rename from RxVolley/app/src/main/res/values/dimens.xml rename to app/src/main/res/values/dimens.xml diff --git a/RxVolley/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml similarity index 100% rename from RxVolley/app/src/main/res/values/strings.xml rename to app/src/main/res/values/strings.xml diff --git a/RxVolley/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml similarity index 100% rename from RxVolley/app/src/main/res/values/styles.xml rename to app/src/main/res/values/styles.xml diff --git a/RxVolley/build.gradle b/build.gradle similarity index 100% rename from RxVolley/build.gradle rename to build.gradle diff --git a/RxVolley/gradle.properties b/gradle.properties similarity index 100% rename from RxVolley/gradle.properties rename to gradle.properties diff --git a/RxVolley/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from RxVolley/gradle/wrapper/gradle-wrapper.jar rename to gradle/wrapper/gradle-wrapper.jar diff --git a/RxVolley/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from RxVolley/gradle/wrapper/gradle-wrapper.properties rename to gradle/wrapper/gradle-wrapper.properties diff --git a/RxVolley/gradlew b/gradlew similarity index 100% rename from RxVolley/gradlew rename to gradlew diff --git a/RxVolley/gradlew.bat b/gradlew.bat similarity index 100% rename from RxVolley/gradlew.bat rename to gradlew.bat diff --git a/RxVolley/bitmapcore/.gitignore b/image/.gitignore similarity index 100% rename from RxVolley/bitmapcore/.gitignore rename to image/.gitignore diff --git a/RxVolley/bitmapcore/build.gradle b/image/build.gradle similarity index 64% rename from RxVolley/bitmapcore/build.gradle rename to image/build.gradle index 5e8b636..9b80bbd 100644 --- a/RxVolley/bitmapcore/build.gradle +++ b/image/build.gradle @@ -1,5 +1,8 @@ apply plugin: 'com.android.library' +group = 'com.github.kymjs.rxvolley' +version = "3.0.0" + android { compileSdkVersion 30 resourcePrefix "bitmapcore_" @@ -28,23 +31,11 @@ android { dependencies { implementation 'io.reactivex.rxjava3:rxjava:3.1.0' implementation 'io.reactivex.rxjava3:rxandroid:3.0.0' - implementation 'com.kymjs.rxvolley:rxvolley:3.0.0' -// implementation project(':rxvolley') - implementation 'com.kymjs.core:common:1.0.10' +// compileOnly 'com.github.kymjs.rxvolley:rxvolley:3.0.0' + compileOnly project(':rxvolley') + implementation 'com.github.kymjs:common:2.0.0' } apply plugin: 'maven-publish' apply plugin: 'com.github.dcendents.android-maven' -afterEvaluate { - publishing { - publications { - release(MavenPublication) { - from components.release - groupId = 'com.kymjs.rxvolley' - artifactId = 'bitmapcore' - version = "3.0.0" - } - } - } -} diff --git a/RxVolley/bitmapcore/proguard-rules.pro b/image/proguard-rules.pro similarity index 100% rename from RxVolley/bitmapcore/proguard-rules.pro rename to image/proguard-rules.pro diff --git a/RxVolley/bitmapcore/src/main/AndroidManifest.xml b/image/src/main/AndroidManifest.xml similarity index 100% rename from RxVolley/bitmapcore/src/main/AndroidManifest.xml rename to image/src/main/AndroidManifest.xml diff --git a/RxVolley/bitmapcore/src/main/java/com/kymjs/core/bitmap/BitmapMemoryCache.java b/image/src/main/java/com/kymjs/core/bitmap/BitmapMemoryCache.java similarity index 100% rename from RxVolley/bitmapcore/src/main/java/com/kymjs/core/bitmap/BitmapMemoryCache.java rename to image/src/main/java/com/kymjs/core/bitmap/BitmapMemoryCache.java diff --git a/RxVolley/bitmapcore/src/main/java/com/kymjs/core/bitmap/DiskImageDisplayer.java b/image/src/main/java/com/kymjs/core/bitmap/DiskImageDisplayer.java similarity index 100% rename from RxVolley/bitmapcore/src/main/java/com/kymjs/core/bitmap/DiskImageDisplayer.java rename to image/src/main/java/com/kymjs/core/bitmap/DiskImageDisplayer.java diff --git a/RxVolley/bitmapcore/src/main/java/com/kymjs/core/bitmap/ImageBale.java b/image/src/main/java/com/kymjs/core/bitmap/ImageBale.java similarity index 100% rename from RxVolley/bitmapcore/src/main/java/com/kymjs/core/bitmap/ImageBale.java rename to image/src/main/java/com/kymjs/core/bitmap/ImageBale.java diff --git a/RxVolley/bitmapcore/src/main/java/com/kymjs/core/bitmap/ImageDisplayer.java b/image/src/main/java/com/kymjs/core/bitmap/ImageDisplayer.java similarity index 100% rename from RxVolley/bitmapcore/src/main/java/com/kymjs/core/bitmap/ImageDisplayer.java rename to image/src/main/java/com/kymjs/core/bitmap/ImageDisplayer.java diff --git a/RxVolley/bitmapcore/src/main/java/com/kymjs/core/bitmap/ImageRequestEven.java b/image/src/main/java/com/kymjs/core/bitmap/ImageRequestEven.java similarity index 100% rename from RxVolley/bitmapcore/src/main/java/com/kymjs/core/bitmap/ImageRequestEven.java rename to image/src/main/java/com/kymjs/core/bitmap/ImageRequestEven.java diff --git a/RxVolley/bitmapcore/src/main/java/com/kymjs/core/bitmap/client/BitmapCore.java b/image/src/main/java/com/kymjs/core/bitmap/client/BitmapCore.java similarity index 100% rename from RxVolley/bitmapcore/src/main/java/com/kymjs/core/bitmap/client/BitmapCore.java rename to image/src/main/java/com/kymjs/core/bitmap/client/BitmapCore.java diff --git a/RxVolley/bitmapcore/src/main/java/com/kymjs/core/bitmap/client/BitmapRequestConfig.java b/image/src/main/java/com/kymjs/core/bitmap/client/BitmapRequestConfig.java similarity index 100% rename from RxVolley/bitmapcore/src/main/java/com/kymjs/core/bitmap/client/BitmapRequestConfig.java rename to image/src/main/java/com/kymjs/core/bitmap/client/BitmapRequestConfig.java diff --git a/RxVolley/bitmapcore/src/main/java/com/kymjs/core/bitmap/client/ImageRequest.java b/image/src/main/java/com/kymjs/core/bitmap/client/ImageRequest.java similarity index 100% rename from RxVolley/bitmapcore/src/main/java/com/kymjs/core/bitmap/client/ImageRequest.java rename to image/src/main/java/com/kymjs/core/bitmap/client/ImageRequest.java diff --git a/RxVolley/bitmapcore/src/main/java/com/kymjs/core/bitmap/diskloader/AsyncPoster.java b/image/src/main/java/com/kymjs/core/bitmap/diskloader/AsyncPoster.java similarity index 100% rename from RxVolley/bitmapcore/src/main/java/com/kymjs/core/bitmap/diskloader/AsyncPoster.java rename to image/src/main/java/com/kymjs/core/bitmap/diskloader/AsyncPoster.java diff --git a/RxVolley/bitmapcore/src/main/java/com/kymjs/core/bitmap/diskloader/BackgroundPoster.java b/image/src/main/java/com/kymjs/core/bitmap/diskloader/BackgroundPoster.java similarity index 100% rename from RxVolley/bitmapcore/src/main/java/com/kymjs/core/bitmap/diskloader/BackgroundPoster.java rename to image/src/main/java/com/kymjs/core/bitmap/diskloader/BackgroundPoster.java diff --git a/RxVolley/bitmapcore/src/main/java/com/kymjs/core/bitmap/diskloader/PendingPost.java b/image/src/main/java/com/kymjs/core/bitmap/diskloader/PendingPost.java similarity index 100% rename from RxVolley/bitmapcore/src/main/java/com/kymjs/core/bitmap/diskloader/PendingPost.java rename to image/src/main/java/com/kymjs/core/bitmap/diskloader/PendingPost.java diff --git a/RxVolley/bitmapcore/src/main/java/com/kymjs/core/bitmap/diskloader/PendingPostQueue.java b/image/src/main/java/com/kymjs/core/bitmap/diskloader/PendingPostQueue.java similarity index 100% rename from RxVolley/bitmapcore/src/main/java/com/kymjs/core/bitmap/diskloader/PendingPostQueue.java rename to image/src/main/java/com/kymjs/core/bitmap/diskloader/PendingPostQueue.java diff --git a/RxVolley/bitmapcore/src/main/java/com/kymjs/core/bitmap/interf/IBitmapCache.java b/image/src/main/java/com/kymjs/core/bitmap/interf/IBitmapCache.java similarity index 100% rename from RxVolley/bitmapcore/src/main/java/com/kymjs/core/bitmap/interf/IBitmapCache.java rename to image/src/main/java/com/kymjs/core/bitmap/interf/IBitmapCache.java diff --git a/RxVolley/bitmapcore/src/main/java/com/kymjs/core/bitmap/toolbox/CreateBitmap.java b/image/src/main/java/com/kymjs/core/bitmap/toolbox/CreateBitmap.java similarity index 100% rename from RxVolley/bitmapcore/src/main/java/com/kymjs/core/bitmap/toolbox/CreateBitmap.java rename to image/src/main/java/com/kymjs/core/bitmap/toolbox/CreateBitmap.java diff --git a/RxVolley/bitmapcore/src/main/res/anim/bitmapcore_enteralpha.xml b/image/src/main/res/anim/bitmapcore_enteralpha.xml similarity index 100% rename from RxVolley/bitmapcore/src/main/res/anim/bitmapcore_enteralpha.xml rename to image/src/main/res/anim/bitmapcore_enteralpha.xml diff --git a/RxVolley/bitmapcore/src/main/res/values/strings.xml b/image/src/main/res/values/strings.xml similarity index 100% rename from RxVolley/bitmapcore/src/main/res/values/strings.xml rename to image/src/main/res/values/strings.xml diff --git a/RxVolley/okhttp/.gitignore b/okhttp/.gitignore similarity index 100% rename from RxVolley/okhttp/.gitignore rename to okhttp/.gitignore diff --git a/RxVolley/okhttp/build.gradle b/okhttp/build.gradle similarity index 66% rename from RxVolley/okhttp/build.gradle rename to okhttp/build.gradle index ebd25c8..c80185b 100644 --- a/RxVolley/okhttp/build.gradle +++ b/okhttp/build.gradle @@ -1,5 +1,8 @@ apply plugin: 'com.android.library' +group = 'com.github.kymjs.rxvolley' +version = "3.0.0" + android { compileSdkVersion 30 resourcePrefix "okhttp_" @@ -26,23 +29,11 @@ android { } dependencies { - implementation 'com.kymjs.rxvolley:rxvolley:3.0.0' -// implementation project(':rxvolley') +// compileOnly 'com.github.kymjs.rxvolley:rxvolley:3.0.0' + compileOnly project(':rxvolley') implementation 'com.squareup.okhttp:okhttp:2.7.0' } apply plugin: 'maven-publish' apply plugin: 'com.github.dcendents.android-maven' -afterEvaluate { - publishing { - publications { - release(MavenPublication) { - from components.release - groupId = 'com.kymjs.core' - artifactId = 'okhttp' - version = "3.0.0" - } - } - } -} diff --git a/RxVolley/okhttp/proguard-rules.pro b/okhttp/proguard-rules.pro similarity index 100% rename from RxVolley/okhttp/proguard-rules.pro rename to okhttp/proguard-rules.pro diff --git a/RxVolley/okhttp/src/main/AndroidManifest.xml b/okhttp/src/main/AndroidManifest.xml similarity index 100% rename from RxVolley/okhttp/src/main/AndroidManifest.xml rename to okhttp/src/main/AndroidManifest.xml diff --git a/RxVolley/okhttp/src/main/java/com/kymjs/okhttp/OkHttpStack.java b/okhttp/src/main/java/com/kymjs/okhttp/OkHttpStack.java similarity index 100% rename from RxVolley/okhttp/src/main/java/com/kymjs/okhttp/OkHttpStack.java rename to okhttp/src/main/java/com/kymjs/okhttp/OkHttpStack.java diff --git a/RxVolley/okhttp/src/main/res/values/strings.xml b/okhttp/src/main/res/values/strings.xml similarity index 100% rename from RxVolley/okhttp/src/main/res/values/strings.xml rename to okhttp/src/main/res/values/strings.xml diff --git a/RxVolley/okhttp3/.gitignore b/okhttp3/.gitignore similarity index 100% rename from RxVolley/okhttp3/.gitignore rename to okhttp3/.gitignore diff --git a/RxVolley/okhttp3/build.gradle b/okhttp3/build.gradle similarity index 61% rename from RxVolley/okhttp3/build.gradle rename to okhttp3/build.gradle index cb388f6..aa6e50f 100644 --- a/RxVolley/okhttp3/build.gradle +++ b/okhttp3/build.gradle @@ -1,5 +1,8 @@ apply plugin: 'com.android.library' +group = 'com.github.kymjs' +version = "3.0.0" + android { compileSdkVersion 30 resourcePrefix "okhttp_" @@ -26,23 +29,10 @@ android { } dependencies { - implementation 'com.kymjs.rxvolley:rxvolley:3.0.0' -// implementation project(':rxvolley') - implementation 'com.squareup.okhttp3:okhttp:3.14.9' +// compileOnly 'com.github.kymjs.rxvolley:rxvolley:3.0.0' + compileOnly project(':rxvolley') + api 'com.squareup.okhttp3:okhttp:3.14.9' } apply plugin: 'maven-publish' apply plugin: 'com.github.dcendents.android-maven' - -afterEvaluate { - publishing { - publications { - release(MavenPublication) { - from components.release - groupId = 'com.kymjs.rxvolley' - artifactId = 'okhttp3' - version = "3.0.0" - } - } - } -} diff --git a/RxVolley/okhttp3/proguard-rules.pro b/okhttp3/proguard-rules.pro similarity index 100% rename from RxVolley/okhttp3/proguard-rules.pro rename to okhttp3/proguard-rules.pro diff --git a/RxVolley/okhttp3/src/main/AndroidManifest.xml b/okhttp3/src/main/AndroidManifest.xml similarity index 100% rename from RxVolley/okhttp3/src/main/AndroidManifest.xml rename to okhttp3/src/main/AndroidManifest.xml diff --git a/RxVolley/okhttp3/src/main/java/com/kymjs/okhttp3/CertificateUtils.java b/okhttp3/src/main/java/com/kymjs/okhttp3/CertificateUtils.java similarity index 100% rename from RxVolley/okhttp3/src/main/java/com/kymjs/okhttp3/CertificateUtils.java rename to okhttp3/src/main/java/com/kymjs/okhttp3/CertificateUtils.java diff --git a/RxVolley/okhttp3/src/main/java/com/kymjs/okhttp3/OkHttpStack.java b/okhttp3/src/main/java/com/kymjs/okhttp3/OkHttpStack.java similarity index 100% rename from RxVolley/okhttp3/src/main/java/com/kymjs/okhttp3/OkHttpStack.java rename to okhttp3/src/main/java/com/kymjs/okhttp3/OkHttpStack.java diff --git a/RxVolley/.gitignore b/rxvolley2/.gitignore similarity index 100% rename from RxVolley/.gitignore rename to rxvolley2/.gitignore diff --git a/RxVolley/rxvolley/build.gradle b/rxvolley2/build.gradle similarity index 71% rename from RxVolley/rxvolley/build.gradle rename to rxvolley2/build.gradle index a932cfa..d42625d 100644 --- a/RxVolley/rxvolley/build.gradle +++ b/rxvolley2/build.gradle @@ -1,5 +1,8 @@ apply plugin: 'com.android.library' +group = 'com.github.kymjs.rxvolley' +version = "3.0.0" + android { compileSdkVersion 30 resourcePrefix "rxvolley_" @@ -28,22 +31,10 @@ android { dependencies { implementation 'io.reactivex.rxjava3:rxjava:3.1.0' implementation 'io.reactivex.rxjava3:rxandroid:3.0.0' - implementation 'com.kymjs.core:common:1.0.10' + implementation 'com.github.kymjs:common:2.0.0' implementation 'androidx.appcompat:appcompat:1.3.1' } apply plugin: 'maven-publish' apply plugin: 'com.github.dcendents.android-maven' -afterEvaluate { - publishing { - publications { - release(MavenPublication) { - from components.release - groupId = 'com.kymjs.rxvolley' - artifactId = 'rxvolley' - version = "3.0.0" - } - } - } -} diff --git a/RxVolley/rxvolley/proguard-rules.pro b/rxvolley2/proguard-rules.pro similarity index 100% rename from RxVolley/rxvolley/proguard-rules.pro rename to rxvolley2/proguard-rules.pro diff --git a/RxVolley/rxvolley/src/main/AndroidManifest.xml b/rxvolley2/src/main/AndroidManifest.xml similarity index 100% rename from RxVolley/rxvolley/src/main/AndroidManifest.xml rename to rxvolley2/src/main/AndroidManifest.xml diff --git a/RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/RxVolley.java b/rxvolley2/src/main/java/com/kymjs/rxvolley/RxVolley.java similarity index 100% rename from RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/RxVolley.java rename to rxvolley2/src/main/java/com/kymjs/rxvolley/RxVolley.java diff --git a/RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/client/FileRequest.java b/rxvolley2/src/main/java/com/kymjs/rxvolley/client/FileRequest.java similarity index 100% rename from RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/client/FileRequest.java rename to rxvolley2/src/main/java/com/kymjs/rxvolley/client/FileRequest.java diff --git a/RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/client/FormRequest.java b/rxvolley2/src/main/java/com/kymjs/rxvolley/client/FormRequest.java similarity index 100% rename from RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/client/FormRequest.java rename to rxvolley2/src/main/java/com/kymjs/rxvolley/client/FormRequest.java diff --git a/RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/client/HttpCallback.java b/rxvolley2/src/main/java/com/kymjs/rxvolley/client/HttpCallback.java similarity index 100% rename from RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/client/HttpCallback.java rename to rxvolley2/src/main/java/com/kymjs/rxvolley/client/HttpCallback.java diff --git a/RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/client/HttpParams.java b/rxvolley2/src/main/java/com/kymjs/rxvolley/client/HttpParams.java similarity index 100% rename from RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/client/HttpParams.java rename to rxvolley2/src/main/java/com/kymjs/rxvolley/client/HttpParams.java diff --git a/RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/client/JsonRequest.java b/rxvolley2/src/main/java/com/kymjs/rxvolley/client/JsonRequest.java similarity index 100% rename from RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/client/JsonRequest.java rename to rxvolley2/src/main/java/com/kymjs/rxvolley/client/JsonRequest.java diff --git a/RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/client/ProgressListener.java b/rxvolley2/src/main/java/com/kymjs/rxvolley/client/ProgressListener.java similarity index 100% rename from RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/client/ProgressListener.java rename to rxvolley2/src/main/java/com/kymjs/rxvolley/client/ProgressListener.java diff --git a/RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/client/RequestConfig.java b/rxvolley2/src/main/java/com/kymjs/rxvolley/client/RequestConfig.java similarity index 100% rename from RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/client/RequestConfig.java rename to rxvolley2/src/main/java/com/kymjs/rxvolley/client/RequestConfig.java diff --git a/RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/http/CacheDispatcher.java b/rxvolley2/src/main/java/com/kymjs/rxvolley/http/CacheDispatcher.java similarity index 100% rename from RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/http/CacheDispatcher.java rename to rxvolley2/src/main/java/com/kymjs/rxvolley/http/CacheDispatcher.java diff --git a/RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/http/DefaultRetryPolicy.java b/rxvolley2/src/main/java/com/kymjs/rxvolley/http/DefaultRetryPolicy.java similarity index 100% rename from RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/http/DefaultRetryPolicy.java rename to rxvolley2/src/main/java/com/kymjs/rxvolley/http/DefaultRetryPolicy.java diff --git a/RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/http/ExecutorDelivery.java b/rxvolley2/src/main/java/com/kymjs/rxvolley/http/ExecutorDelivery.java similarity index 100% rename from RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/http/ExecutorDelivery.java rename to rxvolley2/src/main/java/com/kymjs/rxvolley/http/ExecutorDelivery.java diff --git a/RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/http/HttpConnectStack.java b/rxvolley2/src/main/java/com/kymjs/rxvolley/http/HttpConnectStack.java similarity index 100% rename from RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/http/HttpConnectStack.java rename to rxvolley2/src/main/java/com/kymjs/rxvolley/http/HttpConnectStack.java diff --git a/RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/http/HttpHeaderParser.java b/rxvolley2/src/main/java/com/kymjs/rxvolley/http/HttpHeaderParser.java similarity index 100% rename from RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/http/HttpHeaderParser.java rename to rxvolley2/src/main/java/com/kymjs/rxvolley/http/HttpHeaderParser.java diff --git a/RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/http/Network.java b/rxvolley2/src/main/java/com/kymjs/rxvolley/http/Network.java similarity index 100% rename from RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/http/Network.java rename to rxvolley2/src/main/java/com/kymjs/rxvolley/http/Network.java diff --git a/RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/http/NetworkDispatcher.java b/rxvolley2/src/main/java/com/kymjs/rxvolley/http/NetworkDispatcher.java similarity index 100% rename from RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/http/NetworkDispatcher.java rename to rxvolley2/src/main/java/com/kymjs/rxvolley/http/NetworkDispatcher.java diff --git a/RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/http/NetworkResponse.java b/rxvolley2/src/main/java/com/kymjs/rxvolley/http/NetworkResponse.java similarity index 100% rename from RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/http/NetworkResponse.java rename to rxvolley2/src/main/java/com/kymjs/rxvolley/http/NetworkResponse.java diff --git a/RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/http/Request.java b/rxvolley2/src/main/java/com/kymjs/rxvolley/http/Request.java similarity index 100% rename from RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/http/Request.java rename to rxvolley2/src/main/java/com/kymjs/rxvolley/http/Request.java diff --git a/RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/http/RequestQueue.java b/rxvolley2/src/main/java/com/kymjs/rxvolley/http/RequestQueue.java similarity index 100% rename from RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/http/RequestQueue.java rename to rxvolley2/src/main/java/com/kymjs/rxvolley/http/RequestQueue.java diff --git a/RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/http/Response.java b/rxvolley2/src/main/java/com/kymjs/rxvolley/http/Response.java similarity index 100% rename from RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/http/Response.java rename to rxvolley2/src/main/java/com/kymjs/rxvolley/http/Response.java diff --git a/RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/http/RetryPolicy.java b/rxvolley2/src/main/java/com/kymjs/rxvolley/http/RetryPolicy.java similarity index 100% rename from RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/http/RetryPolicy.java rename to rxvolley2/src/main/java/com/kymjs/rxvolley/http/RetryPolicy.java diff --git a/RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/http/URLHttpResponse.java b/rxvolley2/src/main/java/com/kymjs/rxvolley/http/URLHttpResponse.java similarity index 100% rename from RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/http/URLHttpResponse.java rename to rxvolley2/src/main/java/com/kymjs/rxvolley/http/URLHttpResponse.java diff --git a/RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/http/VolleyError.java b/rxvolley2/src/main/java/com/kymjs/rxvolley/http/VolleyError.java similarity index 100% rename from RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/http/VolleyError.java rename to rxvolley2/src/main/java/com/kymjs/rxvolley/http/VolleyError.java diff --git a/RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/interf/ICache.java b/rxvolley2/src/main/java/com/kymjs/rxvolley/interf/ICache.java similarity index 100% rename from RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/interf/ICache.java rename to rxvolley2/src/main/java/com/kymjs/rxvolley/interf/ICache.java diff --git a/RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/interf/IDelivery.java b/rxvolley2/src/main/java/com/kymjs/rxvolley/interf/IDelivery.java similarity index 100% rename from RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/interf/IDelivery.java rename to rxvolley2/src/main/java/com/kymjs/rxvolley/interf/IDelivery.java diff --git a/RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/interf/IHttpStack.java b/rxvolley2/src/main/java/com/kymjs/rxvolley/interf/IHttpStack.java similarity index 100% rename from RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/interf/IHttpStack.java rename to rxvolley2/src/main/java/com/kymjs/rxvolley/interf/IHttpStack.java diff --git a/RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/interf/INetwork.java b/rxvolley2/src/main/java/com/kymjs/rxvolley/interf/INetwork.java similarity index 100% rename from RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/interf/INetwork.java rename to rxvolley2/src/main/java/com/kymjs/rxvolley/interf/INetwork.java diff --git a/RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/interf/IPersistence.java b/rxvolley2/src/main/java/com/kymjs/rxvolley/interf/IPersistence.java similarity index 100% rename from RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/interf/IPersistence.java rename to rxvolley2/src/main/java/com/kymjs/rxvolley/interf/IPersistence.java diff --git a/RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/rx/Result.java b/rxvolley2/src/main/java/com/kymjs/rxvolley/rx/Result.java similarity index 100% rename from RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/rx/Result.java rename to rxvolley2/src/main/java/com/kymjs/rxvolley/rx/Result.java diff --git a/RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/rx/RxBus.java b/rxvolley2/src/main/java/com/kymjs/rxvolley/rx/RxBus.java similarity index 100% rename from RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/rx/RxBus.java rename to rxvolley2/src/main/java/com/kymjs/rxvolley/rx/RxBus.java diff --git a/RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/toolbox/ByteArrayPool.java b/rxvolley2/src/main/java/com/kymjs/rxvolley/toolbox/ByteArrayPool.java similarity index 100% rename from RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/toolbox/ByteArrayPool.java rename to rxvolley2/src/main/java/com/kymjs/rxvolley/toolbox/ByteArrayPool.java diff --git a/RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/toolbox/DiskBasedCache.java b/rxvolley2/src/main/java/com/kymjs/rxvolley/toolbox/DiskBasedCache.java similarity index 100% rename from RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/toolbox/DiskBasedCache.java rename to rxvolley2/src/main/java/com/kymjs/rxvolley/toolbox/DiskBasedCache.java diff --git a/RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/toolbox/HTTPSTrustManager.java b/rxvolley2/src/main/java/com/kymjs/rxvolley/toolbox/HTTPSTrustManager.java similarity index 100% rename from RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/toolbox/HTTPSTrustManager.java rename to rxvolley2/src/main/java/com/kymjs/rxvolley/toolbox/HTTPSTrustManager.java diff --git a/RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/toolbox/HttpParamsEntry.java b/rxvolley2/src/main/java/com/kymjs/rxvolley/toolbox/HttpParamsEntry.java similarity index 100% rename from RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/toolbox/HttpParamsEntry.java rename to rxvolley2/src/main/java/com/kymjs/rxvolley/toolbox/HttpParamsEntry.java diff --git a/RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/toolbox/HttpStatus.java b/rxvolley2/src/main/java/com/kymjs/rxvolley/toolbox/HttpStatus.java similarity index 100% rename from RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/toolbox/HttpStatus.java rename to rxvolley2/src/main/java/com/kymjs/rxvolley/toolbox/HttpStatus.java diff --git a/RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/toolbox/PoolingByteArrayOutputStream.java b/rxvolley2/src/main/java/com/kymjs/rxvolley/toolbox/PoolingByteArrayOutputStream.java similarity index 100% rename from RxVolley/rxvolley/src/main/java/com/kymjs/rxvolley/toolbox/PoolingByteArrayOutputStream.java rename to rxvolley2/src/main/java/com/kymjs/rxvolley/toolbox/PoolingByteArrayOutputStream.java diff --git a/RxVolley/rxvolley/src/main/res/values/strings.xml b/rxvolley2/src/main/res/values/strings.xml similarity index 100% rename from RxVolley/rxvolley/src/main/res/values/strings.xml rename to rxvolley2/src/main/res/values/strings.xml diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..2cf957b --- /dev/null +++ b/settings.gradle @@ -0,0 +1,5 @@ +include ':app' +include ':rxvolley' +include ':image' +include ':okhttp' +include ':okhttp3'