From 03d38c30f077eee8d645fd5044ffe6c54571ae2d Mon Sep 17 00:00:00 2001 From: Matt Jacobs Date: Sat, 6 Jul 2013 12:50:55 -0700 Subject: [PATCH 1/4] s/rxjava-core-x.y.z.jar/rxjava-x.y.z.jar --- rxjava-core/build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rxjava-core/build.gradle b/rxjava-core/build.gradle index 39232193e8..bf22df5afe 100644 --- a/rxjava-core/build.gradle +++ b/rxjava-core/build.gradle @@ -25,6 +25,8 @@ javadoc { } jar { + archiveName = "rxjava-" + version + "." + extension + manifest { name = 'rxjava-core' instruction 'Bundle-Vendor', 'Netflix' From 7eb47fee463f3d0b14d48ba11e717c0a5058707a Mon Sep 17 00:00:00 2001 From: Matt Jacobs Date: Sat, 6 Jul 2013 14:44:10 -0700 Subject: [PATCH 2/4] Fixed various dependency issues: * Properly changed all artifacts of rxjava-core to be rxjava-x.y.z.* * For Groovy/Clojure/JRuby/dynamic, moved dependency on rxjava-core to provided scope, as well as all tests * For Scala, left rxjava-core as compile scope, since rxjava-scala jar doesn't contain Observable (as constructed) --- language-adaptors/rxjava-clojure/build.gradle | 12 ++++++++---- language-adaptors/rxjava-dynamic/build.gradle | 6 +++--- language-adaptors/rxjava-groovy/build.gradle | 8 ++++---- language-adaptors/rxjava-jruby/build.gradle | 6 +++--- language-adaptors/rxjava-scala/build.gradle | 19 +++++++++---------- rxjava-core/build.gradle | 4 ++-- 6 files changed, 29 insertions(+), 26 deletions(-) diff --git a/language-adaptors/rxjava-clojure/build.gradle b/language-adaptors/rxjava-clojure/build.gradle index 6fb4ea8c30..6a38ff8896 100644 --- a/language-adaptors/rxjava-clojure/build.gradle +++ b/language-adaptors/rxjava-clojure/build.gradle @@ -3,8 +3,8 @@ apply plugin: 'osgi' dependencies { core project(':rxjava-core') - compile project(':rxjava-core') - compile project(':language-adaptors:codegen') + provided project(':rxjava-core') + provided project(':language-adaptors:codegen') compile 'org.clojure:clojure:1.4.+' compile 'clj-http:clj-http:0.6.4' // https://clojars.org/clj-http provided 'junit:junit-dep:4.10' @@ -35,9 +35,13 @@ eclipse { } } +tasks.clojureTest { + classpath = classpath + configurations.provided +} + task createAdaptedObservable(type: JavaExec) { main = 'rx.codegen.ClassPathBasedRunner' - classpath = sourceSets.main.runtimeClasspath + classpath = sourceSets.main.runtimeClasspath + configurations.provided args = ["Clojure", codeGenOutputDir] inputs.files(sourceSets.main.runtimeClasspath) @@ -48,7 +52,7 @@ tasks.test { dependsOn(createAdaptedObservable) //Reorders the classpath so that the newly-create Observables win - classpath = createAdaptedObservable.outputs.files + sourceSets.test.runtimeClasspath + classpath = createAdaptedObservable.outputs.files + configurations.provided + sourceSets.test.runtimeClasspath } tasks.jar { diff --git a/language-adaptors/rxjava-dynamic/build.gradle b/language-adaptors/rxjava-dynamic/build.gradle index 18d03a8d9c..4b75e1d308 100644 --- a/language-adaptors/rxjava-dynamic/build.gradle +++ b/language-adaptors/rxjava-dynamic/build.gradle @@ -2,15 +2,15 @@ apply plugin: 'osgi' dependencies { core project(':rxjava-core') - compile project(':rxjava-core') - compile project(':language-adaptors:codegen') + provided project(':rxjava-core') + provided project(':language-adaptors:codegen') provided 'junit:junit-dep:4.10' provided 'org.mockito:mockito-core:1.8.5' } task createAdaptedObservable(type: JavaExec) { main = 'rx.codegen.ClassPathBasedRunner' - classpath = sourceSets.main.runtimeClasspath + classpath = sourceSets.main.runtimeClasspath + configurations.provided args = ["Dynamic", codeGenOutputDir] inputs.files(sourceSets.main.runtimeClasspath) diff --git a/language-adaptors/rxjava-groovy/build.gradle b/language-adaptors/rxjava-groovy/build.gradle index edb9cb30ea..70fb4e346f 100644 --- a/language-adaptors/rxjava-groovy/build.gradle +++ b/language-adaptors/rxjava-groovy/build.gradle @@ -3,16 +3,16 @@ apply plugin: 'osgi' dependencies { core project(':rxjava-core') - compile project(':rxjava-core') - compile project(':language-adaptors:codegen') - groovy 'org.codehaus.groovy:groovy-all:2.+' + provided project(':rxjava-core') + provided project(':language-adaptors:codegen') + compile 'org.codehaus.groovy:groovy-all:2.+' provided 'junit:junit-dep:4.10' provided 'org.mockito:mockito-core:1.8.5' } task createAdaptedObservable(type: JavaExec) { main = 'rx.codegen.ClassPathBasedRunner' - classpath = sourceSets.main.runtimeClasspath + classpath = sourceSets.main.runtimeClasspath + configurations.provided args = ["Groovy", codeGenOutputDir] inputs.files(sourceSets.main.runtimeClasspath) diff --git a/language-adaptors/rxjava-jruby/build.gradle b/language-adaptors/rxjava-jruby/build.gradle index d7a0d82d39..4359e242ac 100644 --- a/language-adaptors/rxjava-jruby/build.gradle +++ b/language-adaptors/rxjava-jruby/build.gradle @@ -2,8 +2,8 @@ apply plugin: 'osgi' dependencies { core project(':rxjava-core') - compile project(':rxjava-core') - compile project(':language-adaptors:codegen') + provided project(':rxjava-core') + provided project(':language-adaptors:codegen') compile 'org.jruby:jruby:1.6+' provided 'junit:junit-dep:4.10' provided 'org.mockito:mockito-core:1.8.5' @@ -11,7 +11,7 @@ dependencies { task createAdaptedObservable(type: JavaExec) { main = 'rx.codegen.ClassPathBasedRunner' - classpath = sourceSets.main.runtimeClasspath + classpath = sourceSets.main.runtimeClasspath + configurations.provided args = ["JRuby", codeGenOutputDir] inputs.files(sourceSets.main.runtimeClasspath) diff --git a/language-adaptors/rxjava-scala/build.gradle b/language-adaptors/rxjava-scala/build.gradle index be61f1d846..744d277e93 100644 --- a/language-adaptors/rxjava-scala/build.gradle +++ b/language-adaptors/rxjava-scala/build.gradle @@ -21,24 +21,23 @@ sourceSets { } dependencies { - // Scala compiler and related tools - compile 'org.scala-lang:scala-compiler:2.10+' compile 'org.scala-lang:scala-library:2.10+' compile project(':rxjava-core') - compile 'junit:junit-dep:4.10' - compile 'org.mockito:mockito-core:1.8.5' - compile 'org.scalatest:scalatest_2.10:1.9.1' + + provided 'org.scalatest:scalatest_2.10:1.9.1' + provided 'junit:junit-dep:4.10' + provided 'org.mockito:mockito-core:1.8.5' } task test(overwrite: true, dependsOn: testClasses) << { ant.taskdef(name: 'scalatest', - classname: 'org.scalatest.tools.ScalaTestAntTask', - classpath: configurations.testRuntime.asPath + ':' + compileScala.destinationDir - ) + classname: 'org.scalatest.tools.ScalaTestAntTask', + classpath: configurations.testRuntime.asPath + ':' + compileScala.destinationDir + ":" + configurations.provided.asPath + ) ant.scalatest(runpath: sourceSets.test.output.classesDir, - haltonfailure: 'true', - fork: 'false') {reporter(type: 'stdout')} + haltonfailure: 'true', + fork: 'false') {reporter(type: 'stdout')} } jar { diff --git a/rxjava-core/build.gradle b/rxjava-core/build.gradle index bf22df5afe..537aed6686 100644 --- a/rxjava-core/build.gradle +++ b/rxjava-core/build.gradle @@ -25,10 +25,10 @@ javadoc { } jar { - archiveName = "rxjava-" + version + "." + extension + baseName = "rxjava" manifest { - name = 'rxjava-core' + name = 'rxjava' instruction 'Bundle-Vendor', 'Netflix' instruction 'Bundle-DocURL', 'https://github.com/Netflix/RxJava' instruction 'Import-Package', '!org.junit,!junit.framework,!org.mockito.*,*' From ea31aa198fc1d516708597bd61674a576503cd92 Mon Sep 17 00:00:00 2001 From: Matt Jacobs Date: Sat, 6 Jul 2013 15:11:44 -0700 Subject: [PATCH 3/4] Fixed classpaths for running example code in Clojure and Groovy --- language-adaptors/rxjava-clojure/build.gradle | 4 ++++ language-adaptors/rxjava-groovy/build.gradle | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/language-adaptors/rxjava-clojure/build.gradle b/language-adaptors/rxjava-clojure/build.gradle index 6a38ff8896..f2f074540e 100644 --- a/language-adaptors/rxjava-clojure/build.gradle +++ b/language-adaptors/rxjava-clojure/build.gradle @@ -39,6 +39,10 @@ tasks.clojureTest { classpath = classpath + configurations.provided } +tasks.compileExamplesClojure { + classpath = classpath + configurations.provided +} + task createAdaptedObservable(type: JavaExec) { main = 'rx.codegen.ClassPathBasedRunner' classpath = sourceSets.main.runtimeClasspath + configurations.provided diff --git a/language-adaptors/rxjava-groovy/build.gradle b/language-adaptors/rxjava-groovy/build.gradle index 70fb4e346f..b1e6168b26 100644 --- a/language-adaptors/rxjava-groovy/build.gradle +++ b/language-adaptors/rxjava-groovy/build.gradle @@ -26,6 +26,10 @@ tasks.test { classpath = createAdaptedObservable.outputs.files + sourceSets.test.runtimeClasspath } +tasks.compileExamplesGroovy { + classpath = classpath + configurations.provided +} + tasks.jar { dependsOn(createAdaptedObservable) From 91715b8d630d12ac53d06550ac8e0f847cda7e50 Mon Sep 17 00:00:00 2001 From: Joachim Hofer Date: Mon, 8 Jul 2013 13:11:58 +0200 Subject: [PATCH 4/4] Can't exclude inner classes because Scala expects them to exist. --- rxjava-contrib/rxjava-swing/build.gradle | 2 -- 1 file changed, 2 deletions(-) diff --git a/rxjava-contrib/rxjava-swing/build.gradle b/rxjava-contrib/rxjava-swing/build.gradle index 0076915eee..ea863813a2 100644 --- a/rxjava-contrib/rxjava-swing/build.gradle +++ b/rxjava-contrib/rxjava-swing/build.gradle @@ -20,8 +20,6 @@ javadoc { } jar { - exclude('**/*$UnitTest*') - manifest { name = 'rxjava-swing' instruction 'Bundle-Vendor', 'Netflix'