Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use JDK 21 and update Tycho plugin #1645

Merged
merged 4 commits into from
Feb 11, 2025
Merged

Use JDK 21 and update Tycho plugin #1645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0e0bc15
update to jdk 21
Eskibear Feb 11, 2025
c24f1ca
update tycho plugin to 4.0.11
Eskibear Feb 11, 2025
96c74be
Update maven wrapper to maven 3.9.6
Eskibear Feb 11, 2025
c1076fa
Update MANIFEST.MF with JavaSE-21
Eskibear Feb 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .azure-pipelines/vscode-gradle-apiscan.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ extends:
- checkout: self
fetchTags: true
- task: JavaToolInstaller@0
displayName: Install Java 17
displayName: Install Java 21
inputs:
versionSpec: '17'
versionSpec: '21'
jdkArchitectureOption: 'x64'
jdkSourceOption: 'PreInstalled'
- task: NodeTool@0
Expand Down
4 changes: 2 additions & 2 deletions .azure-pipelines/vscode-gradle-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ extends:
- checkout: self
fetchTags: false
- task: JavaToolInstaller@0
displayName: Install Java 17
displayName: Install Java 21
inputs:
versionSpec: '17'
versionSpec: '21'
jdkArchitectureOption: 'x64'
jdkSourceOption: 'PreInstalled'
- task: NodeTool@0
Expand Down
4 changes: 2 additions & 2 deletions .azure-pipelines/vscode-gradle-nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ extends:
packageType: 'sdk'
version: '3.1.x'
- task: JavaToolInstaller@0
displayName: Install Java 17
displayName: Install Java 21
inputs:
versionSpec: '17'
versionSpec: '21'
jdkArchitectureOption: 'x64'
jdkSourceOption: 'PreInstalled'
- task: NodeTool@0
Expand Down
4 changes: 2 additions & 2 deletions .azure-pipelines/vscode-gradle-rc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ extends:
packageType: 'sdk'
version: '3.1.x'
- task: JavaToolInstaller@0
displayName: Install Java 17
displayName: Install Java 21
inputs:
versionSpec: '17'
versionSpec: '21'
jdkArchitectureOption: 'x64'
jdkSourceOption: 'PreInstalled'
- task: NodeTool@0
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:
- uses: actions/checkout@v2
with:
fetch-depth: 0 # required by sonarqube
- name: Use Java 17
- name: Use Java 21
uses: actions/setup-java@v1
with:
java-version: "17"
java-version: "21"
architecture: x64
- name: Use Node 18.20.4
uses: actions/setup-node@v4
Expand Down Expand Up @@ -69,7 +69,7 @@ jobs:
fail-fast: false
matrix:
node-version: [18.20.4]
java-version: ["17", "21"]
java-version: ["21"]
os: [ubuntu-latest, windows-latest, macos-latest]
steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Start by opening an issue using one of the issue templates, or propose a change

### Prerequisites
1. Install [nvm](https://github.com/nvm-sh/nvm)
2. Install [Java version >= 17](https://adoptium.net/)
2. Install [Java version >= 21](https://adoptium.net/)
3. Select Node version: `nvm use`
4. If using an Apple M1:
- Add `npm_arch=x64` to $HOME/.gradle/gradle.properties
Expand Down
2 changes: 1 addition & 1 deletion extension/jdtls.ext/.mvn/wrapper/maven-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.0/apache-maven-3.5.0-bin.zip
distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
2 changes: 1 addition & 1 deletion extension/jdtls.ext/com.microsoft.gradle.bs.importer/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Bundle-Name: Gradle Build Server Importer
Bundle-SymbolicName: com.microsoft.gradle.bs.importer;singleton:=true
Bundle-Version: 0.5.3
Bundle-Activator: com.microsoft.gradle.bs.importer.ImporterPlugin
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-ActivationPolicy: lazy
Import-Package: org.eclipse.jdt.core,
org.eclipse.jdt.launching,
Expand Down
2 changes: 1 addition & 1 deletion extension/jdtls.ext/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<properties>
<base.name>Gradle Build Server Client</base.name>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<tycho-version>2.7.2</tycho-version>
<tycho-version>4.0.11</tycho-version>
</properties>

<modules>
Expand Down
Loading