Skip to content

Commit 3640719

Browse files
committed
Bump jsoniter-scala to 2.38.2 (was 2.13.5.2)
1 parent 29dac88 commit 3640719

File tree

3 files changed

+16
-23
lines changed

3 files changed

+16
-23
lines changed

.scala-steward.conf

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
updates.ignore = [
2-
{ groupId = "com.github.plokhotnyuk.jsoniter-scala", artifactId="jsoniter-scala-macros", version="2.13.5.2" },
3-
{ groupId = "com.github.plokhotnyuk.jsoniter-scala", artifactId="jsoniter-scala-core", version="2.13.5.2" }
4-
]
51
postUpdateHooks = [{
62
command = ["./mill", "-i", "generate-reference-doc[].run"],
73
commitMessage = "Generate the reference doc"

modules/integration/src/test/scala/scala/cli/integration/ExportJsonTestDefinitions.scala

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,8 @@ abstract class ExportJsonTestDefinitions extends ScalaCliSuite with TestScalaVer
5454
|"scalaVersion":"${Constants.scala3Next}",
5555
|"platform":"JVM",
5656
|"jvmVersion":"adopt:11",
57-
|"scopes": [[
58-
| "main",
59-
| {
57+
|"scopes": {
58+
| "main": {
6059
| "sources": ["${withEscapedBackslashes(root / "Main.scala")}"],
6160
| "dependencies": [
6261
| {
@@ -74,7 +73,7 @@ abstract class ExportJsonTestDefinitions extends ScalaCliSuite with TestScalaVer
7473
| "ivy:file:.../.ivy2/local/"
7574
| ]
7675
| }
77-
|]]
76+
|}
7877
|,"scalaCliVersion":"1.1.1-SNAPSHOT"
7978
|}
8079
|""".replaceAll("\\s|\\|", ""))
@@ -112,9 +111,8 @@ abstract class ExportJsonTestDefinitions extends ScalaCliSuite with TestScalaVer
112111
|"scalaVersion":"3.2.2",
113112
|"platform":"Native",
114113
|"scalaNativeVersion":"${Constants.scalaNativeVersion}",
115-
|"scopes": [[
116-
| "main",
117-
| {
114+
|"scopes": {
115+
| "main": {
118116
| "sources": ["${withEscapedBackslashes(root / "Main.scala")}"],
119117
| "scalacOptions":["-Xasync"],
120118
| "scalaCompilerPlugins": [
@@ -142,9 +140,8 @@ abstract class ExportJsonTestDefinitions extends ScalaCliSuite with TestScalaVer
142140
| "ivy:file:.../local-repo/...",
143141
| "ivy:file:.../.ivy2/local/"
144142
| ]
145-
| }], [
146-
| "test",
147-
| {
143+
| },
144+
| "test": {
148145
| "sources":["${withEscapedBackslashes(root / "unit.test.scala")}"],
149146
| "scalacOptions":["-Xasync"],
150147
| "scalaCompilerPlugins": [
@@ -175,8 +172,8 @@ abstract class ExportJsonTestDefinitions extends ScalaCliSuite with TestScalaVer
175172
| ],
176173
| "resourceDirs":["${withEscapedBackslashes(root / "resources")}"],
177174
| "customJarsDecls":["${withEscapedBackslashes(root / "TEST.jar")}"]
178-
| }
179-
|]]
175+
| }
176+
|}
180177
|,"scalaCliVersion":"1.1.1-SNAPSHOT"
181178
|}
182179
|""".replaceAll("\\s|\\|", ""))
@@ -223,9 +220,8 @@ abstract class ExportJsonTestDefinitions extends ScalaCliSuite with TestScalaVer
223220
|"platform": "JS",
224221
|"scalaJsVersion": "${Constants.scalaJsVersion}",
225222
|"jsEsVersion":"es2015",
226-
|"scopes": [[
227-
| "main",
228-
| {
223+
|"scopes": {
224+
| "main": {
229225
| "sources": ["${withEscapedBackslashes(root / "Main.scala")}"],
230226
| "scalacOptions": ["-Xasync"],
231227
| "scalaCompilerPlugins": [
@@ -254,7 +250,8 @@ abstract class ExportJsonTestDefinitions extends ScalaCliSuite with TestScalaVer
254250
| "ivy:file:.../.ivy2/local/"
255251
| ]
256252
| }
257-
|]],"scalaCliVersion":"1.1.1-SNAPSHOT"
253+
|},
254+
|"scalaCliVersion":"1.1.1-SNAPSHOT"
258255
|}
259256
|""".replaceAll("\\s|\\|", ""))
260257

project/deps/package.mill.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ object Deps {
123123
def coursierCli = coursierDefault
124124
def coursierPublish = "0.4.3"
125125
def jmh = "1.37"
126-
def jsoniterScalaJava8 = "2.13.5.2"
126+
def jsoniterScala = "2.38.3"
127127
def jsoup = "1.21.2"
128128
def scalaMeta = "4.13.9"
129129
def scalafmt = "3.9.10"
@@ -198,9 +198,9 @@ object Deps {
198198
def jmhCore = mvn"org.openjdk.jmh:jmh-core:${Versions.jmh}"
199199
def jniUtils = mvn"io.get-coursier.jniutils:windows-jni-utils:0.3.3"
200200
def jsoniterCore =
201-
mvn"com.github.plokhotnyuk.jsoniter-scala::jsoniter-scala-core:${Versions.jsoniterScalaJava8}"
201+
mvn"com.github.plokhotnyuk.jsoniter-scala::jsoniter-scala-core:${Versions.jsoniterScala}"
202202
def jsoniterMacros =
203-
mvn"com.github.plokhotnyuk.jsoniter-scala::jsoniter-scala-macros:${Versions.jsoniterScalaJava8}"
203+
mvn"com.github.plokhotnyuk.jsoniter-scala::jsoniter-scala-macros:${Versions.jsoniterScala}"
204204
def jsoup = mvn"org.jsoup:jsoup:${Versions.jsoup}"
205205
def libsodiumjni = mvn"org.virtuslab.scala-cli:libsodiumjni:0.0.4"
206206
def metaconfigTypesafe =

0 commit comments

Comments
 (0)