Merge pull request #8 from sriraamas/fix-sonatype-publishing

upgrade sbt and also fix publishing hopefully
lucidsoftware · Jan 24, 2023 · 131aae3 · 131aae3
2 parents ed8515b + 228dddf
commit 131aae3
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/build.sbt b/build.sbt
@@ -15,7 +15,6 @@ inScope(Global)(Seq(
   organization := "com.lucidchart",
   organizationHomepage := Some(url("https://github.com/lucidsoftware")),
   organizationName := "Lucid Software",
-  PgpKeys.pgpPassphrase := Some(Array.emptyCharArray),
   resolvers += Resolver.typesafeRepo("releases"),
   scmInfo := Some(ScmInfo(
     url("https://github.com/lucidsoftware/opentracing-thread-context"),
@@ -24,3 +23,4 @@ inScope(Global)(Seq(
   startYear := Some(2017),
   version := sys.props.getOrElse("build.version", "0-SNAPSHOT")
 ))
+skip in publish := true
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.17
+sbt.version=1.3.3
diff --git a/project/build.sbt b/project/build.sbt
@@ -1,3 +1,3 @@
-addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
+addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.0")
 
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1")
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8")
diff --git a/publish.sh b/publish.sh
@@ -3,7 +3,7 @@ set -e
 
 echo "$PGP_SECRET" | base64 --decode | gpg --import
 if [[ $GITHUB_REF == refs/tags/* ]]; then
-  command="; publishSigned; sonatypeRelease"
+  command="; publishSigned; sonatypeBundleRelease"
 else
   command="publishSigned"
 fi

diff --git a/thread-context/build.sbt b/thread-context/build.sbt
@@ -6,3 +6,4 @@ libraryDependencies ++= Seq(
 )
 
 name := s"opentracing-${name.value}"
+publishTo := sonatypePublishToBundle.value
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,3 +6,4 @@ libraryDependencies ++= Seq(
		)

		name := s"opentracing-${name.value}"
		publishTo := sonatypePublishToBundle.value