Skip to content

Commit 3b547e7

Browse files
committed
Disable jdk 7 and fix 2.12/2.10/2.13 builds.
1 parent 767c1a2 commit 3b547e7

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

.travis.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ stages:
1010
script: sbt "++$TRAVIS_SCALA_VERSION test"
1111
jobs:
1212
include:
13-
- scala: 2.10.7
14-
jdk: openjdk7
1513
- scala: 2.10.7
1614
- scala: 2.11.12
1715
before_install:

build.sbt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ val scala210 = "2.10.7"
55
val scala211 = "2.11.12"
66
val scala212 = "2.12.6"
77
val scala213 = "2.13.0-M5"
8-
val baseSettings = Seq(
8+
9+
inThisBuild(List(
910
organization := "com.lihaoyi",
1011
name := "sourcecode",
1112
scalaVersion := scala211,
@@ -18,10 +19,10 @@ val baseSettings = Seq(
1819
name = "Li Haoyi",
1920
url = url("https://github.com/lihaoyi")
2021
)
21-
)
22+
))
2223

23-
baseSettings
2424
skip in publish := true
25+
crossScalaVersions := List() // required for `++2.12.6 test` to ignore native project
2526

2627
def macroDependencies(version: String) =
2728
Seq(
@@ -36,7 +37,6 @@ def macroDependencies(version: String) =
3637

3738
lazy val sourcecode = crossProject(JSPlatform, JVMPlatform, NativePlatform)
3839
.settings(
39-
baseSettings,
4040
libraryDependencies ++= macroDependencies(scalaVersion.value),
4141
test in Test := (run in Test).toTask("").value,
4242
unmanagedSourceDirectories in Compile ++= {

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.2.1
1+
sbt.version=1.2.3

0 commit comments

Comments
 (0)