Merge pull request #74 from lf-lang/pre-build-cmd

Dependency on commons-text
lf-lang · Jun 18, 2024 · 93a7125 · 93a7125
2 parents a592e9a + 32b196d
commit 93a7125
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/org.lflang/lingua-franca b/org.lflang/lingua-franca
diff --git a/org.lflang/pom.xml b/org.lflang/pom.xml
@@ -53,11 +53,11 @@
                     <cleanupDaemonThreads>false</cleanupDaemonThreads> <!-- see https://bugs.eclipse.org/bugs/show_bug.cgi?id=475098#c3 -->
                 </configuration>
                 <dependencies>
-                    <!-- https://mvnrepository.com/artifact/commons-cli/commons-cli -->
+                    <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-text -->
                     <dependency>
-                        <groupId>commons-cli</groupId>
-                        <artifactId>commons-cli</artifactId>
-                        <version>${commonsCliVersion}</version>
+                        <groupId>org.apache.commons</groupId>
+                        <artifactId>commons-text</artifactId>
+                        <version>${commonsTextVersion}</version>
                     </dependency>
                     <dependency>
                         <groupId>org.eclipse.emf</groupId>

diff --git a/pom.xml b/pom.xml
@@ -16,7 +16,7 @@
     <properties>
         <!-- Version Properties -->
         <!-- Sync with build.gradle -->
-        <commonsCliVersion>1.4</commonsCliVersion>
+        <commonsTextVersion>1.12.0</commonsTextVersion>
         <!-- Note that this version is tied to our version of Gradle -->
         <kotlinVersion>1.6.21</kotlinVersion>
+43 −0		.github/actions/setup-flexpret/action.yml
+30 −0		.github/workflows/all-embedded.yml
+25 −0		.github/workflows/c-embedded.yml
+58 −0		.github/workflows/c-flexpret-tests.yml
+1 −4		.github/workflows/lsp-tests.yml
+0 −10		.github/workflows/only-c.yml
+10 −57		CONTRIBUTING.md
+5 −0		buildSrc/src/main/groovy/org.lflang.java-conventions.gradle
+1 −0		cli/lfc/src/main/java/org/lflang/cli/Lfc.java
+26 −26		cli/lfc/src/test/java/org/lflang/cli/LfcCliTest.java
+5 −5		cli/lfd/src/test/java/org/lflang/cli/LfdCliTest.java
+98 −98		cli/lff/src/test/java/org/lflang/cli/LffCliTest.java
+3 −2		core/src/integrationTest/java/org/lflang/tests/RuntimeTest.java
+3 −0		core/src/integrationTest/java/org/lflang/tests/lsp/ErrorInserter.java
+1 −0		core/src/integrationTest/java/org/lflang/tests/lsp/LspTests.java
+80 −0		core/src/integrationTest/java/org/lflang/tests/runtime/CFlexPRETTest.java
+1 −0		core/src/main/java/org/lflang/InferredType.java
+1 −0		core/src/main/java/org/lflang/TimeValue.java
+1 −0		core/src/main/java/org/lflang/ast/DelayedConnectionTransformation.java
+1 −0		core/src/main/java/org/lflang/ast/FormattingUtil.java
+5 −0		core/src/main/java/org/lflang/diagram/synthesis/util/LayoutPostProcessing.java
+38 −36		core/src/main/java/org/lflang/federated/extensions/CExtension.java
+42 −12		core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java
+13 −13		core/src/main/java/org/lflang/federated/extensions/PythonExtension.java
+30 −30		core/src/main/java/org/lflang/federated/extensions/TSExtension.java
+3 −3		core/src/main/java/org/lflang/federated/generator/FedMainEmitter.java
+7 −7		core/src/main/java/org/lflang/federated/generator/FedPreambleEmitter.java
+13 −13		core/src/main/java/org/lflang/federated/serialization/FedROS2CPPSerialization.java
+2 −0		core/src/main/java/org/lflang/generator/CodeMap.java
+1 −0		core/src/main/java/org/lflang/generator/GenerationException.java
+3 −0		core/src/main/java/org/lflang/generator/HumanReadableReportingStrategy.java
+1 −0		core/src/main/java/org/lflang/generator/LanguageServerMessageReporter.java
+1 −0		core/src/main/java/org/lflang/generator/MainContext.java
+1 −0		core/src/main/java/org/lflang/generator/Range.java
+2 −9		core/src/main/java/org/lflang/generator/ReactionInstance.java
+19 −40		core/src/main/java/org/lflang/generator/ReactionInstanceGraph.java
+0 −16		core/src/main/java/org/lflang/generator/ReactorInstance.java
+122 −22		core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
+5 −3		core/src/main/java/org/lflang/generator/c/CCompiler.java
+39 −22		core/src/main/java/org/lflang/generator/c/CGenerator.java
+4 −1		core/src/main/java/org/lflang/generator/c/CMainFunctionGenerator.java
+5 −0		core/src/main/java/org/lflang/generator/c/CMixedRadixGenerator.java
+1 −0		core/src/main/java/org/lflang/generator/c/CPreambleGenerator.java
+1 −1		core/src/main/java/org/lflang/generator/c/CReactionGenerator.java
+18 −14		core/src/main/java/org/lflang/generator/c/CReactorHeaderFileGenerator.java
+0 −4		core/src/main/java/org/lflang/generator/c/CTriggerObjectsGenerator.java
+1 −0		core/src/main/java/org/lflang/generator/c/TypeParameterizedReactor.java
+10 −10		core/src/main/java/org/lflang/generator/docker/CDockerGenerator.java
+13 −13		core/src/main/java/org/lflang/generator/docker/DockerComposeGenerator.java
+2 −2		core/src/main/java/org/lflang/generator/docker/DockerGenerator.java
+15 −15		core/src/main/java/org/lflang/generator/docker/FedDockerComposeGenerator.java
+6 −6		core/src/main/java/org/lflang/generator/docker/PythonDockerGenerator.java
+6 −6		core/src/main/java/org/lflang/generator/docker/TSDockerGenerator.java
+28 −28		core/src/main/java/org/lflang/generator/python/PythonGenerator.java
+2 −0		core/src/main/java/org/lflang/generator/python/PythonValidator.java
+80 −75		core/src/main/java/org/lflang/target/Target.java
+2 −2		core/src/main/java/org/lflang/target/property/ClockSyncOptionsProperty.java
+127 −30		core/src/main/java/org/lflang/target/property/PlatformProperty.java
+1 −0		core/src/main/java/org/lflang/target/property/type/ClockSyncModeType.java
+3 −2		core/src/main/java/org/lflang/target/property/type/PlatformType.java
+7 −7		core/src/main/java/org/lflang/util/ArduinoUtil.java
+1 −0		core/src/main/java/org/lflang/util/FileUtil.java
+44 −0		core/src/main/java/org/lflang/util/FlexPRETUtil.java
+6 −0		core/src/main/java/org/lflang/util/LFCommand.java
+9 −6		core/src/main/java/org/lflang/validation/ValidatorMessageReporter.java
+1 −1		core/src/main/resources/lib/c/reactor-c
+1 −1		core/src/main/resources/lib/cpp/reactor-cpp
+1 −1		core/src/main/resources/org/lflang/StringsBundle.properties
+19 −19		core/src/test/java/org/lflang/tests/compiler/EquivalenceUnitTests.java
+45 −45		core/src/test/java/org/lflang/tests/compiler/FormattingUnitTests.java
+29 −28		core/src/test/java/org/lflang/tests/compiler/LinguaFrancaASTUtilsTest.java
+11 −11		core/src/test/java/org/lflang/tests/compiler/LinguaFrancaDependencyAnalysisTest.java
+28 −28		core/src/test/java/org/lflang/tests/compiler/LinguaFrancaParsingTest.java
+29 −29		core/src/test/java/org/lflang/tests/compiler/LinguaFrancaScopingTest.java
+605 −604		core/src/test/java/org/lflang/tests/compiler/LinguaFrancaValidationTest.java
+33 −4		core/src/testFixtures/java/org/lflang/tests/Configurators.java
+17 −17		core/src/testFixtures/java/org/lflang/tests/TestBase.java
+2 −0		core/src/testFixtures/java/org/lflang/tests/TestRegistry.java
+3 −3		gradle.properties
+ −		gradle/wrapper/gradle-wrapper.jar
+3 −2		gradle/wrapper/gradle-wrapper.properties
+6 −2		gradlew
+54 −0		test/C/src/PeriodicTask.lf
+27 −0		test/Cpp/src/SetZero.lf