Skip to content

Commit

Permalink
Update tests, switch to Scala 3.3 LTS
Browse files Browse the repository at this point in the history
  • Loading branch information
@keynmol
keynmol committed Apr 11, 2024
1 parent fb9b18c commit 49a2d60
Show file tree
Hide file tree
Showing 20 changed files with 987 additions and 985 deletions.
4 changes: 2 additions & 2 deletions build.sbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ lazy val V =
val moped = "0.1.11+2-c9893ac3-SNAPSHOT"
val gradle = "7.0"
val scala213 = "2.13.13"
val scala212 = "2.12.17"
val scala212 = "2.12.19"
val scala211 = "2.11.12"
val scala3 = "3.2.2"
val scala3 = "3.3.3"
val metals = "1.2.2"
val scalameta = "4.9.3"
val semanticdbKotlinc = "0.4.0"
Expand Down
2 changes: 1 addition & 1 deletion tests/buildTools/src/test/scala/tests/GradleBuildToolSuite.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ abstract class GradleBuildToolSuite(allGradle: List[String])

allJava.foreach { java =>
checkGradleBuild(
if (java == "8")
if (java == 8)
s"toolchains-$java".tag(Java8Only)
else
s"toolchains-$java",
Expand Down
4 changes: 3 additions & 1 deletion tests/buildTools/src/test/scala/tests/ScipBuildToolSuite.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,9 @@ class ScipBuildToolSuite extends BaseBuildToolSuite {
ScalaCombination("2.11", V.scala211, V.scala211),
ScalaCombination("2.12", V.scala212, V.scala212),
ScalaCombination("2.13", V.scala213, V.scala213),
ScalaCombination("3", V.scala3, V.scala213)
// The Scala 2.13 version of the build and the Scala 2.13 version of
// Scala 3's standard library are not necessarily aligned
ScalaCombination("3", V.scala3, "2.13.12")
).foreach { scala =>
checkBuild(
s"scala-${scala.fullVersion}",
Expand Down
90 changes: 45 additions & 45 deletions tests/snapshots/src/main/generated/BaseByteRenderer.scala
View file

Large diffs are not rendered by default.

90 changes: 45 additions & 45 deletions tests/snapshots/src/main/generated/BaseCharRenderer.scala
View file

Large diffs are not rendered by default.

510 changes: 255 additions & 255 deletions tests/snapshots/src/main/generated/ByteParser.scala
View file

Large diffs are not rendered by default.

510 changes: 255 additions & 255 deletions tests/snapshots/src/main/generated/CharParser.scala
View file

Large diffs are not rendered by default.

48 changes: 24 additions & 24 deletions tests/snapshots/src/main/generated/ujson/AstTransformer.scala
View file

Large diffs are not rendered by default.

30 changes: 15 additions & 15 deletions tests/snapshots/src/main/generated/ujson/ByteArrayParser.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ package ujson
import scala.annotation.{switch, tailrec}
// ^^^^^ reference semanticdb maven . . scala/
// ^^^^^^^^^^ reference semanticdb maven . . scala/annotation/
// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/annotation/switch#
// ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/annotation/tailrec#
// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/annotation/switch#
// ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/annotation/tailrec#
import java.nio.ByteBuffer
// ^^^^ reference semanticdb maven . . java/
// ^^^ reference semanticdb maven . . java/nio/
Expand Down Expand Up @@ -45,8 +45,8 @@ final class ByteArrayParser[J](src: Array[Byte]) extends ByteParser[J]{
// ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#`<init>`().(src)
// documentation ```scala\nsrc: Array[Byte] \n```
// relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#src.
// ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Array#
// ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#
// ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Array#
// ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#
// ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#
// ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#[J]
// ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#`<init>`().
Expand All @@ -55,7 +55,7 @@ final class ByteArrayParser[J](src: Array[Byte]) extends ByteParser[J]{
// ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#srcLength.
// documentation ```scala\nval srcLength: Int\n```
// ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#src.
// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Array#length().
// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Array#length().
protected[this] final def close() = {}
// ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#close().
// documentation ```scala\nfinal def close(): Unit\n```
Expand All @@ -68,26 +68,26 @@ final class ByteArrayParser[J](src: Array[Byte]) extends ByteParser[J]{
// relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#growBuffer().
// ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#growBuffer().(until)
// documentation ```scala\nuntil: Int \n```
// ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
// ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
// ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
// ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#

def readDataIntoBuffer(buffer: Array[Byte], bufferOffset: Int) = {
// ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#readDataIntoBuffer().
// documentation ```scala\ndef readDataIntoBuffer(buffer: Array[Byte], bufferOffset: Int): (Array[Byte], Boolean, Int)\n```
// relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#readDataIntoBuffer().
// ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#readDataIntoBuffer().(buffer)
// documentation ```scala\nbuffer: Array[Byte] \n```
// ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Array#
// ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#
// ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Array#
// ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#
// ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#readDataIntoBuffer().(bufferOffset)
// documentation ```scala\nbufferOffset: Int \n```
// ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
// ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
if(buffer == null) (src, srcLength == 0, srcLength)
// ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#readDataIntoBuffer().(buffer)
// ^^ reference semanticdb maven jdk 11 java/lang/Object#`==`().
// ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#src.
// ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#srcLength.
// ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`==`(+3).
// ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`==`(+3).
// ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#srcLength.
else (src, true, -1)
// ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#src.
Expand All @@ -98,8 +98,8 @@ object ByteArrayParser extends Transformer[Array[Byte]]{
// ^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser.
// documentation ```scala\nobject ByteArrayParser\n```
// ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#
// ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Array#
// ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#
// ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Array#
// ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#
// ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
def transform[T](j: Array[Byte], f: Visitor[_, T]) = new ByteArrayParser(j).parse(f)
// ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser.transform().
Expand All @@ -109,8 +109,8 @@ object ByteArrayParser extends Transformer[Array[Byte]]{
// documentation ```scala\nT\n```
// ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser.transform().(j)
// documentation ```scala\nj: Array[Byte] \n```
// ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Array#
// ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#
// ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Array#
// ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#
// ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser.transform().(f)
// documentation ```scala\nf: Visitor[local0, T[ \n```
// ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
Expand Down
18 changes: 9 additions & 9 deletions tests/snapshots/src/main/generated/ujson/ByteBufferParser.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import upickle.core.{ObjArrVisitor, Visitor}
import scala.annotation.{switch, tailrec}
// ^^^^^ reference semanticdb maven . . scala/
// ^^^^^^^^^^ reference semanticdb maven . . scala/annotation/
// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/annotation/switch#
// ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/annotation/tailrec#
// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/annotation/switch#
// ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/annotation/tailrec#
import java.nio.ByteBuffer
// ^^^^ reference semanticdb maven . . java/
// ^^^ reference semanticdb maven . . java/nio/
Expand Down Expand Up @@ -59,7 +59,7 @@ final class ByteBufferParser[J](src: ByteBuffer) extends ByteParser[J]{
// documentation ```scala\nprivate[this] final val limit: Int\n```
// ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#src.
// ^^^^^ reference semanticdb maven jdk 11 java/nio/Buffer#limit().
// ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
// ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
// ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#start.


Expand All @@ -76,19 +76,19 @@ final class ByteBufferParser[J](src: ByteBuffer) extends ByteParser[J]{
// relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#growBuffer().
// ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#growBuffer().(until)
// documentation ```scala\nuntil: Int \n```
// ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
// ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
// ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
// ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
def readDataIntoBuffer(buffer: Array[Byte], bufferOffset: Int) = {
// ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#readDataIntoBuffer().
// documentation ```scala\ndef readDataIntoBuffer(buffer: Array[Byte], bufferOffset: Int): (Array[Byte], Boolean, Int)\n```
// relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#readDataIntoBuffer().
// ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#readDataIntoBuffer().(buffer)
// documentation ```scala\nbuffer: Array[Byte] \n```
// ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Array#
// ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#
// ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Array#
// ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#
// ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#readDataIntoBuffer().(bufferOffset)
// documentation ```scala\nbufferOffset: Int \n```
// ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
// ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#

if(buffer == null) (java.util.Arrays.copyOfRange(src.array(), start, src.limit()), limit == 0, limit)
// ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#readDataIntoBuffer().(buffer)
Expand All @@ -103,7 +103,7 @@ final class ByteBufferParser[J](src: ByteBuffer) extends ByteParser[J]{
// ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#src.
// ^^^^^ reference semanticdb maven jdk 11 java/nio/Buffer#limit().
// ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#limit.
// ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`==`(+3).
// ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`==`(+3).
// ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#limit.
else (src.array(), true, -1)
// ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#src.
Expand Down
Loading

0 comments on commit 49a2d60

Please sign in to comment.