From 4501b49d1ea0abfd5b2d1a5361f6386b36774e86 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sun, 17 Sep 2023 13:09:39 -0400 Subject: [PATCH 1/2] Use sbt 1.9.6 --- build.sbt | 7 ++++++- project/build.properties | 2 +- project/plugins.sbt | 3 ++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index ff62efe8..4c0198be 100644 --- a/build.sbt +++ b/build.sbt @@ -1,4 +1,9 @@ -ThisBuild / version := "2.0.1-SNAPSHOT" +ThisBuild / version := { + val old = (ThisBuild / version).value + if ((ThisBuild / isSnapshot).value) "2.1.2-SNAPSHOT" + else old +} + ThisBuild / organization := "com.eed3si9n" def scala212 = "2.12.8" diff --git a/project/build.properties b/project/build.properties index 46e43a97..27430827 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.8.2 +sbt.version=1.9.6 diff --git a/project/plugins.sbt b/project/plugins.sbt index 2196e6bc..20e36329 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,3 +1,4 @@ -addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2") +addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.0.1") +addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1") addSbtPlugin("com.eed3si9n" % "sbt-nocomma" % "0.1.1") addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.5.1") From b69659e6ec2ae75d773e3221de53fb4debf6908e Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sun, 17 Sep 2023 13:10:23 -0400 Subject: [PATCH 2/2] jarjar abrams 1.8.3 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 4c0198be..050c73b5 100644 --- a/build.sbt +++ b/build.sbt @@ -17,7 +17,7 @@ lazy val root = (project in file(".")) name := "sbt-assembly" scalacOptions := Seq("-deprecation", "-unchecked", "-Dscalac.patmat.analysisBudget=1024", "-Xfuture") libraryDependencies ++= Seq( - "com.eed3si9n.jarjarabrams" %% "jarjar-abrams-core" % "1.8.2", + "com.eed3si9n.jarjarabrams" %% "jarjar-abrams-core" % "1.8.3", "org.scalatest" %% "scalatest" % "3.1.1" % Test, ) (pluginCrossBuild / sbtVersion) := {