Merge pull request #97 from yamasa/master

For convenience, change the dependencies of OkHttp and libthrift to `api`.
line · Jun 20, 2021 · b5df162 · b5df162
2 parents 45f9d74 + 44ec5a4
commit b5df162
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 10 deletions.
diff --git a/dagger_sample_app/build.gradle b/dagger_sample_app/build.gradle
@@ -56,7 +56,6 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:${versions.androidxLifecycle}"
     implementation "androidx.room:room-ktx:${versions.androidxRoom}"
     kapt "androidx.room:room-compiler:${versions.androidxRoom}"
-    implementation "com.squareup.okhttp3:okhttp:${versions.okhttp}"
     implementation "com.google.dagger:dagger:${versions.dagger}"
     kapt "com.google.dagger:dagger-compiler:${versions.dagger}"
 

diff --git a/okhttp/build.gradle b/okhttp/build.gradle
@@ -15,7 +15,7 @@ ext.publication = [
 
 dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:${versions.kotlinCoroutines}"
-    implementation "com.squareup.okhttp3:okhttp:${versions.okhttp}"
+    api "com.squareup.okhttp3:okhttp:${versions.okhttp}"
 
     testImplementation 'org.jetbrains.kotlin:kotlin-test'
     testImplementation "com.squareup.okhttp3:mockwebserver:${versions.okhttp}"

diff --git a/sample_app/build.gradle b/sample_app/build.gradle
@@ -58,7 +58,6 @@ dependencies {
     implementation "androidx.navigation:navigation-ui-ktx:${versions.androidxNavigation}"
     implementation "androidx.room:room-ktx:${versions.androidxRoom}"
     kapt "androidx.room:room-compiler:${versions.androidxRoom}"
-    implementation "com.squareup.okhttp3:okhttp:${versions.okhttp}"
 
     debugRuntimeOnly project(':component-debug')
 

diff --git a/thrift-logging/build.gradle b/thrift-logging/build.gradle
@@ -32,10 +32,6 @@ android {
 
 dependencies {
     implementation project(':thrift')
-    implementation("org.apache.thrift:libthrift:${versions.thrift}") {
-        exclude group: 'org.apache.httpcomponents'
-        exclude group: 'org.slf4j'
-    }
     implementation "com.linkedin.dexmaker:dexmaker:${versions.dexmaker}"
 
     androidTestImplementation project(':sample_thrift')
@@ -44,6 +40,5 @@ dependencies {
     androidTestImplementation "androidx.test:runner:${versions.androidxTestRunner}"
     androidTestImplementation "androidx.test.ext:junit:${versions.androidxTestJunit}"
     androidTestImplementation "io.mockk:mockk-android:${versions.mockk}"
-    androidTestImplementation "com.squareup.okhttp3:okhttp:${versions.okhttp}"
     androidTestImplementation "com.squareup.okhttp3:mockwebserver:${versions.okhttp}"
 }
diff --git a/thrift/build.gradle b/thrift/build.gradle
@@ -15,8 +15,8 @@ ext.publication = [
 
 dependencies {
     implementation project(':okhttp')
-    implementation "com.squareup.okhttp3:okhttp:${versions.okhttp}"
-    implementation("org.apache.thrift:libthrift:${versions.thrift}") {
+    api "com.squareup.okhttp3:okhttp:${versions.okhttp}"
+    api("org.apache.thrift:libthrift:${versions.thrift}") {
         exclude group: 'org.apache.httpcomponents'
         exclude group: 'org.slf4j'
     }