Skip to content

Commit 1f8e868

Browse files
nixel2007nixel2007
authored
Merge pull request #3307 from 1c-syntax/develop
2 parents e875425 + dd5b714 commit 1f8e868

File tree

908 files changed

+5036
-2525
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

908 files changed

+5036
-2525
lines changed

‎.devcontainer/devcontainer.json

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,38 @@
1-
{"image":"mcr.microsoft.com/devcontainers/universal:2"}
1+
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
2+
// README at: https://github.com/devcontainers/templates/tree/main/src/java
3+
{
4+
"name": "Java",
5+
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
6+
"image": "mcr.microsoft.com/devcontainers/java:1-17-bookworm",
7+
8+
"features": {
9+
"ghcr.io/devcontainers/features/java:1": {
10+
"version": "none",
11+
"installMaven": "false",
12+
"installGradle": "true"
13+
},
14+
"ghcr.io/devcontainers/features/python:1": {}
15+
},
16+
"customizations": {
17+
"vscode": {
18+
"extensions": [
19+
"vscjava.vscode-gradle",
20+
"GitHub.vscode-github-actions",
21+
"astrizhachuk.1c-extension-pack",
22+
"zhuangtongfa.Material-theme"
23+
]
24+
}
25+
}
26+
27+
// Use 'forwardPorts' to make a list of ports inside the container available locally.
28+
// "forwardPorts": [],
29+
30+
// Use 'postCreateCommand' to run commands after the container is created.
31+
// "postCreateCommand": "java -version",
32+
33+
// Configure tool-specific properties.
34+
// "customizations": {},
35+
36+
// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
37+
// "remoteUser": "root"
38+
}

‎.github/dependabot.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,15 @@ updates:
99
directory: "/" # Location of package manifests
1010
schedule:
1111
interval: "daily"
12+
groups:
13+
freefair:
14+
patterns:
15+
- "io.freefair.*"
1216
- package-ecosystem: "github-actions"
1317
directory: "/"
1418
schedule:
1519
interval: "daily"
20+
- package-ecosystem: "devcontainers"
21+
directory: "/"
22+
schedule:
23+
interval: weekly

‎.github/workflows/benchmark.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,17 @@ jobs:
2929
uses: actions/checkout@v3
3030

3131
- name: Setup JDK
32-
uses: actions/setup-java@v3
32+
uses: actions/setup-java@v4
3333
with:
3434
java-version: 17
3535
distribution: 'temurin'
36+
cache: gradle
3637

3738
- name: Build with Gradle
3839
run: ./gradlew bootJar
3940

4041
- name: Set up Python
41-
uses: actions/setup-python@v4
42+
uses: actions/setup-python@v5
4243
with:
4344
python-version: "3.7"
4445

‎.github/workflows/check-package.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,14 @@ jobs:
3131

3232
steps:
3333
- name: Checkout source
34-
uses: actions/checkout@v3
34+
uses: actions/checkout@v4
3535

3636
- name: Set up JDK
37-
uses: actions/setup-java@v3
37+
uses: actions/setup-java@v4
3838
with:
39-
java-version: 20
39+
java-version: 21
4040
distribution: 'temurin'
41+
cache: gradle
4142

4243
- name: Build bootJar with Gradle
4344
run: ./gradlew check build

‎.github/workflows/codeql-analysis.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,22 @@ jobs:
2323

2424
steps:
2525
- name: Checkout repository
26-
uses: actions/checkout@v3
26+
uses: actions/checkout@v4
2727
with:
2828
# We must fetch at least the immediate parents so that if this is
2929
# a pull request then we can checkout the head.
3030
fetch-depth: 2
3131

32-
- name: Set up JDK 11
33-
uses: actions/setup-java@v3
32+
- name: Set up JDK 17
33+
uses: actions/setup-java@v4
3434
with:
3535
java-version: 17
3636
distribution: 'temurin'
37+
cache: gradle
3738

3839
# Initializes the CodeQL tools for scanning.
3940
- name: Initialize CodeQL
40-
uses: github/codeql-action/init@v2
41+
uses: github/codeql-action/init@v3
4142
# Override language selection by uncommenting this and choosing your languages
4243
with:
4344
languages: java
@@ -52,4 +53,4 @@ jobs:
5253
- run: ./gradlew jar
5354

5455
- name: Perform CodeQL Analysis
55-
uses: github/codeql-action/analyze@v2
56+
uses: github/codeql-action/analyze@v3

‎.github/workflows/gh-pages.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,20 @@ jobs:
1717
build-deploy:
1818
runs-on: ubuntu-latest
1919
steps:
20-
- uses: actions/checkout@v3
20+
- uses: actions/checkout@v4
2121

2222
- name: Setup JDK
23-
uses: actions/setup-java@v3
23+
uses: actions/setup-java@v4
2424
with:
2525
java-version: 17
2626
distribution: 'temurin'
27+
cache: gradle
2728

2829
- name: Build javadoc
2930
run: ./gradlew --no-daemon javadoc
3031

3132
- name: Set up Python
32-
uses: actions/setup-python@v4
33+
uses: actions/setup-python@v5
3334
with:
3435
python-version: '3.7.15'
3536
architecture: 'x64'
@@ -145,7 +146,7 @@ jobs:
145146
cp -R temp/site/. public/dev/en
146147
147148
- name: Deploy
148-
uses: peaceiris/actions-gh-pages@v3.9.3
149+
uses: peaceiris/actions-gh-pages@v4.0.0
149150
with:
150151
deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }}
151152
publish_branch: gh-pages

‎.github/workflows/gradle.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,21 @@ jobs:
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
java_version: ['17', '20']
21+
java_version: ['17', '21']
2222
os: [ubuntu-latest, windows-latest, macOS-latest]
2323
steps:
24-
- uses: actions/checkout@v3
24+
- uses: actions/checkout@v4
2525
- name: Set up JDK ${{ matrix.java_version }}
26-
uses: actions/setup-java@v3
26+
uses: actions/setup-java@v4
2727
with:
2828
java-version: ${{ matrix.java_version }}
2929
distribution: 'temurin'
30+
cache: gradle
3031
- name: Build with Gradle
3132
run: ./gradlew check --stacktrace
3233
- name: Archive test results
3334
if: failure()
34-
uses: actions/upload-artifact@v3
35+
uses: actions/upload-artifact@v4
3536
with:
3637
name: junit_report_${{ matrix.os }}_${{ matrix.java_version }}
3738
path: build/reports/tests/test

‎.github/workflows/javadoc.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@ jobs:
1717
needs: gatekeeper
1818
runs-on: ubuntu-latest
1919
steps:
20-
- uses: actions/checkout@v3
20+
- uses: actions/checkout@v4
2121
- name: Set up JDK
22-
uses: actions/setup-java@v3
22+
uses: actions/setup-java@v4
2323
with:
2424
java-version: 17
2525
distribution: 'temurin'
26+
cache: gradle
2627
- name: Check javadoc build
2728
run: ./gradlew javadoc --stacktrace

‎.github/workflows/pre-qa.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
run: echo ${{ github.event.number }} > PR_NUMBER.txt
2222
- name: Archive PR number
2323
if: github.event_name == 'pull_request'
24-
uses: actions/upload-artifact@v3
24+
uses: actions/upload-artifact@v4
2525
with:
2626
name: PR_NUMBER
2727
path: PR_NUMBER.txt

‎.github/workflows/publish-to-sonatype.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@ jobs:
1212
publish:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v3
15+
- uses: actions/checkout@v4
1616
- name: Set up JDK
17-
uses: actions/setup-java@v3
17+
uses: actions/setup-java@v4
1818
with:
1919
java-version: 17
2020
distribution: 'temurin'
21+
cache: gradle
2122
- name: Publish to Sonatype
2223
run: ./gradlew publishMavenPublicationToSonatypeRepository -PsimplifyVersion
2324
env:

‎.github/workflows/qa.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
steps:
1414
- name: Download PR number artifact
1515
if: github.event.workflow_run.event == 'pull_request'
16-
uses: dawidd6/action-download-artifact@v2
16+
uses: dawidd6/action-download-artifact@v5
1717
with:
1818
workflow: ${{ github.event.workflow_run.name }}
1919
run_id: ${{ github.event.workflow_run.id }}
@@ -34,7 +34,7 @@ jobs:
3434
full_name: ${{ github.event.repository.full_name }}
3535
env:
3636
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
37-
- uses: actions/checkout@v3
37+
- uses: actions/checkout@v4
3838
with:
3939
repository: ${{ github.event.workflow_run.head_repository.full_name }}
4040
ref: ${{ github.event.workflow_run.head_branch }}
@@ -48,10 +48,11 @@ jobs:
4848
git checkout ${{ github.event.workflow_run.head_branch }}
4949
git clean -ffdx && git reset --hard HEAD
5050
- name: Set up JDK 17
51-
uses: actions/setup-java@v3
51+
uses: actions/setup-java@v4
5252
with:
5353
java-version: 17
5454
distribution: 'temurin'
55+
cache: gradle
5556
- name: SonarCloud Scan on PR
5657
if: github.event.workflow_run.event == 'pull_request'
5758
run: ./gradlew check sonar -Dsonar.scm.revision=${{ github.event.workflow_run.head_sha }} -Dsonar.pullrequest.key=${{ fromJson(steps.get_pr_data.outputs.data).number }} -Dsonar.pullrequest.branch=${{ fromJson(steps.get_pr_data.outputs.data).head.ref }} -Dsonar.pullrequest.base=${{ fromJson(steps.get_pr_data.outputs.data).base.ref }}

‎.github/workflows/qodana.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,27 +10,27 @@ on:
1010
jobs:
1111
gatekeeper:
1212
runs-on: ubuntu-latest
13-
if: github.event_name == 'pull_request' && startsWith(github.head_ref, 'translations_') == false || github.event_name == 'push'
13+
if: github.event_name == 'pull_request' && startsWith(github.head_ref, 'translations_') == false || github.event_name == 'push' || github.event_name == 'workflow_dispatch'
1414
steps:
1515
- run: echo 'Open the Golden Gate'
1616

1717
qodana:
1818
needs: gatekeeper
1919
runs-on: ubuntu-latest
2020
steps:
21-
- uses: actions/checkout@v3
21+
- uses: actions/checkout@v4
2222
- name: 'Qodana Scan'
23-
uses: JetBrains/qodana-action@v2023.2.1
23+
uses: JetBrains/qodana-action@v2024.1.5
2424
env:
2525
QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}
2626
with:
2727
linter: jetbrains/qodana-jvm-community
28-
- uses: github/codeql-action/upload-sarif@v2
28+
- uses: github/codeql-action/upload-sarif@v3
2929
with:
3030
sarif_file: ${{ runner.temp }}/qodana/results/qodana.sarif.json
3131
- name: Deploy to GitHub Pages
3232
if: github.event_name == 'push'
33-
uses: peaceiris/actions-gh-pages@v3.9.3
33+
uses: peaceiris/actions-gh-pages@v4.0.0
3434
with:
3535
github_token: ${{ secrets.GITHUB_TOKEN }}
3636
publish_dir: ${{ runner.temp }}/qodana/results/report

‎.github/workflows/rebase.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: Checkout the latest code
12-
uses: actions/checkout@v3
12+
uses: actions/checkout@v4
1313
with:
1414
token: ${{ secrets.GITHUB_TOKEN }}
1515
fetch-depth: 0 # otherwise, you will fail to push refs to dest repo

‎.github/workflows/release.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,14 @@ jobs:
2828

2929
steps:
3030
- name: Checkout source
31-
uses: actions/checkout@v3
31+
uses: actions/checkout@v4
3232

3333
- name: Set up JDK
34-
uses: actions/setup-java@v3
34+
uses: actions/setup-java@v4
3535
with:
36-
java-version: 20
36+
java-version: 21
3737
distribution: 'temurin'
38+
cache: gradle
3839

3940
- name: Build bootJar with Gradle
4041
run: ./gradlew check bootJar
@@ -43,13 +44,13 @@ jobs:
4344
run: python .github/scripts/build-jpackage.py ${{ matrix.prefix }} ${{ matrix.app-image }}
4445

4546
- name: Upload artifact
46-
uses: actions/upload-artifact@v3
47+
uses: actions/upload-artifact@v4
4748
with:
4849
name: bsl-language-server_${{ matrix.prefix }}.zip
4950
path: ./${{ matrix.app-image }}
5051

5152
- name: Upload assets to release
52-
uses: AButler/upload-release-assets@v2.0
53+
uses: AButler/upload-release-assets@v3.0
5354
with:
5455
files: './bsl-language-server_${{ matrix.prefix }}.zip'
5556
repo-token: ${{ secrets.GITHUB_TOKEN }}
@@ -60,7 +61,7 @@ jobs:
6061

6162
- name: Upload jar to release
6263
if: matrix.prefix == 'nix'
63-
uses: AButler/upload-release-assets@v2.0
64+
uses: AButler/upload-release-assets@v3.0
6465
with:
6566
files: './build/libs/*.jar'
6667
repo-token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/sentry.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@ name: Sentry
22
on:
33
push:
44
branches-ignore:
5-
- "translations_*"
5+
- "translations_**"
6+
- "dependabot/**"
67
jobs:
78

89
sentry:
910
name: Sentry
1011
runs-on: ubuntu-latest
1112
steps:
12-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
1314
- name: Create Sentry release
1415
uses: getsentry/action-release@v1
1516
env:

‎.github/workflows/update-gradle.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Update Gradle Wrapper
2+
3+
on:
4+
workflow_dispatch:
5+
schedule:
6+
- cron: "0 0 * * 0"
7+
8+
jobs:
9+
update-gradle-wrapper:
10+
runs-on: ubuntu-latest
11+
12+
steps:
13+
- uses: actions/checkout@v4
14+
15+
- name: Set up JDK 17
16+
uses: actions/setup-java@v4
17+
with:
18+
java-version: 17
19+
distribution: 'temurin'
20+
cache: gradle
21+
22+
- name: Update Gradle Wrapper
23+
uses: gradle-update/update-gradle-wrapper-action@v1
24+
with:
25+
repo-token: ${{ secrets.GITHUB_TOKEN }}
26+
set-distribution-checksum: false

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,3 +80,6 @@ public/
8080
bsl-language-server/
8181
bsl-language-server_*.zip
8282
/.idea/misc.xml
83+
*.log
84+
*.hprof
85+
/.idea/material_theme_project_new.xml

0 commit comments

Comments
 (0)