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.0
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.1
Choose a head ref
  • 6 commits
  • 8 files changed
  • 2 contributors

Commits on Jun 27, 2024

  1. Update sbt-sonatype to 3.11.0 (#494)

    xerial-bot authored Jun 27, 2024

    Verified

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

Commits on Jul 2, 2024

  1. Update airframe-http to 24.7.0 (#495)

    xerial-bot authored Jul 2, 2024

    Verified

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

Commits on Jul 8, 2024

  1. Update sbt, scripted-plugin to 1.10.1 (#496)

    xerial-bot authored Jul 8, 2024
    Copy the full SHA
    8b7a983 View commit details

Commits on Jul 17, 2024

  1. Update airframe-http, airspec to 24.7.1 (#498)

    xerial-bot authored Jul 17, 2024

    Verified

    This commit was signed with the committer’s verified signature.
    aduh95 Antoine du Hamel
    Copy the full SHA
    110e3bf View commit details

Commits on Jul 25, 2024

  1. Update scalafmt-core to 3.8.3 (#500)

    xerial-bot authored Jul 25, 2024

    Verified

    This commit was signed with the committer’s verified signature.
    aduh95 Antoine du Hamel
    Copy the full SHA
    5abf84c View commit details

Commits on Jul 26, 2024

  1. Fix computation of sonatypeDefaultResolver for Sonatype Central (#501)

    kubukoz authored Jul 26, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    8f8b370 View commit details
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 3.8.2
version = 3.8.3
project.layout = StandardConvention
runner.dialect = scala212
maxColumn = 120
3 changes: 1 addition & 2 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ Global / onChangedBuildSource := ReloadOnSourceChanges

val versions = new {
val scala = "2.12.19" // Must use Scala 2.12.x for sbt plugins
val airframe = "24.3.0"
val airframe = "24.7.1"
val sonatypeZapperClient = "1.3"
val sttp = "4.0.0-M10"
val zioJson = "0.6.2"
@@ -49,7 +49,6 @@ lazy val buildSettings: Seq[Setting[_]] = Seq(
}
)


val AIRFRAME_VERSION = "24.6.1"

// Project modules
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.0
sbt.version=1.10.1
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.10.0")
val SONATYPE_VERSION = sys.env.getOrElse("SONATYPE_VERSION", "3.11.0")
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")
2 changes: 1 addition & 1 deletion src/main/scala/xerial/sbt/Sonatype.scala
Original file line number Diff line number Diff line change
@@ -141,7 +141,7 @@ object Sonatype extends AutoPlugin with LogSupport {
},
sonatypeDefaultResolver := {
if (sonatypeCredentialHost.value == SonatypeCentralClient.host) {
Resolver.url(s"https://$sonatypeCredentialHost")
Resolver.url(s"https://${sonatypeCredentialHost.value}")
} else {
val profileM = sonatypeTargetRepositoryProfile.?.value
val repository = sonatypeRepository.value
8 changes: 8 additions & 0 deletions src/sbt-test/sbt-sonatype/sonatype-central-host/build.sbt
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
sonatypeCredentialHost := xerial.sbt.sonatype.SonatypeCentralClient.host

val checkSonatypeDefaultResolver = taskKey[Unit]("Check if the default resolver is Sonatype")
checkSonatypeDefaultResolver := {
val actual = sonatypeDefaultResolver.value
val expected = Resolver.url("https://central.sonatype.com")
require(actual == expected, s"expected $actual to be $expected")
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
val pluginVersion = System.getProperty("plugin.version")
if (pluginVersion == null)
throw new RuntimeException("""|The system property 'plugin.version' is not defined.
|Specify this property using the scriptedLaunchOpts -D.""".stripMargin)
else
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % pluginVersion)
}
1 change: 1 addition & 0 deletions src/sbt-test/sbt-sonatype/sonatype-central-host/test
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
> checkSonatypeDefaultResolver