Skip to content

Commit 72fb5b2

Browse files
committed
Focus an Scala 2.12.
1 parent b39278a commit 72fb5b2

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

.travis.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@ sudo: false
22

33
language: scala
44
scala:
5-
- 2.10.7
6-
- 2.11.12
7-
- 2.12.6
5+
#- 2.11.12
6+
- 2.12.7
87

98
before_install:
109
- "export DISPLAY=:99.0"

build.sbt

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@ import java.net.URL
1010

1111
val projectVersion = "0.2.2-SNAPSHOT"
1212
val versionTagDir = if (projectVersion.endsWith("SNAPSHOT")) "master" else "v" + projectVersion
13-
val scalaVersions = Seq("2.11.12", "2.12.7")
13+
val _scalaVersions = Seq("2.12.7")
14+
val _scalaVersion = _scalaVersions.head
1415

15-
crossScalaVersions := scalaVersions
16-
scalaVersion := crossScalaVersions { versions => versions.head }.value
16+
crossScalaVersions := _scalaVersions
17+
scalaVersion := _scalaVersion
1718

1819
lazy val OSName = System.getProperty("os.name") match {
1920
case n if n.startsWith("Linux") => "linux"
@@ -31,23 +32,21 @@ lazy val scalaFXExtras = (project in file("scalafx-extras")).settings(
3132
scalaFXExtrasSettings,
3233
name := "scalafx-extras",
3334
description := "The ScalaFX Extras",
34-
fork in run := true,
3535
scalacOptions in(Compile, doc) ++= Seq(
3636
"-sourcepath", baseDirectory.value.toString,
3737
"-doc-root-content", baseDirectory.value + "/src/main/scala/root-doc.creole",
3838
"-doc-source-url", "https://github.com/SscalaFX-Extras/scalafx-extras/blob/" + versionTagDir + "/scalafx/€{FILE_PATH}.scala"
3939
) ++ (Option(System.getenv("GRAPHVIZ_DOT_PATH")) match {
4040
case Some(path) => Seq("-diagrams", "-diagrams-dot-path", path)
4141
case None => Seq.empty[String]
42-
}) ++ (if(scalaVersion.value.startsWith("2.11")) Seq("-Xexperimental") else Seq.empty[String])
42+
}) ++ (if (_scalaVersion.startsWith("2.11")) Seq("-Xexperimental") else Seq.empty[String])
4343
)
4444

4545
// ScalaFX Extras Demos project
4646
lazy val scalaFXExtrasDemos = (project in file("scalafx-extras-demos")).settings(
4747
scalaFXExtrasSettings,
4848
name := "scalafx-extras-demos",
4949
description := "The ScalaFX Extras demonstrations",
50-
fork in run := true,
5150
javaOptions ++= Seq(
5251
"-Xmx512M",
5352
"-Djavafx.verbose"
@@ -69,16 +68,17 @@ resolvers += Resolver.sonatypeRepo("snapshots")
6968
lazy val scalaFXExtrasSettings = Seq(
7069
organization := "org.scalafx",
7170
version := projectVersion,
72-
crossScalaVersions := scalaVersions,
73-
scalaVersion := crossScalaVersions { versions => versions.head }.value,
71+
crossScalaVersions := _scalaVersions,
72+
scalaVersion := _scalaVersion,
7473
scalacOptions ++= Seq("-unchecked", "-deprecation", "-Xcheckinit", "-encoding", "utf8", "-feature"),
74+
scalacOptions in(Compile, doc) ++= (if (_scalaVersion.startsWith("2.11")) Seq("-Xexperimental") else Seq.empty[String]),
7575
scalacOptions in(Compile, doc) ++= Opts.doc.title("ScalaFX Extras API"),
7676
scalacOptions in(Compile, doc) ++= Opts.doc.version(projectVersion),
7777
scalacOptions in(Compile, doc) += s"-doc-external-doc:${scalaInstance.value.libraryJar}#http://www.scala-lang.org/api/${scalaVersion.value}/",
7878
scalacOptions in(Compile, doc) ++= Seq("-doc-footer", s"ScalaFX Extras API v.$projectVersion"),
7979
javacOptions ++= Seq(
80-
"-target", "1.8",
81-
"-source", "1.8",
80+
// "-target", "1.8",
81+
// "-source", "1.8",
8282
"-Xlint:deprecation"),
8383
libraryDependencies ++= Seq(
8484
"com.beachape" %% "enumeratum" % "1.5.13",
@@ -90,6 +90,7 @@ lazy val scalaFXExtrasSettings = Seq(
9090
autoAPIMappings := true,
9191
manifestSetting,
9292
publishSetting,
93+
fork in run := true,
9394
fork in Test := true,
9495
parallelExecution in Test := false,
9596
resolvers += Resolver.sonatypeRepo("snapshots"),

0 commit comments

Comments
 (0)