Skip to content

Aligning with internal infrastructure. #117

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

Closed
wants to merge 1 commit into from
Closed

Aligning with internal infrastructure. #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion language-adaptors/rxjava-jruby/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apply plugin: 'idea'

dependencies {
compile project(':rxjava-core')
compile 'org.jruby:jruby:1.7.2'
compile 'org.jruby:jruby:1.6.3'
provided 'junit:junit:4.10'
provided 'org.mockito:mockito-core:1.8.5'
}
14 changes: 7 additions & 7 deletions language-adaptors/rxjava-scala/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@ tasks.withType(ScalaCompile) {

dependencies {
// Scala compiler and related tools
scalaTools 'org.scala-lang:scala-compiler:2.10.0'
scalaTools 'org.scala-lang:scala-library:2.10.0'
scalaTools 'org.scala-lang:scala-compiler:2.9.1'
scalaTools 'org.scala-lang:scala-library:2.9.1'

provided 'org.scala-lang:scala-library:2.10.0'
provided 'org.scala-lang:scala-reflect:2.10.0'
provided 'org.scalatest:scalatest_2.10:1.9.1'
provided 'org.scala-lang:scala-library:2.9.1'
// provided 'org.scala-lang:scala-reflect:2.9.1'
provided 'org.scalatest:scalatest_2.9.1:1.8'

compile project(':rxjava-core')
provided 'junit:junit:4.10'
provided 'org.mockito:mockito-core:1.8.5'

testCompile 'org.scalatest:scalatest_2.10:1.9.1'
testCompile 'org.scalatest:scalatest_2.9.1:1.8'
}

task test(overwrite: true, dependsOn: testClasses) << {
Expand All @@ -36,4 +36,4 @@ task test(overwrite: true, dependsOn: testClasses) << {
ant.scalatest(runpath: sourceSets.test.classesDir,
haltonfailure: 'true',
fork: 'false') {reporter(type: 'stdout')}
}
}
2 changes: 1 addition & 1 deletion rxjava-core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apply plugin: 'eclipse'
apply plugin: 'idea'

// we want to target Java 1.5 so this can be used on Android
sourceCompatibility = JavaVersion.VERSION_1_6
sourceCompatibility = JavaVersion.VERSION_1_5
targetCompatibility = JavaVersion.VERSION_1_5

dependencies {
Expand Down