Merge pull request #34 from AVSystem/scala-2.13.13

Scala 2.13.13
AVSystem · Mar 5, 2024 · 27b7f16 · 27b7f16
2 parents c620f8f + 833a34b
commit 27b7f16
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,7 +23,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.13.12]
+        scala: [2.13.13]
         java: [temurin@11]
     runs-on: ${{ matrix.os }}
     steps:
@@ -73,7 +73,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.13.12]
+        scala: [2.13.13]
         java: [temurin@11]
     runs-on: ${{ matrix.os }}
     steps:
@@ -101,12 +101,12 @@ jobs:
             ~/Library/Caches/Coursier/v1
           key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
 
-      - name: Download target directories (2.13.12)
+      - name: Download target directories (2.13.13)
         uses: actions/download-artifact@v2
         with:
-          name: target-${{ matrix.os }}-2.13.12-${{ matrix.java }}
+          name: target-${{ matrix.os }}-2.13.13-${{ matrix.java }}
 
-      - name: Inflate target directories (2.13.12)
+      - name: Inflate target directories (2.13.13)
         run: |
           tar xf targets.tar
           rm targets.tar

diff --git a/build.sbt b/build.sbt
@@ -2,7 +2,7 @@ name := "scex"
 
 inThisBuild(Seq(
   organization := "com.avsystem.scex",
-  scalaVersion := "2.13.12",
+  scalaVersion := "2.13.13",
 
   githubWorkflowTargetTags ++= Seq("v*"),
   githubWorkflowJavaVersions := Seq(JavaSpec.temurin("11")),
@@ -22,17 +22,17 @@ inThisBuild(Seq(
 val CompileAndTest = "compile->compile;test->test"
 
 val parserCombinatorsVersion = "1.1.2"
-val avsCommonsVersion = "2.13.3"
-val jettyVersion = "9.4.53.v20231009" // Tests only
+val avsCommonsVersion = "2.14.0"
+val jettyVersion = "9.4.54.v20240208" // Tests only
 val vaadinVersion = "6.8.18" // Tests only
-val slf4jVersion = "1.7.36"
-val logbackVersion = "1.4.7" // Tests only
+val slf4jVersion = "2.0.12"
+val logbackVersion = "1.4.14" // Tests only
 val commonsLang3Version = "3.14.0"
 val commonsCodecVersion = "1.16.1"
 val guavaVersion = "33.0.0-jre"
 val commonsNetVersion = "3.10.0"
 val jodaTimeVersion = "2.12.7"
-val scalatestVersion = "3.2.17"
+val scalatestVersion = "3.2.18"
 
 val noPublishSettings = Seq(
   publish / skip := true

diff --git a/scex-test/src/main/scala/com/avsystem/scex/example/Quickstart.scala b/scex-test/src/main/scala/com/avsystem/scex/example/Quickstart.scala
@@ -51,7 +51,7 @@ object Quickstart {
     SymbolAttributes.empty,
     "import com.avsystem.scex.util.CommonExpressionUtils._",
     NamedSource("empty", ""),
-    true,
+    dynamicVariablesEnabled = true,
   )
 
   // The root object of an expression. It defines the primary API exposed into expressions (apart from "static" utils

diff --git a/scex-test/src/main/scala/vaadin/CompletionPlayground.scala b/scex-test/src/main/scala/vaadin/CompletionPlayground.scala
@@ -113,8 +113,8 @@ object CompletionPlayground {
           val parsedTree = completer.parse(event.getText)
           val typedPrefix = completion.typedPrefixTree
           val parsedPrefix = parsedTree.locate(typedPrefix.attachments.position)
-          label.setValue(s"POSITION: $pos\nPARSED:\n${parsedTree.pretty(true, true)}\nERRORS:\n$errors\nPPREFIX:\n${parsedPrefix.pretty(true, true)}\n" +
-            s"TPREFIX:\n${typedPrefix.pretty(true, true)}\nCOMPLETION:\n$members\nSCOPE COMPLETION:\n$scopeMembers")
+          label.setValue(s"POSITION: $pos\nPARSED:\n${parsedTree.pretty(withPositions = true, withTypes = true)}\nERRORS:\n$errors\nPPREFIX:\n${parsedPrefix.pretty(withPositions = true, withTypes = true)}\n" +
+            s"TPREFIX:\n${typedPrefix.pretty(withPositions = true, withTypes = true)}\nCOMPLETION:\n$members\nSCOPE COMPLETION:\n$scopeMembers")
         }
       })