From 5af5cf38d4a5bee4c1442b6e0f294ba86c7c9322 Mon Sep 17 00:00:00 2001 From: Karel Maesen Date: Fri, 14 Jul 2023 14:05:17 +0200 Subject: [PATCH] Zet release versie Dit wordt dan versie 2.0 --- build.sbt | 16 ++++++---------- project/plugins.sbt | 2 +- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/build.sbt b/build.sbt index 69c5dc5..18e6c5a 100644 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,6 @@ val Organization = "be.wegenenverkeer" -val Version = "2.0-RC2" +val Version = "2.0" val ScalaVersion = "2.13.0" @@ -165,25 +165,21 @@ lazy val pomInfo = https://github.com/WegenenVerkeer/atomium val publishingCredentials = (for { username <- Option(System.getenv().get("SONATYPE_USERNAME")) password <- Option(System.getenv().get("SONATYPE_PASSWORD")) -} yield +} yield { + println(s"username: $username; passwd: $password") Seq( Credentials("Sonatype Nexus Repository Manager", "oss.sonatype.org", username, - password))).getOrElse(Seq()) + password)) +}).getOrElse(Seq()) val publishSettings = Seq( publishMavenStyle := true, pomIncludeRepository := { _ => false }, - publishTo := { - val nexus = "https://oss.sonatype.org/" - if (isSnapshot.value) - Some("snapshots" at nexus + "content/repositories/snapshots") - else - Some("releases" at nexus + "service/local/staging/deploy/maven2") - }, + publishTo := sonatypePublishToBundle.value, pomExtra := pomInfo, credentials ++= publishingCredentials ) diff --git a/project/plugins.sbt b/project/plugins.sbt index a740832..3fec4a1 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -7,4 +7,4 @@ addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "1.5.1") // supports release in maven central addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.4") -addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1") +addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")