This is an automated email from the ASF dual-hosted git repository.
shanedell pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/daffodil-vscode.git
The following commit(s) were added to refs/heads/main by this push:
new 4999e1a Update to Apache Daffodil 3.7.0
4999e1a is described below
commit 4999e1a6e41c2a0356e5589b15a56666bd9d3ea9
Author: Shane Dell <[email protected]>
AuthorDate: Fri Apr 19 12:57:08 2024 -0400
Update to Apache Daffodil 3.7.0
- Update version of nodejs 18 used in CI as the latest (18.20.2) breaks on
windows.
Closes #1004
---
.github/workflows/CI.yml | 2 +-
.github/workflows/nightly.yml | 2 +-
debugger/src/main/scala/org.apache.daffodil.debugger.dap/Parse.scala | 3 ++-
package.json | 2 +-
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index e67cc11..3ffce19 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -132,7 +132,7 @@ jobs:
java_distribution: [ temurin ]
java_version: [ 8, 11, 17 ]
os: [ macos-12, ubuntu-20.04, windows-2019 ]
- node: [ '16', '18' ]
+ node: [ '16', '18.20.1' ] # version 18.20.2 (current latest of 18) is
broken on windows
vscode: [ 'stable' ]
fail-fast: false # don't immediately fail all other jobs if a single
job fails
runs-on: ${{ matrix.os }}
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 4d43a7c..388def3 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -27,7 +27,7 @@ jobs:
strategy:
matrix:
os: [ macos-12, ubuntu-20.04, windows-2019, macos-latest,
ubuntu-latest, windows-latest ]
- node: [ '16', '18' ]
+ node: [ '16', '18.20.1' ] # version 18.20.2 (current latest of 18) is
broken on windows
vscode: [ 'stable', 'insiders' ]
java_distribution: [ temurin ]
java_version: [ 8, 11, 17 ]
diff --git
a/debugger/src/main/scala/org.apache.daffodil.debugger.dap/Parse.scala
b/debugger/src/main/scala/org.apache.daffodil.debugger.dap/Parse.scala
index 80f8c4b..1f5f15e 100644
--- a/debugger/src/main/scala/org.apache.daffodil.debugger.dap/Parse.scala
+++ b/debugger/src/main/scala/org.apache.daffodil.debugger.dap/Parse.scala
@@ -34,7 +34,8 @@ import java.nio.file._
import org.apache.commons.io.FileUtils
import org.apache.daffodil.debugger.dap.{BuildInfo => DAPBuildInfo}
import org.apache.daffodil.runtime1.debugger.Debugger
-import org.apache.daffodil.runtime1.infoset.{DIDocument, DIElement,
InfosetElement, InfosetWalker}
+import org.apache.daffodil.runtime1.api.InfosetElement
+import org.apache.daffodil.runtime1.infoset.{DIDocument, DIElement,
InfosetWalker}
import org.apache.daffodil.runtime1.processors._
import org.apache.daffodil.runtime1.processors.dfa.DFADelimiter
import org.apache.daffodil.runtime1.processors.parsers._
diff --git a/package.json b/package.json
index da89dd6..7c867cb 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
"displayName": "Apache Daffodilâ„¢ Extension for Visual Studio Code",
"description": "Apache Daffodilâ„¢ Extension for Visual Studio Code providing
DFDL syntax highlighting, DFDL code completion, DFDL schema debugging, and data
editor",
"version": "1.4.0-SNAPSHOT",
- "daffodilVersion": "3.6.0",
+ "daffodilVersion": "3.7.0",
"publisher": "asf",
"author": "Apache Daffodil",
"license": "Apache-2.0",