Commit 5adfd7e9 by olly Committed by Oliver Woodman

Simplify OkHttp extension build.gradle

The lint workaround and org.json exclusion aren't needed any more.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=195557066
parent 9de27560
...@@ -23,19 +23,12 @@ android { ...@@ -23,19 +23,12 @@ android {
targetSdkVersion project.ext.targetSdkVersion targetSdkVersion project.ext.targetSdkVersion
consumerProguardFiles 'proguard-rules.txt' consumerProguardFiles 'proguard-rules.txt'
} }
lintOptions {
// See: https://github.com/square/okio/issues/58
warning 'InvalidPackage'
}
} }
dependencies { dependencies {
implementation project(modulePrefix + 'library-core') implementation project(modulePrefix + 'library-core')
implementation 'com.android.support:support-annotations:' + supportLibraryVersion implementation 'com.android.support:support-annotations:' + supportLibraryVersion
api('com.squareup.okhttp3:okhttp:3.10.0') { api 'com.squareup.okhttp3:okhttp:3.10.0'
exclude group: 'org.json'
}
} }
ext { ext {
......
...@@ -24,9 +24,8 @@ android { ...@@ -24,9 +24,8 @@ android {
} }
lintOptions { lintOptions {
// Truth depends on JUnit, which depends on java.lang.management, which // Robolectric depends on BouncyCastle, which depends on javax.naming,
// is not part of Android. Remove this when JUnit 4.13 or later is used. // which is not part of Android.
// See: https://github.com/junit-team/junit4/pull/1187.
disable 'InvalidPackage' disable 'InvalidPackage'
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment