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.9.21
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.10.0
Choose a head ref

Commits on May 16, 2023

  1. Update sbt-sonatype to 3.9.21 (#401)

    * Update sbt-sonatype to 3.9.21
    
    * Update release-drafter.yml
    
    ---------
    
    Co-authored-by: Taro L. Saito <leo@xerial.org>
    xerial-bot and xerial authored May 16, 2023
    Copy the full SHA
    ff0a5bc View commit details

Commits on May 23, 2023

  1. Copy the full SHA
    f1b41ad View commit details

Commits on May 24, 2023

  1. ci(Mergify): configuration update (#404)

    Signed-off-by: Taro L. Saito <leo@xerial.org>
    xerial authored May 24, 2023
    Copy the full SHA
    45bafe4 View commit details

Commits on May 25, 2023

  1. Copy the full SHA
    8aca37f View commit details

Commits on Jun 2, 2023

  1. Copy the full SHA
    2de594d View commit details

Commits on Jun 7, 2023

  1. Copy the full SHA
    28708fe View commit details

Commits on Jun 12, 2023

  1. Copy the full SHA
    089981b View commit details

Commits on Jun 15, 2023

  1. Copy the full SHA
    4228f88 View commit details

Commits on Jun 16, 2023

  1. Copy the full SHA
    23de6c2 View commit details

Commits on Jun 23, 2023

  1. Copy the full SHA
    3790ac0 View commit details

Commits on Jul 5, 2023

  1. Copy the full SHA
    69c5c6f View commit details
  2. Copy the full SHA
    28df1f8 View commit details

Commits on Jul 6, 2023

  1. Copy the full SHA
    0508b98 View commit details

Commits on Jul 13, 2023

  1. Copy the full SHA
    42e7b0b View commit details

Commits on Jul 17, 2023

  1. Copy the full SHA
    bd692ac View commit details

Commits on Jul 24, 2023

  1. Copy the full SHA
    05349ba View commit details

Commits on Jul 29, 2023

  1. Copy the full SHA
    ae1d8ac View commit details

Commits on Aug 4, 2023

  1. Copy the full SHA
    156580d View commit details

Commits on Aug 7, 2023

  1. Copy the full SHA
    a8eec5e View commit details

Commits on Aug 8, 2023

  1. Copy the full SHA
    17bb1d7 View commit details

Commits on Aug 17, 2023

  1. Copy the full SHA
    e170557 View commit details

Commits on Aug 23, 2023

  1. Copy the full SHA
    fd50362 View commit details

Commits on Aug 24, 2023

  1. Copy the full SHA
    aa16295 View commit details

Commits on Aug 25, 2023

  1. Copy the full SHA
    1463067 View commit details

Commits on Aug 29, 2023

  1. Copy the full SHA
    b41bd78 View commit details

Commits on Aug 30, 2023

  1. Copy the full SHA
    de43bb6 View commit details
  2. Copy the full SHA
    2f4a81a View commit details

Commits on Sep 5, 2023

  1. Copy the full SHA
    b4c1d44 View commit details
  2. Copy the full SHA
    579e770 View commit details

Commits on Sep 12, 2023

  1. Bump actions/checkout from 3 to 4 (#437)

    Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
    - [Release notes](https://github.com/actions/checkout/releases)
    - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
    - [Commits](actions/checkout@v3...v4)
    
    ---
    updated-dependencies:
    - dependency-name: actions/checkout
      dependency-type: direct:production
      update-type: version-update:semver-major
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Sep 12, 2023
    Copy the full SHA
    32d1b07 View commit details
  2. Copy the full SHA
    5a78508 View commit details

Commits on Sep 23, 2023

  1. Copy the full SHA
    af4482a View commit details

Commits on Sep 29, 2023

  1. Copy the full SHA
    eaff7b9 View commit details

Commits on Oct 24, 2023

  1. Copy the full SHA
    f6d76c8 View commit details
  2. Copy the full SHA
    dd40142 View commit details
  3. Copy the full SHA
    fcb200b View commit details

Commits on Oct 25, 2023

  1. Upgrade sbt to 1.9.7 (#444)

    xerial authored Oct 25, 2023
    Copy the full SHA
    ea04dcf View commit details
  2. Fix build.sbt (#445)

    xerial authored Oct 25, 2023
    Copy the full SHA
    e66c797 View commit details
  3. Update scalafmt-core to 3.7.15 (#447)

    * Update scalafmt-core to 3.7.15
    
    * Reformat with scalafmt 3.7.15
    
    Executed command: scalafmt --non-interactive
    
    * Add 'Reformat with scalafmt 3.7.15' to .git-blame-ignore-revs
    xerial-bot authored Oct 25, 2023
    Copy the full SHA
    847ebbc View commit details
  4. Copy the full SHA
    a6e99e3 View commit details

Commits on Oct 26, 2023

  1. Update .scala-steward.conf

    xerial authored Oct 26, 2023
    Copy the full SHA
    8ad342b View commit details

Commits on Oct 30, 2023

  1. Copy the full SHA
    dcbb780 View commit details
  2. Copy the full SHA
    e0bd85d View commit details

Commits on Nov 2, 2023

  1. Copy the full SHA
    2cf0529 View commit details

Commits on Nov 12, 2023

  1. Copy the full SHA
    bbd5882 View commit details

Commits on Nov 13, 2023

  1. Copy the full SHA
    f7538e9 View commit details
Showing with 84 additions and 28 deletions.
  1. +3 −0 .git-blame-ignore-revs
  2. +36 −0 .github/release-drafter.yml
  3. +3 −11 .github/workflows/test.yml
  4. +18 −0 .mergify.yml
  5. +2 −1 .scala-steward.conf
  6. +1 −1 .scalafmt.conf
  7. +6 −6 README.md
  8. +7 −1 build.sbt
  9. +1 −1 project/build.properties
  10. +3 −3 project/plugins.sbt
  11. +4 −4 sbt
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
# Scala Steward: Reformat with scalafmt 3.7.0
c3efd683f835329e057719c1f2ededac55589933

# Scala Steward: Reformat with scalafmt 3.7.15
99aee8ec7e98cd260d674cca8f05505133e43d73
36 changes: 36 additions & 0 deletions .github/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,39 @@
name-template: 'v$RESOLVED_VERSION'
tag-template: 'v$RESOLVED_VERSION'
categories:
- title: '🔥 Breaking Changes'
labels:
- 'breaking'
- title: '🚀 Features'
labels:
- 'feature'
- 'enhancement'
- title: '🐛 Bug Fixes'
labels:
- 'bug'
- title: '👋 Deprecated'
labels:
- 'deprecation'
- title: '🔗 Dependency Updates'
labels:
- 'library-update'
- 'dependencies'
- title: '🛠 Internal Updates'
labels:
- 'internal'
- 'kaizen'
- 'test-library-update'
- 'sbt-plugin-update'
- title: '📚 Docs'
labels:
- 'doc'
change-template: '- $TITLE @$AUTHOR (#$NUMBER)'

template: |
## What's Changed
$CHANGES
**Full Changelog**: https://github.com/$OWNER/$REPOSITORY/compare/$PREVIOUS_TAG...v$RESOLVED_VERSION
autolabeler:
- label: 'doc'
files:
14 changes: 3 additions & 11 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -2,31 +2,23 @@ name: CI

on:
pull_request:
paths:
- '**.scala'
- '**.sbt'
- '.github/workflows/**.yml'
push:
branches:
- master
paths:
- '**.scala'
- '**.sbt'
- '.github/workflows/**.yml'

jobs:
code_format:
name: Code Format
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: scalafmt
run: ./sbt scalafmtCheckAll
test_jdk11:
name: Test JDK11
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
@@ -37,7 +29,7 @@ jobs:
name: Test JDK17
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
18 changes: 18 additions & 0 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
pull_request_rules:
- name: Automatic merge Scala Steward PRs
conditions:
- author=xerial-bot
- check-success=Code Format
- check-success=Test JDK11
- check-success=Test JDK17
- or:
- title~=^Update airframe-
- title~=^Update sbt-airframe
- title~=^Update airspec
- title~=^Update scalafmt-core
- label=sbt-plugin-update
- label=test-library-update
- label=library-update
actions:
merge:
method: squash
3 changes: 2 additions & 1 deletion .scala-steward.conf
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
updates.ignore = [ { groupId = "org.scala-sbt" } ]
# sbt plugins must use Scala 2.12.x
updates.pin = [ { groupId = "org.scala-lang", artifactId="scala-library", version = "2.12." } ]
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 3.7.3
version = 3.7.15
project.layout = StandardConvention
runner.dialect = scala212
maxColumn = 120
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -7,12 +7,12 @@ A sbt plugin for publishing your project to the Maven central repository through
* Create GPG signed artifacts to a local staging repository.
* Make sure adding `publishTo := sonatypePublishToBundle.value` to your build.sbt
* `sonatypeBundleRelease` (New in sbt-sonatype 3.4)
* This command will prepare a new remote staging repository at Sonatype. If there are exisiting staging repositories that have the same description with `sonatypeSessionName` key, sbt-sonatype will discard them properly.
* This command will prepare a new remote staging repository at Sonatype. If there are existing staging repositories that have the same description with `sonatypeSessionName` key, sbt-sonatype will discard them properly.
* Then, it will upload the artifacts in the local staging folder to the remote staging repository. Uploading artifacts as a bundle is much faster than uploading each artifact to Sonatype. For example, thousands of files can be uploaded in several minutes with bundle upload.
* Finally, this command will perform the close and release steps at the Sonatype Nexus repository to verify the Maven central requirements.
* Finally, this command will perform the close and release steps at the Sonatype Nexus repository to meet the Maven central requirements.

After these steps, your project will be synchronized to the Maven central within ten minutes. No longer need to enter the web interface of
[Sonatype Nexus repository](http://oss.sonatype.org/) to performe these release steps.
[Sonatype Nexus repository](http://oss.sonatype.org/) to perform these release steps.


- [Release notes](ReleaseNotes.md)
@@ -109,7 +109,7 @@ credentials += Credentials("Sonatype Nexus Repository Manager",
sbt-sonatype is an auto-plugin, which will automatically configure your build. There are a few settings though that you need to define by yourself:

* `sonatypeProfileName`
* This is your Sonatype acount profile name, e.g. `org.xerial`. If you do not set this value, it will be the same with the `organization` value.
* This is your Sonatype account profile name, e.g. `org.xerial`. If you do not set this value, it will be the same with the `organization` value.
* `pomExtra`
* A fragment of Maven's pom.xml. You must define url, licenses, scm and developers tags in this XML to satisfy [Central Repository sync requirements](http://central.sonatype.org/pages/requirements.html).

@@ -166,7 +166,7 @@ Usually, we only need to run `sonatypeBundleRelease` command in sbt-sonatype:

### Individual Step Commands
* __sonatypePrepare__
* Drop the exising staging repositories (if exist) and create a new staging repository using `sonatypeSessionName` as a unique key.
* Drop the existing staging repositories (if exist) and create a new staging repository using `sonatypeSessionName` as a unique key.
* This will update `sonatypePublishTo` setting.
* For cross-build projects, make sure running this command only once at the beginning of the release process.
* Usually using sonatypeBundleUpload should be sufficient, but if you need to parallelize artifact uploads, run `sonatypeOpen` before each upload to reuse the already created stging repository.
@@ -184,7 +184,7 @@ Usually, we only need to run `sonatypeBundleRelease` command in sbt-sonatype:
* __sonatypeReleaseAll__ (sonatypeProfileName)?
* Close and promote all staging repositories (Useful for cross-building projects)

## Other Commmands
## Other Commands
* __sonatypeBundleClean__
* Clean a local bundle folder
* __sonatypeClean__
8 changes: 7 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
@@ -16,8 +16,14 @@

Global / onChangedBuildSource := ReloadOnSourceChanges

// Must use Scala 2.12.x for sbt plugins
val SCALA_VERSION = "2.12.18"

ThisBuild / dynverSeparator := "-"

// Set scala version for passing scala-steward run on JDK20
ThisBuild / scalaVersion := SCALA_VERSION

lazy val buildSettings: Seq[Setting[_]] = Seq(
organization := "org.xerial.sbt",
organizationName := "Xerial project",
@@ -35,7 +41,7 @@ lazy val buildSettings: Seq[Setting[_]] = Seq(
}
)

val AIRFRAME_VERSION = "23.5.3"
val AIRFRAME_VERSION = "23.11.3"

// Project modules
lazy val sbtSonatype =
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.8.2
sbt.version=1.9.7
6 changes: 3 additions & 3 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
val SONATYPE_VERSION = sys.env.getOrElse("SONATYPE_VERSION", "3.9.20")
val SONATYPE_VERSION = sys.env.getOrElse("SONATYPE_VERSION", "3.9.21")
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.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.0.1")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")

libraryDependencies += "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value
8 changes: 4 additions & 4 deletions sbt
Original file line number Diff line number Diff line change
@@ -34,11 +34,11 @@

set -o pipefail

declare -r sbt_release_version="1.6.2"
declare -r sbt_unreleased_version="1.6.2"
declare -r sbt_release_version="1.9.7"
declare -r sbt_unreleased_version="1.9.7"

declare -r latest_213="2.13.8"
declare -r latest_212="2.12.15"
declare -r latest_213="2.13.12"
declare -r latest_212="2.12.18"
declare -r latest_211="2.11.12"
declare -r latest_210="2.10.7"
declare -r latest_29="2.9.3"