From 8a71d804a41ffbd80f881fae24c42637e246afc2 Mon Sep 17 00:00:00 2001 From: Jakob Odersky Date: Mon, 25 Mar 2019 21:48:39 -0400 Subject: Update plugins and build --- .travis.yml | 2 +- build.sbt | 6 +++--- project/build.properties | 2 +- project/plugins.sbt | 8 ++++---- project/publish.sbt | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index e144bff..c97e096 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ jdk: - oraclejdk8 before_install: - - curl https://raw.githubusercontent.com/scala-native/scala-native/68122ea1ce88ff0ccfb94cbbcd4dae34b68f21cf/scripts/travis_setup.sh | bash -x + - curl https://raw.githubusercontent.com/scala-native/scala-native/4c2ce46242f872f3e7879810565147c4233cd52e/scripts/travis_setup.sh | bash -x env: global: diff --git a/build.sbt b/build.sbt index 758fb7f..152be51 100644 --- a/build.sbt +++ b/build.sbt @@ -11,16 +11,16 @@ lazy val commando = crossProject(JSPlatform, JVMPlatform, NativePlatform) "-feature" ), libraryDependencies ++= Seq( - "com.lihaoyi" %%% "utest" % "0.6.3" % "test" + "com.lihaoyi" %%% "utest" % "0.6.6" % "test" ), testFrameworks += new TestFramework("utest.runner.Framework"), scalaVersion := crossScalaVersions.value.head ) .jsSettings( - crossScalaVersions := "2.12.5" :: "2.11.12" :: Nil + crossScalaVersions := "2.12.8" :: "2.11.12" :: Nil ) .jvmSettings( - crossScalaVersions := "2.12.5" :: "2.11.12" :: Nil + crossScalaVersions := "2.12.8" :: "2.11.12" :: Nil ) .nativeSettings( crossScalaVersions := "2.11.12" :: Nil, diff --git a/project/build.properties b/project/build.properties index 64cf32f..c0bab04 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.1.4 +sbt.version=1.2.8 diff --git a/project/plugins.sbt b/project/plugins.sbt index e63c0d7..233cf8d 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,6 @@ addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "1.5.1") -addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.4.0") -addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "0.4.0") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.22") -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.3.7") +addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.0") +addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "0.6.0") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.26") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.3.8") diff --git a/project/publish.sbt b/project/publish.sbt index 630c3c2..b39e15a 100644 --- a/project/publish.sbt +++ b/project/publish.sbt @@ -1,2 +1,2 @@ addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.3") -addSbtPlugin("io.crashbox" % "sbt-gpg" % "0.1.5") +addSbtPlugin("io.crashbox" % "sbt-gpg" % "0.2.0") -- cgit v1.2.3