Don't use provided dependency configuration for test dependencies.

ldaley · ldaley · commit f4f44e555ac9 · 2014-01-21T13:15:02.000Z
Gets test dependencies off the compile classpath and removes the need to prevent imports of packages in the OSGi manifest.
diff --git a/language-adaptors/rxjava-clojure/build.gradle b/language-adaptors/rxjava-clojure/build.gradle
@@ -29,7 +29,6 @@ jar {
         name = 'rxjava-clojure'
         instruction 'Bundle-Vendor', 'Netflix'
         instruction 'Bundle-DocURL', 'https://github.com/Netflix/RxJava'
-        instruction 'Import-Package', '!org.junit,!junit.framework,!org.mockito.*,*'
         instruction 'Fragment-Host', 'com.netflix.rxjava.core'
     }
 }
diff --git a/language-adaptors/rxjava-groovy/build.gradle b/language-adaptors/rxjava-groovy/build.gradle
@@ -12,7 +12,6 @@ jar {
         name = 'rxjava-groovy'
         instruction 'Bundle-Vendor', 'Netflix'
         instruction 'Bundle-DocURL', 'https://github.com/Netflix/RxJava'
-        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
@@ -20,8 +20,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'
 }
@@ -41,7 +41,6 @@ jar {
         name = 'rxjava-jruby'
         instruction 'Bundle-Vendor', 'Netflix'
         instruction 'Bundle-DocURL', 'https://github.com/Netflix/RxJava'
-        instruction 'Import-Package', '!org.junit,!junit.framework,!org.mockito.*,*'
         instruction 'Fragment-Host', 'com.netflix.rxjava.core'
     }
 }
diff --git a/language-adaptors/rxjava-kotlin/build.gradle b/language-adaptors/rxjava-kotlin/build.gradle
@@ -13,16 +13,15 @@ apply plugin: 'kotlin'
 dependencies {
     compile project(':rxjava-core')
     compile 'org.jetbrains.kotlin:kotlin-stdlib:0.6.1673'
-    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 {
     manifest {
         name = 'rxjava-kotlin'
         instruction 'Bundle-Vendor', 'Netflix'
         instruction 'Bundle-DocURL', 'https://github.com/Netflix/RxJava'
-        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
@@ -40,7 +40,6 @@ jar {
         name = 'rxjava-scala'
         instruction 'Bundle-Vendor', 'Netflix'
         instruction 'Bundle-DocURL', 'https://github.com/Netflix/RxJava'
-        instruction 'Import-Package', '!org.junit,!junit.framework,!org.mockito.*,!org.scalatest.*,*'
         instruction 'Fragment-Host', 'com.netflix.rxjava.core'
     }
 }
diff --git a/rxjava-contrib/rxjava-android/build.gradle b/rxjava-contrib/rxjava-android/build.gradle
@@ -5,10 +5,9 @@ dependencies {
     provided 'com.google.android:android:4.0.1.2'
     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.1.1'
+    testCompile 'junit:junit-dep:4.10'
+    testCompile 'org.mockito:mockito-core:1.8.5'
+    testCompile 'org.robolectric:robolectric:2.1.1'
 }
 
 
@@ -17,7 +16,6 @@ jar {
         name = 'rxjava-android'
         instruction 'Bundle-Vendor', 'Netflix'
         instruction 'Bundle-DocURL', 'https://github.com/Netflix/RxJava'
-        instruction 'Import-Package', '!org.junit,!junit.framework,!org.mockito.*,*'
     }
 }
 
diff --git a/rxjava-contrib/rxjava-apache-http/build.gradle b/rxjava-contrib/rxjava-apache-http/build.gradle
@@ -10,6 +10,5 @@ jar {
         name = 'rxjava-apache-http'
         instruction 'Bundle-Vendor', 'Netflix'
         instruction 'Bundle-DocURL', 'https://github.com/Netflix/RxJava'
-        instruction 'Import-Package', '!org.junit,!junit.framework,!org.mockito.*,*'
     }
 }
diff --git a/rxjava-contrib/rxjava-async-util/build.gradle b/rxjava-contrib/rxjava-async-util/build.gradle
@@ -1,15 +1,14 @@
 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 {
     manifest {
         name = 'rxjava-async-util'
         instruction 'Bundle-Vendor', 'Netflix'
         instruction 'Bundle-DocURL', 'https://github.com/Netflix/RxJava'
-        instruction 'Import-Package', '!org.junit,!junit.framework,!org.mockito.*,*'
     }
 }
diff --git a/rxjava-contrib/rxjava-computation-expressions/build.gradle b/rxjava-contrib/rxjava-computation-expressions/build.gradle
@@ -9,6 +9,5 @@ jar {
         name = 'rxjava-computation-expressions'
         instruction 'Bundle-Vendor', 'Netflix'
         instruction 'Bundle-DocURL', 'https://github.com/Netflix/RxJava'
-        instruction 'Import-Package', '!org.junit,!junit.framework,!org.mockito.*,*'
     }
 }
diff --git a/rxjava-contrib/rxjava-string/build.gradle b/rxjava-contrib/rxjava-string/build.gradle
@@ -1,15 +1,14 @@
 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 {
     manifest {
         name = 'rxjava-string'
         instruction 'Bundle-Vendor', 'Netflix'
         instruction 'Bundle-DocURL', 'https://github.com/Netflix/RxJava'
-        instruction 'Import-Package', '!org.junit,!junit.framework,!org.mockito.*,*'
     }
 }
diff --git a/rxjava-contrib/rxjava-swing/build.gradle b/rxjava-contrib/rxjava-swing/build.gradle
@@ -1,14 +1,13 @@
 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'
 }
 
 jar {
     manifest {
         name = 'rxjava-swing'
         instruction 'Bundle-Vendor', 'Netflix'
         instruction 'Bundle-DocURL', 'https://github.com/Netflix/RxJava'
-        instruction 'Import-Package', '!org.junit,!junit.framework,!org.mockito.*,*'
     }
 }
diff --git a/rxjava-core/build.gradle b/rxjava-core/build.gradle
@@ -1,16 +1,15 @@
 apply plugin: 'maven'
 
 dependencies {
-    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 {
     manifest {
         name = 'rxjava-core'
         instruction 'Bundle-Vendor', 'Netflix'
         instruction 'Bundle-DocURL', 'https://github.com/Netflix/RxJava'
-        instruction 'Import-Package', '!org.junit,!junit.framework,!org.mockito.*,*'
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,6 @@ jar {`
`29`	`29`	`name = 'rxjava-clojure'`
`30`	`30`	`instruction 'Bundle-Vendor', 'Netflix'`
`31`	`31`	`instruction 'Bundle-DocURL', 'https://github.com/Netflix/RxJava'`
`32`		`- instruction 'Import-Package', '!org.junit,!junit.framework,!org.mockito.,'`
`33`	`32`	`instruction 'Fragment-Host', 'com.netflix.rxjava.core'`
`34`	`33`	`}`
`35`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@ jar {`
`12`	`12`	`name = 'rxjava-groovy'`
`13`	`13`	`instruction 'Bundle-Vendor', 'Netflix'`
`14`	`14`	`instruction 'Bundle-DocURL', 'https://github.com/Netflix/RxJava'`
`15`		`- instruction 'Import-Package', '!org.junit,!junit.framework,!org.mockito.,'`
`16`	`15`	`instruction 'Fragment-Host', 'com.netflix.rxjava.core'`
`17`	`16`	`}`
`18`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,8 @@ sourceSets {`
`20`	`20`	`dependencies {`
`21`	`21`	`compile project(':rxjava-core')`
`22`	`22`	`compile 'org.jruby:jruby:1.7+'`
`23`		`- provided 'junit:junit-dep:4.10'`
`24`		`- provided 'org.mockito:mockito-core:1.8.5'`
	`23`	`+ testCompile 'junit:junit-dep:4.10'`
	`24`	`+ testCompile 'org.mockito:mockito-core:1.8.5'`
`25`	`25`	`rspec 'org.jruby:jruby-complete:1.7.4'`
`26`	`26`	`rspec 'org.rubygems:rspec:2.14.1'`
`27`	`27`	`}`
`@@ -41,7 +41,6 @@ jar {`
`41`	`41`	`name = 'rxjava-jruby'`
`42`	`42`	`instruction 'Bundle-Vendor', 'Netflix'`
`43`	`43`	`instruction 'Bundle-DocURL', 'https://github.com/Netflix/RxJava'`
`44`		`- instruction 'Import-Package', '!org.junit,!junit.framework,!org.mockito.,'`
`45`	`44`	`instruction 'Fragment-Host', 'com.netflix.rxjava.core'`
`46`	`45`	`}`
`47`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,16 +13,15 @@ apply plugin: 'kotlin'`
`13`	`13`	`dependencies {`
`14`	`14`	`compile project(':rxjava-core')`
`15`	`15`	`compile 'org.jetbrains.kotlin:kotlin-stdlib:0.6.1673'`
`16`		`- provided 'junit:junit-dep:4.10'`
`17`		`- provided 'org.mockito:mockito-core:1.8.5'`
	`16`	`+ testCompile 'junit:junit-dep:4.10'`
	`17`	`+ testCompile 'org.mockito:mockito-core:1.8.5'`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`jar {`
`21`	`21`	`manifest {`
`22`	`22`	`name = 'rxjava-kotlin'`
`23`	`23`	`instruction 'Bundle-Vendor', 'Netflix'`
`24`	`24`	`instruction 'Bundle-DocURL', 'https://github.com/Netflix/RxJava'`
`25`		`- instruction 'Import-Package', '!org.junit,!junit.framework,!org.mockito.,'`
`26`	`25`	`instruction 'Fragment-Host', 'com.netflix.rxjava.core'`
`27`	`26`	`}`
`28`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,6 @@ jar {`
`40`	`40`	`name = 'rxjava-scala'`
`41`	`41`	`instruction 'Bundle-Vendor', 'Netflix'`
`42`	`42`	`instruction 'Bundle-DocURL', 'https://github.com/Netflix/RxJava'`
`43`		`- instruction 'Import-Package', '!org.junit,!junit.framework,!org.mockito.,!org.scalatest.,*'`
`44`	`43`	`instruction 'Fragment-Host', 'com.netflix.rxjava.core'`
`45`	`44`	`}`
`46`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,10 +5,9 @@ dependencies {`
`5`	`5`	`provided 'com.google.android:android:4.0.1.2'`
`6`	`6`	`provided 'com.google.android:support-v4:r7'`
`7`	`7`
`8`		`- // testing`
`9`		`- provided 'junit:junit-dep:4.10'`
`10`		`- provided 'org.mockito:mockito-core:1.8.5'`
`11`		`- provided 'org.robolectric:robolectric:2.1.1'`
	`8`	`+ testCompile 'junit:junit-dep:4.10'`
	`9`	`+ testCompile 'org.mockito:mockito-core:1.8.5'`
	`10`	`+ testCompile 'org.robolectric:robolectric:2.1.1'`
`12`	`11`	`}`
`13`	`12`
`14`	`13`
`@@ -17,7 +16,6 @@ jar {`
`17`	`16`	`name = 'rxjava-android'`
`18`	`17`	`instruction 'Bundle-Vendor', 'Netflix'`
`19`	`18`	`instruction 'Bundle-DocURL', 'https://github.com/Netflix/RxJava'`
`20`		`- instruction 'Import-Package', '!org.junit,!junit.framework,!org.mockito.,'`
`21`	`19`	`}`
`22`	`20`	`}`
`23`	`21`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,5 @@ jar {`
`10`	`10`	`name = 'rxjava-apache-http'`
`11`	`11`	`instruction 'Bundle-Vendor', 'Netflix'`
`12`	`12`	`instruction 'Bundle-DocURL', 'https://github.com/Netflix/RxJava'`
`13`		`- instruction 'Import-Package', '!org.junit,!junit.framework,!org.mockito.,'`
`14`	`13`	`}`
`15`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,14 @@`
`1`	`1`	`dependencies {`
`2`	`2`	`compile project(':rxjava-core')`
`3`	`3`	`testCompile project(":rxjava-core").sourceSets.test.output`
`4`		`- provided 'junit:junit-dep:4.10'`
`5`		`- provided 'org.mockito:mockito-core:1.8.5'`
	`4`	`+ testCompile 'junit:junit-dep:4.10'`
	`5`	`+ testCompile 'org.mockito:mockito-core:1.8.5'`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`jar {`
`9`	`9`	`manifest {`
`10`	`10`	`name = 'rxjava-async-util'`
`11`	`11`	`instruction 'Bundle-Vendor', 'Netflix'`
`12`	`12`	`instruction 'Bundle-DocURL', 'https://github.com/Netflix/RxJava'`
`13`		`- instruction 'Import-Package', '!org.junit,!junit.framework,!org.mockito.,'`
`14`	`13`	`}`
`15`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,5 @@ jar {`
`9`	`9`	`name = 'rxjava-computation-expressions'`
`10`	`10`	`instruction 'Bundle-Vendor', 'Netflix'`
`11`	`11`	`instruction 'Bundle-DocURL', 'https://github.com/Netflix/RxJava'`
`12`		`- instruction 'Import-Package', '!org.junit,!junit.framework,!org.mockito.,'`
`13`	`12`	`}`
`14`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,13 @@`
`1`	`1`	`dependencies {`
`2`	`2`	`compile project(':rxjava-core')`
`3`		`- provided 'junit:junit-dep:4.10'`
`4`		`- provided 'org.mockito:mockito-core:1.8.5'`
	`3`	`+ testCompile 'junit:junit-dep:4.10'`
	`4`	`+ testCompile 'org.mockito:mockito-core:1.8.5'`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`jar {`
`8`	`8`	`manifest {`
`9`	`9`	`name = 'rxjava-swing'`
`10`	`10`	`instruction 'Bundle-Vendor', 'Netflix'`
`11`	`11`	`instruction 'Bundle-DocURL', 'https://github.com/Netflix/RxJava'`
`12`		`- instruction 'Import-Package', '!org.junit,!junit.framework,!org.mockito.,'`
`13`	`12`	`}`
`14`	`13`	`}`