Merge pull request #391 from brad-uk/master

benjchristensen · benjchristensen · commit 9c3d197ce9a6 · 2013-09-18T21:54:33.000-07:00
remove scalatest packages from OSGI imports
diff --git a/language-adaptors/rxjava-scala/build.gradle b/language-adaptors/rxjava-scala/build.gradle
@@ -49,7 +49,7 @@ 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.*,*'
+        instruction 'Import-Package', '!org.junit,!junit.framework,!org.mockito.*,!org.scalatest.*,*'
         instruction 'Fragment-Host', 'com.netflix.rxjava.core'
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ jar {`
`49`	`49`	`name = 'rxjava-scala'`
`50`	`50`	`instruction 'Bundle-Vendor', 'Netflix'`
`51`	`51`	`instruction 'Bundle-DocURL', 'https://github.com/Netflix/RxJava'`
`52`		`- instruction 'Import-Package', '!org.junit,!junit.framework,!org.mockito.,'`
	`52`	`+ instruction 'Import-Package', '!org.junit,!junit.framework,!org.mockito.,!org.scalatest.,*'`
`53`	`53`	`instruction 'Fragment-Host', 'com.netflix.rxjava.core'`
`54`	`54`	`}`
`55`	`55`	`}`