diff --git a/oomph/LinguaFrancaEpoch.setup b/oomph/LinguaFrancaEpoch.setup index 214517b..16b2bf1 100644 --- a/oomph/LinguaFrancaEpoch.setup +++ b/oomph/LinguaFrancaEpoch.setup @@ -12,7 +12,7 @@ xmlns:setup.p2="http://www.eclipse.org/oomph/setup/p2/1.0" xmlns:setup.targlets="http://www.eclipse.org/oomph/setup/targlets/1.0" xmlns:setup.workingsets="http://www.eclipse.org/oomph/setup/workingsets/1.0" - xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/jdt/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/JDT.ecore http://www.eclipse.org/oomph/setup/launching/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/Launching.ecore http://www.eclipse.org/oomph/predicates/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/projects/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/Projects.ecore http://www.eclipse.org/oomph/setup/targlets/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/SetupTarglets.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/SetupWorkingSets.ecore" + xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/jdt/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore http://www.eclipse.org/oomph/setup/launching/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Launching.ecore http://www.eclipse.org/oomph/predicates/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/projects/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Projects.ecore http://www.eclipse.org/oomph/setup/targlets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupTarglets.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore" name="lingua.franca.epoch" label="Lingua Franca (Epoch)"> + - + diff --git a/org.lflang/META-INF/MANIFEST.MF b/org.lflang/META-INF/MANIFEST.MF index 133a13e..68abc46 100644 --- a/org.lflang/META-INF/MANIFEST.MF +++ b/org.lflang/META-INF/MANIFEST.MF @@ -33,7 +33,8 @@ Require-Bundle: org.eclipse.xtext, org.lflang.epoch.mirror.json;bundle-version="1.20230618.0", org.lflang.epoch.mirror.kotlin;bundle-version="1.6.21", org.lflang.epoch.mirror.jcip;bundle-version="1.0.0", - com.google.gson;bundle-version="2.10.1" + com.google.gson;bundle-version="2.10.1", + org.apache.commons.text;bundle-version="1.11.0" Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.lflang, org.lflang.ast, diff --git a/org.lflang/src-mock/org/lflang/analyses/uclid/UclidGenerator.java b/org.lflang/src-mock/org/lflang/analyses/uclid/UclidGenerator.java index de2e1e9..367d0ac 100644 --- a/org.lflang/src-mock/org/lflang/analyses/uclid/UclidGenerator.java +++ b/org.lflang/src-mock/org/lflang/analyses/uclid/UclidGenerator.java @@ -7,6 +7,7 @@ import org.lflang.generator.GeneratorBase; import org.lflang.generator.LFGeneratorContext; import org.lflang.generator.TargetTypes; +import org.lflang.generator.docker.DockerGenerator; import org.lflang.lf.Attribute; import org.lflang.target.Target; @@ -29,5 +30,10 @@ public TargetTypes getTargetTypes() { public Target getTarget() { throw new IllegalStateException(Mock.VERIFIER_MSG); } + + @Override + protected DockerGenerator getDockerGenerator(LFGeneratorContext context) { + throw new IllegalStateException(Mock.VERIFIER_MSG); + } } diff --git a/org.lflang/src-mock/org/lflang/generator/cpp/CppGenerator.java b/org.lflang/src-mock/org/lflang/generator/cpp/CppGenerator.java index 47bb478..550f321 100644 --- a/org.lflang/src-mock/org/lflang/generator/cpp/CppGenerator.java +++ b/org.lflang/src-mock/org/lflang/generator/cpp/CppGenerator.java @@ -5,6 +5,7 @@ import org.lflang.generator.GeneratorBase; import org.lflang.generator.LFGeneratorContext; import org.lflang.generator.TargetTypes; +import org.lflang.generator.docker.DockerGenerator; import org.lflang.scoping.LFGlobalScopeProvider; import org.lflang.target.Target; @@ -25,5 +26,10 @@ public TargetTypes getTargetTypes() { public Target getTarget() { throw new IllegalStateException(Mock.KOTLIN_MSG); } + + @Override + protected DockerGenerator getDockerGenerator(LFGeneratorContext context) { + throw new IllegalStateException(Mock.KOTLIN_MSG); + } } diff --git a/org.lflang/src-mock/org/lflang/generator/rust/RustGenerator.java b/org.lflang/src-mock/org/lflang/generator/rust/RustGenerator.java index 3ef84bf..dcfc222 100644 --- a/org.lflang/src-mock/org/lflang/generator/rust/RustGenerator.java +++ b/org.lflang/src-mock/org/lflang/generator/rust/RustGenerator.java @@ -5,6 +5,7 @@ import org.lflang.generator.GeneratorBase; import org.lflang.generator.LFGeneratorContext; import org.lflang.generator.TargetTypes; +import org.lflang.generator.docker.DockerGenerator; import org.lflang.scoping.LFGlobalScopeProvider; import org.lflang.target.Target; @@ -25,5 +26,10 @@ public TargetTypes getTargetTypes() { public Target getTarget() { throw new IllegalStateException(Mock.KOTLIN_MSG); } + + @Override + protected DockerGenerator getDockerGenerator(LFGeneratorContext context) { + throw new IllegalStateException(Mock.KOTLIN_MSG); + } } diff --git a/org.lflang/src-mock/org/lflang/generator/ts/TSGenerator.java b/org.lflang/src-mock/org/lflang/generator/ts/TSGenerator.java index bd53ad7..6b5cd72 100644 --- a/org.lflang/src-mock/org/lflang/generator/ts/TSGenerator.java +++ b/org.lflang/src-mock/org/lflang/generator/ts/TSGenerator.java @@ -5,6 +5,7 @@ import org.lflang.generator.GeneratorBase; import org.lflang.generator.LFGeneratorContext; import org.lflang.generator.TargetTypes; +import org.lflang.generator.docker.DockerGenerator; import org.lflang.scoping.LFGlobalScopeProvider; import org.lflang.target.Target; @@ -30,4 +31,9 @@ public Target getTarget() { throw new IllegalStateException(Mock.KOTLIN_MSG); } + @Override + protected DockerGenerator getDockerGenerator(LFGeneratorContext context) { + throw new IllegalStateException(Mock.KOTLIN_MSG); + } + }