Merged master into release

lf-lang · May 1, 2022 · 282a65c · 282a65c
2 parents f9744f1 + 5d952b2
commit 282a65c
Show file tree

Hide file tree

Showing 386 changed files with 2,209 additions and 1,825 deletions.
diff --git a/.github/actions/prepare-build-env/action.yml b/.github/actions/prepare-build-env/action.yml
@@ -6,18 +6,7 @@ runs:
     - name: Set up Java JDK
       uses: actions/setup-java@v2
       with:
-        java-version: 11
-        distribution: zulu
-    - name: Set up Maven
-      uses: stCarolas/setup-maven@v4
-      with:
-        maven-version: 3.8.1
-    - name: Cache local Maven repository
-      uses: actions/cache@v2
-      with:
-        path: ~/.m2/repository
-        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-        restore-keys: |
-          ${{ runner.os }}-maven-      
+        java-version: 17
+        distribution: zulu      
     - name: Validate Gradle wrapper
-      uses: gradle/wrapper-validation-action@v1
+      uses: gradle/wrapper-validation-action@v1.0.4
diff --git a/.github/scripts/test-lfc.sh b/.github/scripts/test-lfc.sh
@@ -63,7 +63,7 @@ bin/lfc --output-path . test/C/src/Minimal.lf
 #    --runtime-version <arg>         Specify the version of the runtime
 #                                    library used for compiling LF
 #                                    programs.
-bin/lfc --runtime-version ca216ccc3da5ecff0e8013f75e275d7acac099de test/Cpp/src/Minimal.lf
+bin/lfc --runtime-version 46a618c01e494b7b476707c30dd6067ad66759d6 test/Cpp/src/Minimal.lf
 
 # -w,--workers                       Specify the default number of worker threads.
 bin/lfc -w 2 test/C/src/Minimal.lf

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -25,6 +25,9 @@ jobs:
       - name: Build and package lfc
         run: .github/scripts/package_lfc.sh
         shell: bash
+      - name: Check Maven/Java configuration
+        run: mvn -version
+        shell: bash
       - name: Build and package epoch
         run: mvn package || mvn -U package
         shell: bash

diff --git a/.github/workflows/c-tests.yml b/.github/workflows/c-tests.yml
@@ -24,18 +24,16 @@ jobs:
         platform: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.platform }}
     steps:
-      - name: Install JDK
-        uses: actions/setup-java@v1.4.3
-        with:
-          java-version: 11
       - name: Check out lingua-franca repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: lf-lang/lingua-franca
           submodules: true
           ref: ${{ inputs.compiler-ref }}
+      - name: Prepare build environment
+        uses: ./.github/actions/prepare-build-env
       - name: Check out specific ref of reactor-c
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: lf-lang/reactor-c
           path: org.lflang/src/lib/c/reactor-c

diff --git a/.github/workflows/cli-tests.yml b/.github/workflows/cli-tests.yml
@@ -10,13 +10,11 @@ jobs:
         platform: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.platform }}
     steps:
-      - name: Setup Java JDK
-        uses: actions/setup-java@v1.4.3
-        with:
-          java-version: 11
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: true
+      - name: Prepare build environment
+        uses: ./.github/actions/prepare-build-env
       - name: Run standalone lfc tests
         run: |
           ./gradlew :org.lflang.lfc:test --stacktrace

diff --git a/.github/workflows/cpp-ros2-tests.yml b/.github/workflows/cpp-ros2-tests.yml
@@ -13,17 +13,15 @@ jobs:
   run:
     runs-on: ubuntu-latest
     steps:
-      - name: Setup Java JDK
-        uses: actions/setup-java@v1.4.3
-        with:
-          java-version: 11
       - name: Check out lingual-franca repository
         uses: actions/checkout@v2
         with:
           repository: lf-lang/lingua-franca
           submodules: true
           ref: ${{ inputs.compiler-ref }}
-      - name: Check out specific ref of reactor-CPO
+      - name: Prepare build environment
+        uses: ./.github/actions/prepare-build-env
+      - name: Check out specific ref of reactor-cpp
         uses: actions/checkout@v2
         with:
           repository: lf-lang/reactor-cpp

diff --git a/.github/workflows/cpp-tests.yml b/.github/workflows/cpp-tests.yml
@@ -16,19 +16,17 @@ jobs:
         platform: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.platform }}
     steps:
-      - name: Setup Java JDK
-        uses: actions/setup-java@v1.4.3
-        with:
-          java-version: 11
-      - name: Install Dependencies OS X
-        run: brew install coreutils
-        if: runner.os == 'macOS'
       - name: Check out lingua-franca repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: lf-lang/lingua-franca
           submodules: true
           ref: ${{ inputs.compiler-ref }}
+      - name: Prepare build environment
+        uses: ./.github/actions/prepare-build-env
+      - name: Install Dependencies OS X
+        run: brew install coreutils
+        if: runner.os == 'macOS'
       - name: Check out specific ref of reactor-cpp
         uses: actions/checkout@v2
         with:

diff --git a/.github/workflows/eclipse-tests.yml b/.github/workflows/eclipse-tests.yml
@@ -10,13 +10,11 @@ jobs:
         platform: [ubuntu-latest, macos-latest]
     runs-on: ${{ matrix.platform }}
     steps:
-      - name: Setup Java JDK
-        uses: actions/setup-java@v1.4.3
-        with:
-          java-version: 11
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: true
+      - name: Prepare build environment
+        uses: ./.github/actions/prepare-build-env
       - name: Setup Node.js environment
         uses: actions/setup-node@v2.1.2
       - name: Install pnpm

diff --git a/.github/workflows/lsp-tests.yml b/.github/workflows/lsp-tests.yml
@@ -13,6 +13,14 @@ jobs:
       # Uninstall operations are needed because the language server is able to use multiple
       # different compilers for syntax checking. We test that it correctly detects which tools are
       # present and responds appropriately.
+      - name: Check out lingua-franca repository
+        uses: actions/checkout@v3
+        with:
+          repository: lf-lang/lingua-franca
+          submodules: true
+          ref: ${{ inputs.compiler-ref }}
+      - name: Prepare build environment
+        uses: ./.github/actions/prepare-build-env
       - name: Uninstall packages Ubuntu
         run: sudo apt-get remove clang-*
         if: ${{ runner.os == 'Linux' }}
@@ -25,10 +33,6 @@ jobs:
           del "C:\Strawberry\c\bin\g++.exe"
           del "C:\Program Files\LLVM\bin\clang++.exe"
         if: ${{ runner.os == 'Windows' }}
-      - name: Install JDK
-        uses: actions/setup-java@v1.4.3
-        with:
-          java-version: 11
       - name: Setup Node.js environment
         uses: actions/setup-node@v2.1.2
       - name: Install pnpm
@@ -52,12 +56,6 @@ jobs:
           brew install protobuf
           brew install protobuf-c
         if: ${{ runner.os == 'macOS' }}
-      - name: Check out lingua-franca repository
-        uses: actions/checkout@v2
-        with:
-          repository: lf-lang/lingua-franca
-          submodules: true
-          ref: ${{ inputs.compiler-ref }}
       - name: Run language server Python tests without PyLint
         run: ./gradlew test --tests org.lflang.tests.lsp.LspTests.pythonSyntaxOnlyValidationTest
       - name: Report to CodeCov

diff --git a/.github/workflows/py-tests.yml b/.github/workflows/py-tests.yml
@@ -20,10 +20,14 @@ jobs:
         platform: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.platform }}
     steps:
-      - name: Setup Java JDK
-        uses: actions/setup-java@v1.4.3
+      - name: Check out lingua-franca repository
+        uses: actions/checkout@v3
         with:
-          java-version: 11
+          repository: lf-lang/lingua-franca
+          submodules: true
+          ref: ${{ inputs.compiler-ref }}
+      - name: Prepare build environment
+        uses: ./.github/actions/prepare-build-env
       - name: Setup Python
         uses: actions/setup-python@v2
       - name: Install dependencies OS X
@@ -34,12 +38,6 @@ jobs:
         run: pip3 install LinguaFrancaBase
       - name: Install Google API Python Client
         run: pip3 install --upgrade google-api-python-client
-      - name: Check out lingua-franca repository
-        uses: actions/checkout@v2
-        with:
-          repository: lf-lang/lingua-franca
-          submodules: true
-          ref: ${{ inputs.compiler-ref }}
       - name: Check out specific ref of reactor-c
         uses: actions/checkout@v2
         with:

diff --git a/.github/workflows/rs-tests.yml b/.github/workflows/rs-tests.yml
@@ -18,21 +18,19 @@ jobs:
         rust: [nightly]
     runs-on: ${{ matrix.platform }}
     steps:
-      - name: Setup Java JDK
-        uses: actions/setup-java@v1.4.3
+      - name: Check out lingua-franca repository
+        uses: actions/checkout@v3
         with:
-          java-version: 11
+          repository: lf-lang/lingua-franca
+          submodules: true
+          ref: ${{ inputs.compiler-ref }}
+      - name: Prepare build environment
+        uses: ./.github/actions/prepare-build-env
       - name: Setup Rust
         uses: ATiltedTree/setup-rust@v1
         with:
           rust-version: ${{ matrix.rust }}
           components: clippy
-      - name: Check out lingua-franca repository
-        uses: actions/checkout@v2
-        with:
-          repository: lf-lang/lingua-franca
-          submodules: true
-          ref: ${{ inputs.compiler-ref }}
       - name: Set rust runtime version
         run: |
             echo ${{ inputs.runtime-ref }} > org.lflang/src/org/lflang/generator/rust/rust-runtime-version.txt

diff --git a/.github/workflows/serialization-tests.yml b/.github/workflows/serialization-tests.yml
@@ -11,16 +11,14 @@ jobs:
   run:
     runs-on: ubuntu-latest
     steps:
-      - name: Setup Java JDK
-        uses: actions/setup-java@v1.4.3
-        with:
-          java-version: 11
       - name: Check out lingua-franca repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: lf-lang/lingua-franca
           submodules: true
           ref: ${{ inputs.compiler-ref }}
+      - name: Prepare build environment
+        uses: ./.github/actions/prepare-build-env
       - name: Setup ROS2
         uses: ros-tooling/setup-ros@0.2.2
         with:

diff --git a/.github/workflows/ts-tests.yml b/.github/workflows/ts-tests.yml
@@ -17,10 +17,14 @@ jobs:
         platform: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.platform }}
     steps:
-      - name: Setup Java JDK
-        uses: actions/setup-java@v1.4.3
+      - name: Check out lingua-franca repository
+        uses: actions/checkout@v3
         with:
-          java-version: 11
+          repository: lf-lang/lingua-franca
+          submodules: true
+          ref: ${{ inputs.compiler-ref }}
+      - name: Prepare build environment
+        uses: ./.github/actions/prepare-build-env
       - name: Setup Node.js environment
         uses: actions/setup-node@v2.1.2
       - name: Install pnpm
@@ -34,12 +38,6 @@ jobs:
         run: |
           brew install coreutils
         if: ${{ runner.os == 'macOS' }}
-      - name: Check out lingua-franca repository
-        uses: actions/checkout@v2
-        with:
-          repository: lf-lang/lingua-franca
-          submodules: true
-          ref: ${{ inputs.compiler-ref }}
       - name: Check out specific ref of reactor-ts
         uses: actions/checkout@v2
         with:

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -10,11 +10,9 @@ jobs:
         platform: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.platform }}
     steps:
-      - name: Setup Java JDK
-        uses: actions/setup-java@v1.4.3
-        with:
-          java-version: 11
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
+      - name: Prepare build environment
+        uses: ./.github/actions/prepare-build-env
       - name: Run compiler tests
         run: |
           ./gradlew test --tests org.lflang.tests.compiler.*

diff --git a/build.gradle b/build.gradle
@@ -47,8 +47,8 @@ subprojects {
     // generate xtend sources before kotlin compilation
     compileKotlin.dependsOn("generateXtext")
 
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 
     configurations.all {
         exclude group: 'asm'

diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 [header]
 group=org.lflang
-version=0.1.0
+version=0.2.0-SNAPSHOT
 
 [versions]
 commonsCliVersion=1.4
@@ -9,8 +9,8 @@ jacocoVersion=0.8.7
 jupiterVersion=5.8.2
 jUnitPlatformVersion=1.8.2
 jUnitVersion=4.13.2
-kotlinJvmTarget=11
-kotlinVersion=1.4.30
+kotlinJvmTarget=17
+kotlinVersion=1.6.20
 lsp4jVersion=0.12.0
 mwe2LaunchVersion=2.12.2
 openTest4jVersion=1.2.0

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/oomph/LinguaFranca.setup b/oomph/LinguaFranca.setup
@@ -17,8 +17,8 @@
     label="Lingua Franca">
   <setupTask
       xsi:type="jdt:JRETask"
-      version="JavaSE-11"
-      location="${jre.location-11}">
+      version="JavaSE-17"
+      location="${jre.location-17}">
     <description>The JRE needed to compile and run the Java projects of ${scope.project.label}</description>
   </setupTask>
   <setupTask

diff --git a/org.lflang.diagram/.classpath b/org.lflang.diagram/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
     <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
     <classpathentry kind="src" path="src"/>
     <classpathentry kind="output" path="bin"/>

diff --git a/org.lflang.diagram/.settings/org.eclipse.jdt.core.prefs b/org.lflang.diagram/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,9 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=17
 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

diff --git a/org.lflang.diagram/META-INF/MANIFEST.MF b/org.lflang.diagram/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Lingua Franca Block Diagram Editor
 Bundle-SymbolicName: org.lflang.diagram;singleton:=true
-Bundle-Version: 0.1.0
+Bundle-Version: 0.2.0.qualifier
 Automatic-Module-Name: org.lflang.diagram
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
 Require-Bundle: de.cau.cs.kieler.klighd;bundle-version="2.0.0",
  de.cau.cs.kieler.klighd.krendering.extensions;bundle-version="2.0.0",