Merge remote-tracking branch 'origin/develop' into feature/osClassModuleType

Author: asosnoviy

.devcontainer/devcontainer.json

@@ -0,0 +1 @@
+{"image":"mcr.microsoft.com/devcontainers/universal:2"}

.github/dependabot.yml

@@ -9,6 +9,10 @@ updates:
     directory: "/" # Location of package manifests
     schedule:
       interval: "daily"
+    groups:
+      freefair:
+        patterns:
+          - "io.freefair.*"
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:

.github/scripts/build-jpackage.py

@@ -0,0 +1,73 @@
+import ntpath
+import os
+import platform
+import re
+import shutil
+import sys
+
+
+def build_image(base_dir, image_prefix, executable_file):
+    path_to_jar = get_bsl_ls_jar(base_dir)
+    if path_to_jar is None:
+        exit()
+
+    cmd_args = [
+        'jpackage',
+        '--name', 'bsl-language-server',
+        '--input', 'build/libs',
+        '--main-jar', path_to_jar]
+
+    if is_windows():
+        cmd_args.append('--win-console')
+
+    cmd_args.append('--type')
+    cmd_args.append('app-image')
+    cmd_args.append('--java-options')
+    cmd_args.append('-Xmx3g')
+
+    cmd = ' '.join(cmd_args)
+    os.system(cmd)
+
+    shutil.make_archive(
+        "bsl-language-server_" + image_prefix,
+        'zip',
+        './',
+        executable_file)
+
+
+def is_windows():
+    return platform.system() == 'Windows'
+
+
+def get_base_dir():
+    if is_windows():
+        base_dir = os.getcwd() + "\\build\\libs"
+    else:
+        base_dir = os.getcwd() + "/build/libs"
+    return base_dir
+
+
+def get_bsl_ls_jar(dir_name):
+    pattern = r"bsl.+\.jar"
+    names = os.listdir(dir_name)
+    for name in names:
+        fullname = os.path.join(dir_name, name)
+        if os.path.isfile(fullname) and re.search(pattern, fullname) and fullname.find('exec.jar') != -1:
+            return ntpath.basename(fullname)
+
+    return None
+
+
+if __name__ == "__main__":
+    # directory with build project
+    arg_base_dir = get_base_dir()
+
+    # image prefix: `win`, `nic` or `mac`
+    arg_image_prefix = sys.argv[1]
+
+    # executable file: `bsl-language-server` or `bsl-language-server.app`
+    arg_executable_file = sys.argv[2]
+
+    build_image(base_dir=get_base_dir(),
+                image_prefix=sys.argv[1],
+                executable_file=sys.argv[2])

.github/workflows/benchmark.yml

@@ -29,7 +29,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: 'temurin'
@@ -38,7 +38,7 @@ jobs:
         run: ./gradlew bootJar
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.7"
 

.github/workflows/check-package.yml

@@ -0,0 +1,50 @@
+name: Check making image
+
+on:
+    push:
+        branches:
+            - develop
+            - feature/check-package
+
+
+jobs:
+    build:
+        strategy:
+            fail-fast: true
+            matrix:
+               os: [windows-latest, ubuntu-latest, macOS-latest]
+               include:
+                    - os: windows-latest
+                      displayName: Windows
+                      prefix: win
+                      app-image: bsl-language-server
+                    - os: ubuntu-latest
+                      displayName: Linux
+                      prefix: nix
+                      app-image: bsl-language-server
+                    - os: macOS-latest
+                      displayName: MacOS
+                      prefix: mac
+                      app-image: bsl-language-server.app
+        runs-on: ${{ matrix.os }}
+        name: (${{ matrix.displayName }}) create image app version
+
+        steps:
+            - name: Checkout source
+              uses: actions/checkout@v4
+
+            - name: Set up JDK
+              uses: actions/setup-java@v4
+              with:
+                java-version: 20
+                distribution: 'temurin'
+
+            - name: Build bootJar with Gradle
+              run: ./gradlew check build
+
+            - name: Build jpackage application image
+              run: python .github/scripts/build-jpackage.py ${{ matrix.prefix }} ${{ matrix.app-image }}
+
+
+                  
+                  

.github/workflows/codeql-analysis.yml

@@ -23,21 +23,21 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         # We must fetch at least the immediate parents so that if this is
         # a pull request then we can checkout the head.
         fetch-depth: 2
 
     - name: Set up JDK 11
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: 17
         distribution: 'temurin'
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       # Override language selection by uncommenting this and choosing your languages
       with:
         languages: java
@@ -52,4 +52,4 @@ jobs:
     - run: ./gradlew jar
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

.github/workflows/gh-pages.yml

@@ -17,10 +17,10 @@ jobs:
   build-deploy:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Setup JDK
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: 17
         distribution: 'temurin'
@@ -29,7 +29,7 @@ jobs:
       run: ./gradlew --no-daemon javadoc
 
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: '3.7.15'
         architecture: 'x64'
@@ -145,7 +145,7 @@ jobs:
         cp -R temp/site/. public/dev/en
         
     - name: Deploy
-      uses: peaceiris/actions-gh-pages@v3.9.2
+      uses: peaceiris/actions-gh-pages@v3.9.3
       with:
         deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }}
         publish_branch: gh-pages

.github/workflows/gradle.yml

@@ -18,20 +18,20 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java_version: ['11', '17']
+        java_version: ['17', '20']
         os: [ubuntu-latest, windows-latest, macOS-latest]
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up JDK ${{ matrix.java_version }}
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: ${{ matrix.java_version }}
         distribution: 'temurin'
     - name: Build with Gradle
       run: ./gradlew check --stacktrace
     - name: Archive test results
       if: failure()
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: junit_report_${{ matrix.os }}_${{ matrix.java_version }}
         path: build/reports/tests/test

.github/workflows/javadoc.yml

@@ -17,9 +17,9 @@ jobs:
     needs: gatekeeper
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up JDK
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: 17
         distribution: 'temurin'

.github/workflows/pre-qa.yml

@@ -21,7 +21,7 @@ jobs:
       run: echo ${{ github.event.number }} > PR_NUMBER.txt
     - name: Archive PR number
       if: github.event_name == 'pull_request'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: PR_NUMBER
         path: PR_NUMBER.txt