From 69c75b6388cf43eb5efa6f67195f4b6b945b8916 Mon Sep 17 00:00:00 2001 From: Dave Ray Date: Sat, 31 Aug 2013 12:54:54 -0700 Subject: [PATCH] Make DummyObservable visible to clojureTest classpath. RxJava issue #327. Moved DummyObservable into main so that it's compiled and available when the clojureTest task executes. Perhaps someone with stronger Gradle skills can figure out how to put this Java class in src/test and get things to work out. Correctly. For the time being, several clean/build cycles worked fine for me. --- language-adaptors/rxjava-clojure/build.gradle | 5 ++--- .../java/rx/lang/clojure/interop/DummyObservable.java | 0 2 files changed, 2 insertions(+), 3 deletions(-) rename language-adaptors/rxjava-clojure/src/{test => main}/java/rx/lang/clojure/interop/DummyObservable.java (100%) diff --git a/language-adaptors/rxjava-clojure/build.gradle b/language-adaptors/rxjava-clojure/build.gradle index 47472611c58..6e59b613057 100644 --- a/language-adaptors/rxjava-clojure/build.gradle +++ b/language-adaptors/rxjava-clojure/build.gradle @@ -6,14 +6,13 @@ 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 } tasks.compileExamplesClojure.classpath = files(tasks.compileClojure.destinationDir) + tasks.compileClojure.classpath -clojureTest.dependsOn compileTestJava /* * Clojure */ @@ -38,7 +37,7 @@ eclipse { } } -tasks.clojureTest { +tasks.clojureTest { classpath = classpath + configurations.provided } diff --git a/language-adaptors/rxjava-clojure/src/test/java/rx/lang/clojure/interop/DummyObservable.java b/language-adaptors/rxjava-clojure/src/main/java/rx/lang/clojure/interop/DummyObservable.java similarity index 100% rename from language-adaptors/rxjava-clojure/src/test/java/rx/lang/clojure/interop/DummyObservable.java rename to language-adaptors/rxjava-clojure/src/main/java/rx/lang/clojure/interop/DummyObservable.java