Skip to content

Commit 12aabec

Browse files
authored
Merge pull request #15 from sparsetech/feat/update-deps
Update dependencies
2 parents 9d13362 + a7a0bb4 commit 12aabec

File tree

7 files changed

+17
-11
lines changed

7 files changed

+17
-11
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
language: scala
22
scala:
3-
- 2.12.4
3+
- 2.11.12
4+
- 2.12.10
5+
- 2.13.1
46
jdk:
57
- openjdk8
68

@@ -9,8 +11,6 @@ install:
911
- . $HOME/.nvm/nvm.sh
1012
- nvm install stable
1113
- nvm use stable
12-
- npm install
13-
- npm install jsdom
1414

1515
# See https://github.com/scala-js/scala-js/issues/2642
1616
script:

build.sbt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
val Scala2_11 = "2.11.12"
2-
val Scala2_12 = "2.12.8"
2+
val Scala2_12 = "2.12.10"
3+
val Scala2_13 = "2.13.1"
34
val ScalaTest = "3.0.8"
45

56
val SharedSettings = Seq(
67
name := "translit-scala",
78
organization := "tech.sparse",
8-
scalaVersion := Scala2_12,
9-
crossScalaVersions := Seq(Scala2_12, Scala2_11),
9+
scalaVersion := Scala2_13,
10+
crossScalaVersions := Seq(Scala2_13, Scala2_12, Scala2_11),
1011
scalacOptions := Seq(
1112
"-unchecked",
1213
"-deprecation",

build212.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[project]
2-
scalaVersion = "2.12.8"
2+
scalaVersion = "2.12.10"
33
scalaJsVersion = "0.6.28"
44
scalaOptions = [
55
"-encoding", "UTF-8",

build213.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[project]
2-
scalaVersion = "2.13.0"
2+
scalaVersion = "2.13.1"
33
scalaJsVersion = "0.6.28"
44
scalaOptions = [
55
"-encoding", "UTF-8",

project/build.properties

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

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
logLevel := Level.Warn
22

3-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.28")
3+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.29")

version.sbt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,6 @@
1-
version in ThisBuild := "0.1.2-SNAPSHOT"
1+
version in ThisBuild := {
2+
import sys.process._
3+
val version = Seq("git", "describe", "--tags").!!.trim.tail
4+
println("[info] Setting version to: " + version)
5+
version
6+
}

0 commit comments

Comments
 (0)