Skip to content

Commit

Permalink
Deps upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
nixel2007 committed Nov 13, 2021
1 parent c8450d9 commit 408ac55
Show file tree
Hide file tree
Showing 14 changed files with 177 additions and 128 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/benchmark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ jobs:
- name: Setup JDK
uses: actions/setup-java@v2
with:
java-version: 16
distribution: 'adopt'
java-version: 17
distribution: 'temurin'

- name: Build with Gradle
run: ./gradlew bootJar
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ jobs:
- name: Set up JDK 11
uses: actions/setup-java@v2
with:
java-version: 11
distribution: 'adopt'
java-version: 17
distribution: 'temurin'

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ jobs:
- name: Setup JDK
uses: actions/setup-java@v2
with:
java-version: 16
distribution: 'adopt'
java-version: 17
distribution: 'temurin'

- name: Build javadoc
run: ./gradlew --no-daemon javadoc
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ jobs:
strategy:
fail-fast: false
matrix:
java_version: ['11', '16']
java_version: ['11', '17']
os: [ubuntu-latest, windows-latest, macOS-latest]
steps:
- uses: actions/[email protected]
- name: Set up JDK ${{ matrix.java_version }}
uses: actions/setup-java@v2
with:
java-version: ${{ matrix.java_version }}
distribution: 'adopt'
distribution: 'temurin'
- name: Build with Gradle
run: ./gradlew check --stacktrace
- name: Archive test results
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/javadoc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v2
with:
java-version: 16
distribution: 'adopt'
java-version: 17
distribution: 'temurin'
- name: Check javadoc build
run: ./gradlew javadoc --stacktrace
4 changes: 2 additions & 2 deletions .github/workflows/publish-to-sonatype.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v2
with:
java-version: 16
distribution: 'adopt'
java-version: 17
distribution: 'temurin'
- name: Publish to Sonatype
run: ./gradlew publishMavenPublicationToSonatypeRepository -PsimplifyVersion
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/qa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
uses: actions/setup-java@v2
with:
java-version: 11
distribution: 'adopt'
distribution: 'temurin'
- name: SonarCloud Scan
run: ./gradlew check sonarqube
env:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v2
with:
java-version: 16
distribution: 'adopt'
java-version: 17
distribution: 'temurin'
- name: Build bootJar with Gradle
run: ./gradlew check bootJar
- name: Build jpackage app-image
Expand Down
8 changes: 4 additions & 4 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ plugins {
id("org.cadixdev.licenser") version "0.6.1"
id("org.sonarqube") version "3.3"
id("io.freefair.lombok") version "6.3.0"
id("io.freefair.javadoc-links") version "6.2.0"
id("io.freefair.javadoc-links") version "6.3.0"
id("io.freefair.javadoc-utf-8") version "6.3.0"
id("io.freefair.aspectj.post-compile-weaving") version "6.3.0"
id("io.freefair.maven-central.validate-poms") version "6.3.0"
Expand Down Expand Up @@ -49,15 +49,15 @@ gitVersioning.apply {

val isSnapshot = gitVersioning.gitVersionDetails.refType != GitRefType.TAG

val languageToolVersion = "5.4"
val languageToolVersion = "5.5"

dependencies {

// RUNTIME

// spring
api("org.springframework.boot:spring-boot-starter")
api("info.picocli:picocli-spring-boot-starter:4.6.1")
api("info.picocli:picocli-spring-boot-starter:4.6.2")

// lsp4j core
api("org.eclipse.lsp4j", "org.eclipse.lsp4j", "0.12.0")
Expand Down Expand Up @@ -115,7 +115,7 @@ dependencies {

// test utils
testImplementation("com.ginsberg", "junit5-system-exit", "1.1.1")
testImplementation("org.awaitility", "awaitility", "4.1.0")
testImplementation("org.awaitility", "awaitility", "4.1.1")
}

java {
Expand Down
2 changes: 1 addition & 1 deletion docs/en/systemRequirements.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Using `BSL Language Server` has some limitations, listed bellow

`BSL Language Server` is a console Java application and requires the presence of a Java virtual machine on the computer.

The minimum supported version is Java 11, but as part of the build pipelines, a health check is performed when using more recent versions. Java versions 11 and 16 are currently supported.
The minimum supported version is Java 11, but as part of the build pipelines, a health check is performed when using more recent versions. Java versions 11 and 17 are currently supported.

JDK vendor is also interesting. Due to the changed licensing policy of Oracle, it is recommended to use open implementations of the `OpenJDK` virtual machine: AdoptOpenJDK, Liberica JDK.

Expand Down
2 changes: 1 addition & 1 deletion docs/systemRequirements.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

`BSL Language Server` представляет собой консольное Java приложение, соответственно, для его функционирования необходимо наличие виртуальной машины Java на компьютере.

На данный момент минимальной поддерживаемой версией является Java 11, но в рамках сборочных конвейеров происходит проверка работоспособности при использовании более свежих версий. На данный момент поддерживаются Java версий 11 и 16.
На данный момент минимальной поддерживаемой версией является Java 11, но в рамках сборочных конвейеров происходит проверка работоспособности при использовании более свежих версий. На данный момент поддерживаются Java версий 11 и 17.

Кроме версии Java интересен и вендор JDK. В связи с изменившейся политикой лицензирования Oracle, рекомендуется использование открытых реализаций виртуальной машины `OpenJDK`: AdoptOpenJDK, Liberica JDK.

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 408ac55

Please sign in to comment.