Show sbt-sonatype version in the log (#366)

xerial · Jan 27, 2023 · 4475ab4 · 4475ab4
1 parent 507a241
commit 4475ab4
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 11 deletions.
diff --git a/build.sbt b/build.sbt
@@ -42,10 +42,12 @@ lazy val sbtSonatype =
   project
     .withId("sbt-sonatype")
     .in(file("."))
-    .enablePlugins(ScriptedPlugin)
+    .enablePlugins(ScriptedPlugin, BuildInfoPlugin)
     .settings(
       buildSettings,
       testFrameworks += new TestFramework("wvlet.airspec.Framework"),
+      buildInfoKeys    := Seq[BuildInfoKey](name, version, scalaVersion, sbtVersion),
+      buildInfoPackage := "org.xerial.sbt.sonatype",
       libraryDependencies ++= Seq(
         "org.sonatype.spice.zapper" % "spice-zapper"  % "1.3",
         "org.wvlet.airframe"       %% "airframe-http" % AIRFRAME_VERSION

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.3
+sbt.version=1.8.2
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,8 +1,9 @@
 val SONATYPE_VERSION = sys.env.getOrElse("SONATYPE_VERSION", "3.9.16")
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % SONATYPE_VERSION)
-addSbtPlugin("com.github.sbt" % "sbt-pgp"      % "2.2.1")
-addSbtPlugin("org.scalameta"  % "sbt-scalafmt" % "2.5.0")
-addSbtPlugin("com.dwijnand"   % "sbt-dynver"   % "4.1.1")
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype"  % SONATYPE_VERSION)
+addSbtPlugin("com.github.sbt" % "sbt-pgp"       % "2.2.1")
+addSbtPlugin("org.scalameta"  % "sbt-scalafmt"  % "2.5.0")
+addSbtPlugin("com.dwijnand"   % "sbt-dynver"    % "4.1.1")
+addSbtPlugin("com.eed3si9n"   % "sbt-buildinfo" % "0.11.0")
 
 libraryDependencies += "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value
 

diff --git a/src/main/scala/xerial/sbt/sonatype/SonatypeClient.scala b/src/main/scala/xerial/sbt/sonatype/SonatypeClient.scala
@@ -47,7 +47,7 @@ class SonatypeClient(
     credt
   }
 
-  private val base64Credentials = {
+  private lazy val base64Credentials = {
     val credt = directCredentials
     Base64.getEncoder.encodeToString(s"${credt.userName}:${credt.passwd}".getBytes(StandardCharsets.UTF_8))
   }
@@ -61,7 +61,7 @@ class SonatypeClient(
     new java.net.URL(repoUri).getPath
   }
 
-  private val clientConfig = {
+  private[sonatype] val clientConfig = {
     Http.client
       // Disables the circuit breaker, because Sonatype can be down for a long time https://github.com/xerial/sbt-sonatype/issues/363
       .noCircuitBreaker
@@ -84,7 +84,7 @@ class SonatypeClient(
       }
   }
 
-  private val httpClient = clientConfig.newSyncClient(repoUri)
+  private[sonatype] val httpClient = clientConfig.newSyncClient(repoUri)
 
   // Create stage is not idempotent, so we just need to wait for a long time without retry
   private val httpClientForCreateStage =

diff --git a/src/main/scala/xerial/sbt/sonatype/SonatypeService.scala b/src/main/scala/xerial/sbt/sonatype/SonatypeService.scala
@@ -1,11 +1,12 @@
 package xerial.sbt.sonatype
 
-import java.io.File
+import org.xerial.sbt.sonatype.BuildInfo
 
+import java.io.File
 import sbt.io.IO
 import wvlet.airframe.codec.MessageCodecFactory
 import wvlet.log.LogSupport
-import xerial.sbt.sonatype.SonatypeClient._
+import xerial.sbt.sonatype.SonatypeClient.*
 import xerial.sbt.sonatype.SonatypeException.{MISSING_PROFILE, MISSING_STAGING_PROFILE, MULTIPLE_TARGETS, UNKNOWN_STAGE}
 
 import scala.util.Try
@@ -23,6 +24,7 @@ class SonatypeService(
 
   def this(sonatypClient: SonatypeClient, profileName: String) = this(sonatypClient, profileName, None)
 
+  info(s"sbt-sonatype version: ${BuildInfo.version}")
   info(s"sonatypeRepository  : ${sonatypClient.repoUri}")
   info(s"sonatypeProfileName : ${profileName}")
 

diff --git a/src/test/scala/xerial/sbt/sonatype/SonatypeClientTest.scala b/src/test/scala/xerial/sbt/sonatype/SonatypeClientTest.scala
@@ -23,4 +23,9 @@ class SonatypeClientTest extends AirSpec {
 
     profile shouldBe unpacked
   }
+
+//  test("create client") {
+//    val client = new SonatypeClient("https://httpbin.org/", Seq.empty, "")
+//    client.httpClient.readAs[Json](Http.GET("/status/500"))
+//  }
 }