Skip to content

Commit 73bd41c

Browse files
author
Justin Ryan
committed
Aligning build with internal infrastructure
1 parent 3a410c3 commit 73bd41c

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

language-adaptors/rxjava-jruby/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apply plugin: 'idea'
44

55
dependencies {
66
compile project(':rxjava-core')
7-
compile 'org.jruby:jruby:1.7.2'
7+
compile 'org.jruby:jruby:1.6.3'
88
provided 'junit:junit:4.10'
99
provided 'org.mockito:mockito-core:1.8.5'
1010
}

language-adaptors/rxjava-scala/build.gradle

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@ tasks.withType(ScalaCompile) {
1414

1515
dependencies {
1616
// Scala compiler and related tools
17-
scalaTools 'org.scala-lang:scala-compiler:2.10.0'
18-
scalaTools 'org.scala-lang:scala-library:2.10.0'
17+
scalaTools 'org.scala-lang:scala-compiler:2.9.1'
18+
scalaTools 'org.scala-lang:scala-library:2.9.1'
1919

20-
provided 'org.scala-lang:scala-library:2.10.0'
21-
provided 'org.scala-lang:scala-reflect:2.10.0'
22-
provided 'org.scalatest:scalatest_2.10:1.9.1'
20+
provided 'org.scala-lang:scala-library:2.9.1'
21+
// provided 'org.scala-lang:scala-reflect:2.9.1'
22+
provided 'org.scalatest:scalatest_2.9.1:1.8'
2323

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

28-
testCompile 'org.scalatest:scalatest_2.10:1.9.1'
28+
testCompile 'org.scalatest:scalatest_2.9.1:1.8'
2929
}
3030

3131
task test(overwrite: true, dependsOn: testClasses) << {
@@ -36,4 +36,4 @@ task test(overwrite: true, dependsOn: testClasses) << {
3636
ant.scalatest(runpath: sourceSets.test.classesDir,
3737
haltonfailure: 'true',
3838
fork: 'false') {reporter(type: 'stdout')}
39-
}
39+
}

rxjava-core/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apply plugin: 'eclipse'
33
apply plugin: 'idea'
44

55
// we want to target Java 1.5 so this can be used on Android
6-
sourceCompatibility = JavaVersion.VERSION_1_6
6+
sourceCompatibility = JavaVersion.VERSION_1_5
77
targetCompatibility = JavaVersion.VERSION_1_5
88

99
dependencies {

0 commit comments

Comments
 (0)