Skip to content

Commit 83a1892

Browse files
xerialclaude
xerial
and
claude
authored
Migrate from sbt-sonatype to built-in sonaRelease (msgpack#898)
* Update sbt-dynver to 5.1.1 Fixes msgpack#892 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]> * Migrate from sbt-sonatype to built-in sonaRelease - Remove sbt-sonatype plugin dependency from project/plugins.sbt - Move publishing metadata from sonatype.sbt to build.sbt - Update publishTo configuration to use direct Sonatype URLs - Use built-in sbt functionality instead of plugin for Sonatype publishing 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]> * Update to sbt 1.11.3 and fix publishTo configuration - Update sbt version to 1.11.3 for built-in localStaging support - Fix publishTo setting to use correct Sonatype Central URLs - Use localStaging.value for releases and central-snapshots for snapshots 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]> * Format code with scalafmt and fix scalafmt configuration - Fix .scalafmt.conf with version 3.9.8 and scala213 dialect - Format Scala test code according to project style - Maintain 180 character line limit and alignment style 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]> * Update GitHub Actions workflows for Sonatype Central migration - Fix secret names to use SONATYPE_USERNAME and SONATYPE_PASSWORD - Remove deprecated sonatypeBundleRelease command from release workflow - Consolidate release steps to use publishSigned with correct environment - Update both release.yml and snapshot.yml workflows 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]> * Use sonaRelease command in release workflow - Replace publishSigned with sonaRelease for proper release flow - sonaRelease handles both publishing and release to Central Portal 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]> * Add publishSigned step back to release workflow - First step: publishSigned to stage signed artifacts - Second step: sonaRelease to release staged artifacts to Central - Both steps needed for proper release flow 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]> * Revert to original workflow structure with updated secrets - Restore "Build bundle" and "Release to Sonatype" step names - Keep publishSigned in Build bundle step - Use sonaRelease in Release step with correct secret names - Maintain original workflow structure with modern functionality 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]> --------- Co-authored-by: Claude <[email protected]>
1 parent 5c57bcf commit 83a1892

18 files changed

+62
-67
lines changed

‎.github/workflows/release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@ jobs:
3333
./sbt publishSigned
3434
- name: Release to Sonatype
3535
env:
36-
SONATYPE_USERNAME: '${{ secrets.SONATYPE_USER }}'
37-
SONATYPE_PASSWORD: '${{ secrets.SONATYPE_PASS }}'
38-
run: ./sbt sonatypeBundleRelease
36+
SONATYPE_USERNAME: '${{ secrets.SONATYPE_USERNAME }}'
37+
SONATYPE_PASSWORD: '${{ secrets.SONATYPE_PASSWORD }}'
38+
run: ./sbt sonaRelease

‎.github/workflows/snapshot.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ jobs:
2727
distribution: adopt
2828
- name: Publish snapshots
2929
env:
30-
SONATYPE_USERNAME: '${{ secrets.SONATYPE_USER }}'
31-
SONATYPE_PASSWORD: '${{ secrets.SONATYPE_PASS }}'
30+
SONATYPE_USERNAME: '${{ secrets.SONATYPE_USERNAME }}'
31+
SONATYPE_PASSWORD: '${{ secrets.SONATYPE_PASSWORD }}'
3232
run: ./sbt publish

‎.scalafmt.conf‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
version = 3.9.8
2+
runner.dialect = scala213
13
maxColumn = 180
24
style = defaultWithAlign
35
optIn.breaksInsideChains = true

‎build.sbt‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,24 @@ ThisBuild / dynverSonatypeSnapshots := true
1212
// Use coursier friendly version separator
1313
ThisBuild / dynverSeparator := "-"
1414

15+
// Publishing metadata
16+
ThisBuild / homepage := Some(url("https://msgpack.org/"))
17+
ThisBuild / licenses := Seq("Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0.txt"))
18+
ThisBuild / scmInfo := Some(
19+
ScmInfo(
20+
url("https://github.com/msgpack/msgpack-java"),
21+
"scm:[email protected]:msgpack/msgpack-java.git"
22+
)
23+
)
24+
ThisBuild / developers := List(
25+
Developer(id = "frsyuki", name = "Sadayuki Furuhashi", email = "[email protected]", url = url("https://github.com/frsyuki")),
26+
Developer(id = "muga", name = "Muga Nishizawa", email = "[email protected]", url = url("https://github.com/muga")),
27+
Developer(id = "oza", name = "Tsuyoshi Ozawa", email = "[email protected]", url = url("https://github.com/oza")),
28+
Developer(id = "komamitsu", name = "Mitsunori Komatsu", email = "[email protected]", url = url("https://github.com/komamitsu")),
29+
Developer(id = "xerial", name = "Taro L. Saito", email = "[email protected]", url = url("https://github.com/xerial"))
30+
)
31+
32+
1533
val buildSettings = Seq[Setting[_]](
1634
organization := "org.msgpack",
1735
organizationName := "MessagePack",
@@ -38,7 +56,11 @@ val buildSettings = Seq[Setting[_]](
3856
}
3957
},
4058
// Add sonatype repository settings
41-
publishTo := sonatypePublishToBundle.value,
59+
publishTo := {
60+
val centralSnapshots = "https://central.sonatype.com/repository/maven-snapshots/"
61+
if (isSnapshot.value) Some("central-snapshots" at centralSnapshots)
62+
else localStaging.value
63+
},
4264
// Style check config: (sbt-jchekcstyle)
4365
jcheckStyleConfig := "facebook",
4466
// Run jcheckstyle both for main and test codes

‎msgpack-core/src/test/scala/org/msgpack/core/InvalidDataReadTest.scala‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ package org.msgpack.core
33
import org.msgpack.core.MessagePackSpec.createMessagePackData
44
import wvlet.airspec.AirSpec
55

6-
/**
7-
*/
6+
/** */
87
class InvalidDataReadTest extends AirSpec {
98

109
test("Reading long EXT32") {

‎msgpack-core/src/test/scala/org/msgpack/core/MessageFormatTest.scala‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ import wvlet.airspec.spi.AirSpecException
2222

2323
import scala.util.Random
2424

25-
/**
26-
* Created on 2014/05/07.
25+
/** Created on 2014/05/07.
2726
*/
2827
class MessageFormatTest extends AirSpec with Benchmark {
2928
test("MessageFormat") {

‎msgpack-core/src/test/scala/org/msgpack/core/MessagePackSpec.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import wvlet.log.io.{TimeReport, Timer}
2121
import java.io.ByteArrayOutputStream
2222

2323
object MessagePackSpec {
24-
def toHex(arr: Array[Byte]) = arr.map(x => f"$x%02x").mkString(" ")
24+
def toHex(arr: Array[Byte]) = arr.map(x => f"$x%02x").mkString(" ")
2525
def createMessagePackData(f: MessagePacker => Unit): Array[Byte] = {
2626
val b = new ByteArrayOutputStream()
2727
val packer = MessagePack.newDefaultPacker(b)

‎msgpack-core/src/test/scala/org/msgpack/core/MessagePackTest.scala‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ import java.nio.charset.{CodingErrorAction, UnmappableCharacterException}
3030
import java.time.Instant
3131
import scala.util.Random
3232

33-
/**
34-
* Created on 2014/05/07.
33+
/** Created on 2014/05/07.
3534
*/
3635
class MessagePackTest extends AirSpec with PropertyCheck with Benchmark {
3736

@@ -396,7 +395,7 @@ class MessagePackTest extends AirSpec with PropertyCheck with Benchmark {
396395
test("report errors when packing/unpacking malformed strings") {
397396
pending("We need to produce malformed utf-8 strings in Java 8")
398397
// Create 100 malformed UTF8 Strings
399-
val r = new Random(0)
398+
val r = new Random(0)
400399
val malformedStrings = Iterator
401400
.continually {
402401
val b = new Array[Byte](10)
@@ -433,7 +432,7 @@ class MessagePackTest extends AirSpec with PropertyCheck with Benchmark {
433432
test("report errors when packing/unpacking strings that contain unmappable characters") {
434433

435434
val unmappable = Array[Byte](0xfc.toByte, 0x0a.toByte)
436-
//val unmappableChar = Array[Char](new Character(0xfc0a).toChar)
435+
// val unmappableChar = Array[Char](new Character(0xfc0a).toChar)
437436

438437
// Report error on unmappable character
439438
val unpackerConfig = new UnpackerConfig()
@@ -534,10 +533,9 @@ class MessagePackTest extends AirSpec with PropertyCheck with Benchmark {
534533
m,
535534
{ packer =>
536535
packer.packMapHeader(v.length)
537-
m.map {
538-
case (k: Int, v: String) =>
539-
packer.packInt(k)
540-
packer.packString(v)
536+
m.map { case (k: Int, v: String) =>
537+
packer.packInt(k)
538+
packer.packString(v)
541539
}
542540
},
543541
{ unpacker =>
@@ -666,13 +664,14 @@ class MessagePackTest extends AirSpec with PropertyCheck with Benchmark {
666664
val posLong = Gen.chooseNum[Long](-31557014167219200L, 31556889864403199L)
667665
forAll(posLong) { (millis: Long) =>
668666
val v = Instant.ofEpochMilli(millis)
669-
check(v, { _.packTimestamp(millis) },
667+
check(
668+
v,
669+
{ _.packTimestamp(millis) },
670670
{ u =>
671671
val extHeader = u.unpackExtensionTypeHeader()
672-
if(extHeader.isTimestampType) {
672+
if (extHeader.isTimestampType) {
673673
u.unpackTimestamp(extHeader)
674-
}
675-
else {
674+
} else {
676675
fail("Cannot reach here")
677676
}
678677
}

‎msgpack-core/src/test/scala/org/msgpack/core/MessagePackerTest.scala‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ import wvlet.log.io.IOUtil.withResource
2424
import java.io.{ByteArrayOutputStream, File, FileInputStream, FileOutputStream}
2525
import scala.util.Random
2626

27-
/**
28-
*/
27+
/** */
2928
class MessagePackerTest extends AirSpec with Benchmark {
3029

3130
private def verifyIntSeq(answer: Array[Int], packed: Array[Byte]): Unit = {
@@ -141,8 +140,8 @@ class MessagePackerTest extends AirSpec with Benchmark {
141140
32 -> 31,
142141
34 -> 32
143142
)
144-
testCases.foreach {
145-
case (bufferSize, stringSize) => test(bufferSize, stringSize)
143+
testCases.foreach { case (bufferSize, stringSize) =>
144+
test(bufferSize, stringSize)
146145
}
147146
}
148147

@@ -234,7 +233,7 @@ class MessagePackerTest extends AirSpec with Benchmark {
234233
}
235234

236235
test("compute totalWrittenBytes") {
237-
val out = new ByteArrayOutputStream
236+
val out = new ByteArrayOutputStream
238237
val packerTotalWrittenBytes =
239238
withResource(MessagePack.newDefaultPacker(out)) { packer =>
240239
packer
@@ -255,7 +254,7 @@ class MessagePackerTest extends AirSpec with Benchmark {
255254
test("support read-only buffer") {
256255
val payload = Array[Byte](1)
257256
val out = new ByteArrayOutputStream()
258-
val packer = MessagePack
257+
val packer = MessagePack
259258
.newDefaultPacker(out)
260259
.packBinaryHeader(1)
261260
.writePayload(payload)
@@ -299,14 +298,14 @@ class MessagePackerTest extends AirSpec with Benchmark {
299298

300299
test("write raw binary") {
301300
val packer = new MessagePack.PackerConfig().newBufferPacker()
302-
val msg =
301+
val msg =
303302
Array[Byte](-127, -92, 116, 121, 112, 101, -92, 112, 105, 110, 103)
304303
packer.writePayload(msg)
305304
}
306305

307306
test("append raw binary") {
308307
val packer = new MessagePack.PackerConfig().newBufferPacker()
309-
val msg =
308+
val msg =
310309
Array[Byte](-127, -92, 116, 121, 112, 101, -92, 112, 105, 110, 103)
311310
packer.addPayload(msg)
312311
}

‎msgpack-core/src/test/scala/org/msgpack/core/MessageUnpackerTest.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import scala.util.Random
3030

3131
object MessageUnpackerTest {
3232
class SplitMessageBufferInput(array: Array[Array[Byte]]) extends MessageBufferInput {
33-
var cursor = 0
33+
var cursor = 0
3434
override def next(): MessageBuffer = {
3535
if (cursor < array.length) {
3636
val a = array(cursor)
@@ -49,7 +49,7 @@ import org.msgpack.core.MessageUnpackerTest._
4949

5050
class MessageUnpackerTest extends AirSpec with Benchmark {
5151

52-
private val universal = MessageBuffer.allocate(0).isInstanceOf[MessageBufferU]
52+
private val universal = MessageBuffer.allocate(0).isInstanceOf[MessageBufferU]
5353
private def testData: Array[Byte] = {
5454
val out = new ByteArrayOutputStream()
5555
val packer = MessagePack.newDefaultPacker(out)

0 commit comments

Comments
 (0)