From b9b15a1b98e132ec699445f3a6ff21abcbe43a45 Mon Sep 17 00:00:00 2001 From: David Przybilla Date: Mon, 20 Jan 2020 15:02:45 +0900 Subject: [PATCH 1/2] crosscompiling --- build.sbt | 6 ++++-- project/bintray.sbt | 2 +- project/build.properties | 2 +- project/git.sbt | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/build.sbt b/build.sbt index 0340052..b66c6b5 100644 --- a/build.sbt +++ b/build.sbt @@ -12,12 +12,14 @@ lazy val root = (project in file(".")). description := "sbt assembly plugin merge strategy for log4j2 plugins", licenses := Seq("MIT License" -> url("https://github.com/idio/sbt-assembly-log4j2/blob/master/LICENSE")), scalacOptions := Seq("-deprecation", "-unchecked"), - addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.4"), + addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.10"), libraryDependencies ++= Seq( "org.apache.logging.log4j" % "log4j-core" % "2.8.1" ), + crossSbtVersions := Seq("0.13.16", "1.2.8"), + crossScalaVersions := Seq("2.11.8", "2.12.10"), publishArtifact in (Compile, packageBin) := true, publishArtifact in (Test, packageBin) := false, publishArtifact in (Compile, packageDoc) := false, - publishArtifact in (Compile, packageSrc) := true + publishArtifact in (Compile, packageSrc) := true, ) diff --git a/project/bintray.sbt b/project/bintray.sbt index 8dd913f..93d2ef0 100644 --- a/project/bintray.sbt +++ b/project/bintray.sbt @@ -1 +1 @@ -addSbtPlugin("me.lessis" % "bintray-sbt" % "0.3.0") +addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.6") diff --git a/project/build.properties b/project/build.properties index 27e88aa..c0bab04 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.13 +sbt.version=1.2.8 diff --git a/project/git.sbt b/project/git.sbt index 40c1b4c..23d5057 100644 --- a/project/git.sbt +++ b/project/git.sbt @@ -1 +1 @@ -addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.8.0") +addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.0") From 4d6c5e24004894fe3c507545ae1e3453b6defd42 Mon Sep 17 00:00:00 2001 From: David Przybilla Date: Tue, 21 Jan 2020 11:21:37 +0900 Subject: [PATCH 2/2] bumping version --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index b66c6b5..faec51a 100644 --- a/build.sbt +++ b/build.sbt @@ -1,5 +1,5 @@ lazy val commonSettings: Seq[Setting[_]] = Seq( - git.baseVersion in ThisBuild := "1.0.0", + git.baseVersion in ThisBuild := "2.0.0", organization in ThisBuild := "org.idio" )