Skip to content

Commit

Permalink
Revert to api dependencies because of Android Studio bug.
Browse files Browse the repository at this point in the history
  • Loading branch information
xian committed Mar 15, 2019
1 parent 030f13a commit ccbf4e2
Show file tree
Hide file tree
Showing 13 changed files with 50 additions and 50 deletions.
10 changes: 5 additions & 5 deletions junit/build.gradle
Expand Up @@ -3,11 +3,11 @@ new RoboJavaModulePlugin(
).apply(project)

dependencies {
implementation project(":annotations")
implementation project(":sandbox")
implementation project(":pluginapi")
implementation project(":shadowapi")
implementation project(":utils:reflector")
api project(":annotations")
api project(":sandbox")
api project(":pluginapi")
api project(":shadowapi")
api project(":utils:reflector")

compileOnly "com.google.code.findbugs:jsr305:3.0.2"
compileOnly "junit:junit:4.12"
Expand Down
8 changes: 4 additions & 4 deletions pluginapi/build.gradle
Expand Up @@ -3,10 +3,10 @@ new RoboJavaModulePlugin(
).apply(project)

dependencies {
implementation project(":annotations")
implementation "com.google.auto.service:auto-service:1.0-rc4"
implementation "org.apache.ant:ant:1.8.0"
implementation("org.apache.maven:maven-ant-tasks:2.1.3") {
api project(":annotations")
compileOnly "com.google.auto.service:auto-service:1.0-rc4"
api "org.apache.ant:ant:1.8.0"
api("org.apache.maven:maven-ant-tasks:2.1.3") {
exclude group: "junit", module: "junit"
}

Expand Down
10 changes: 5 additions & 5 deletions plugins/maven-dependency-resolver/build.gradle
Expand Up @@ -3,12 +3,12 @@ new RoboJavaModulePlugin(
).apply(project)

dependencies {
implementation project(":pluginapi")
implementation project(":utils")
api project(":pluginapi")
api project(":utils")

implementation "com.google.auto.service:auto-service:1.0-rc4"
implementation "org.apache.ant:ant:1.8.0"
implementation("org.apache.maven:maven-ant-tasks:2.1.3") {
compileOnly "com.google.auto.service:auto-service:1.0-rc4"
api "org.apache.ant:ant:1.8.0"
api("org.apache.maven:maven-ant-tasks:2.1.3") {
exclude group: "junit", module: "junit"
}

Expand Down
12 changes: 6 additions & 6 deletions processor/build.gradle
Expand Up @@ -32,14 +32,14 @@ task('generateSdksFile', type: GenerateSdksFileTask) {
tasks['classes'].dependsOn(generateSdksFile)

dependencies {
implementation project(":annotations")
api project(":annotations")

compileOnly "com.google.code.findbugs:jsr305:3.0.2"
implementation "org.ow2.asm:asm:7.0"
implementation "org.ow2.asm:asm-commons:7.0"
implementation "com.google.guava:guava:27.0.1-jre"
implementation "com.google.code.gson:gson:2.8.2"
implementation 'ch.raffael.pegdown-doclet:pegdown-doclet:1.3'
api "org.ow2.asm:asm:7.0"
api "org.ow2.asm:asm-commons:7.0"
api "com.google.guava:guava:27.0.1-jre"
api "com.google.code.gson:gson:2.8.2"
api 'ch.raffael.pegdown-doclet:pegdown-doclet:1.3'

def toolsJar = org.gradle.internal.jvm.Jvm.current().getToolsJar()
if (toolsJar != null) {
Expand Down
2 changes: 1 addition & 1 deletion resources/build.gradle
Expand Up @@ -5,7 +5,7 @@ new RoboJavaModulePlugin(
dependencies {
api project(":utils")
api project(":annotations")
implementation project(":pluginapi")
api project(":pluginapi")

api "com.google.guava:guava:27.0.1-jre"
compileOnly "com.google.code.findbugs:jsr305:3.0.2"
Expand Down
10 changes: 5 additions & 5 deletions robolectric/build.gradle
Expand Up @@ -25,11 +25,11 @@ dependencies {
api project(":resources")
api project(":sandbox")
api project(":utils")
implementation project(":utils:reflector")
implementation project(":plugins:maven-dependency-resolver")
implementation "javax.inject:javax.inject:1"
implementation "com.google.auto.service:auto-service:1.0-rc4"
implementation "javax.annotation:javax.annotation-api:1.3.2"
api project(":utils:reflector")
api project(":plugins:maven-dependency-resolver")
api "javax.inject:javax.inject:1"
compileOnly "com.google.auto.service:auto-service:1.0-rc4"
api "javax.annotation:javax.annotation-api:1.3.2"

// We need to have shadows-framework.jar on the runtime system classpath so ServiceLoader
// can find its META-INF/services/org.robolectric.shadows.ShadowAdapter.
Expand Down
8 changes: 4 additions & 4 deletions sandbox/build.gradle
Expand Up @@ -8,10 +8,10 @@ dependencies {
api project(":annotations")
api project(":utils")
api project(":shadowapi")
implementation project(":utils:reflector")
implementation "com.google.auto.service:auto-service:1.0-rc4"
implementation "javax.annotation:javax.annotation-api:1.3.2"
implementation "javax.inject:javax.inject:1"
api project(":utils:reflector")
compileOnly "com.google.auto.service:auto-service:1.0-rc4"
api "javax.annotation:javax.annotation-api:1.3.2"
api "javax.inject:javax.inject:1"

api "org.ow2.asm:asm:7.0"
api "org.ow2.asm:asm-commons:7.0"
Expand Down
12 changes: 6 additions & 6 deletions shadows/framework/build.gradle
Expand Up @@ -37,12 +37,12 @@ jar {
}

dependencies {
implementation project(":annotations")
implementation project(":resources")
implementation project(":pluginapi")
implementation project(":utils")
implementation project(":utils:reflector")
implementation "androidx.test:monitor:1.1.1"
api project(":annotations")
api project(":resources")
api project(":pluginapi")
api project(":utils")
api project(":utils:reflector")
api "androidx.test:monitor:1.1.1"

compileOnly "com.google.code.findbugs:jsr305:3.0.2"
api "com.almworks.sqlite4java:sqlite4java:0.282"
Expand Down
4 changes: 2 additions & 2 deletions shadows/httpclient/build.gradle
Expand Up @@ -14,8 +14,8 @@ configurations {
}

dependencies {
implementation project(":annotations")
implementation project(":utils")
api project(":annotations")
api project(":utils")

earlyRuntime "org.apache.httpcomponents:httpcore:4.0.1"
api "org.apache.httpcomponents:httpclient:4.0.3"
Expand Down
2 changes: 1 addition & 1 deletion shadows/multidex/build.gradle
Expand Up @@ -11,7 +11,7 @@ shadows {

dependencies {
compileOnly project(":shadows:framework")
implementation project(":annotations")
api project(":annotations")

compileOnly "com.android.support:multidex:1.0.1"

Expand Down
4 changes: 2 additions & 2 deletions shadows/playservices/build.gradle
Expand Up @@ -11,8 +11,8 @@ shadows {

dependencies {
compileOnly project(":shadows:framework")
implementation project(":annotations")
implementation "com.google.guava:guava:27.0.1-jre"
api project(":annotations")
api "com.google.guava:guava:27.0.1-jre"

compileOnly "com.android.support:support-fragment:26.0.1"
compileOnly "com.google.android.gms:play-services-base:8.4.0"
Expand Down
12 changes: 6 additions & 6 deletions utils/build.gradle
Expand Up @@ -3,12 +3,12 @@ new RoboJavaModulePlugin(
).apply(project)

dependencies {
implementation project(":annotations")
implementation project(":pluginapi")
implementation project(":utils:reflector")
implementation "com.google.auto.service:auto-service:1.0-rc4"
implementation "javax.inject:javax.inject:1"
implementation "javax.annotation:javax.annotation-api:1.3.2"
api project(":annotations")
api project(":pluginapi")
api project(":utils:reflector")
compileOnly "com.google.auto.service:auto-service:1.0-rc4"
api "javax.inject:javax.inject:1"
api "javax.annotation:javax.annotation-api:1.3.2"
compileOnly "com.google.code.findbugs:jsr305:3.0.2"

testAnnotationProcessor "com.google.auto.service:auto-service:1.0-rc4"
Expand Down
6 changes: 3 additions & 3 deletions utils/reflector/build.gradle
Expand Up @@ -3,9 +3,9 @@ new RoboJavaModulePlugin(
).apply(project)

dependencies {
implementation "org.ow2.asm:asm:7.0"
implementation "org.ow2.asm:asm-commons:7.0"
implementation "org.ow2.asm:asm-util:7.0"
api "org.ow2.asm:asm:7.0"
api "org.ow2.asm:asm-commons:7.0"
api "org.ow2.asm:asm-util:7.0"

testImplementation project(":shadowapi")
testImplementation "junit:junit:4.12"
Expand Down

0 comments on commit ccbf4e2

Please sign in to comment.