Skip to content

Commit 4459dcb

Browse files
authored
Merge pull request #93 from SethTisue/sbt-1
upgrade to sbt 1
2 parents a0f8e18 + a9be4a4 commit 4459dcb

File tree

5 files changed

+4
-7
lines changed

5 files changed

+4
-7
lines changed

admin/build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ if [[ "$TRAVIS_TAG" =~ $tagPat ]]; then
3939
echo "Releasing $tagVer on Java version $currentJvmVer according to 'scalaVersionsByJvm' in build.sbt."
4040
fi
4141
42-
extraTarget="+publish-signed"
42+
extraTarget="+publishSigned"
4343
cat admin/gpg.sbt >> project/plugins.sbt
4444
cp admin/publish-settings.sbt .
4545

admin/gpg.sbt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
2-
addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.3") // only added when publishing, see build.sh
1+
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2-1") // only added when publishing, see build.sh

build.sbt

-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ scalaVersion in ThisBuild := "2.13.0-M5" // for testing
2121

2222
OsgiKeys.exportPackage := Seq(s"scala.swing.*;version=${version.value}")
2323

24-
licenses := Seq("Apache 2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0"))
25-
2624
mimaPreviousVersion := Some("2.1.0")
2725

2826
// set the prompt (for this build) to include the project id.

project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.13.18
1+
sbt.version=1.2.8

project/plugins.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "1.0.14")
1+
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.0.0")

0 commit comments

Comments
 (0)