Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: xerial/sbt-sonatype
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v3.11.1
Choose a base ref
...
head repository: xerial/sbt-sonatype
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v3.11.2
Choose a head ref
  • 2 commits
  • 4 files changed
  • 2 contributors

Commits on Jul 26, 2024

  1. Update sbt-sonatype to 3.11.1 (#503)

    xerial-bot authored Jul 26, 2024

    Verified

    This commit was signed with the committer’s verified signature.
    joyeecheung Joyee Cheung
    Copy the full SHA
    baacc3f View commit details

Commits on Aug 10, 2024

  1. Change sonatype central client dependency to use upickle instead of z…

    …io-json (#504)
    
    * Change .gitignore to facilitate vscode and metals usage
    
    * Change sonatype central client dependency to remove zio-json dependency
    
    Changes zio-json dependency to upickle
    KacperFKorban authored Aug 10, 2024

    Verified

    This commit was signed with the committer’s verified signature.
    joyeecheung Joyee Cheung
    Copy the full SHA
    c945ea0 View commit details
Showing with 11 additions and 8 deletions.
  1. +4 −0 .gitignore
  2. +4 −5 build.sbt
  3. +1 −1 project/plugins.sbt
  4. +2 −2 src/main/scala/xerial/sbt/sonatype/SonatypeCentralClient.scala
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -16,6 +16,10 @@ project/plugins/project/
.scala_dependencies
.idea*
.bsp
.vscode/
.bloop/
.metals/
metals.sbt

src/sbt-test/*/*/bin/.lib

9 changes: 4 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -22,9 +22,8 @@ val versions = new {
val scala = "2.12.19" // Must use Scala 2.12.x for sbt plugins
val airframe = "24.7.1"
val sonatypeZapperClient = "1.3"
val sttp = "4.0.0-M10"
val zioJson = "0.6.2"
val sonatypeClient = "0.1.0"
val sttp = "4.0.0-M16"
val sonatypeClient = "0.3.0"
}

ThisBuild / dynverSeparator := "-"
@@ -70,8 +69,8 @@ lazy val sbtSonatype =
excludeAll (ExclusionRule("org.scala-lang.modules", "scala-parser-combinators_2.12")),
"org.wvlet.airframe" %% "airspec" % versions.airframe % Test,
"com.lumidion" %% "sonatype-central-client-sttp-core" % versions.sonatypeClient,
"com.lumidion" %% "sonatype-central-client-zio-json" % versions.sonatypeClient,
"com.lumidion" %% "sonatype-central-client-upickle" % versions.sonatypeClient,
"com.softwaremill.sttp.client4" %% "slf4j-backend" % versions.sttp,
"com.softwaremill.sttp.client4" %% "zio-json" % versions.sttp
"com.softwaremill.sttp.client4" %% "upickle" % versions.sttp
)
)
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
val SONATYPE_VERSION = sys.env.getOrElse("SONATYPE_VERSION", "3.11.0")
val SONATYPE_VERSION = sys.env.getOrElse("SONATYPE_VERSION", "3.11.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.2")
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ import com.lumidion.sonatype.central.client.core.{
}
import com.lumidion.sonatype.central.client.core.DeploymentState.PUBLISHED
import com.lumidion.sonatype.central.client.sttp.core.SyncSonatypeClient
import com.lumidion.sonatype.central.client.zio.json.decoders.*
import com.lumidion.sonatype.central.client.upickle.decoders.*
import java.io.File
import sbt.librarymanagement.ivy.Credentials
import scala.math.pow
@@ -18,7 +18,7 @@ import sttp.client4.{HttpError, ResponseException}
import sttp.client4.httpurlconnection.HttpURLConnectionBackend
import sttp.client4.logging.slf4j.Slf4jLoggingBackend
import sttp.client4.logging.LoggingOptions
import sttp.client4.ziojson.asJson
import sttp.client4.upicklejson.default.*
import sttp.model.StatusCode
import wvlet.log.LogSupport
import xerial.sbt.sonatype.utils.Extensions.*