JDK21 (#162)

* JDK21

* GA

Author: theshadowco

.github/workflows/check.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java_version: [ '17', '21' ]
+        java_version: [ '21', '25' ]
         os: [ ubuntu-latest, windows-latest, macOS-latest ]
     steps:
       - uses: actions/checkout@v6

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

@@ -18,7 +18,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v5
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
           cache: gradle
       - name: Deploy to Central Portal

.github/workflows/qa.yml

@@ -17,10 +17,10 @@ jobs:
           fetch-depth: ''
       - run: |
           git fetch --prune --unshallow
-      - name: Set up JDK 17
+      - name: Set up JDK
         uses: actions/setup-java@v5
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'adopt'
       - name: SonarCloud Scan
         run: ./gradlew check sonar

.github/workflows/update-gradle.yaml

@@ -15,10 +15,10 @@ jobs:
           fetch-depth: 0
           fetch-tags: true
 
-      - name: Set up JDK 17
+      - name: Set up JDK
         uses: actions/setup-java@v5
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
           cache: gradle
 

build.gradle.kts

@@ -49,12 +49,12 @@ gitVersioning.apply {
 dependencies {
 
     implementation("org.apache.commons:commons-collections4:4.5.0")
-    implementation("io.github.1c-syntax:utils:0.6.3")
+    implementation("io.github.1c-syntax:utils:0.7.0")
 
     // логирование
     implementation("org.slf4j:slf4j-api:2.0.17")
 
-    implementation("org.jspecify:jspecify:1.0.0")
+    api("org.jspecify:jspecify:1.0.0")
 
     // логирование
     testImplementation("org.slf4j:slf4j-reload4j:2.0.17")
@@ -70,8 +70,8 @@ dependencies {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
     withSourcesJar()
     withJavadocJar()
 }

src/main/java/com/github/_1c_syntax/bsl/types/MultiLanguageString.java

@@ -82,7 +82,7 @@ public static MultiLanguageString create(List<MultiLanguageString> strings) {
     if (strings.isEmpty()) {
       return EMPTY;
     } else if (strings.size() == 1) {
-      return strings.get(0);
+      return strings.getFirst();
     } else {
       Set<Entry> content = new HashSet<>();
       strings.forEach(string -> content.addAll(string.getContent()));

src/main/java/com/github/_1c_syntax/bsl/types/ValueTypeDescription.java

@@ -140,7 +140,7 @@ public static ValueTypeDescription create(List<ValueType> types, List<Qualifier>
       return EMPTY;
     }
 
-    var composite = types.size() > 1 || types.get(0) instanceof MDOValueType;
+    var composite = types.size() > 1 || types.getFirst() instanceof MDOValueType;
     return new ValueTypeDescription(types, qualifiers, composite);
   }