From 0794b257c7e1c3dce2abb702fbe4bce81774b74a Mon Sep 17 00:00:00 2001 From: Marten Lohstroh Date: Mon, 22 Apr 2024 15:51:02 -0700 Subject: [PATCH] Xtext bumped to 3.34.0 --- .../test/java/org/lflang/tests/compiler/LetInferenceTests.java | 2 +- .../org/lflang/tests/compiler/LinguaFrancaASTUtilsTest.java | 2 +- gradle.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/test/java/org/lflang/tests/compiler/LetInferenceTests.java b/core/src/test/java/org/lflang/tests/compiler/LetInferenceTests.java index 8f78cd5906..3a6223a92f 100644 --- a/core/src/test/java/org/lflang/tests/compiler/LetInferenceTests.java +++ b/core/src/test/java/org/lflang/tests/compiler/LetInferenceTests.java @@ -27,7 +27,7 @@ import static org.lflang.ast.ASTUtils.toDefinition; -import javax.inject.Inject; +import com.google.inject.Inject; import org.eclipse.emf.common.util.TreeIterator; import org.eclipse.emf.ecore.EObject; import org.eclipse.xtext.testing.InjectWith; diff --git a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaASTUtilsTest.java b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaASTUtilsTest.java index 52a553e978..66fb64a896 100644 --- a/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaASTUtilsTest.java +++ b/core/src/test/java/org/lflang/tests/compiler/LinguaFrancaASTUtilsTest.java @@ -30,11 +30,11 @@ import static org.lflang.ast.ASTUtils.isInitialized; import static org.lflang.util.IteratorUtil.asStream; +import com.google.inject.Inject; import java.util.List; import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; -import javax.inject.Inject; import org.eclipse.xtext.testing.InjectWith; import org.eclipse.xtext.testing.extensions.InjectionExtension; import org.eclipse.xtext.testing.util.ParseHelper; diff --git a/gradle.properties b/gradle.properties index 42a4872a0f..8380667652 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,7 +16,7 @@ mwe2LaunchVersion=2.14.0 openTest4jVersion=1.2.0 picocliVersion=4.7.0 resourcesVersion=3.19.0 -xtextVersion=2.31.0 +xtextVersion=2.34.0 klighdVersion=2.3.0.v20230606 freehepVersion=2.4 swtVersion=3.124.0