Skip to content

Commit 58cc6f0

Browse files
committed
Example update and test simplification
1 parent 18921b2 commit 58cc6f0

File tree

3 files changed

+11
-18
lines changed

3 files changed

+11
-18
lines changed

.travis.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ dist: trusty
44
jdk: openjdk11
55

66
scala:
7-
- 2.12.10
87
- 2.13.1
98

109
before_script:
@@ -23,6 +22,5 @@ before_script:
2322
- export PATH=$PWD/selenium-bin:$PATH
2423

2524
script:
26-
- sbt ++$TRAVIS_SCALA_VERSION test
27-
- sbt ++$TRAVIS_SCALA_VERSION publishLocal
28-
- cd example && sbt ++$TRAVIS_SCALA_VERSION compile jquery-global-demo/fullOptJS jquery-bundler-demo/compileStatics
25+
- sbt +test +publishLocal
26+
- cd example && sbt compile jquery-global-demo/fullOptJS jquery-bundler-demo/compileStatics

example/build.sbt

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
name := "jquery-demo"
22

33
inThisBuild(Seq(
4-
version := "3.0.0",
4+
version := "3.0.1",
55
organization := "io.udash",
66
))
77

88
val commonSettings = Seq(
99
scalaVersion := "2.12.10",
10-
crossScalaVersions := Seq("2.11.12", "2.12.10"),
10+
crossScalaVersions := Seq("2.12.10"), //todo 2.13
1111
scalacOptions ++= Seq(
1212
"-feature",
1313
"-deprecation",
@@ -16,18 +16,13 @@ val commonSettings = Seq(
1616
"-language:existentials",
1717
"-language:dynamics",
1818
"-language:postfixOps",
19-
"-Xfuture",
2019
"-Xfatal-warnings",
2120
"-Xlint:_",
21+
"-Ywarn-unused:_,-explicits,-implicits",
22+
"-Ybackend-parallelism", "4",
23+
"-Ycache-plugin-class-loader:last-modified",
24+
"-Ycache-macro-class-loader:last-modified"
2225
),
23-
scalacOptions ++= {
24-
if (scalaBinaryVersion.value == "2.12") Seq(
25-
"-Ywarn-unused:_,-explicits,-implicits",
26-
"-Ybackend-parallelism", "4",
27-
"-Ycache-plugin-class-loader:last-modified",
28-
"-Ycache-macro-class-loader:last-modified"
29-
) else Seq.empty
30-
},
3126

3227
libraryDependencies ++= Dependencies.deps.value
3328
)

example/project/Dependencies.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ import org.portablescala.sbtplatformdeps.PlatformDepsPlugin.autoImport._
33
import sbt._
44

55
object Dependencies {
6-
val udashCoreVersion = "0.6.1"
7-
val udashJQueryVersion = "3.0.0"
6+
val udashCoreVersion = "0.8.1"
7+
val udashJQueryVersion = "3.0.1"
88

99
val deps = Def.setting(Seq[ModuleID](
10-
"io.udash" %%% "udash-core-frontend" % udashCoreVersion,
10+
"io.udash" %%% "udash-core" % udashCoreVersion,
1111
"io.udash" %%% "udash-jquery" % udashJQueryVersion
1212
))
1313

0 commit comments

Comments
 (0)