Remove build provided references (except for rxjava-android)

gliptak · gliptak · commit 3fff46ff4754 · 2014-07-09T17:32:25.000-04:00
diff --git a/language-adaptors/rxjava-clojure/build.gradle b/language-adaptors/rxjava-clojure/build.gradle
@@ -7,11 +7,11 @@ dependencies {
     // clojure
     compile 'org.clojure:clojure:1.4.+'
 
-    // this should be 'compile' for the 'examples' module ... can't figure that out right now so making 'provided'
-    provided 'clj-http:clj-http:0.6.4' // https://clojars.org/clj-http
+    // this should be 'compile' for the 'examples' module
+    testCompile 'clj-http:clj-http:0.6.4' // https://clojars.org/clj-http
 }
 
-tasks.compileExamplesClojure.classpath = files(tasks.compileClojure.destinationDir) + tasks.compileClojure.classpath
+tasks.compileExamplesClojure.classpath = files(tasks.compileClojure.destinationDir) + tasks.compileClojure.classpath + configurations.testCompile
 
 /*
  * Clojure
@@ -29,7 +29,7 @@ repositories {
 }
 
 /*
- * Add Counterclockwise and include 'provided' dependencies
+ * Add Counterclockwise and include 'testCompile' dependencies
  */
 eclipse {
   project {
@@ -38,7 +38,7 @@ eclipse {
 }
 
 tasks.clojureTest {
-    classpath = classpath + configurations.provided
+    classpath = classpath + configurations.testCompile
 }
 
 jar {
diff --git a/language-adaptors/rxjava-groovy/build.gradle b/language-adaptors/rxjava-groovy/build.gradle
@@ -4,8 +4,8 @@ apply plugin: 'osgi'
 dependencies {
     compile project(':rxjava-core')
     compile 'org.codehaus.groovy:groovy-all:2.+'
-    provided 'junit:junit-dep:4.10'
-    provided 'org.mockito:mockito-core:1.8.5'
+    testCompile 'junit:junit-dep:4.10'
+    testCompile 'org.mockito:mockito-core:1.8.5'
 }
 
 jar {
@@ -16,4 +16,4 @@ jar {
         instruction 'Import-Package', '!org.junit,!junit.framework,!org.mockito.*,*'
         instruction 'Fragment-Host', 'com.netflix.rxjava.core'
     }
-}
+}
diff --git a/language-adaptors/rxjava-jruby/build.gradle b/language-adaptors/rxjava-jruby/build.gradle
@@ -22,8 +22,8 @@ sourceSets {
 dependencies {
     compile project(':rxjava-core')
     compile 'org.jruby:jruby:1.7+'
-    provided 'junit:junit-dep:4.10'
-    provided 'org.mockito:mockito-core:1.8.5'
+    testCompile 'junit:junit-dep:4.10'
+    testCompile 'org.mockito:mockito-core:1.8.5'
     rspec 'org.jruby:jruby-complete:1.7.4'
     rspec 'org.rubygems:rspec:2.14.1'
 }
diff --git a/language-adaptors/rxjava-kotlin/build.gradle b/language-adaptors/rxjava-kotlin/build.gradle
@@ -14,8 +14,8 @@ apply plugin: 'osgi'
 dependencies {
     compile project(':rxjava-core')
     compile 'org.jetbrains.kotlin:kotlin-stdlib:0.8.11'
-    provided 'junit:junit-dep:4.10'
-    provided 'org.mockito:mockito-core:1.8.5'
+    testCompile 'junit:junit-dep:4.10'
+    testCompile 'org.mockito:mockito-core:1.8.5'
 }
 
 jar {
@@ -26,4 +26,4 @@ jar {
         instruction 'Import-Package', '!org.junit,!junit.framework,!org.mockito.*,*'
         instruction 'Fragment-Host', 'com.netflix.rxjava.core'
     }
-}
+}
diff --git a/language-adaptors/rxjava-scala/build.gradle b/language-adaptors/rxjava-scala/build.gradle
@@ -66,7 +66,7 @@ tasks.compileExamplesScala {
 task test(overwrite: true, dependsOn: testClasses) << {
     ant.taskdef(name: 'scalatest',
             classname: 'org.scalatest.tools.ScalaTestAntTask',
-            classpath: configurations.provided.asPath + ':' + configurations.testRuntime.asPath + ":" + compileScala.destinationDir
+            classpath: configurations.testCompile.asPath + ':' + configurations.testRuntime.asPath + ":" + compileScala.destinationDir
     )
     ant.scalatest(runpath: sourceSets.test.output.classesDir,
             haltonfailure: 'true',
diff --git a/rxjava-contrib/rxjava-android/build.gradle b/rxjava-contrib/rxjava-android/build.gradle
@@ -6,9 +6,9 @@ dependencies {
     provided 'com.google.android:support-v4:r7'
 
     // testing
-    provided 'junit:junit-dep:4.10'
-    provided 'org.mockito:mockito-core:1.8.5'
-    provided 'org.robolectric:robolectric:2.2'
+    testCompile 'junit:junit-dep:4.10'
+    testCompile 'org.mockito:mockito-core:1.8.5'
+    testCompile 'org.robolectric:robolectric:2.2'
 }
 
 javadoc {
diff --git a/rxjava-contrib/rxjava-async-util/build.gradle b/rxjava-contrib/rxjava-async-util/build.gradle
@@ -6,8 +6,8 @@ targetCompatibility = JavaVersion.VERSION_1_6
 dependencies {
     compile project(':rxjava-core')
     testCompile project(":rxjava-core").sourceSets.test.output 
-    provided 'junit:junit-dep:4.10'
-    provided 'org.mockito:mockito-core:1.8.5'
+    testCompile 'junit:junit-dep:4.10'
+    testCompile 'org.mockito:mockito-core:1.8.5'
 }
 
 jar {
diff --git a/rxjava-contrib/rxjava-computation-expressions/build.gradle b/rxjava-contrib/rxjava-computation-expressions/build.gradle
@@ -6,8 +6,8 @@ targetCompatibility = JavaVersion.VERSION_1_6
 dependencies {
     compile project(':rxjava-core')
     testCompile project(":rxjava-core").sourceSets.test.output 
-    provided 'junit:junit-dep:4.10'
-    provided 'org.mockito:mockito-core:1.8.5'
+    testCompile 'junit:junit-dep:4.10'
+    testCompile 'org.mockito:mockito-core:1.8.5'
 }
 
 jar {
diff --git a/rxjava-contrib/rxjava-debug/build.gradle b/rxjava-contrib/rxjava-debug/build.gradle
@@ -6,8 +6,8 @@ targetCompatibility = JavaVersion.VERSION_1_6
 dependencies {
     compile project(':rxjava-core')
     testCompile project(":rxjava-core").sourceSets.test.output 
-    provided 'junit:junit-dep:4.10'
-    provided 'org.mockito:mockito-core:1.8.5'
+    testCompile 'junit:junit-dep:4.10'
+    testCompile 'org.mockito:mockito-core:1.8.5'
 }
 
 javadoc {
diff --git a/rxjava-contrib/rxjava-ios/build.gradle b/rxjava-contrib/rxjava-ios/build.gradle
@@ -2,12 +2,12 @@ apply plugin: 'osgi'
 
 dependencies {
     compile project(':rxjava-core')
-
-    // testing
-    provided 'junit:junit-dep:4.10'
     compile 'org.robovm:robovm-rt:0.0.12'
     compile 'org.robovm:robovm-objc:0.0.12'
     compile 'org.robovm:robovm-cocoatouch:0.0.12'
+
+    // testing
+    testCompile 'junit:junit-dep:4.10'
 }
 
 javadoc {
diff --git a/rxjava-contrib/rxjava-javafx/build.gradle b/rxjava-contrib/rxjava-javafx/build.gradle
@@ -5,8 +5,8 @@ targetCompatibility = JavaVersion.VERSION_1_6
 
 dependencies {
     compile project(':rxjava-core')
-    provided 'junit:junit-dep:4.10'
-    provided 'org.mockito:mockito-core:1.8.5'
+    testCompile 'junit:junit-dep:4.10'
+    testCompile 'org.mockito:mockito-core:1.8.5'
 }
 
 javadoc {
diff --git a/rxjava-contrib/rxjava-joins/build.gradle b/rxjava-contrib/rxjava-joins/build.gradle
@@ -6,8 +6,8 @@ targetCompatibility = JavaVersion.VERSION_1_6
 dependencies {
     compile project(':rxjava-core')
     testCompile project(":rxjava-core").sourceSets.test.output 
-    provided 'junit:junit-dep:4.10'
-    provided 'org.mockito:mockito-core:1.8.5'
+    testCompile 'junit:junit-dep:4.10'
+    testCompile 'org.mockito:mockito-core:1.8.5'
 }
 
 jar {
diff --git a/rxjava-contrib/rxjava-math/build.gradle b/rxjava-contrib/rxjava-math/build.gradle
@@ -6,8 +6,8 @@ targetCompatibility = JavaVersion.VERSION_1_6
 dependencies {
     compile project(':rxjava-core')
     testCompile project(":rxjava-core").sourceSets.test.output 
-    provided 'junit:junit-dep:4.10'
-    provided 'org.mockito:mockito-core:1.8.5'
+    testCompile 'junit:junit-dep:4.10'
+    testCompile 'org.mockito:mockito-core:1.8.5'
 }
 
 javadoc {
diff --git a/rxjava-contrib/rxjava-quasar/build.gradle b/rxjava-contrib/rxjava-quasar/build.gradle
@@ -18,8 +18,8 @@ dependencies {
     compile 'co.paralleluniverse:quasar-core:0.5.0'
     quasar  'co.paralleluniverse:quasar-core:0.5.0'
     testCompile project(":rxjava-core").sourceSets.test.output 
-    provided 'junit:junit-dep:4.10'
-    provided 'org.mockito:mockito-core:1.8.5'
+    testCompile 'junit:junit-dep:4.10'
+    testCompile 'org.mockito:mockito-core:1.8.5'
 }
 
 jar {
diff --git a/rxjava-contrib/rxjava-scalaz/build.gradle b/rxjava-contrib/rxjava-scalaz/build.gradle
@@ -35,10 +35,6 @@ dependencies {
     testCompile 'junit:junit-dep:4.10'
 }
 
-tasks.compileScala {
-    classpath = classpath + (configurations.compile + configurations.provided)
-}
-
 task repl(type: Exec) {
     commandLine 'scala', '-cp', sourceSets.test.runtimeClasspath.asPath
     standardInput = System.in
diff --git a/rxjava-contrib/rxjava-string/build.gradle b/rxjava-contrib/rxjava-string/build.gradle
@@ -6,8 +6,8 @@ targetCompatibility = JavaVersion.VERSION_1_6
 dependencies {
     compile project(':rxjava-core')
     testCompile project(":rxjava-core").sourceSets.test.output 
-    provided 'junit:junit-dep:4.10'
-    provided 'org.mockito:mockito-core:1.8.5'
+    testCompile 'junit:junit-dep:4.10'
+    testCompile 'org.mockito:mockito-core:1.8.5'
 }
 
 javadoc {

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ tasks.compileExamplesScala {`
`66`	`66`	`task test(overwrite: true, dependsOn: testClasses) << {`
`67`	`67`	`ant.taskdef(name: 'scalatest',`
`68`	`68`	`classname: 'org.scalatest.tools.ScalaTestAntTask',`
`69`		`- classpath: configurations.provided.asPath + ':' + configurations.testRuntime.asPath + ":" + compileScala.destinationDir`
	`69`	`+ classpath: configurations.testCompile.asPath + ':' + configurations.testRuntime.asPath + ":" + compileScala.destinationDir`
`70`	`70`	`)`
`71`	`71`	`ant.scalatest(runpath: sourceSets.test.output.classesDir,`
`72`	`72`	`haltonfailure: 'true',`