diff --git a/pluto-plugins/bundle/lib-no-op/build.gradle.kts b/pluto-plugins/bundle/lib-no-op/build.gradle.kts index 21533d42e..10325711d 100644 --- a/pluto-plugins/bundle/lib-no-op/build.gradle.kts +++ b/pluto-plugins/bundle/lib-no-op/build.gradle.kts @@ -89,9 +89,7 @@ mavenPublishing { dependencies { api(project(":pluto-plugins:plugins:exceptions:lib-no-op")) - api(project(":pluto-plugins:plugins:network:core:lib-no-op")) - api(project(":pluto-plugins:plugins:network:interceptor-ktor:lib-no-op")) - api(project(":pluto-plugins:plugins:network:interceptor-okhttp:lib-no-op")) + api(project(":pluto-plugins:plugins:network:lib-no-op")) api(project(":pluto-plugins:plugins:shared-preferences:lib-no-op")) api(project(":pluto-plugins:plugins:logger:lib-no-op")) api(project(":pluto-plugins:plugins:datastore:lib-no-op")) diff --git a/pluto-plugins/bundle/lib/build.gradle.kts b/pluto-plugins/bundle/lib/build.gradle.kts index cf74dc806..715329e28 100644 --- a/pluto-plugins/bundle/lib/build.gradle.kts +++ b/pluto-plugins/bundle/lib/build.gradle.kts @@ -89,9 +89,9 @@ mavenPublishing { dependencies { api(project(":pluto-plugins:plugins:exceptions:lib")) - api(project(":pluto-plugins:plugins:network:core:lib")) - api(project(":pluto-plugins:plugins:network:interceptor-ktor:lib")) - api(project(":pluto-plugins:plugins:network:interceptor-okhttp:lib")) + api(project(":pluto-plugins:plugins:network:lib")) +// api(project(":pluto-plugins:plugins:network:interceptor-ktor:lib")) +// api(project(":pluto-plugins:plugins:network:interceptor-okhttp:lib")) api(project(":pluto-plugins:plugins:shared-preferences:lib")) api(project(":pluto-plugins:plugins:logger:lib")) api(project(":pluto-plugins:plugins:datastore:lib")) diff --git a/pluto-plugins/plugins/network/README.md b/pluto-plugins/plugins/network/README.md index de51b396b..baa723e4a 100644 --- a/pluto-plugins/plugins/network/README.md +++ b/pluto-plugins/plugins/network/README.md @@ -22,20 +22,11 @@ Pluto.Installer(this) .install() ```
- -> Note: If you are already using Network plugin, you need to do some code changes to migrate to version`2.1.7+`. Please [read here](https://github.com/androidPluto/pluto/wiki/Migrating-Network-plugin-to-version-2.1.7) for migration. +
### Add interceptors #### 1. Okhttp Interceptor -Add okhttp-interceptor dependency -```groovy -dependencies { - debugImplementation "com.plutolib.plugins:network-interceptor-okhttp:$plutoVersion" - releaseImplementation "com.plutolib.plugins:network-interceptor-okhttp-no-op:$plutoVersion" -} -``` - Add interceptor in your OkHttp Client Builder ```kotlin val client = OkHttpClient.Builder() @@ -45,14 +36,6 @@ val client = OkHttpClient.Builder()
#### 2. Ktor Interceptor -Add ktor-interceptor dependency -```groovy -dependencies { - debugImplementation "com.plutolib.plugins:network-interceptor-ktor:$plutoVersion" - releaseImplementation "com.plutolib.plugins:network-interceptor-ktor-no-op:$plutoVersion" -} -``` - Add interceptor in your HttpClient ```kotlin val client = HttpClient { diff --git a/pluto-plugins/plugins/network/core/lib/detekt-baseline.xml b/pluto-plugins/plugins/network/core/lib/detekt-baseline.xml deleted file mode 100644 index 6bd61eb56..000000000 --- a/pluto-plugins/plugins/network/core/lib/detekt-baseline.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - TopLevelPropertyNaming:BodyTransformer.kt$internal const val BINARY_MEDIA_TYPE = "binary" - TopLevelPropertyNaming:BodyTransformer.kt$internal const val BODY_INDENTATION = 2 - TopLevelPropertyNaming:BodyTransformer.kt$private const val BINARY_BODY = "~ Binary Data" - TopLevelPropertyNaming:BodyTransformer.kt$private const val HTTPS_PORT = 443 - TopLevelPropertyNaming:BodyTransformer.kt$private const val HTTP_PORT = 80 - TopLevelPropertyNaming:CustomTabKtx.kt$internal const val CHROME_PACKAGE_NAME = "com.android.chrome" - TopLevelPropertyNaming:DataConvertor.kt$private const val BUFFER_SIZE = 1024 - TopLevelPropertyNaming:OkHttpKtx.kt$private const val HTTP_CONTINUE = 100 - TopLevelPropertyNaming:ShareHelper.kt$private const val STACK_TRACE_LENGTH = 10 - - diff --git a/pluto-plugins/plugins/network/interceptor-ktor/lib-no-op/.gitignore b/pluto-plugins/plugins/network/interceptor-ktor/lib-no-op/.gitignore deleted file mode 100644 index 42afabfd2..000000000 --- a/pluto-plugins/plugins/network/interceptor-ktor/lib-no-op/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/pluto-plugins/plugins/network/interceptor-ktor/lib-no-op/build.gradle.kts b/pluto-plugins/plugins/network/interceptor-ktor/lib-no-op/build.gradle.kts deleted file mode 100644 index 68a47a802..000000000 --- a/pluto-plugins/plugins/network/interceptor-ktor/lib-no-op/build.gradle.kts +++ /dev/null @@ -1,92 +0,0 @@ -import com.vanniktech.maven.publish.SonatypeHost - -plugins { - alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) - alias(libs.plugins.maven.publish) -} - -val version = Versioning.loadVersioningData() -val verCode = version["code"] as Int -val verPublish = version["publish"] as String -val verGitSHA = version["gitSha"] as String - -android { - namespace = "com.pluto.plugins.network.ktor" - - compileSdk = libs.versions.compileSdk.get().toInt() - buildToolsVersion = libs.versions.buildTools.get() - - buildFeatures { - viewBinding = true - } - - defaultConfig { - minSdk = libs.versions.minSdk.get().toInt() - } - - buildTypes { - getByName("release") { -// isDebuggable = true - isMinifyEnabled = false - isShrinkResources = false - } - } - - compileOptions { - sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) - targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) - } - - kotlinOptions { - jvmTarget = libs.versions.java.get() - } - - lint { - abortOnError = false - targetSdk = libs.versions.targetSdk.get().toInt() - } -} - -extra["PUBLISH_GROUP_ID"] = "com.androidpluto.plugins" -extra["PUBLISH_ARTIFACT_ID"] = "network-interceptor-ktor-no-op" -extra["PUBLISH_ARTIFACT_NAME"] = "Android Pluto Network Ktor Plugin" -extra["PUBLISH_ARTIFACT_DESCRIPTION"] = "Plugin to monitor ktor network calls in Android Pluto" - -mavenPublishing { - coordinates( - groupId = extra["PUBLISH_GROUP_ID"] as String, - artifactId = extra["PUBLISH_ARTIFACT_ID"] as String, - version = verPublish - ) - pom { - name.set(extra["PUBLISH_ARTIFACT_NAME"] as String) - description.set(extra["PUBLISH_ARTIFACT_DESCRIPTION"] as String) - inceptionYear.set(project.findProperty("pom.inceptionYear") as? String) - url.set(project.findProperty("pom.url") as? String) - licenses { - license { - name.set(project.findProperty("pom.license.name") as? String) - url.set(project.findProperty("pom.license.url") as? String) - } - } - developers { - developer { - id.set(project.findProperty("pom.developer.id") as? String) - name.set(project.findProperty("pom.developer.name") as? String) - email.set(project.findProperty("pom.developer.email") as? String) - } - } - scm { - connection.set(project.findProperty("pom.scm.connection") as? String) - developerConnection.set(project.findProperty("pom.scm.developerConnection") as? String) - url.set(project.findProperty("pom.scm.url") as? String) - } - } - publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL) - signAllPublications() -} - -dependencies { - implementation(libs.ktor.client.core.jvm) -} diff --git a/pluto-plugins/plugins/network/interceptor-ktor/lib/.gitignore b/pluto-plugins/plugins/network/interceptor-ktor/lib/.gitignore deleted file mode 100644 index 42afabfd2..000000000 --- a/pluto-plugins/plugins/network/interceptor-ktor/lib/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/pluto-plugins/plugins/network/interceptor-ktor/lib/build.gradle.kts b/pluto-plugins/plugins/network/interceptor-ktor/lib/build.gradle.kts deleted file mode 100644 index 21ae9a71b..000000000 --- a/pluto-plugins/plugins/network/interceptor-ktor/lib/build.gradle.kts +++ /dev/null @@ -1,102 +0,0 @@ -import com.vanniktech.maven.publish.SonatypeHost - -plugins { - alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) - alias(libs.plugins.kotlin.parcelize) - alias(libs.plugins.ksp) - alias(libs.plugins.maven.publish) -} - -val version = Versioning.loadVersioningData() -val verCode = version["code"] as Int -val verPublish = version["publish"] as String -val verGitSHA = version["gitSha"] as String - -android { - resourcePrefix = "pluto_network___" - namespace = "com.pluto.plugins.network.ktor" - - compileSdk = libs.versions.compileSdk.get().toInt() - buildToolsVersion = libs.versions.buildTools.get() - - buildFeatures { - buildConfig = true - viewBinding = true - } - - defaultConfig { - minSdk = libs.versions.minSdk.get().toInt() - - buildConfigField("String", "VERSION_NAME", "\"$verPublish\"") - buildConfigField("long", "VERSION_CODE", "$verCode") - buildConfigField("String", "GIT_SHA", "\"$verGitSHA\"") - } - - buildTypes { - getByName("release") { -// isDebuggable = true - isMinifyEnabled = false - isShrinkResources = false - } - } - - compileOptions { - sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) - targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) - } - - kotlinOptions { - jvmTarget = libs.versions.java.get() - } - - lint { - abortOnError = false - targetSdk = libs.versions.targetSdk.get().toInt() - } -} - -extra["PUBLISH_GROUP_ID"] = "com.androidpluto.plugins" -extra["PUBLISH_ARTIFACT_ID"] = "network-interceptor-ktor" -extra["PUBLISH_ARTIFACT_NAME"] = "Android Pluto Network Ktor Plugin" -extra["PUBLISH_ARTIFACT_DESCRIPTION"] = "Plugin to monitor ktor network calls in Android Pluto" - -mavenPublishing { - coordinates( - groupId = extra["PUBLISH_GROUP_ID"] as String, - artifactId = extra["PUBLISH_ARTIFACT_ID"] as String, - version = verPublish - ) - pom { - name.set(extra["PUBLISH_ARTIFACT_NAME"] as String) - description.set(extra["PUBLISH_ARTIFACT_DESCRIPTION"] as String) - inceptionYear.set(project.findProperty("pom.inceptionYear") as? String) - url.set(project.findProperty("pom.url") as? String) - licenses { - license { - name.set(project.findProperty("pom.license.name") as? String) - url.set(project.findProperty("pom.license.url") as? String) - } - } - developers { - developer { - id.set(project.findProperty("pom.developer.id") as? String) - name.set(project.findProperty("pom.developer.name") as? String) - email.set(project.findProperty("pom.developer.email") as? String) - } - } - scm { - connection.set(project.findProperty("pom.scm.connection") as? String) - developerConnection.set(project.findProperty("pom.scm.developerConnection") as? String) - url.set(project.findProperty("pom.scm.url") as? String) - } - } - publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL) - signAllPublications() -} - -dependencies { - implementation(project(":pluto-plugins:plugins:network:core:lib")) - - implementation(libs.ktor.client.core.jvm) -} diff --git a/pluto-plugins/plugins/network/interceptor-okhttp/lib-no-op/.gitignore b/pluto-plugins/plugins/network/interceptor-okhttp/lib-no-op/.gitignore deleted file mode 100644 index 42afabfd2..000000000 --- a/pluto-plugins/plugins/network/interceptor-okhttp/lib-no-op/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/pluto-plugins/plugins/network/interceptor-okhttp/lib-no-op/build.gradle.kts b/pluto-plugins/plugins/network/interceptor-okhttp/lib-no-op/build.gradle.kts deleted file mode 100644 index 979da1d12..000000000 --- a/pluto-plugins/plugins/network/interceptor-okhttp/lib-no-op/build.gradle.kts +++ /dev/null @@ -1,92 +0,0 @@ -import com.vanniktech.maven.publish.SonatypeHost - -plugins { - alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) - alias(libs.plugins.maven.publish) -} - -val version = Versioning.loadVersioningData() -val verCode = version["code"] as Int -val verPublish = version["publish"] as String -val verGitSHA = version["gitSha"] as String - -android { - namespace = "com.pluto.plugins.network.okhttp" - - compileSdk = libs.versions.compileSdk.get().toInt() - buildToolsVersion = libs.versions.buildTools.get() - - buildFeatures { - viewBinding = true - } - - defaultConfig { - minSdk = libs.versions.minSdk.get().toInt() - } - - buildTypes { - getByName("release") { -// isDebuggable = true - isMinifyEnabled = false - isShrinkResources = false - } - } - - compileOptions { - sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) - targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) - } - - kotlinOptions { - jvmTarget = libs.versions.java.get() - } - - lint { - abortOnError = false - targetSdk = libs.versions.targetSdk.get().toInt() - } -} - -extra["PUBLISH_GROUP_ID"] = "com.androidpluto.plugins" -extra["PUBLISH_ARTIFACT_ID"] = "network-interceptor-okhttp-no-op" -extra["PUBLISH_ARTIFACT_NAME"] = "Android Pluto Network Okhttp Plugin" -extra["PUBLISH_ARTIFACT_DESCRIPTION"] = "Plugin to monitor okhttp network calls in Android Pluto" - -mavenPublishing { - coordinates( - groupId = extra["PUBLISH_GROUP_ID"] as String, - artifactId = extra["PUBLISH_ARTIFACT_ID"] as String, - version = verPublish - ) - pom { - name.set(extra["PUBLISH_ARTIFACT_NAME"] as String) - description.set(extra["PUBLISH_ARTIFACT_DESCRIPTION"] as String) - inceptionYear.set(project.findProperty("pom.inceptionYear") as? String) - url.set(project.findProperty("pom.url") as? String) - licenses { - license { - name.set(project.findProperty("pom.license.name") as? String) - url.set(project.findProperty("pom.license.url") as? String) - } - } - developers { - developer { - id.set(project.findProperty("pom.developer.id") as? String) - name.set(project.findProperty("pom.developer.name") as? String) - email.set(project.findProperty("pom.developer.email") as? String) - } - } - scm { - connection.set(project.findProperty("pom.scm.connection") as? String) - developerConnection.set(project.findProperty("pom.scm.developerConnection") as? String) - url.set(project.findProperty("pom.scm.url") as? String) - } - } - publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL) - signAllPublications() -} - -dependencies { - implementation(libs.okhttp) -} diff --git a/pluto-plugins/plugins/network/interceptor-okhttp/lib/.gitignore b/pluto-plugins/plugins/network/interceptor-okhttp/lib/.gitignore deleted file mode 100644 index 42afabfd2..000000000 --- a/pluto-plugins/plugins/network/interceptor-okhttp/lib/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/pluto-plugins/plugins/network/interceptor-okhttp/lib/build.gradle.kts b/pluto-plugins/plugins/network/interceptor-okhttp/lib/build.gradle.kts deleted file mode 100644 index cc87974cd..000000000 --- a/pluto-plugins/plugins/network/interceptor-okhttp/lib/build.gradle.kts +++ /dev/null @@ -1,101 +0,0 @@ -import com.vanniktech.maven.publish.SonatypeHost - -plugins { - alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) - alias(libs.plugins.maven.publish) -} - -val version = Versioning.loadVersioningData() -val verCode = version["code"] as Int -val verPublish = version["publish"] as String -val verGitSHA = version["gitSha"] as String - -android { - resourcePrefix = "pluto_network___" - namespace = "com.pluto.plugins.network.okhttp" - - compileSdk = libs.versions.compileSdk.get().toInt() - buildToolsVersion = libs.versions.buildTools.get() - - buildFeatures { - buildConfig = true - viewBinding = true - } - - defaultConfig { - minSdk = libs.versions.minSdk.get().toInt() - - buildConfigField("String", "VERSION_NAME", "\"$verPublish\"") - buildConfigField("long", "VERSION_CODE", "$verCode") - buildConfigField("String", "GIT_SHA", "\"$verGitSHA\"") - } - - buildTypes { - getByName("release") { -// isDebuggable = true - isMinifyEnabled = false - isShrinkResources = false - } - } - - compileOptions { - sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) - targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) - } - - kotlinOptions { - jvmTarget = libs.versions.java.get() - } - - lint { - abortOnError = false - targetSdk = libs.versions.targetSdk.get().toInt() - } -} - -extra["PUBLISH_GROUP_ID"] = "com.androidpluto.plugins" -extra["PUBLISH_ARTIFACT_ID"] = "network-interceptor-okhttp" -extra["PUBLISH_ARTIFACT_NAME"] = "Android Pluto Network Okhttp Plugin" -extra["PUBLISH_ARTIFACT_DESCRIPTION"] = "Plugin to monitor okhttp network calls in Android Pluto" - -mavenPublishing { - coordinates( - groupId = extra["PUBLISH_GROUP_ID"] as String, - artifactId = extra["PUBLISH_ARTIFACT_ID"] as String, - version = verPublish - ) - pom { - name.set(extra["PUBLISH_ARTIFACT_NAME"] as String) - description.set(extra["PUBLISH_ARTIFACT_DESCRIPTION"] as String) - inceptionYear.set(project.findProperty("pom.inceptionYear") as? String) - url.set(project.findProperty("pom.url") as? String) - licenses { - license { - name.set(project.findProperty("pom.license.name") as? String) - url.set(project.findProperty("pom.license.url") as? String) - } - } - developers { - developer { - id.set(project.findProperty("pom.developer.id") as? String) - name.set(project.findProperty("pom.developer.name") as? String) - email.set(project.findProperty("pom.developer.email") as? String) - } - } - scm { - connection.set(project.findProperty("pom.scm.connection") as? String) - developerConnection.set(project.findProperty("pom.scm.developerConnection") as? String) - url.set(project.findProperty("pom.scm.url") as? String) - } - } - publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL) - signAllPublications() -} - -dependencies { - implementation(project(":pluto-plugins:base:lib")) - implementation(project(":pluto-plugins:plugins:network:core:lib")) - - implementation(libs.okhttp) -} diff --git a/pluto-plugins/plugins/network/core/lib-no-op/.gitignore b/pluto-plugins/plugins/network/lib-no-op/.gitignore similarity index 100% rename from pluto-plugins/plugins/network/core/lib-no-op/.gitignore rename to pluto-plugins/plugins/network/lib-no-op/.gitignore diff --git a/pluto-plugins/plugins/network/core/lib-no-op/build.gradle.kts b/pluto-plugins/plugins/network/lib-no-op/build.gradle.kts similarity index 97% rename from pluto-plugins/plugins/network/core/lib-no-op/build.gradle.kts rename to pluto-plugins/plugins/network/lib-no-op/build.gradle.kts index 3973c149d..2f3f4be85 100644 --- a/pluto-plugins/plugins/network/core/lib-no-op/build.gradle.kts +++ b/pluto-plugins/plugins/network/lib-no-op/build.gradle.kts @@ -88,4 +88,6 @@ mavenPublishing { } dependencies { + implementation(libs.okhttp) + implementation(libs.ktor.client.core.jvm) } diff --git a/pluto-plugins/plugins/network/core/lib-no-op/src/main/AndroidManifest.xml b/pluto-plugins/plugins/network/lib-no-op/src/main/AndroidManifest.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib-no-op/src/main/AndroidManifest.xml rename to pluto-plugins/plugins/network/lib-no-op/src/main/AndroidManifest.xml diff --git a/pluto-plugins/plugins/network/core/lib-no-op/src/main/java/com/pluto/plugins/network/PlutoNetworkPlugin.kt b/pluto-plugins/plugins/network/lib-no-op/src/main/java/com/pluto/plugins/network/PlutoNetworkPlugin.kt similarity index 100% rename from pluto-plugins/plugins/network/core/lib-no-op/src/main/java/com/pluto/plugins/network/PlutoNetworkPlugin.kt rename to pluto-plugins/plugins/network/lib-no-op/src/main/java/com/pluto/plugins/network/PlutoNetworkPlugin.kt diff --git a/pluto-plugins/plugins/network/core/lib-no-op/src/main/java/com/pluto/plugins/network/intercept/NetworkData.kt b/pluto-plugins/plugins/network/lib-no-op/src/main/java/com/pluto/plugins/network/intercept/NetworkData.kt similarity index 100% rename from pluto-plugins/plugins/network/core/lib-no-op/src/main/java/com/pluto/plugins/network/intercept/NetworkData.kt rename to pluto-plugins/plugins/network/lib-no-op/src/main/java/com/pluto/plugins/network/intercept/NetworkData.kt diff --git a/pluto-plugins/plugins/network/core/lib-no-op/src/main/java/com/pluto/plugins/network/intercept/NetworkInterceptor.kt b/pluto-plugins/plugins/network/lib-no-op/src/main/java/com/pluto/plugins/network/intercept/NetworkInterceptor.kt similarity index 100% rename from pluto-plugins/plugins/network/core/lib-no-op/src/main/java/com/pluto/plugins/network/intercept/NetworkInterceptor.kt rename to pluto-plugins/plugins/network/lib-no-op/src/main/java/com/pluto/plugins/network/intercept/NetworkInterceptor.kt diff --git a/pluto-plugins/plugins/network/interceptor-ktor/lib-no-op/src/main/java/com/pluto/plugins/network/ktor/PlutoKtorInterceptor.kt b/pluto-plugins/plugins/network/lib-no-op/src/main/java/com/pluto/plugins/network/interceptors/ktor/PlutoKtorInterceptor.kt similarity index 93% rename from pluto-plugins/plugins/network/interceptor-ktor/lib-no-op/src/main/java/com/pluto/plugins/network/ktor/PlutoKtorInterceptor.kt rename to pluto-plugins/plugins/network/lib-no-op/src/main/java/com/pluto/plugins/network/interceptors/ktor/PlutoKtorInterceptor.kt index 04474952a..b3cab7c94 100644 --- a/pluto-plugins/plugins/network/interceptor-ktor/lib-no-op/src/main/java/com/pluto/plugins/network/ktor/PlutoKtorInterceptor.kt +++ b/pluto-plugins/plugins/network/lib-no-op/src/main/java/com/pluto/plugins/network/interceptors/ktor/PlutoKtorInterceptor.kt @@ -1,4 +1,4 @@ -package com.pluto.plugins.network.ktor +package com.pluto.plugins.network.interceptors.ktor import io.ktor.client.HttpClient import io.ktor.client.plugins.HttpClientPlugin diff --git a/pluto-plugins/plugins/network/interceptor-okhttp/lib-no-op/src/main/java/com/pluto/plugins/network/okhttp/PlutoOkhttpHelper.kt b/pluto-plugins/plugins/network/lib-no-op/src/main/java/com/pluto/plugins/network/interceptors/okhttp/PlutoOkhttpHelper.kt similarity index 69% rename from pluto-plugins/plugins/network/interceptor-okhttp/lib-no-op/src/main/java/com/pluto/plugins/network/okhttp/PlutoOkhttpHelper.kt rename to pluto-plugins/plugins/network/lib-no-op/src/main/java/com/pluto/plugins/network/interceptors/okhttp/PlutoOkhttpHelper.kt index b44071b4a..4c4c67106 100644 --- a/pluto-plugins/plugins/network/interceptor-okhttp/lib-no-op/src/main/java/com/pluto/plugins/network/okhttp/PlutoOkhttpHelper.kt +++ b/pluto-plugins/plugins/network/lib-no-op/src/main/java/com/pluto/plugins/network/interceptors/okhttp/PlutoOkhttpHelper.kt @@ -1,4 +1,4 @@ -package com.pluto.plugins.network.okhttp +package com.pluto.plugins.network.interceptors.okhttp import okhttp3.OkHttpClient diff --git a/pluto-plugins/plugins/network/interceptor-okhttp/lib-no-op/src/main/java/com/pluto/plugins/network/okhttp/PlutoOkhttpInterceptor.kt b/pluto-plugins/plugins/network/lib-no-op/src/main/java/com/pluto/plugins/network/interceptors/okhttp/PlutoOkhttpInterceptor.kt similarity index 87% rename from pluto-plugins/plugins/network/interceptor-okhttp/lib-no-op/src/main/java/com/pluto/plugins/network/okhttp/PlutoOkhttpInterceptor.kt rename to pluto-plugins/plugins/network/lib-no-op/src/main/java/com/pluto/plugins/network/interceptors/okhttp/PlutoOkhttpInterceptor.kt index 6b322e5c0..c9bb14cc1 100644 --- a/pluto-plugins/plugins/network/interceptor-okhttp/lib-no-op/src/main/java/com/pluto/plugins/network/okhttp/PlutoOkhttpInterceptor.kt +++ b/pluto-plugins/plugins/network/lib-no-op/src/main/java/com/pluto/plugins/network/interceptors/okhttp/PlutoOkhttpInterceptor.kt @@ -1,4 +1,4 @@ -package com.pluto.plugins.network.okhttp +package com.pluto.plugins.network.interceptors.okhttp import androidx.annotation.Keep import okhttp3.Interceptor diff --git a/pluto-plugins/plugins/network/core/lib/.gitignore b/pluto-plugins/plugins/network/lib/.gitignore similarity index 100% rename from pluto-plugins/plugins/network/core/lib/.gitignore rename to pluto-plugins/plugins/network/lib/.gitignore diff --git a/pluto-plugins/plugins/network/core/lib/build.gradle.kts b/pluto-plugins/plugins/network/lib/build.gradle.kts similarity index 97% rename from pluto-plugins/plugins/network/core/lib/build.gradle.kts rename to pluto-plugins/plugins/network/lib/build.gradle.kts index b69f2c95e..6ad41503c 100644 --- a/pluto-plugins/plugins/network/core/lib/build.gradle.kts +++ b/pluto-plugins/plugins/network/lib/build.gradle.kts @@ -110,4 +110,7 @@ dependencies { implementation(libs.androidx.browser) testImplementation(libs.junit) + + implementation(libs.okhttp) + implementation(libs.ktor.client.core.jvm) } diff --git a/pluto-plugins/plugins/network/core/lib/src/main/AndroidManifest.xml b/pluto-plugins/plugins/network/lib/src/main/AndroidManifest.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/AndroidManifest.xml rename to pluto-plugins/plugins/network/lib/src/main/AndroidManifest.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/PlutoNetworkPlugin.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/PlutoNetworkPlugin.kt similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/PlutoNetworkPlugin.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/PlutoNetworkPlugin.kt diff --git a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/intercept/NetworkData.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/intercept/NetworkData.kt similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/intercept/NetworkData.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/intercept/NetworkData.kt diff --git a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/intercept/NetworkInterceptor.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/intercept/NetworkInterceptor.kt similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/intercept/NetworkInterceptor.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/intercept/NetworkInterceptor.kt diff --git a/pluto-plugins/plugins/network/interceptor-ktor/lib/src/main/kotlin/com/pluto/plugins/network/ktor/PlutoKtorHelper.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/interceptors/ktor/PlutoKtorHelper.kt similarity index 87% rename from pluto-plugins/plugins/network/interceptor-ktor/lib/src/main/kotlin/com/pluto/plugins/network/ktor/PlutoKtorHelper.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/interceptors/ktor/PlutoKtorHelper.kt index c5d12b903..2080878c0 100644 --- a/pluto-plugins/plugins/network/interceptor-ktor/lib/src/main/kotlin/com/pluto/plugins/network/ktor/PlutoKtorHelper.kt +++ b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/interceptors/ktor/PlutoKtorHelper.kt @@ -1,9 +1,9 @@ -package com.pluto.plugins.network.ktor +package com.pluto.plugins.network.interceptors.ktor import androidx.annotation.Keep import com.pluto.plugins.network.intercept.NetworkInterceptor -import com.pluto.plugins.network.ktor.internal.KtorRequestConverter.convert -import com.pluto.plugins.network.ktor.internal.KtorResponseConverter.convert +import com.pluto.plugins.network.interceptors.ktor.internal.KtorRequestConverter.convert +import com.pluto.plugins.network.interceptors.ktor.internal.KtorResponseConverter.convert import io.ktor.client.HttpClient import io.ktor.client.call.save import io.ktor.client.plugins.HttpClientPlugin @@ -43,7 +43,7 @@ fun HttpClient.addPlutoKtorInterceptor() { } @Keep -class PlutoKtorInterceptor { +class PlutoKtorInterceptor private constructor() { companion object : HttpClientPlugin { override val key: AttributeKey @@ -56,10 +56,7 @@ class PlutoKtorInterceptor { override fun install(plugin: PlutoKtorInterceptor, scope: HttpClient) { scope.addPlutoKtorInterceptor() } - } } - private const val NAME = "Ktor" - diff --git a/pluto-plugins/plugins/network/interceptor-ktor/lib/src/main/kotlin/com/pluto/plugins/network/ktor/internal/KtorRequestConverter.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/interceptors/ktor/internal/KtorRequestConverter.kt similarity index 79% rename from pluto-plugins/plugins/network/interceptor-ktor/lib/src/main/kotlin/com/pluto/plugins/network/ktor/internal/KtorRequestConverter.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/interceptors/ktor/internal/KtorRequestConverter.kt index ffa6fab18..80ab3639e 100644 --- a/pluto-plugins/plugins/network/interceptor-ktor/lib/src/main/kotlin/com/pluto/plugins/network/ktor/internal/KtorRequestConverter.kt +++ b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/interceptors/ktor/internal/KtorRequestConverter.kt @@ -1,4 +1,4 @@ -package com.pluto.plugins.network.ktor.internal +package com.pluto.plugins.network.interceptors.ktor.internal import com.pluto.plugins.network.intercept.NetworkData.Body import com.pluto.plugins.network.intercept.NetworkData.Request @@ -38,24 +38,16 @@ internal object KtorRequestConverter : RequestConverter { } // TODO handle gzip + @SuppressWarnings("UnusedPrivateMember") private fun extractBody(body: OutgoingContent, isGzipped: Boolean): CharSequence { return body.run { when (this) { - is OutgoingContent.ByteArrayContent -> { - (this).bytes().decodeToString() - } - + is OutgoingContent.ByteArrayContent -> this.bytes().decodeToString() is OutgoingContent.NoContent -> "" is OutgoingContent.ProtocolUpgrade -> "" - is OutgoingContent.ReadChannelContent -> { - "Binary_Body" - } - - is OutgoingContent.WriteChannelContent -> { - "" - } + is OutgoingContent.ReadChannelContent -> "Binary_Body" + is OutgoingContent.WriteChannelContent -> "" } } } - -} \ No newline at end of file +} diff --git a/pluto-plugins/plugins/network/interceptor-ktor/lib/src/main/kotlin/com/pluto/plugins/network/ktor/internal/KtorResponseConverter.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/interceptors/ktor/internal/KtorResponseConverter.kt similarity index 96% rename from pluto-plugins/plugins/network/interceptor-ktor/lib/src/main/kotlin/com/pluto/plugins/network/ktor/internal/KtorResponseConverter.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/interceptors/ktor/internal/KtorResponseConverter.kt index 888e1b05b..078460e35 100644 --- a/pluto-plugins/plugins/network/interceptor-ktor/lib/src/main/kotlin/com/pluto/plugins/network/ktor/internal/KtorResponseConverter.kt +++ b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/interceptors/ktor/internal/KtorResponseConverter.kt @@ -1,4 +1,4 @@ -package com.pluto.plugins.network.ktor.internal +package com.pluto.plugins.network.interceptors.ktor.internal import com.pluto.plugins.network.intercept.NetworkData.Body import com.pluto.plugins.network.intercept.NetworkData.Response @@ -21,7 +21,6 @@ internal object KtorResponseConverter : ResponseConverter { ) } - // private fun HttpResponse.statusCodeMessage(): String { // return status.description // } @@ -53,6 +52,4 @@ internal object KtorResponseConverter : ResponseConverter { // // private val HttpResponse.isGzipped: Boolean // get() = headers.contains("Content-Encoding", "gzip") - - -} \ No newline at end of file +} diff --git a/pluto-plugins/plugins/network/interceptor-ktor/lib/src/main/kotlin/com/pluto/plugins/network/ktor/internal/RequestConverter.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/interceptors/ktor/internal/RequestConverter.kt similarity index 69% rename from pluto-plugins/plugins/network/interceptor-ktor/lib/src/main/kotlin/com/pluto/plugins/network/ktor/internal/RequestConverter.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/interceptors/ktor/internal/RequestConverter.kt index d69d7db4c..2c8b4ff2f 100644 --- a/pluto-plugins/plugins/network/interceptor-ktor/lib/src/main/kotlin/com/pluto/plugins/network/ktor/internal/RequestConverter.kt +++ b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/interceptors/ktor/internal/RequestConverter.kt @@ -1,4 +1,4 @@ -package com.pluto.plugins.network.ktor.internal +package com.pluto.plugins.network.interceptors.ktor.internal import com.pluto.plugins.network.intercept.NetworkData.Request diff --git a/pluto-plugins/plugins/network/interceptor-ktor/lib/src/main/kotlin/com/pluto/plugins/network/ktor/internal/ResponseConverter.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/interceptors/ktor/internal/ResponseConverter.kt similarity index 70% rename from pluto-plugins/plugins/network/interceptor-ktor/lib/src/main/kotlin/com/pluto/plugins/network/ktor/internal/ResponseConverter.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/interceptors/ktor/internal/ResponseConverter.kt index a6ec250dc..a6ac34587 100644 --- a/pluto-plugins/plugins/network/interceptor-ktor/lib/src/main/kotlin/com/pluto/plugins/network/ktor/internal/ResponseConverter.kt +++ b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/interceptors/ktor/internal/ResponseConverter.kt @@ -1,4 +1,4 @@ -package com.pluto.plugins.network.ktor.internal +package com.pluto.plugins.network.interceptors.ktor.internal import com.pluto.plugins.network.intercept.NetworkData.Response diff --git a/pluto-plugins/plugins/network/interceptor-okhttp/lib/src/main/kotlin/com/pluto/plugins/network/okhttp/PlutoOkhttpHelper.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/interceptors/okhttp/PlutoOkhttpHelper.kt similarity index 86% rename from pluto-plugins/plugins/network/interceptor-okhttp/lib/src/main/kotlin/com/pluto/plugins/network/okhttp/PlutoOkhttpHelper.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/interceptors/okhttp/PlutoOkhttpHelper.kt index b13f588ef..4c4c53a17 100644 --- a/pluto-plugins/plugins/network/interceptor-okhttp/lib/src/main/kotlin/com/pluto/plugins/network/okhttp/PlutoOkhttpHelper.kt +++ b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/interceptors/okhttp/PlutoOkhttpHelper.kt @@ -1,7 +1,7 @@ -package com.pluto.plugins.network.okhttp +package com.pluto.plugins.network.interceptors.okhttp -import okhttp3.OkHttpClient import javax.net.SocketFactory +import okhttp3.OkHttpClient @Deprecated("add PlutoHttpInterceptor directly to OkHttpClient instead") fun OkHttpClient.Builder.addPlutoOkhttpInterceptor(): OkHttpClient.Builder { diff --git a/pluto-plugins/plugins/network/interceptor-okhttp/lib/src/main/kotlin/com/pluto/plugins/network/okhttp/PlutoOkhttpInterceptor.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/interceptors/okhttp/PlutoOkhttpInterceptor.kt similarity index 77% rename from pluto-plugins/plugins/network/interceptor-okhttp/lib/src/main/kotlin/com/pluto/plugins/network/okhttp/PlutoOkhttpInterceptor.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/interceptors/okhttp/PlutoOkhttpInterceptor.kt index fd85306dd..2e6bd7974 100644 --- a/pluto-plugins/plugins/network/interceptor-okhttp/lib/src/main/kotlin/com/pluto/plugins/network/okhttp/PlutoOkhttpInterceptor.kt +++ b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/interceptors/okhttp/PlutoOkhttpInterceptor.kt @@ -1,24 +1,24 @@ -package com.pluto.plugins.network.okhttp +package com.pluto.plugins.network.interceptors.okhttp import androidx.annotation.Keep import com.pluto.plugin.libinterface.PlutoInterface import com.pluto.plugins.network.intercept.NetworkData import com.pluto.plugins.network.intercept.NetworkInterceptor -import com.pluto.plugins.network.okhttp.internal.ResponseReportingSinkCallback -import com.pluto.plugins.network.okhttp.internal.convert -import com.pluto.plugins.network.okhttp.internal.hasBody -import com.pluto.plugins.network.okhttp.internal.utilities.DepletingSource -import com.pluto.plugins.network.okhttp.internal.utilities.ReportingSink -import com.pluto.plugins.network.okhttp.internal.utilities.TeeSource +import com.pluto.plugins.network.interceptors.okhttp.internal.ResponseReportingSinkCallback +import com.pluto.plugins.network.interceptors.okhttp.internal.convert +import com.pluto.plugins.network.interceptors.okhttp.internal.hasBody +import com.pluto.plugins.network.interceptors.okhttp.internal.utilities.DepletingSource +import com.pluto.plugins.network.interceptors.okhttp.internal.utilities.ReportingSink +import com.pluto.plugins.network.interceptors.okhttp.internal.utilities.TeeSource +import java.io.IOException import okhttp3.Interceptor import okhttp3.Response import okhttp3.ResponseBody import okio.BufferedSource import okio.buffer -import java.io.IOException @Keep -class PlutoOkhttpInterceptor { +class PlutoOkhttpInterceptor private constructor() { companion object : Interceptor { private const val NAME = "Okhttp" @@ -61,4 +61,3 @@ private fun BufferedSource.asResponseBody(referenceBody: ResponseBody) = object override fun source() = this@asResponseBody } - diff --git a/pluto-plugins/plugins/network/interceptor-okhttp/lib/src/main/kotlin/com/pluto/plugins/network/okhttp/internal/ContentProcessor.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/interceptors/okhttp/internal/ContentProcessor.kt similarity index 88% rename from pluto-plugins/plugins/network/interceptor-okhttp/lib/src/main/kotlin/com/pluto/plugins/network/okhttp/internal/ContentProcessor.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/interceptors/okhttp/internal/ContentProcessor.kt index 416fbce7c..63c011e88 100644 --- a/pluto-plugins/plugins/network/interceptor-okhttp/lib/src/main/kotlin/com/pluto/plugins/network/okhttp/internal/ContentProcessor.kt +++ b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/interceptors/okhttp/internal/ContentProcessor.kt @@ -1,4 +1,4 @@ -package com.pluto.plugins.network.okhttp.internal +package com.pluto.plugins.network.interceptors.okhttp.internal import com.pluto.plugins.network.intercept.NetworkData.Body import com.pluto.plugins.network.internal.interceptor.logic.UTF8 @@ -46,7 +46,7 @@ private fun RequestBody.extractBody(gzipped: Boolean): CharSequence { } internal fun MediaType.isText(): Boolean = (type == "application" || type == "text") && - (subtype.endsWith("json") || subtype == "plain" || subtype == "xml" || subtype == "html" || subtype == "x-www-form-urlencoded") + (subtype.endsWith("json") || subtype == "plain" || subtype == "xml" || subtype == "html" || subtype == "x-www-form-urlencoded") internal fun HttpUrl.hostUrl(): String = StringBuilder().apply { append("$scheme://$host") @@ -59,4 +59,4 @@ internal const val BODY_INDENTATION = 2 private const val BINARY_BODY = "~ Binary Data" private const val HTTP_PORT = 80 private const val HTTPS_PORT = 443 -private const val LOG_TAG = "content-processor" \ No newline at end of file +private const val LOG_TAG = "content-processor" diff --git a/pluto-plugins/plugins/network/interceptor-okhttp/lib/src/main/kotlin/com/pluto/plugins/network/okhttp/internal/DataConvertor.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/interceptors/okhttp/internal/DataConvertor.kt similarity index 96% rename from pluto-plugins/plugins/network/interceptor-okhttp/lib/src/main/kotlin/com/pluto/plugins/network/okhttp/internal/DataConvertor.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/interceptors/okhttp/internal/DataConvertor.kt index da21cafca..646ba15f9 100644 --- a/pluto-plugins/plugins/network/interceptor-okhttp/lib/src/main/kotlin/com/pluto/plugins/network/okhttp/internal/DataConvertor.kt +++ b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/interceptors/okhttp/internal/DataConvertor.kt @@ -1,4 +1,4 @@ -package com.pluto.plugins.network.okhttp.internal +package com.pluto.plugins.network.interceptors.okhttp.internal import com.pluto.plugins.network.intercept.NetworkData import okhttp3.Request diff --git a/pluto-plugins/plugins/network/interceptor-okhttp/lib/src/main/kotlin/com/pluto/plugins/network/okhttp/internal/OkHttpKtx.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/interceptors/okhttp/internal/OkHttpKtx.kt similarity index 95% rename from pluto-plugins/plugins/network/interceptor-okhttp/lib/src/main/kotlin/com/pluto/plugins/network/okhttp/internal/OkHttpKtx.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/interceptors/okhttp/internal/OkHttpKtx.kt index 435aac8f2..d98908a64 100644 --- a/pluto-plugins/plugins/network/interceptor-okhttp/lib/src/main/kotlin/com/pluto/plugins/network/okhttp/internal/OkHttpKtx.kt +++ b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/interceptors/okhttp/internal/OkHttpKtx.kt @@ -1,4 +1,4 @@ -package com.pluto.plugins.network.okhttp.internal +package com.pluto.plugins.network.interceptors.okhttp.internal import java.net.HttpURLConnection import okhttp3.Request @@ -49,4 +49,3 @@ internal val Request.isGzipped: Boolean get() { return this.header("Content-Encoding").equals("gzip", ignoreCase = true) } - diff --git a/pluto-plugins/plugins/network/interceptor-okhttp/lib/src/main/kotlin/com/pluto/plugins/network/okhttp/internal/ResponseReportingSinkCallback.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/interceptors/okhttp/internal/ResponseReportingSinkCallback.kt similarity index 89% rename from pluto-plugins/plugins/network/interceptor-okhttp/lib/src/main/kotlin/com/pluto/plugins/network/okhttp/internal/ResponseReportingSinkCallback.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/interceptors/okhttp/internal/ResponseReportingSinkCallback.kt index 5b1945af7..3e1b04f4b 100644 --- a/pluto-plugins/plugins/network/interceptor-okhttp/lib/src/main/kotlin/com/pluto/plugins/network/okhttp/internal/ResponseReportingSinkCallback.kt +++ b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/interceptors/okhttp/internal/ResponseReportingSinkCallback.kt @@ -1,14 +1,14 @@ -package com.pluto.plugins.network.okhttp.internal +package com.pluto.plugins.network.interceptors.okhttp.internal import com.pluto.plugins.network.intercept.NetworkData -import com.pluto.plugins.network.okhttp.internal.utilities.ReportingSink +import com.pluto.plugins.network.interceptors.okhttp.internal.utilities.ReportingSink +import java.io.File +import java.io.IOException import okhttp3.Response import okio.Buffer import okio.GzipSource import okio.buffer import okio.source -import java.io.File -import java.io.IOException class ResponseReportingSinkCallback( private val response: Response, @@ -36,4 +36,4 @@ class ResponseReportingSinkCallback( IOException("Response payload couldn't be processed by Pluto", e).printStackTrace() null } -} \ No newline at end of file +} diff --git a/pluto-plugins/plugins/network/interceptor-okhttp/lib/src/main/kotlin/com/pluto/plugins/network/okhttp/internal/StreamKtx.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/interceptors/okhttp/internal/StreamKtx.kt similarity index 96% rename from pluto-plugins/plugins/network/interceptor-okhttp/lib/src/main/kotlin/com/pluto/plugins/network/okhttp/internal/StreamKtx.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/interceptors/okhttp/internal/StreamKtx.kt index b39bb0e87..d3ab204a8 100644 --- a/pluto-plugins/plugins/network/interceptor-okhttp/lib/src/main/kotlin/com/pluto/plugins/network/okhttp/internal/StreamKtx.kt +++ b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/interceptors/okhttp/internal/StreamKtx.kt @@ -1,12 +1,12 @@ -package com.pluto.plugins.network.okhttp.internal +package com.pluto.plugins.network.interceptors.okhttp.internal import com.pluto.utilities.DebugLog -import okio.IOException import java.io.ByteArrayInputStream import java.io.ByteArrayOutputStream import java.io.InputStream import java.nio.charset.Charset import java.util.zip.GZIPInputStream +import okio.IOException @Suppress("TooGenericExceptionCaught") internal fun ByteArray.unzipToString(): String { diff --git a/pluto-plugins/plugins/network/interceptor-okhttp/lib/src/main/kotlin/com/pluto/plugins/network/okhttp/internal/utilities/DepletingSource.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/interceptors/okhttp/internal/utilities/DepletingSource.kt similarity index 93% rename from pluto-plugins/plugins/network/interceptor-okhttp/lib/src/main/kotlin/com/pluto/plugins/network/okhttp/internal/utilities/DepletingSource.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/interceptors/okhttp/internal/utilities/DepletingSource.kt index 9a22e50aa..b3b881255 100644 --- a/pluto-plugins/plugins/network/interceptor-okhttp/lib/src/main/kotlin/com/pluto/plugins/network/okhttp/internal/utilities/DepletingSource.kt +++ b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/interceptors/okhttp/internal/utilities/DepletingSource.kt @@ -2,7 +2,7 @@ * Source: chucker - https://github.com/ChuckerTeam/chucker.git * License: https://github.com/ChuckerTeam/chucker/blob/develop/LICENSE.txt */ -package com.pluto.plugins.network.okhttp.internal.utilities +package com.pluto.plugins.network.interceptors.okhttp.internal.utilities import java.io.IOException import okio.Buffer diff --git a/pluto-plugins/plugins/network/interceptor-okhttp/lib/src/main/kotlin/com/pluto/plugins/network/okhttp/internal/utilities/ReportingSink.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/interceptors/okhttp/internal/utilities/ReportingSink.kt similarity index 93% rename from pluto-plugins/plugins/network/interceptor-okhttp/lib/src/main/kotlin/com/pluto/plugins/network/okhttp/internal/utilities/ReportingSink.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/interceptors/okhttp/internal/utilities/ReportingSink.kt index 2455bb2f6..8ab48c7b3 100644 --- a/pluto-plugins/plugins/network/interceptor-okhttp/lib/src/main/kotlin/com/pluto/plugins/network/okhttp/internal/utilities/ReportingSink.kt +++ b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/interceptors/okhttp/internal/utilities/ReportingSink.kt @@ -2,8 +2,9 @@ * Source: chucker - https://github.com/ChuckerTeam/chucker.git * License: https://github.com/ChuckerTeam/chucker/blob/develop/LICENSE.txt */ -package com.pluto.plugins.network.okhttp.internal.utilities +package com.pluto.plugins.network.interceptors.okhttp.internal.utilities +import com.pluto.plugins.network.interceptors.okhttp.internal.ResponseReportingSinkCallback import java.io.File import java.io.IOException import okio.Buffer @@ -21,7 +22,7 @@ import okio.sink */ internal class ReportingSink( private val downstreamFile: File?, - private val callback: Callback, + private val callback: ResponseReportingSinkCallback, private val writeByteLimit: Long = 300_000L ) : Sink { private var totalByteCount = 0L diff --git a/pluto-plugins/plugins/network/interceptor-okhttp/lib/src/main/kotlin/com/pluto/plugins/network/okhttp/internal/utilities/TeeSource.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/interceptors/okhttp/internal/utilities/TeeSource.kt similarity index 95% rename from pluto-plugins/plugins/network/interceptor-okhttp/lib/src/main/kotlin/com/pluto/plugins/network/okhttp/internal/utilities/TeeSource.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/interceptors/okhttp/internal/utilities/TeeSource.kt index f77acf1c9..4fe2b8a45 100644 --- a/pluto-plugins/plugins/network/interceptor-okhttp/lib/src/main/kotlin/com/pluto/plugins/network/okhttp/internal/utilities/TeeSource.kt +++ b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/interceptors/okhttp/internal/utilities/TeeSource.kt @@ -2,7 +2,7 @@ * Source: chucker - https://github.com/ChuckerTeam/chucker.git * License: https://github.com/ChuckerTeam/chucker/blob/develop/LICENSE.txt */ -package com.pluto.plugins.network.okhttp.internal.utilities +package com.pluto.plugins.network.interceptors.okhttp.internal.utilities import java.io.IOException import okio.Buffer diff --git a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/CustomTabKtx.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/CustomTabKtx.kt similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/CustomTabKtx.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/CustomTabKtx.kt diff --git a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/DataModel.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/DataModel.kt similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/DataModel.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/DataModel.kt diff --git a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/NetworkFragment.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/NetworkFragment.kt similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/NetworkFragment.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/NetworkFragment.kt diff --git a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/Session.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/Session.kt similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/Session.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/Session.kt diff --git a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/database/DatabaseManager.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/database/DatabaseManager.kt similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/database/DatabaseManager.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/database/DatabaseManager.kt diff --git a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/database/PlutoNetworkDatabase.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/database/PlutoNetworkDatabase.kt similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/database/PlutoNetworkDatabase.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/database/PlutoNetworkDatabase.kt diff --git a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/logic/ContentProcessor.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/logic/ContentProcessor.kt similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/logic/ContentProcessor.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/logic/ContentProcessor.kt diff --git a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/logic/NetworkCallsRepo.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/logic/NetworkCallsRepo.kt similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/logic/NetworkCallsRepo.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/logic/NetworkCallsRepo.kt diff --git a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/logic/ResponseCodeMessageMapper.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/logic/ResponseCodeMessageMapper.kt similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/logic/ResponseCodeMessageMapper.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/logic/ResponseCodeMessageMapper.kt diff --git a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/logic/ThrowableKtx.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/logic/ThrowableKtx.kt similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/logic/ThrowableKtx.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/logic/ThrowableKtx.kt diff --git a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/logic/transformers/AnyJsonAdapter.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/logic/transformers/AnyJsonAdapter.kt similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/logic/transformers/AnyJsonAdapter.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/logic/transformers/AnyJsonAdapter.kt diff --git a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/logic/transformers/BaseTransformer.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/logic/transformers/BaseTransformer.kt similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/logic/transformers/BaseTransformer.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/logic/transformers/BaseTransformer.kt diff --git a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/logic/transformers/FormEncodedTransformer.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/logic/transformers/FormEncodedTransformer.kt similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/logic/transformers/FormEncodedTransformer.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/logic/transformers/FormEncodedTransformer.kt diff --git a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/logic/transformers/JsonTransformer.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/logic/transformers/JsonTransformer.kt similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/logic/transformers/JsonTransformer.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/logic/transformers/JsonTransformer.kt diff --git a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/logic/transformers/XmlTransformer.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/logic/transformers/XmlTransformer.kt similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/logic/transformers/XmlTransformer.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/logic/transformers/XmlTransformer.kt diff --git a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/ContentFragment.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/ContentFragment.kt similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/ContentFragment.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/ContentFragment.kt diff --git a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/DetailsFragment.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/DetailsFragment.kt similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/DetailsFragment.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/DetailsFragment.kt diff --git a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/ListFragment.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/ListFragment.kt similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/ListFragment.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/ListFragment.kt diff --git a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/NetworkViewModel.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/NetworkViewModel.kt similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/NetworkViewModel.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/NetworkViewModel.kt diff --git a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/components/CommonDetailsComponents.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/components/CommonDetailsComponents.kt similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/components/CommonDetailsComponents.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/components/CommonDetailsComponents.kt diff --git a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/components/CustomTraceInfoFragment.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/components/CustomTraceInfoFragment.kt similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/components/CustomTraceInfoFragment.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/components/CustomTraceInfoFragment.kt diff --git a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/components/OverviewStub.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/components/OverviewStub.kt similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/components/OverviewStub.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/components/OverviewStub.kt diff --git a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/components/RequestStub.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/components/RequestStub.kt similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/components/RequestStub.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/components/RequestStub.kt diff --git a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/components/ResponseStub.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/components/ResponseStub.kt similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/components/ResponseStub.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/components/ResponseStub.kt diff --git a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/list/ApiItemHolder.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/list/ApiItemHolder.kt similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/list/ApiItemHolder.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/list/ApiItemHolder.kt diff --git a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/list/NetworkAdapter.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/list/NetworkAdapter.kt similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/list/NetworkAdapter.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/interceptor/ui/list/NetworkAdapter.kt diff --git a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/mock/logic/MockSettingsRepo.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/mock/logic/MockSettingsRepo.kt similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/mock/logic/MockSettingsRepo.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/mock/logic/MockSettingsRepo.kt diff --git a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/mock/logic/dao/MockSettingsConverters.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/mock/logic/dao/MockSettingsConverters.kt similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/mock/logic/dao/MockSettingsConverters.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/mock/logic/dao/MockSettingsConverters.kt diff --git a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/mock/logic/dao/MockSettingsDao.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/mock/logic/dao/MockSettingsDao.kt similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/mock/logic/dao/MockSettingsDao.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/mock/logic/dao/MockSettingsDao.kt diff --git a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/mock/logic/dao/MockSettingsEntity.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/mock/logic/dao/MockSettingsEntity.kt similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/mock/logic/dao/MockSettingsEntity.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/mock/logic/dao/MockSettingsEntity.kt diff --git a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/mock/ui/MockSettingsFragment.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/mock/ui/MockSettingsFragment.kt similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/mock/ui/MockSettingsFragment.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/mock/ui/MockSettingsFragment.kt diff --git a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/mock/ui/MockSettingsListFragment.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/mock/ui/MockSettingsListFragment.kt similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/mock/ui/MockSettingsListFragment.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/mock/ui/MockSettingsListFragment.kt diff --git a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/mock/ui/MockSettingsViewModel.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/mock/ui/MockSettingsViewModel.kt similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/mock/ui/MockSettingsViewModel.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/mock/ui/MockSettingsViewModel.kt diff --git a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/mock/ui/list/MockSettingsItemAdapter.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/mock/ui/list/MockSettingsItemAdapter.kt similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/mock/ui/list/MockSettingsItemAdapter.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/mock/ui/list/MockSettingsItemAdapter.kt diff --git a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/mock/ui/list/MockSettingsItemHolder.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/mock/ui/list/MockSettingsItemHolder.kt similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/mock/ui/list/MockSettingsItemHolder.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/mock/ui/list/MockSettingsItemHolder.kt diff --git a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/share/ShareFragment.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/share/ShareFragment.kt similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/share/ShareFragment.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/share/ShareFragment.kt diff --git a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/share/ShareHelper.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/share/ShareHelper.kt similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/share/ShareHelper.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/share/ShareHelper.kt diff --git a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/share/ShareOptionsAdapter.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/share/ShareOptionsAdapter.kt similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/share/ShareOptionsAdapter.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/share/ShareOptionsAdapter.kt diff --git a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/share/ShareOptionsViewModel.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/share/ShareOptionsViewModel.kt similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/share/ShareOptionsViewModel.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/share/ShareOptionsViewModel.kt diff --git a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/share/holders/ShareHeadingHolder.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/share/holders/ShareHeadingHolder.kt similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/share/holders/ShareHeadingHolder.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/share/holders/ShareHeadingHolder.kt diff --git a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/share/holders/ShareOptionHolder.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/share/holders/ShareOptionHolder.kt similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/share/holders/ShareOptionHolder.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/share/holders/ShareOptionHolder.kt diff --git a/pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/share/holders/ShareResponseOptionHolder.kt b/pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/share/holders/ShareResponseOptionHolder.kt similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/java/com/pluto/plugins/network/internal/share/holders/ShareResponseOptionHolder.kt rename to pluto-plugins/plugins/network/lib/src/main/java/com/pluto/plugins/network/internal/share/holders/ShareResponseOptionHolder.kt diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___bg_bottom_sheet.xml b/pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___bg_bottom_sheet.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___bg_bottom_sheet.xml rename to pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___bg_bottom_sheet.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___bg_cta_dashed_blue.xml b/pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___bg_cta_dashed_blue.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___bg_cta_dashed_blue.xml rename to pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___bg_cta_dashed_blue.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___bg_details_tab.xml b/pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___bg_details_tab.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___bg_details_tab.xml rename to pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___bg_details_tab.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___bg_section_body.xml b/pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___bg_section_body.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___bg_section_body.xml rename to pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___bg_section_body.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___bg_section_header.xml b/pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___bg_section_header.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___bg_section_header.xml rename to pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___bg_section_header.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_alert.xml b/pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_alert.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_alert.xml rename to pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_alert.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_arrow_back.xml b/pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_arrow_back.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_arrow_back.xml rename to pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_arrow_back.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_arrow_back_white.xml b/pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_arrow_back_white.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_arrow_back_white.xml rename to pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_arrow_back_white.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_arrow_down.xml b/pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_arrow_down.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_arrow_down.xml rename to pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_arrow_down.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_arrow_up.xml b/pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_arrow_up.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_arrow_up.xml rename to pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_arrow_up.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_chevron_right.xml b/pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_chevron_right.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_chevron_right.xml rename to pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_chevron_right.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_clear_all.xml b/pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_clear_all.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_clear_all.xml rename to pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_clear_all.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_close.xml b/pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_close.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_close.xml rename to pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_close.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_close_gray.xml b/pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_close_gray.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_close_gray.xml rename to pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_close_gray.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_copy.xml b/pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_copy.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_copy.xml rename to pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_copy.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_custom_trace_info.xml b/pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_custom_trace_info.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_custom_trace_info.xml rename to pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_custom_trace_info.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_delete.xml b/pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_delete.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_delete.xml rename to pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_delete.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_done.xml b/pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_done.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_done.xml rename to pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_done.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_error.xml b/pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_error.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_error.xml rename to pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_error.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_error_orange.xml b/pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_error_orange.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_error_orange.xml rename to pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_error_orange.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_error_outline.xml b/pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_error_outline.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_error_outline.xml rename to pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_error_outline.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_graphql.xml b/pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_graphql.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_graphql.xml rename to pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_graphql.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_more.xml b/pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_more.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_more.xml rename to pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_more.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_option_clear.xml b/pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_option_clear.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_option_clear.xml rename to pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_option_clear.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_option_mock_settings.xml b/pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_option_mock_settings.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_option_mock_settings.xml rename to pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_option_mock_settings.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_plugin_logo.xml b/pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_plugin_logo.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_plugin_logo.xml rename to pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_plugin_logo.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_proxy_base_request_dark.xml b/pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_proxy_base_request_dark.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_proxy_base_request_dark.xml rename to pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_proxy_base_request_dark.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_proxy_base_response_dark.xml b/pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_proxy_base_response_dark.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_proxy_base_response_dark.xml rename to pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_proxy_base_response_dark.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_proxy_indicator.xml b/pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_proxy_indicator.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_proxy_indicator.xml rename to pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_proxy_indicator.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_proxy_settings.xml b/pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_proxy_settings.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_proxy_settings.xml rename to pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_proxy_settings.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_proxy_settings_disabled.xml b/pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_proxy_settings_disabled.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_proxy_settings_disabled.xml rename to pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_proxy_settings_disabled.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_proxy_settings_enabled.xml b/pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_proxy_settings_enabled.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_proxy_settings_enabled.xml rename to pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_proxy_settings_enabled.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_search_white.xml b/pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_search_white.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_search_white.xml rename to pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_search_white.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_share.xml b/pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_share.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_share.xml rename to pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_share.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_share_all.xml b/pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_share_all.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_share_all.xml rename to pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_share_all.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_share_curl.xml b/pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_share_curl.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_share_curl.xml rename to pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_share_curl.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_success.xml b/pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_success.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/drawable/pluto_network___ic_success.xml rename to pluto-plugins/plugins/network/lib/src/main/res/drawable/pluto_network___ic_success.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/layout/pluto_network___dialog_custom_traces_info.xml b/pluto-plugins/plugins/network/lib/src/main/res/layout/pluto_network___dialog_custom_traces_info.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/layout/pluto_network___dialog_custom_traces_info.xml rename to pluto-plugins/plugins/network/lib/src/main/res/layout/pluto_network___dialog_custom_traces_info.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/layout/pluto_network___fragment_content.xml b/pluto-plugins/plugins/network/lib/src/main/res/layout/pluto_network___fragment_content.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/layout/pluto_network___fragment_content.xml rename to pluto-plugins/plugins/network/lib/src/main/res/layout/pluto_network___fragment_content.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/layout/pluto_network___fragment_details.xml b/pluto-plugins/plugins/network/lib/src/main/res/layout/pluto_network___fragment_details.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/layout/pluto_network___fragment_details.xml rename to pluto-plugins/plugins/network/lib/src/main/res/layout/pluto_network___fragment_details.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/layout/pluto_network___fragment_list.xml b/pluto-plugins/plugins/network/lib/src/main/res/layout/pluto_network___fragment_list.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/layout/pluto_network___fragment_list.xml rename to pluto-plugins/plugins/network/lib/src/main/res/layout/pluto_network___fragment_list.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/layout/pluto_network___fragment_mock_settings.xml b/pluto-plugins/plugins/network/lib/src/main/res/layout/pluto_network___fragment_mock_settings.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/layout/pluto_network___fragment_mock_settings.xml rename to pluto-plugins/plugins/network/lib/src/main/res/layout/pluto_network___fragment_mock_settings.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/layout/pluto_network___fragment_mock_settings_list.xml b/pluto-plugins/plugins/network/lib/src/main/res/layout/pluto_network___fragment_mock_settings_list.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/layout/pluto_network___fragment_mock_settings_list.xml rename to pluto-plugins/plugins/network/lib/src/main/res/layout/pluto_network___fragment_mock_settings_list.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/layout/pluto_network___fragment_network.xml b/pluto-plugins/plugins/network/lib/src/main/res/layout/pluto_network___fragment_network.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/layout/pluto_network___fragment_network.xml rename to pluto-plugins/plugins/network/lib/src/main/res/layout/pluto_network___fragment_network.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/layout/pluto_network___fragment_share.xml b/pluto-plugins/plugins/network/lib/src/main/res/layout/pluto_network___fragment_share.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/layout/pluto_network___fragment_share.xml rename to pluto-plugins/plugins/network/lib/src/main/res/layout/pluto_network___fragment_share.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/layout/pluto_network___item_mock_settings.xml b/pluto-plugins/plugins/network/lib/src/main/res/layout/pluto_network___item_mock_settings.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/layout/pluto_network___item_mock_settings.xml rename to pluto-plugins/plugins/network/lib/src/main/res/layout/pluto_network___item_mock_settings.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/layout/pluto_network___item_network.xml b/pluto-plugins/plugins/network/lib/src/main/res/layout/pluto_network___item_network.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/layout/pluto_network___item_network.xml rename to pluto-plugins/plugins/network/lib/src/main/res/layout/pluto_network___item_network.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/layout/pluto_network___item_share_option.xml b/pluto-plugins/plugins/network/lib/src/main/res/layout/pluto_network___item_share_option.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/layout/pluto_network___item_share_option.xml rename to pluto-plugins/plugins/network/lib/src/main/res/layout/pluto_network___item_share_option.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/layout/pluto_network___item_share_option_header.xml b/pluto-plugins/plugins/network/lib/src/main/res/layout/pluto_network___item_share_option_header.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/layout/pluto_network___item_share_option_header.xml rename to pluto-plugins/plugins/network/lib/src/main/res/layout/pluto_network___item_share_option_header.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/layout/pluto_network___item_share_option_response.xml b/pluto-plugins/plugins/network/lib/src/main/res/layout/pluto_network___item_share_option_response.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/layout/pluto_network___item_share_option_response.xml rename to pluto-plugins/plugins/network/lib/src/main/res/layout/pluto_network___item_share_option_response.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/layout/pluto_network___stub_details_overview.xml b/pluto-plugins/plugins/network/lib/src/main/res/layout/pluto_network___stub_details_overview.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/layout/pluto_network___stub_details_overview.xml rename to pluto-plugins/plugins/network/lib/src/main/res/layout/pluto_network___stub_details_overview.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/layout/pluto_network___stub_details_request.xml b/pluto-plugins/plugins/network/lib/src/main/res/layout/pluto_network___stub_details_request.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/layout/pluto_network___stub_details_request.xml rename to pluto-plugins/plugins/network/lib/src/main/res/layout/pluto_network___stub_details_request.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/layout/pluto_network___stub_details_response.xml b/pluto-plugins/plugins/network/lib/src/main/res/layout/pluto_network___stub_details_response.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/layout/pluto_network___stub_details_response.xml rename to pluto-plugins/plugins/network/lib/src/main/res/layout/pluto_network___stub_details_response.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/layout/pluto_network___stub_network_settings.xml b/pluto-plugins/plugins/network/lib/src/main/res/layout/pluto_network___stub_network_settings.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/layout/pluto_network___stub_network_settings.xml rename to pluto-plugins/plugins/network/lib/src/main/res/layout/pluto_network___stub_network_settings.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/menu/pluto_network___menu_more_options.xml b/pluto-plugins/plugins/network/lib/src/main/res/menu/pluto_network___menu_more_options.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/menu/pluto_network___menu_more_options.xml rename to pluto-plugins/plugins/network/lib/src/main/res/menu/pluto_network___menu_more_options.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/navigation/pluto_network___navigation.xml b/pluto-plugins/plugins/network/lib/src/main/res/navigation/pluto_network___navigation.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/navigation/pluto_network___navigation.xml rename to pluto-plugins/plugins/network/lib/src/main/res/navigation/pluto_network___navigation.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/values/colors.xml b/pluto-plugins/plugins/network/lib/src/main/res/values/colors.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/values/colors.xml rename to pluto-plugins/plugins/network/lib/src/main/res/values/colors.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/values/strings.xml b/pluto-plugins/plugins/network/lib/src/main/res/values/strings.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/values/strings.xml rename to pluto-plugins/plugins/network/lib/src/main/res/values/strings.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/main/res/values/styles.xml b/pluto-plugins/plugins/network/lib/src/main/res/values/styles.xml similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/main/res/values/styles.xml rename to pluto-plugins/plugins/network/lib/src/main/res/values/styles.xml diff --git a/pluto-plugins/plugins/network/core/lib/src/test/java/com/pluto/plugins/network/internal/interceptor/logic/transformers/JsonTransformerTest.kt b/pluto-plugins/plugins/network/lib/src/test/java/com/pluto/plugins/network/internal/interceptor/logic/transformers/JsonTransformerTest.kt similarity index 100% rename from pluto-plugins/plugins/network/core/lib/src/test/java/com/pluto/plugins/network/internal/interceptor/logic/transformers/JsonTransformerTest.kt rename to pluto-plugins/plugins/network/lib/src/test/java/com/pluto/plugins/network/internal/interceptor/logic/transformers/JsonTransformerTest.kt diff --git a/sample/src/main/java/com/sampleapp/functions/network/internal/ktor/KtorNetwork.kt b/sample/src/main/java/com/sampleapp/functions/network/internal/ktor/KtorNetwork.kt index c564f5c13..426c5e807 100644 --- a/sample/src/main/java/com/sampleapp/functions/network/internal/ktor/KtorNetwork.kt +++ b/sample/src/main/java/com/sampleapp/functions/network/internal/ktor/KtorNetwork.kt @@ -1,6 +1,6 @@ package com.sampleapp.functions.network.internal.ktor -import com.pluto.plugins.network.ktor.PlutoKtorInterceptor +import com.pluto.plugins.network.interceptors.ktor.PlutoKtorInterceptor import io.ktor.client.HttpClient import io.ktor.client.plugins.contentnegotiation.ContentNegotiation import io.ktor.client.plugins.defaultRequest diff --git a/sample/src/main/java/com/sampleapp/functions/network/internal/okhttp/Network.kt b/sample/src/main/java/com/sampleapp/functions/network/internal/okhttp/Network.kt index 4ac1a0d80..a94d67dc8 100644 --- a/sample/src/main/java/com/sampleapp/functions/network/internal/okhttp/Network.kt +++ b/sample/src/main/java/com/sampleapp/functions/network/internal/okhttp/Network.kt @@ -1,6 +1,6 @@ package com.sampleapp.functions.network.internal.okhttp -import com.pluto.plugins.network.okhttp.PlutoOkhttpInterceptor +import com.pluto.plugins.network.interceptors.okhttp.PlutoOkhttpInterceptor import java.util.concurrent.TimeUnit import okhttp3.OkHttpClient import okhttp3.logging.HttpLoggingInterceptor diff --git a/settings.gradle b/settings.gradle index 80645471f..c89f706b3 100644 --- a/settings.gradle +++ b/settings.gradle @@ -26,8 +26,8 @@ include ':pluto-plugins:bundle:lib' include ':pluto-plugins:bundle:lib-no-op' include ':pluto-plugins:plugins:exceptions:lib' include ':pluto-plugins:plugins:exceptions:lib-no-op' -include ':pluto-plugins:plugins:network:core:lib' -include ':pluto-plugins:plugins:network:core:lib-no-op' +include ':pluto-plugins:plugins:network:lib' +include ':pluto-plugins:plugins:network:lib-no-op' include ':pluto-plugins:plugins:shared-preferences:lib' include ':pluto-plugins:plugins:shared-preferences:lib-no-op' include ':pluto-plugins:plugins:logger:lib' @@ -38,7 +38,3 @@ include ':pluto-plugins:plugins:rooms-database:lib' include ':pluto-plugins:plugins:rooms-database:lib-no-op' include ':pluto-plugins:plugins:layout-inspector:lib' include ':pluto-plugins:plugins:layout-inspector:lib-no-op' -include ':pluto-plugins:plugins:network:interceptor-okhttp:lib' -include ':pluto-plugins:plugins:network:interceptor-okhttp:lib-no-op' -include ':pluto-plugins:plugins:network:interceptor-ktor:lib' -include ':pluto-plugins:plugins:network:interceptor-ktor:lib-no-op' \ No newline at end of file