Upgrade to sbt 1.0.0 (#105)

sbt · Aug 11, 2017 · 8ed3f41 · 8ed3f41
1 parent 72ba07d
commit 8ed3f41
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 language: scala
 
 scala:
-  - 2.10.6
+  - 2.12.3
 
 jdk:
   - oraclejdk8

diff --git a/build.sbt b/build.sbt
@@ -46,7 +46,7 @@ lazy val commonSettings =
       "-unchecked",
       "-deprecation",
       "-language:_",
-      "-target:jvm-1.6",
+      "-target:jvm-1.8",
       "-encoding", "UTF-8"
     ),
     unmanagedSourceDirectories.in(Compile) := Seq(scalaSource.in(Compile).value),
@@ -72,9 +72,8 @@ lazy val scalafmtSettings =
   )
 
 lazy val sbtScriptedSettings =
-  scriptedSettings ++
   Seq(
-    scriptedLaunchOpts ++= Vector(
+    scriptedLaunchOpts ++= Seq(
       "-Xmx1024M",
       s"-Dplugin.version=${version.value}"
     )

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version = 0.13.15
+sbt.version = 1.0.0
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,10 +1,10 @@
-addSbtPlugin("com.dwijnand"      % "sbt-travisci"  % "1.1.0")
+// addSbtPlugin("com.dwijnand"      % "sbt-travisci"  % "1.1.0")
 addSbtPlugin("com.typesafe.sbt"  % "sbt-git"       % "0.9.3")
 addSbtPlugin("com.lucidchart"    % "sbt-scalafmt"  % "1.10")
-addSbtPlugin("de.heikoseeberger" % "sbt-header"    % "2.0.0")
+addSbtPlugin("de.heikoseeberger" % "sbt-header"    % "3.0.0")
 addSbtPlugin("org.foundweekends" % "sbt-bintray"   % "0.5.1")
 
 libraryDependencies ++= Seq(
-  "org.scala-sbt" % "scripted-plugin" % sbtVersion.value,
-  "org.slf4j"     % "slf4j-nop"       % "1.7.25" // Needed by sbt-git
+  "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value,
+  "org.slf4j"     %  "slf4j-nop"       % "1.7.25" // Needed by sbt-git
 )
diff --git 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.16
+    """|sbt.version = 1.0.0
        |""".stripMargin
 
   def buildSbt(organization: String,
@@ -213,7 +213,7 @@ private object Template {
 
     s"""|$travisPlugin${wartRemoverPlugin}addSbtPlugin("com.typesafe.sbt"  % "sbt-git"         % "0.9.3")
         |addSbtPlugin("com.lucidchart"    % "sbt-scalafmt"    % "1.10")
-        |addSbtPlugin("de.heikoseeberger" % "sbt-header"      % "2.0.0")
+        |addSbtPlugin("de.heikoseeberger" % "sbt-header"      % "3.0.0")
         |
         |libraryDependencies += "org.slf4j" % "slf4j-nop" % "1.7.25" // Needed by sbt-git
         |""".stripMargin

diff --git a/src/sbt-test/sbt-fresh/default/project/test.sbt b/src/sbt-test/sbt-fresh/default/project/test.sbt
@@ -3,5 +3,3 @@ val pluginVersion = sys.props
   .getOrElse(sys.error("Sys prop plugin.version must be defined!"))
 
 addSbtPlugin("de.heikoseeberger" % "sbt-fresh" % pluginVersion)
-
-libraryDependencies += "org.eclipse.jgit" % "org.eclipse.jgit" % "4.2.0.201601211800-r"
diff --git a/src/sbt-test/sbt-fresh/default/test b/src/sbt-test/sbt-fresh/default/test
@@ -1,7 +1,7 @@
-> fresh organization=org name=acme
+> fresh organization=org name=acme setUpTravis=false
 $ exists .gitignore
 $ exists .scalafmt.conf
-$ exists .travis.yml
+# $ exists .travis.yml
 $ exists build.sbt
 $ exists LICENSE
 $ exists NOTICE
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,5 +3,3 @@ val pluginVersion = sys.props
		.getOrElse(sys.error("Sys prop plugin.version must be defined!"))

		addSbtPlugin("de.heikoseeberger" % "sbt-fresh" % pluginVersion)

		libraryDependencies += "org.eclipse.jgit" % "org.eclipse.jgit" % "4.2.0.201601211800-r"