Skip to content

Commit 9006161

Browse files
JiaamingJiaaming
committed
merge
Fix buildJars task (microsoft#1481) chore(deps): bump protobufjs from 7.2.4 to 7.2.6 in /npm-package (microsoft#1483) Bumps [protobufjs](https://github.com/protobufjs/protobuf.js) from 7.2.4 to 7.2.6. - [Release notes](https://github.com/protobufjs/protobuf.js/releases) - [Changelog](https://github.com/protobufjs/protobuf.js/blob/master/CHANGELOG.md) - [Commits](protobufjs/protobuf.js@protobufjs-v7.2.4...protobufjs-v7.2.6) --- updated-dependencies: - dependency-name: protobufjs dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jinbo Wang <jinbwan@microsoft.com> chore(deps-dev): bump protobufjs from 7.2.4 to 7.2.6 in /extension (microsoft#1482) Bumps [protobufjs](https://github.com/protobufjs/protobuf.js) from 7.2.4 to 7.2.6. - [Release notes](https://github.com/protobufjs/protobuf.js/releases) - [Changelog](https://github.com/protobufjs/protobuf.js/blob/master/CHANGELOG.md) - [Commits](protobufjs/protobuf.js@protobufjs-v7.2.4...protobufjs-v7.2.6) --- updated-dependencies: - dependency-name: protobufjs dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jinbo Wang <jinbwan@microsoft.com> chores: Add build server debug config (microsoft#1486) build: Update code sign task to v5 (microsoft#1488) refactor: Move Gradle Daemons implementation from Java into Typescript (microsoft#1489) Fix: Append the log message to build output if it's from compilation report. (microsoft#1490) - Store the id of the compilation task in an LRU cache. - Append the log message to the build output if it's from the compilation task. Signed-off-by: Sheng Chen <sheche@microsoft.com> fix: set GradleExecution jdk use java.import.gradle.java.home (microsoft#1491) Refresh the output folders after build tasks (microsoft#1493) Signed-off-by: Sheng Chen <sheche@microsoft.com> build: Update telemetry wrapper to 0.14.0 (microsoft#1495) chore(deps-dev): bump braces from 3.0.2 to 3.0.3 in /extension (microsoft#1496) Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3. - [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md) - [Commits](micromatch/braces@3.0.2...3.0.3) --- updated-dependencies: - dependency-name: braces dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Extract api scan to a separate pipeline (microsoft#1498) build: Prepare for 3.14.0 (microsoft#1499) chore(deps-dev): bump braces from 3.0.2 to 3.0.3 in /npm-package (microsoft#1500) Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3. - [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md) - [Commits](micromatch/braces@3.0.2...3.0.3) --- updated-dependencies: - dependency-name: braces dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> gradle server muti-thread fix- Fix the importer version and prepare for 3.14.1 (microsoft#1501) build - Update target platform (microsoft#1502) init named pipe impl muti-thread and named pipe for buildServer gradle server muti-thread fix- Fix the importer version and prepare for 3.14.1 (microsoft#1501) build - Update target platform (microsoft#1502) init named pipe test build Server named pipe connection test build Server named pipe connection update build/initialize sender finish forward message demo finish merge and named pipe implement polling solution Only send request after initialization (microsoft#1503) fix - Add java 22 to compatibility matrix (microsoft#1505) Introduce gson to simplify the object parsing (microsoft#1509) Signed-off-by: Sheng Chen <sheche@microsoft.com> fix bug: buildServerHandler
1 parent ddb31c4 commit 9006161

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+1667
-454
lines changed

‎.azure-pipelines/vscode-gradle-apiscan.yml

+112
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
name: $(Date:yyyyMMdd).$(Rev:r)
2+
resources:
3+
repositories:
4+
- repository: self
5+
type: git
6+
ref: refs/heads/main
7+
- repository: 1esPipelines
8+
type: git
9+
name: 1ESPipelineTemplates/1ESPipelineTemplates
10+
ref: refs/tags/release
11+
trigger: none
12+
pr: none
13+
extends:
14+
template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
15+
parameters:
16+
pool:
17+
name: 1ES_JavaTooling_Pool
18+
image: 1ES_JavaTooling_Windows_2022
19+
os: windows
20+
sdl:
21+
sourceAnalysisPool:
22+
name: 1ES_JavaTooling_Pool
23+
image: 1ES_JavaTooling_Windows_2022
24+
os: windows
25+
spotBugs:
26+
enabled: false
27+
stages:
28+
- stage: Build
29+
jobs:
30+
- job: Job_1
31+
displayName: VSCode-Gradle-API-SCAN
32+
templateContext:
33+
outputs:
34+
- output: pipelineArtifact
35+
artifactName: extension
36+
targetPath: $(Build.ArtifactStagingDirectory)
37+
displayName: "Publish Artifact: extension"
38+
steps:
39+
- checkout: self
40+
fetchTags: true
41+
- task: JavaToolInstaller@0
42+
displayName: Install Java 11
43+
inputs:
44+
versionSpec: '11'
45+
jdkArchitectureOption: 'x64'
46+
jdkSourceOption: 'PreInstalled'
47+
- task: NodeTool@0
48+
displayName: Install Node 16.14.2
49+
inputs:
50+
versionSpec: '16.14.2'
51+
- task: Gradle@2
52+
displayName: Build
53+
inputs:
54+
gradleWrapperFile: 'gradlew'
55+
gradleOptions: '-Xmx3072m'
56+
tasks: 'build'
57+
- task: Gradle@2
58+
displayName: PrepareForRelease
59+
inputs:
60+
gradleWrapperFile: 'gradlew'
61+
gradleOptions: '-Xmx3072m'
62+
tasks: 'prepareForRelease'
63+
- bash: chmod +x gradle-server
64+
workingDirectory: $(Build.SourcesDirectory)/extension/lib
65+
displayName: Set permission
66+
- task: DownloadBuildArtifacts@1
67+
displayName: 'Download Build Server Artifacts'
68+
inputs:
69+
buildType: specific
70+
project: 'a4d27ce2-a42d-4b71-8eef-78cee9a9728e'
71+
pipeline: 16493
72+
downloadType: specific
73+
extractTars: false
74+
- task: CopyFiles@2
75+
displayName: 'Copy Build Server Artifacts'
76+
inputs:
77+
SourceFolder: '$(System.ArtifactsDirectory)/build-server/server/build/libs'
78+
Contents: '**'
79+
TargetFolder: $(Build.SourcesDirectory)/extension/server
80+
- task: JavaToolInstaller@0
81+
displayName: Install Java 17
82+
inputs:
83+
versionSpec: '17'
84+
jdkArchitectureOption: 'x64'
85+
jdkSourceOption: 'PreInstalled'
86+
- task: Gradle@2
87+
displayName: Build
88+
inputs:
89+
gradleWrapperFile: 'gradlew'
90+
gradleOptions: '-Xmx3072m'
91+
tasks: ':extension:copyJdtlsPluginJar'
92+
- bash: npx @vscode/vsce@latest package
93+
workingDirectory: $(Build.SourcesDirectory)/extension
94+
displayName: Package VSIX
95+
- task: CopyFiles@2
96+
displayName: "Copy Files for APIScan"
97+
inputs:
98+
Contents: "extension/*.vsix"
99+
TargetFolder: $(Agent.TempDirectory)/APIScanFiles
100+
condition: and(succeeded(), ne(variables['DisableAPIScan'], 'true'))
101+
### Run latest version of APIScan listed at https://www.1eswiki.com/wiki/APIScan_Build_Task
102+
- task: APIScan@2
103+
displayName: Run APIScan
104+
inputs:
105+
softwareFolder: $(Agent.TempDirectory)/APIScanFiles
106+
softwareName: "vscode-gradle"
107+
softwareVersionNum: "$(Build.BuildId)"
108+
isLargeApp: false
109+
toolVersion: "Latest"
110+
condition: and(succeeded(), ne(variables['DisableAPIScan'], 'true'))
111+
env:
112+
AzureServicesAuthConnectionString: runAs=App;AppId=$(ApiScanClientId);TenantId=$(ApiScanTenant);AppKey=$(ApiScanSecret)

‎.azure-pipelines/vscode-gradle-nightly.yml

+16-25
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ extends:
2020
parameters:
2121
pool:
2222
name: 1ES_JavaTooling_Pool
23-
image: 1ES_JavaTooling_Windows_2022
24-
os: windows
23+
image: 1ES_JavaTooling_Ubuntu-2004
24+
os: linux
2525
sdl:
2626
sourceAnalysisPool:
2727
name: 1ES_JavaTooling_Pool
@@ -68,10 +68,15 @@ extends:
6868
- bash: chmod +x gradle-server
6969
workingDirectory: $(Build.SourcesDirectory)/extension/lib
7070
displayName: Set permission
71-
- task: EsrpCodeSigning@2
71+
- task: EsrpCodeSigning@5
7272
displayName: 'ESRP CodeSigning'
7373
inputs:
74-
ConnectedServiceName: 'vscjavaci_esrp_codesign'
74+
ConnectedServiceName: 'ESRP-Release-Test'
75+
AppRegistrationClientId: '1992ee18-e9d2-42d6-ab20-94dd947a44b6'
76+
AppRegistrationTenantId: '72f988bf-86f1-41af-91ab-2d7cd011db47'
77+
AuthAKVName: 'vscjavaci'
78+
AuthCertName: 'vscjava-esrprelease-auth'
79+
AuthSignCertName: 'VSCJava-CodeSign'
7580
FolderPath: 'extension/lib'
7681
Pattern: 'gradle-server.jar'
7782
signConfigType: 'inlineSignParams'
@@ -143,10 +148,15 @@ extends:
143148
gradleWrapperFile: 'gradlew'
144149
gradleOptions: '-Xmx3072m'
145150
tasks: ':extension:copyJdtlsPluginJar'
146-
- task: EsrpCodeSigning@2
151+
- task: EsrpCodeSigning@5
147152
displayName: 'ESRP CodeSigning'
148153
inputs:
149-
ConnectedServiceName: 'vscjavaci_esrp_codesign'
154+
ConnectedServiceName: 'ESRP-Release-Test'
155+
AppRegistrationClientId: '1992ee18-e9d2-42d6-ab20-94dd947a44b6'
156+
AppRegistrationTenantId: '72f988bf-86f1-41af-91ab-2d7cd011db47'
157+
AuthAKVName: 'vscjavaci'
158+
AuthCertName: 'vscjava-esrprelease-auth'
159+
AuthSignCertName: 'VSCJava-CodeSign'
150160
FolderPath: 'extension/server'
151161
Pattern: 'com.microsoft.gradle.bs.importer-*.jar'
152162
signConfigType: 'inlineSignParams'
@@ -173,25 +183,6 @@ extends:
173183
- bash: npx @vscode/vsce@latest package --pre-release
174184
workingDirectory: $(Build.SourcesDirectory)/extension
175185
displayName: Package VSIX
176-
### Copy files for APIScan
177-
- task: CopyFiles@2
178-
displayName: "Copy Files for APIScan"
179-
inputs:
180-
Contents: "extension/*.vsix"
181-
TargetFolder: $(Agent.TempDirectory)/APIScanFiles
182-
condition: and(succeeded(), ne(variables['DisableAPIScan'], 'true'))
183-
### Run latest version of APIScan listed at https://www.1eswiki.com/wiki/APIScan_Build_Task
184-
- task: APIScan@2
185-
displayName: Run APIScan
186-
inputs:
187-
softwareFolder: $(Agent.TempDirectory)/APIScanFiles
188-
softwareName: "vscode-gradle"
189-
softwareVersionNum: "$(Build.BuildId)"
190-
isLargeApp: false
191-
toolVersion: "Latest"
192-
condition: and(succeeded(), ne(variables['DisableAPIScan'], 'true'))
193-
env:
194-
AzureServicesAuthConnectionString: runAs=App;AppId=$(ApiScanClientId);TenantId=$(ApiScanTenant);AppKey=$(ApiScanSecret)
195186
- task: CopyFiles@2
196187
displayName: Copy VSIX
197188
inputs:

‎.azure-pipelines/vscode-gradle-rc.yml

+16-24
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ extends:
2020
parameters:
2121
pool:
2222
name: 1ES_JavaTooling_Pool
23-
image: 1ES_JavaTooling_Windows_2022
24-
os: windows
23+
image: 1ES_JavaTooling_Ubuntu-2004
24+
os: linux
2525
sdl:
2626
sourceAnalysisPool:
2727
name: 1ES_JavaTooling_Pool
@@ -68,10 +68,15 @@ extends:
6868
- bash: chmod +x gradle-server
6969
workingDirectory: $(Build.SourcesDirectory)/extension/lib
7070
displayName: Set permission
71-
- task: EsrpCodeSigning@2
71+
- task: EsrpCodeSigning@5
7272
displayName: 'ESRP CodeSigning'
7373
inputs:
74-
ConnectedServiceName: 'vscjavaci_esrp_codesign'
74+
ConnectedServiceName: 'ESRP-Release-Test'
75+
AppRegistrationClientId: '1992ee18-e9d2-42d6-ab20-94dd947a44b6'
76+
AppRegistrationTenantId: '72f988bf-86f1-41af-91ab-2d7cd011db47'
77+
AuthAKVName: 'vscjavaci'
78+
AuthCertName: 'vscjava-esrprelease-auth'
79+
AuthSignCertName: 'VSCJava-CodeSign'
7580
FolderPath: 'extension/lib'
7681
Pattern: 'gradle-server.jar'
7782
signConfigType: 'inlineSignParams'
@@ -138,10 +143,15 @@ extends:
138143
gradleWrapperFile: 'gradlew'
139144
gradleOptions: '-Xmx3072m'
140145
tasks: ':extension:copyJdtlsPluginJar'
141-
- task: EsrpCodeSigning@2
146+
- task: EsrpCodeSigning@5
142147
displayName: 'ESRP CodeSigning'
143148
inputs:
144-
ConnectedServiceName: 'vscjavaci_esrp_codesign'
149+
ConnectedServiceName: 'ESRP-Release-Test'
150+
AppRegistrationClientId: '1992ee18-e9d2-42d6-ab20-94dd947a44b6'
151+
AppRegistrationTenantId: '72f988bf-86f1-41af-91ab-2d7cd011db47'
152+
AuthAKVName: 'vscjavaci'
153+
AuthCertName: 'vscjava-esrprelease-auth'
154+
AuthSignCertName: 'VSCJava-CodeSign'
145155
FolderPath: 'extension/server'
146156
Pattern: 'com.microsoft.gradle.bs.importer-*.jar'
147157
signConfigType: 'inlineSignParams'
@@ -168,24 +178,6 @@ extends:
168178
- bash: npx @vscode/vsce@latest package
169179
workingDirectory: $(Build.SourcesDirectory)/extension
170180
displayName: Package VSIX
171-
- task: CopyFiles@2
172-
displayName: "Copy Files for APIScan"
173-
inputs:
174-
Contents: "extension/*.vsix"
175-
TargetFolder: $(Agent.TempDirectory)/APIScanFiles
176-
condition: and(succeeded(), ne(variables['DisableAPIScan'], 'true'))
177-
### Run latest version of APIScan listed at https://www.1eswiki.com/wiki/APIScan_Build_Task
178-
- task: APIScan@2
179-
displayName: Run APIScan
180-
inputs:
181-
softwareFolder: $(Agent.TempDirectory)/APIScanFiles
182-
softwareName: "vscode-gradle"
183-
softwareVersionNum: "$(Build.BuildId)"
184-
isLargeApp: false
185-
toolVersion: "Latest"
186-
condition: and(succeeded(), ne(variables['DisableAPIScan'], 'true'))
187-
env:
188-
AzureServicesAuthConnectionString: runAs=App;AppId=$(ApiScanClientId);TenantId=$(ApiScanTenant);AppKey=$(ApiScanSecret)
189181
- task: CopyFiles@2
190182
displayName: Copy VSIX
191183
inputs:

‎.vscode/launch.json

+20
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,26 @@
8181
"order": 2
8282
}
8383
},
84+
{
85+
"name": "Debug Extension & Build Server",
86+
"type": "extensionHost",
87+
"request": "launch",
88+
"runtimeExecutable": "${execPath}",
89+
"args": [
90+
"--extensionDevelopmentPath=${workspaceFolder}/extension"
91+
],
92+
"outFiles": [
93+
"${workspaceFolder}/extension/dist/**/*.js"
94+
],
95+
"preLaunchTask": "Gradle: Build",
96+
"presentation": {
97+
"group": "debug",
98+
"order": 3
99+
},
100+
"env": {
101+
"DEBUG_GRADLE_BUILD_SERVER":"true"
102+
},
103+
},
84104
{
85105
"name": "Debug Language Server: Launch Extension",
86106
"type": "extensionHost",

‎.vscode/settings.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
],
1919
"editor.formatOnSave": false,
2020
"editor.codeActionsOnSave": {
21-
"source.fixAll.eslint": true
21+
"source.fixAll.eslint": "explicit"
2222
},
2323
"[markdown]": {
2424
"editor.defaultFormatter": "esbenp.prettier-vscode"
@@ -32,12 +32,13 @@
3232
"[java]": {
3333
"editor.defaultFormatter": "redhat.java",
3434
"editor.codeActionsOnSave": {
35-
"source.fixAll.spotlessGradle": true
35+
"source.fixAll.spotlessGradle": "explicit"
3636
}
3737
},
3838
"[xml]": {
3939
"editor.defaultFormatter": "esbenp.prettier-vscode"
4040
},
4141
"files.insertFinalNewline": true,
42-
"files.trimTrailingWhitespace": true
42+
"files.trimTrailingWhitespace": true,
43+
"java.compile.nullAnalysis.mode": "disabled"
4344
}

‎CHANGELOG.md

+23
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,29 @@ All notable changes to the "vscode-gradle" extension will be documented in this
44
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
55
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
66

7+
### 3.14.1
8+
### What's Changed
9+
* fix - Fix the importer version.
10+
11+
## 3.14.0
12+
### What's Changed
13+
* enhancement - Bump Gradle Wrapper to v8.5 and change Java 21 min Gradle version by @JoseLion in https://github.com/microsoft/vscode-gradle/pull/1455
14+
* enhancement - Group the Gradle related menus in the file explorer into a submenu labeled 'Gradle' by @testforstephen in https://github.com/microsoft/vscode-gradle/pull/1474
15+
* enhancement - Upgrade Build Server for Gradle to 0.2.0
16+
* fix - Exclude the project itself becoming its project classpath entry by @jdneo in https://github.com/microsoft/vscode-gradle/pull/1464
17+
* fix - Append the log message to build output if it's from compilation report. by @jdneo in https://github.com/microsoft/vscode-gradle/pull/1490
18+
* fix - Set GradleExecution jdk use java.import.gradle.java.home by @Jiaaming in https://github.com/microsoft/vscode-gradle/pull/1491
19+
* fix - Refresh the output folders after build tasks by @jdneo in https://github.com/microsoft/vscode-gradle/pull/1493
20+
* build - Fix buildJars task by @donat in https://github.com/microsoft/vscode-gradle/pull/1481
21+
* build - Add Build Server debug config by @Jiaaming in https://github.com/microsoft/vscode-gradle/pull/1486
22+
* build - Move Gradle Daemons implementation from Java into Typescript by @Jiaaming in https://github.com/microsoft/vscode-gradle/pull/1489
23+
24+
## New Contributors
25+
* @donat made their first contribution in https://github.com/microsoft/vscode-gradle/pull/1481
26+
* @Jiaaming made their first contribution in https://github.com/microsoft/vscode-gradle/pull/1486
27+
28+
**Full Changelog**: https://github.com/microsoft/vscode-gradle/compare/3.13.5...3.14.0
29+
730
## 3.13.5
831
### Added
932
- Implement onWillUpdate() in GradleBuildServerBuildSupport. [PR#1405](https://github.com/microsoft/vscode-gradle/pull/1405)

‎CONTRIBUTING.md

+19
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,25 @@ The extension uses a Gradle plugin (`com.microsoft.gradle.GradlePlugin`) to get
4040

4141
> Note: There is a known issue that when the Gradle project stores in a sub-folder of the root folder, the `Attach to Gradle Plugin` will fail to attach. See [#1237](https://github.com/microsoft/vscode-gradle/issues/1237).
4242
43+
## Debugging Gradle Build Server
44+
45+
To debug the Extension with the [Gradle Build Server](https://github.com/microsoft/build-server-for-gradle), follow these steps:
46+
47+
1. Open the `extension/build-server-for-gradle` directory, which you should have [imported previously](#build-gradle-project-importer) as a separate project.
48+
2. In the `.vscode/launch.json` of the build-server-for-gradle project, ensure you have the following configuration to attach the debugger:
49+
```json
50+
{
51+
"type": "java",
52+
"name": "Attach to Gradle Build Server",
53+
"request": "attach",
54+
"hostName": "localhost",
55+
"port": "8989",
56+
"projectName": "server"
57+
}
58+
```
59+
3. In your main project (vscode-gradle), start the `Debug Extension & Build Server` launch configuration.
60+
4. In the build-server-for-gradle project, start the `Attach to Gradle Build Server` launch configuration.
61+
4362
## Debugging Gradle Language Server (editing feature related)
4463

4564
1. Run vscode launch configuration `Debug Language Server: Launch Extension`.

0 commit comments

Comments
 (0)