Skip to content

Commit de5581f

Browse files
authored
jdk21 (#586)
* jdk 21 * fix
1 parent b23ee3e commit de5581f

8 files changed

Lines changed: 19 additions & 21 deletions

File tree

.github/copilot-instructions.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ MDClasses is a Java library for reading and analyzing metadata from 1C:Enterpris
66

77
**Project Type**: Java library
88
**Build Tool**: Gradle with Kotlin DSL
9-
**Primary Language**: Java 17+
10-
**Target Runtime**: JVM (Java 17, 21, 25 tested)
9+
**Primary Language**: Java 21+
10+
**Target Runtime**: JVM (Java 21, 25 tested)
1111
**Repository Size**: Medium-sized Java project with extensive test coverage
1212

1313
## Build and Test Instructions
1414

1515
### Prerequisites
16-
- Java 17 or higher (tested on Java 17, 21, and 25)
16+
- Java 21 or higher (tested on Java 21, and 25)
1717
- Git with LFS support for test data
1818
- No additional environment setup required
1919

@@ -107,15 +107,15 @@ This runs tests and updates license headers.
107107
### GitHub Actions Workflows
108108
1. **Java CI** (`.github/workflows/java-ci.yml`)
109109
- Runs on: push and pull request
110-
- Tests matrix: Java 17, 21, 25 on Ubuntu, Windows, macOS
110+
- Tests matrix: Java 21, 25 on Ubuntu, Windows, macOS
111111
- Command: `./gradlew check --stacktrace`
112112
- Duration: ~5-10 minutes
113113
- Artifacts: Test results uploaded for all matrix combinations
114114

115115
2. **GitHub Pages** (`.github/workflows/gh-pages.yml`)
116116
- Runs on: push to master/develop when docs change
117117
- Builds Javadoc and MkDocs documentation
118-
- Requires Python 3.10+ and Java 17
118+
- Requires Python 3.10+ and Java 21
119119

120120
### Pre-commit Validation Steps
121121
Before submitting a PR, ensure:
@@ -127,7 +127,7 @@ Before submitting a PR, ensure:
127127
## Code Conventions
128128

129129
### Java Code Style
130-
- Target Java 17, use modern Java features where appropriate
130+
- Target Java 21, use modern Java features where appropriate
131131
- Use Lombok annotations for reducing boilerplate (`@Getter`, `@Setter`, `@Builder`, etc.)
132132
- Package naming: `com.github._1c_syntax.bsl.*`
133133
- Follow standard Java naming conventions

.github/workflows/check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
strategy:
99
fail-fast: false
1010
matrix:
11-
java_version: ['17', '21', '25']
11+
java_version: ['21', '25']
1212
os: [ubuntu-latest, windows-latest, macOS-latest]
1313
include:
1414
- os: windows-latest

.github/workflows/gh-pages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Setup JDK
2626
uses: actions/setup-java@v5
2727
with:
28-
java-version: 17
28+
java-version: 21
2929
distribution: 'liberica'
3030
- name: Build javadoc
3131
run: ./gradlew --no-daemon javadoc

.github/workflows/publish-to-maven-central.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Set up JDK
1919
uses: actions/setup-java@v5
2020
with:
21-
java-version: 17
21+
java-version: 21
2222
distribution: 'temurin'
2323
cache: gradle
2424
- name: Deploy to Central Portal

.github/workflows/qa-sq.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919
lfs: true
2020
- run: |
2121
git fetch --prune --unshallow
22-
- name: Set up JDK 17
22+
- name: Set up JDK
2323
uses: actions/setup-java@v5
2424
with:
25-
java-version: 17
25+
java-version: 21
2626
distribution: 'liberica'
2727
- name: SonarCloud Scan
2828
run: ./gradlew check sonar

.github/workflows/update-gradle.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ jobs:
1515
fetch-depth: 0
1616
fetch-tags: true
1717

18-
- name: Set up JDK 17
18+
- name: Set up JDK
1919
uses: actions/setup-java@v5
2020
with:
21-
java-version: 17
21+
java-version: 21
2222
distribution: 'temurin'
2323
cache: gradle
2424

build.gradle.kts

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,9 @@ dependencies {
6060
// прочее
6161
implementation("commons-io:commons-io:2.21.0")
6262

63-
implementation("io.github.1c-syntax:bsl-common-library:0.9.2")
64-
implementation("io.github.1c-syntax:utils:0.6.8")
65-
implementation("io.github.1c-syntax:supportconf:0.15.0") {
66-
exclude("io.github.1c-syntax:bsl-common-library")
67-
}
63+
implementation("io.github.1c-syntax:bsl-common-library:0.10.0")
64+
implementation("io.github.1c-syntax:utils:0.7.0")
65+
implementation("io.github.1c-syntax:supportconf:0.16.0")
6866

6967
// быстрый поиск классов
7068
implementation("io.github.classgraph:classgraph:4.8.184")
@@ -92,8 +90,8 @@ dependencies {
9290
}
9391

9492
java {
95-
sourceCompatibility = JavaVersion.VERSION_17
96-
targetCompatibility = JavaVersion.VERSION_17
93+
sourceCompatibility = JavaVersion.VERSION_21
94+
targetCompatibility = JavaVersion.VERSION_21
9795
withSourcesJar()
9896
withJavadocJar()
9997
}

docs/ru/systemRequirements.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
MDClasses представляет собой Java библиотеку, соответственно ее использование возможно в приложения, использующих JVM.
88

9-
На данный момент библиотека разрабатывается с использованием Java 17, но в рамках сборочных конвейеров происходит проверка работоспособности при использовании более свежих версий, в частности версии Java 20.
9+
На данный момент библиотека разрабатывается с использованием Java 21, но в рамках сборочных конвейеров происходит проверка работоспособности при использовании более свежих версий, в частности версии Java 25.
1010

1111
## Поддерживаемые операционные системы
1212

0 commit comments

Comments
 (0)