Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Can't exclude inner classes because Scala expects them to exist. #1

Closed
wants to merge 4 commits into from
Closed

Can't exclude inner classes because Scala expects them to exist. #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
03d38c3
s/rxjava-core-x.y.z.jar/rxjava-x.y.z.jar
mattrjacobs Jul 6, 2013
7eb47fe
Fixed various dependency issues:
mattrjacobs Jul 6, 2013
ea31aa1
Fixed classpaths for running example code in Clojure and Groovy
mattrjacobs Jul 6, 2013
91715b8
Can't exclude inner classes because Scala expects them to exist.
jmhofer Jul 8, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions language-adaptors/rxjava-clojure/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -35,9 +35,17 @@ eclipse {
}
}

tasks.clojureTest {
classpath = classpath + configurations.provided
}

tasks.compileExamplesClojure {
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)
Expand All @@ -48,7 +56,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 {
Expand Down
6 changes: 3 additions & 3 deletions language-adaptors/rxjava-dynamic/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
12 changes: 8 additions & 4 deletions language-adaptors/rxjava-groovy/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -26,6 +26,10 @@ tasks.test {
classpath = createAdaptedObservable.outputs.files + sourceSets.test.runtimeClasspath
}

tasks.compileExamplesGroovy {
classpath = classpath + configurations.provided
}

tasks.jar {
dependsOn(createAdaptedObservable)

Expand Down
6 changes: 3 additions & 3 deletions language-adaptors/rxjava-jruby/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@ 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'
}

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)
Expand Down
19 changes: 9 additions & 10 deletions language-adaptors/rxjava-scala/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 0 additions & 2 deletions rxjava-contrib/rxjava-swing/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ javadoc {
}

jar {
exclude('**/*$UnitTest*')

manifest {
name = 'rxjava-swing'
instruction 'Bundle-Vendor', 'Netflix'
Expand Down
4 changes: 3 additions & 1 deletion rxjava-core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,10 @@ javadoc {
}

jar {
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.*,*'
Expand Down