File tree 3 files changed +40
-7
lines changed
compat/src/test/scala/test/scala/collection
3 files changed +40
-7
lines changed Original file line number Diff line number Diff line change 5
5
- 2.12.6
6
6
- 2.13.0-M4
7
7
jdk :
8
- - openjdk7
8
+ - openjdk6
9
9
- oraclejdk8
10
10
env :
11
11
global :
23
23
matrix :
24
24
exclude :
25
25
# > 2.12 requires jdk8
26
- - jdk : openjdk7
26
+ - jdk : openjdk6
27
27
scala : 2.12.6
28
28
29
- - jdk : openjdk7
29
+ - jdk : openjdk6
30
30
scala : 2.13.0-M4
31
31
32
32
# ?
@@ -45,9 +45,9 @@ matrix:
45
45
46
46
# | jdk | scala | scala target | scala target version | scalafix test |
47
47
# | ----------- | --------- | ------------ | -------------------- |---------------|
48
- # | openjdk7 | 2.11.12 | jvm | | |
49
- # | openjdk7 | 2.11.12 | js | 0.6.23 | |
50
- # | openjdk7 | 2.11.12 | js | 1.0.0-M3 | |
48
+ # | openjdk6 | 2.11.12 | jvm | | |
49
+ # | openjdk6 | 2.11.12 | js | 0.6.23 | |
50
+ # | openjdk6 | 2.11.12 | js | 1.0.0-M3 | |
51
51
# | oraclejdk8 | 2.12.6 | jvm | | |
52
52
# | oraclejdk8 | 2.12.6 | js | 0.6.23 | |
53
53
# | oraclejdk8 | 2.12.6 | js | 1.0.0-M3 | |
@@ -58,6 +58,7 @@ matrix:
58
58
before_script : ./checkCLA.sh
59
59
script :
60
60
- java -version
61
+ - echo $JAVA_HOME
61
62
- admin/build.sh
62
63
63
64
cache :
Original file line number Diff line number Diff line change @@ -32,7 +32,14 @@ lazy val compat = crossProject(JSPlatform, JVMPlatform)
32
32
)
33
33
.jvmSettings(
34
34
OsgiKeys .exportPackage := Seq (s " scala.collection.compat.*;version= ${version.value}" ),
35
- libraryDependencies += " com.novocode" % " junit-interface" % " 0.11" % " test"
35
+ libraryDependencies += " com.novocode" % " junit-interface" % " 0.11" % " test" ,
36
+ javaHome := {
37
+ val oldValue = javaHome.value
38
+ val isOnCi = sys.env.get(" CI" ).isDefined
39
+
40
+ if (isOnCi) Some (file(sys.env(" JAVA_HOME" )))
41
+ else oldValue
42
+ }
36
43
)
37
44
.jsSettings(
38
45
scalacOptions += {
Original file line number Diff line number Diff line change
1
+ package test .scala .collection
2
+
3
+ import org .junit .Assert ._
4
+ import org .junit .Test
5
+
6
+ class JdkVersionTest {
7
+
8
+ @ Test
9
+ def testJavaVersion : Unit = {
10
+ val isOnCi = sys.env.get(" CI" ).isDefined
11
+
12
+ if (isOnCi) {
13
+ val travisJdkVersion = sys.env(" TRAVIS_JDK_VERSION" )
14
+ val jdkVersion = sys.props(" java.specification.version" )
15
+
16
+ if (travisJdkVersion == " openjdk6" ) {
17
+ assertEquals(jdkVersion, " 1.6" )
18
+ } else if (travisJdkVersion == " oraclejdk8" ) {
19
+ assertEquals(jdkVersion, " 1.8" )
20
+ } else {
21
+ throw new Exception (s " Unknown CI jdk version: $travisJdkVersion" )
22
+ }
23
+ }
24
+ }
25
+ }
You can’t perform that action at this time.
0 commit comments