Skip to content

Commit 11f52d3

Browse files
lihaoyilihaoyi
authored
Bump uPickle to 4.2.1, test namedtuple integration (#5139)
Pulls in @bishabosha's work in com-lihaoyi/upickle#662, which gives us an opt-in implicit for Scala >=3.7.0 that lets us serialize named tuples as JSON dictionaries CC @lefou
1 parent 57d4062 commit 11f52d3

File tree

7 files changed

+32
-16
lines changed

7 files changed

+32
-16
lines changed

‎core/define/package.mill‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ object `package` extends MillStableScalaModule {
2424
Deps.osLib,
2525
Deps.mainargs,
2626
Deps.upickle,
27+
Deps.upickleNamedTuples,
2728
Deps.pprint,
2829
Deps.fansi,
2930
Deps.mainargs,

‎integration/feature/scala-3-syntax/resources/build.mill‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import mill.{Task, Command, Cross}, Task.Anon
44

55
import build.Box
66
import build.{given Box[Int]}
7+
import upickle.implicits.namedTuples.default.given
78

89
given Cross.ToSegments[DayValue](d => List(d.toString))
910

@@ -39,4 +40,8 @@ object `package` extends mill.Module:
3940
end today
4041
end DayModule
4142

43+
def namedTupleTask = Task {
44+
(hello = "world", i = Seq("am", "cow"))
45+
}
46+
4247
end `package`

‎integration/feature/scala-3-syntax/src/Scala3SyntaxTests.scala‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@ object Scala3SyntaxTests extends UtestIntegrationTestSuite {
1919
val res2 = eval("someTopLevelCommand")
2020
assert(res2.isSuccess)
2121
assert(res2.out == "Hello, world! Box[Int] 42")
22+
val res3 = eval(("show", "namedTupleTask"))
23+
assert(res3.isSuccess)
24+
assert(
25+
ujson.read(res3.out) ==
26+
ujson.read("""{"hello": "world", "i": ["am", "cow"]}""")
27+
)
2228
}
2329
}
2430
}

‎integration/ide/gen-idea/resources/extended/idea/mill_modules/mill-build.iml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,12 @@
106106
<orderEntry type="library" name="specification-level_2.13-1.1.3.jar" level="project"/>
107107
<orderEntry type="library" name="test-interface-1.0.jar" level="project"/>
108108
<orderEntry type="library" name="tika-core-3.1.0.jar" level="project"/>
109-
<orderEntry type="library" name="ujson_3-4.1.0.jar" level="project"/>
110-
<orderEntry type="library" name="upack_3-4.1.0.jar" level="project"/>
111-
<orderEntry type="library" name="upickle-core_3-4.1.0.jar" level="project"/>
112-
<orderEntry type="library" name="upickle-implicits_3-4.1.0.jar" level="project"/>
113-
<orderEntry type="library" name="upickle_3-4.1.0.jar" level="project"/>
109+
<orderEntry type="library" name="ujson_3-4.2.1.jar" level="project"/>
110+
<orderEntry type="library" name="upack_3-4.2.1.jar" level="project"/>
111+
<orderEntry type="library" name="upickle-core_3-4.2.1.jar" level="project"/>
112+
<orderEntry type="library" name="upickle-implicits-named-tuples_3-4.2.1.jar" level="project"/>
113+
<orderEntry type="library" name="upickle-implicits_3-4.2.1.jar" level="project"/>
114+
<orderEntry type="library" name="upickle_3-4.2.1.jar" level="project"/>
114115
<orderEntry type="library" name="versions_2.13-0.5.1.jar" level="project"/>
115116
<orderEntry type="library" name="windows-ansi-0.0.6.jar" level="project"/>
116117
<orderEntry type="library" name="windows-jni-utils-0.3.3.jar" level="project"/>

‎integration/ide/gen-idea/resources/extended/idea/mill_modules/mill-build.mill-build.iml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,12 @@
108108
<orderEntry type="library" name="specification-level_2.13-1.1.3.jar" level="project"/>
109109
<orderEntry type="library" name="test-interface-1.0.jar" level="project"/>
110110
<orderEntry type="library" name="tika-core-3.1.0.jar" level="project"/>
111-
<orderEntry type="library" name="ujson_3-4.1.0.jar" level="project"/>
112-
<orderEntry type="library" name="upack_3-4.1.0.jar" level="project"/>
113-
<orderEntry type="library" name="upickle-core_3-4.1.0.jar" level="project"/>
114-
<orderEntry type="library" name="upickle-implicits_3-4.1.0.jar" level="project"/>
115-
<orderEntry type="library" name="upickle_3-4.1.0.jar" level="project"/>
111+
<orderEntry type="library" name="ujson_3-4.2.1.jar" level="project"/>
112+
<orderEntry type="library" name="upack_3-4.2.1.jar" level="project"/>
113+
<orderEntry type="library" name="upickle-core_3-4.2.1.jar" level="project"/>
114+
<orderEntry type="library" name="upickle-implicits-named-tuples_3-4.2.1.jar" level="project"/>
115+
<orderEntry type="library" name="upickle-implicits_3-4.2.1.jar" level="project"/>
116+
<orderEntry type="library" name="upickle_3-4.2.1.jar" level="project"/>
116117
<orderEntry type="library" name="versions_2.13-0.5.1.jar" level="project"/>
117118
<orderEntry type="library" name="windows-ansi-0.0.6.jar" level="project"/>
118119
<orderEntry type="library" name="windows-jni-utils-0.3.3.jar" level="project"/>

‎integration/ide/gen-idea/resources/hello-idea/idea/mill_modules/mill-build.iml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,12 @@
102102
<orderEntry type="library" name="specification-level_2.13-1.1.3.jar" level="project"/>
103103
<orderEntry type="library" name="test-interface-1.0.jar" level="project"/>
104104
<orderEntry type="library" name="tika-core-3.1.0.jar" level="project"/>
105-
<orderEntry type="library" name="ujson_3-4.1.0.jar" level="project"/>
106-
<orderEntry type="library" name="upack_3-4.1.0.jar" level="project"/>
107-
<orderEntry type="library" name="upickle-core_3-4.1.0.jar" level="project"/>
108-
<orderEntry type="library" name="upickle-implicits_3-4.1.0.jar" level="project"/>
109-
<orderEntry type="library" name="upickle_3-4.1.0.jar" level="project"/>
105+
<orderEntry type="library" name="ujson_3-4.2.1.jar" level="project"/>
106+
<orderEntry type="library" name="upack_3-4.2.1.jar" level="project"/>
107+
<orderEntry type="library" name="upickle-core_3-4.2.1.jar" level="project"/>
108+
<orderEntry type="library" name="upickle-implicits-named-tuples_3-4.2.1.jar" level="project"/>
109+
<orderEntry type="library" name="upickle-implicits_3-4.2.1.jar" level="project"/>
110+
<orderEntry type="library" name="upickle_3-4.2.1.jar" level="project"/>
110111
<orderEntry type="library" name="versions_2.13-0.5.1.jar" level="project"/>
111112
<orderEntry type="library" name="windows-ansi-0.0.6.jar" level="project"/>
112113
<orderEntry type="library" name="windows-jni-utils-0.3.3.jar" level="project"/>

‎mill-build/src/millbuild/Deps.scala‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,8 @@ object Deps {
151151
val semanticDbJava = mvn"com.sourcegraph:semanticdb-java:0.10.3"
152152
val sourcecode = mvn"com.lihaoyi::sourcecode:0.4.3-M5"
153153
val springBootTools = mvn"org.springframework.boot:spring-boot-loader-tools:3.4.5"
154-
val upickle = mvn"com.lihaoyi::upickle:4.1.0"
154+
val upickle = mvn"com.lihaoyi::upickle:4.2.1"
155+
val upickleNamedTuples = mvn"com.lihaoyi::upickle-implicits-named-tuples:4.2.1"
155156
// Using "native-terminal-no-ffm" rather than just "native-terminal", as the GraalVM releases currently
156157
// lacks support for FFM on Mac ARM. That should be fixed soon, see oracle/graal#8113.
157158
val nativeTerminal = mvn"io.github.alexarchambault.native-terminal:native-terminal-no-ffm:0.0.9.1"

0 commit comments

Comments
 (0)