Skip to content

Commit

Permalink
Merge pull request #11 from idio/dp-sbt-upgrade
Browse files Browse the repository at this point in the history
crosscompiling plugin
  • Loading branch information
dav009 authored Jan 21, 2020
2 parents 9047be1 + 4d6c5e2 commit 4001077
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
8 changes: 5 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -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"
)

Expand All @@ -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,
)
2 changes: 1 addition & 1 deletion project/bintray.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
addSbtPlugin("me.lessis" % "bintray-sbt" % "0.3.0")
addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.6")
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.13
sbt.version=1.2.8
2 changes: 1 addition & 1 deletion project/git.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.8.0")
addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.0")

0 comments on commit 4001077

Please sign in to comment.