Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: microsoft/vscode-gradle
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a473ddf3dea314504bb69de55ad9ad3bf3165274
Choose a base ref
..
head repository: microsoft/vscode-gradle
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: dcdc8ae74c8c597a0c36ffcd81d19743dcf1a2bb
Choose a head ref
Showing with 4,381 additions and 2,274 deletions.
  1. +2 −27 .azure-pipelines/vscode-gradle-ci.yml
  2. +6 −6 .azure-pipelines/vscode-gradle-nightly.yml
  3. +6 −6 .azure-pipelines/vscode-gradle-rc.yml
  4. +8 −8 .github/workflows/main.yml
  5. +42 −0 CHANGELOG.md
  6. +3 −2 README.md
  7. +3 −3 build.gradle
  8. +179 −178 cgmanifest.json
  9. +5 −0 extension/build.gradle
  10. BIN extension/icon.png
  11. +3,484 −1,756 extension/package-lock.json
  12. +60 −36 extension/package.json
  13. BIN extension/resources/icon-transparency.png
  14. BIN extension/resources/icon.png
  15. +5 −0 extension/src/commands/Commands.ts
  16. +37 −6 extension/src/commands/CreateProjectCommand.ts
  17. +23 −0 extension/src/commands/ReloadJavaProjectsCommand.ts
  18. +3 −0 extension/src/constant.ts
  19. +5 −6 extension/src/createProject/SpecifyProjectNameStep.ts
  20. +3 −18 extension/src/createProject/SpecifySourcePackageNameStep.ts
  21. +14 −19 extension/src/languageServer/languageServer.ts
  22. +9 −2 extension/src/server/GradleServer.ts
  23. +5 −3 extension/src/server/serverUtil.ts
  24. +26 −3 extension/src/tasks/taskUtil.ts
  25. +10 −8 extension/src/terminal/GradleRunnerTerminal.ts
  26. +3 −2 extension/src/test/runTests.ts
  27. +3 −2 extension/src/test/unit/gradleDaemons.test.ts
  28. +1 −1 extension/src/test/vscode-version.ts
  29. +35 −0 extension/src/util/config.ts
  30. +18 −6 extension/src/util/index.ts
  31. +12 −0 extension/src/util/javaExtension.ts
  32. +9 −1 extension/src/views/gradleTasks/GradleTasksTreeDataProvider.ts
  33. +6 −0 extension/src/views/viewUtil.ts
  34. +1 −1 extension/test-fixtures/gradle-groovy-custom-build-file/gradle/wrapper/gradle-wrapper.properties
  35. +1 −1 extension/test-fixtures/gradle-groovy-default-build-file/gradle/wrapper/gradle-wrapper.properties
  36. +1 −1 extension/test-fixtures/gradle-kotlin-default-build-file/gradle/wrapper/gradle-wrapper.properties
  37. +1 −1 extension/test-fixtures/multi-project/gradle/wrapper/gradle-wrapper.properties
  38. +5 −2 gradle-language-server/build.gradle
  39. +1 −0 gradle-plugin/build.gradle
  40. +4 −0 gradle-plugin/src/main/java/com/microsoft/gradle/DefaultGradleTask.java
  41. +1 −1 gradle-plugin/src/main/java/com/microsoft/gradle/GradlePlugin.java
  42. +72 −31 gradle-plugin/src/main/java/com/microsoft/gradle/GradleProjectModelBuilder.java
  43. +2 −0 gradle-server/build.gradle
  44. +19 −5 gradle-server/src/main/java/com/github/badsyntax/gradle/GradleBuildRunner.java
  45. +8 −4 gradle-server/src/main/java/com/github/badsyntax/gradle/handlers/GetBuildHandler.java
  46. +70 −21 gradle-server/src/main/java/com/github/badsyntax/gradle/utils/PluginUtils.java
  47. +5 −2 gradle-server/src/main/java/com/github/badsyntax/gradle/utils/Utils.java
  48. +9 −0 gradle-server/src/test/java/com/github/badsyntax/gradle/UtilsTest.java
  49. BIN gradle/wrapper/gradle-wrapper.jar
  50. +1 −1 gradle/wrapper/gradle-wrapper.properties
  51. +153 −104 gradlew
  52. +2 −0 npm-package/build.gradle
29 changes: 2 additions & 27 deletions .azure-pipelines/vscode-gradle-ci.yml
Original file line number Diff line number Diff line change
@@ -25,31 +25,6 @@ jobs:
inputs:
CredScan: true

- job: codeql_semmle
displayName: CodeQL - Semmle
pool:
vmImage: 'windows-latest'
steps:
- task: Semmle@1
displayName: CodeQL - Semmle - extension
inputs:
sourceCodeDirectory: '$(Build.SourcesDirectory)/extension'
includeNodeModules: false
language: 'tsandjs'
querySuite: 'Recommended'
timeout: '1800'
ram: '16384'
addProjectDirToScanningExclusionList: true
- task: Semmle@1
displayName: CodeQL - Semmle
inputs:
sourceCodeDirectory: '$(Build.SourcesDirectory)'
language: 'java'
querySuite: 'Recommended'
timeout: '1800'
ram: '16384'
addProjectDirToScanningExclusionList: true

- job: ci
dependsOn: cred_scan
displayName: VSCode-Gradle-CI
@@ -63,9 +38,9 @@ jobs:
jdkArchitectureOption: 'x64'
jdkSourceOption: 'PreInstalled'
- task: NodeTool@0
displayName: Install Node 14.15.4
displayName: Install Node 16.14.2
inputs:
versionSpec: '14.15.4'
versionSpec: '16.14.2'
- task: Gradle@2
displayName: Build
inputs:
12 changes: 6 additions & 6 deletions .azure-pipelines/vscode-gradle-nightly.yml
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ schedules:
- develop

pool:
vmImage: 'ubuntu-latest'
vmImage: 'ubuntu-20.04'

steps:
- task: JavaToolInstaller@0
@@ -24,9 +24,9 @@ steps:
jdkArchitectureOption: 'x64'
jdkSourceOption: 'PreInstalled'
- task: NodeTool@0
displayName: Install Node 14.15.4
displayName: Install Node 16.14.2
inputs:
versionSpec: '14.15.4'
versionSpec: '16.14.2'
- task: Gradle@2
displayName: Build
inputs:
@@ -43,13 +43,13 @@ steps:
cd $(Build.SourcesDirectory)/extension/lib
chmod +x gradle-server
displayName: Set permission
- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
- task: EsrpCodeSigning@2
displayName: 'ESRP CodeSigning'
inputs:
ConnectedServiceName: 'vscjavaci_codesign'
FolderPath: extension/lib
FolderPath: 'extension/lib'
Pattern: 'gradle-server.jar'
signConfigType: inlineSignParams
signConfigType: 'inlineSignParams'
inlineOperation: |
[
{
12 changes: 6 additions & 6 deletions .azure-pipelines/vscode-gradle-rc.yml
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ trigger: none
pr: none

pool:
vmImage: 'ubuntu-latest'
vmImage: 'ubuntu-20.04'

steps:
- task: JavaToolInstaller@0
@@ -17,9 +17,9 @@ steps:
jdkArchitectureOption: 'x64'
jdkSourceOption: 'PreInstalled'
- task: NodeTool@0
displayName: Install Node 14.15.4
displayName: Install Node 16.14.2
inputs:
versionSpec: '14.15.4'
versionSpec: '16.14.2'
- task: Gradle@2
displayName: Build
inputs:
@@ -36,13 +36,13 @@ steps:
cd $(Build.SourcesDirectory)/extension/lib
chmod +x gradle-server
displayName: Set permission
- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
- task: EsrpCodeSigning@2
displayName: 'ESRP CodeSigning'
inputs:
ConnectedServiceName: 'vscjavaci_codesign'
FolderPath: extension/lib
FolderPath: 'extension/lib'
Pattern: 'gradle-server.jar'
signConfigType: inlineSignParams
signConfigType: 'inlineSignParams'
inlineOperation: |
[
{
16 changes: 8 additions & 8 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ on:
jobs:
build-and-analyse:
name: Build & Analyse
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
@@ -18,10 +18,10 @@ jobs:
with:
java-version: "11"
architecture: x64
- name: Use Node 14.15.4
- name: Use Node 16.14.2
uses: actions/setup-node@v1
with:
node-version: 14.15.4
node-version: 16.14.2
- name: Cache npm cache directory
uses: actions/cache@v2
with:
@@ -54,9 +54,9 @@ jobs:
strategy:
fail-fast: false
matrix:
node-version: [14.15.4]
java-version: ["8", "11", "17"]
os: [ubuntu-20.04, windows-2019, macos-10.15]
node-version: [16.14.2]
java-version: ["8", "11", "17", "19"]
os: [ubuntu-latest, windows-latest, macos-latest]
steps:
- uses: actions/checkout@v2
- name: Use Node ${{ matrix.node-version }}
@@ -90,12 +90,12 @@ jobs:
- name: Start Xvfb
run: |
Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
if: matrix.os == 'ubuntu-20.04'
if: matrix.os == 'ubuntu-latest'
- name: Set permissions
run: |
chmod +x extension/lib/gradle-server
unset npm_config_prefix
if: matrix.os != 'windows-2019'
if: matrix.os != 'windows-latest'
- name: Test Gradle Language Server
uses: gradle/gradle-build-action@v2
with:
42 changes: 42 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -4,6 +4,48 @@ All notable changes to the "vscode-gradle" extension will be documented in this
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [3.12.7](https://github.com/microsoft/vscode-gradle/compare/3.12.6...3.12.7) (2023-03-29)

### Added
- Support Java 19. [PR#1319](https://github.com/microsoft/vscode-gradle/pull/1319)

### Changed
- Upgrade vscode requirement to `1.76.0`. [PR#1263](https://github.com/microsoft/vscode-gradle/pull/1263)
- Upgrade repository wrapper to `8.0.2`. [PR#1317](https://github.com/microsoft/vscode-gradle/pull/1317)

### Fixed
- [Bugs fixed](https://github.com/microsoft/vscode-gradle/issues?q=is%3Aissue+label%3Abug+milestone%3A%22March+2023%22+is%3Aclosed)

## [3.12.6](https://github.com/microsoft/vscode-gradle/compare/3.12.5...3.12.6) (2022-11-29)

### Fixed
- [Bugs fixed](https://github.com/microsoft/vscode-gradle/issues?q=is%3Aissue+label%3Abug+milestone%3A%22November+2022%22+is%3Aclosed)

## [3.12.5](https://github.com/microsoft/vscode-gradle/compare/3.12.4...3.12.5) (2022-09-28)

### Added
- New configuration `gradle.projectOpenBehaviour` to specify the default method of opening newly created project. [PR#1282](https://github.com/microsoft/vscode-gradle/pull/1282)

## [3.12.4](https://github.com/microsoft/vscode-gradle/compare/3.12.3...3.12.4) (2022-08-31)

### Added
- Automatically rename duplicate task names with additional relative path. [PR#1265](https://github.com/microsoft/vscode-gradle/pull/1265)

### Changed
- Allow to use environment executable java to launch servers. [PR#1263](https://github.com/microsoft/vscode-gradle/pull/1263)

### Fixed
- [Bugs fixed](https://github.com/microsoft/vscode-gradle/issues?q=is%3Aissue+label%3Abug+milestone%3A%22Augest+2022%22+is%3Aclosed)

## [3.12.3](https://github.com/microsoft/vscode-gradle/compare/3.12.2...3.12.3) (2022-07-27)

### Added
- Show Gradle commands in Project Manager's submenu. [PR#1252](https://github.com/microsoft/vscode-gradle/pull/1252)
- Show shortcut for reload all Java projects in Gradle Project view. [PR#1259](https://github.com/microsoft/vscode-gradle/pull/1259)

### Changed
- Move the previous refresh button to overflow group. [PR#1259](https://github.com/microsoft/vscode-gradle/pull/1259)

## [3.12.2](https://github.com/microsoft/vscode-gradle/compare/3.12.1...3.12.2) (2022-06-30)

### Fixed
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -8,8 +8,8 @@ This VS Code extension provides a visual interface for your Gradle build. You ca

## Requirements

- [VS Code >= 1.63.0](https://code.visualstudio.com/download)
- [Java >= 8](https://adoptopenjdk.net/)
- [VS Code >= 1.76.0](https://code.visualstudio.com/download)
- [Java from 8 to 19](https://adoptopenjdk.net/)

## Project Discovery

@@ -223,6 +223,7 @@ This extension contributes the following settings:
- `gradle.debug`: Show extra debug info in the output panel (boolean)
- `gradle.disableConfirmations`: Disable the warning confirm messages when performing batch actions (eg clear tasks, stop daemons etc) (boolean)
- `gradle.allowParallelRun`: Allow to run tasks in parallel, each running will create a new terminal. This configuration will override `gradle.reuseTerminals` and always create new task terminals when running or debugging a task.
- `gradle.projectOpenBehaviour`: Specify the default method of opening newly created project ("Interactive", "Open" or "Add to Workspace")

## Gradle & Java Settings

6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ plugins {
project.ext.set('grpcVersion', '1.45.0')
project.ext.set('protobufVersion', '3.12.0')
project.ext.set('protocVersion', project.protobufVersion)
project.ext.set('toolingAPIVersion', '7.3')
project.ext.set('toolingAPIVersion', '8.0.2')

allprojects {
group = 'vscode-gradle'
@@ -20,14 +20,14 @@ subprojects {
apply plugin: 'com.diffplug.spotless'

repositories {
mavenCentral()
mavenLocal()
maven {
url 'https://maven-central.storage-download.googleapis.com/repos/central/data/'
}
maven {
url 'https://repo.gradle.org/gradle/libs-releases'
}
mavenCentral()
mavenLocal()
}

protobuf {
Loading