From 20bcc026bf1bc6d0863e751e9f89e1dce5319ab4 Mon Sep 17 00:00:00 2001 From: Heiko Seeberger Date: Sun, 6 Aug 2017 13:44:53 +0200 Subject: [PATCH] Upgrade to Scala 2.12.3 and sbt 0.13.6 (#104) --- project/plugins.sbt | 4 ++-- .../scala/de/heikoseeberger/sbtfresh/Template.scala | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 547f772..d19a9d3 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,8 +1,8 @@ addSbtPlugin("com.dwijnand" % "sbt-travisci" % "1.1.0") addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.9.3") -addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.8") +addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.10") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "2.0.0") -addSbtPlugin("me.lessis" % "bintray-sbt" % "0.3.0") +addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.1") libraryDependencies ++= Seq( "org.scala-sbt" % "scripted-plugin" % sbtVersion.value, diff --git a/src/main/scala/de/heikoseeberger/sbtfresh/Template.scala b/src/main/scala/de/heikoseeberger/sbtfresh/Template.scala index 60ad481..8ea1b1c 100644 --- a/src/main/scala/de/heikoseeberger/sbtfresh/Template.scala +++ b/src/main/scala/de/heikoseeberger/sbtfresh/Template.scala @@ -24,7 +24,7 @@ private object Template { private val year = now().getYear def buildProperties: String = - """|sbt.version = 0.13.15 + """|sbt.version = 0.13.16 |""".stripMargin def buildSbt(organization: String, @@ -68,8 +68,8 @@ private object Template { val scalaVersion = if (setUpTravis) """|// scalaVersion from .travis.yml via sbt-travisci - | // scalaVersion := "2.12.2",""".stripMargin - else """scalaVersion := "2.12.2",""" + | // scalaVersion := "2.12.3",""".stripMargin + else """scalaVersion := "2.12.3",""" s"""|// ***************************************************************************** |// Projects @@ -212,7 +212,7 @@ private object Template { else "" s"""|$travisPlugin${wartRemoverPlugin}addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.9.3") - |addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.8") + |addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.10") |addSbtPlugin("de.heikoseeberger" % "sbt-header" % "2.0.0") | |libraryDependencies += "org.slf4j" % "slf4j-nop" % "1.7.25" // Needed by sbt-git @@ -263,7 +263,7 @@ private object Template { """|language: scala | |scala: - | - 2.12.2 + | - 2.12.3 | |jdk: | - oraclejdk8