Skip to content

Commit

Permalink
Upgrade to Scala 2.12.3 and sbt 0.13.6 (#104)
Browse files Browse the repository at this point in the history
  • Loading branch information
hseeberger authored Aug 6, 2017
1 parent d182c6f commit 20bcc02
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
10 changes: 5 additions & 5 deletions src/main/scala/de/heikoseeberger/sbtfresh/Template.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -263,7 +263,7 @@ private object Template {
"""|language: scala
|
|scala:
| - 2.12.2
| - 2.12.3
|
|jdk:
| - oraclejdk8
Expand Down

0 comments on commit 20bcc02

Please sign in to comment.