Skip to content

Commit f3b55da

Browse files
committed
Fixed broken builds in IntelliJ
To be honest, not even sure how it was building command-line, but now it's no longer double-including all its funky dependencies.
1 parent 982256a commit f3b55da

File tree

1 file changed

+6
-23
lines changed

1 file changed

+6
-23
lines changed

rxandroid-framework/build.gradle

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,5 @@
1-
buildscript {
2-
repositories { jcenter() }
3-
dependencies {
4-
classpath 'com.netflix.nebula:gradle-rxjava-project-plugin:1.12.+'
5-
classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:1.12.+'
6-
}
7-
}
8-
9-
apply plugin: 'rxjava-project'
10-
apply plugin: 'provided-base'
11-
12-
dependencies {
13-
compile "io.reactivex:rxjava:$rxJavaVersion"
14-
provided 'com.google.android:android:4.0.1.2'
15-
provided 'com.google.android:support-v4:r7'
16-
17-
// testing
18-
testCompile 'junit:junit-dep:4.11'
19-
testCompile 'org.mockito:mockito-core:1.10.8'
20-
testCompile('org.robolectric:robolectric:2.4') {
21-
exclude group: 'com.android.support'
22-
}
23-
}
1+
// Multi-module modules aren't really supported
2+
version = rootProject.version
243

254
test {
265
testLogging {
@@ -29,3 +8,7 @@ test {
298
displayGranularity 2
309
}
3110
}
11+
12+
dependencies {
13+
compile(project(":rxandroid"))
14+
}

0 commit comments

Comments
 (0)