Skip to content

Commit 221785c

Browse files
Remove scala from rxjava-examples
Groovy and Scala can't co-exist in a single Eclipse project even though Gradle handles it fine. Perhaps the examples should go in the /test/ folder of each of the rxjava-[language] projects instead of rxjava-examples?
1 parent 1cf564a commit 221785c

File tree

2 files changed

+29
-71
lines changed

2 files changed

+29
-71
lines changed

rxjava-examples/build.gradle

Lines changed: 29 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,25 @@
1+
apply plugin: 'clojure'
12
apply plugin: 'java'
23
apply plugin: 'groovy'
3-
apply plugin: 'clojure'
4-
apply plugin: 'scala'
54
apply plugin: 'eclipse'
65
apply plugin: 'idea'
76

8-
aotCompile = true
9-
warnOnReflection = true
10-
11-
repositories {
12-
mavenCentral()
13-
clojarsRepo()
14-
}
7+
/*
8+
* Can't have Scala in same project as Groovy
9+
* and work in Eclipse
10+
* http://groovy-eclipse-plugin.42567.n3.nabble.com/GrEclipse-and-Scala-td4025025.html
11+
*
12+
* It works fine with Gradle.
13+
*/
14+
// apply plugin: 'scala'
1515

16-
tasks.withType(ScalaCompile) {
17-
scalaCompileOptions.fork = true
18-
scalaCompileOptions.unchecked = true
1916

20-
configure(scalaCompileOptions.forkOptions) {
21-
memoryMaximumSize = '1g'
22-
jvmArgs = ['-XX:MaxPermSize=512m']
23-
}
24-
}
2517

2618
dependencies {
2719
compile project(':language-adaptors:rxjava-clojure')
2820
compile project(':language-adaptors:rxjava-groovy')
2921
compile project(':language-adaptors:rxjava-scala')
30-
compile project(':language-adaptors:rxjava-jruby')
22+
//compile project(':language-adaptors:rxjava-jruby')
3123

3224
provided 'junit:junit:4.10'
3325
provided 'org.mockito:mockito-core:1.8.5'
@@ -36,12 +28,23 @@ dependencies {
3628
compile 'clj-http:clj-http:0.6.4' // https://clojars.org/clj-http
3729

3830
// groovy
39-
groovy 'org.codehaus.groovy:groovy-all:1.8+'
40-
41-
// scala
42-
scalaTools 'org.scala-lang:scala-compiler:2.10+'
43-
scalaTools 'org.scala-lang:scala-library:2.10+'
44-
provided 'org.scalatest:scalatest_2.10:1.9.1'
31+
groovy 'org.codehaus.groovy:groovy-all:2.+'
32+
}
33+
34+
/*
35+
* Clojure
36+
*/
37+
aotCompile = true
38+
warnOnReflection = true
39+
40+
buildscript {
41+
repositories { maven { url "http://clojars.org/repo" } }
42+
dependencies { classpath "clojuresque:clojuresque:1.5.4" }
43+
}
44+
45+
repositories {
46+
mavenCentral()
47+
clojarsRepo()
4548
}
4649

4750
/*
@@ -58,11 +61,6 @@ eclipse {
5861
}
5962
}
6063

61-
/*
62-
* Adds clojuresque to the (build) classpath
63-
*/
64-
buildscript {
65-
repositories { maven { url "http://clojars.org/repo" } }
66-
dependencies { classpath "clojuresque:clojuresque:1.5.4" }
67-
}
64+
65+
6866

rxjava-examples/src/main/scala/rx/examples/scala/RxExamples.scala

Lines changed: 0 additions & 40 deletions
This file was deleted.

0 commit comments

Comments
 (0)