Skip to content

Commit e1cf562

Browse files
authored
build: Prepare for 3.13.5 (#1452)
Signed-off-by: Sheng Chen <[email protected]>
1 parent 8a9771a commit e1cf562

File tree

9 files changed

+28
-12
lines changed

9 files changed

+28
-12
lines changed

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,17 @@ 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.13.5
8+
### Added
9+
- Implement onWillUpdate() in GradleBuildServerBuildSupport. [PR#1405](https://github.com/microsoft/vscode-gradle/pull/1405)
10+
11+
### Fixed
12+
- Disable manually applying configuration files on import temporarily. [PR#1451](https://github.com/microsoft/vscode-gradle/pull/1451)
13+
14+
### Changed
15+
- Bump Gradle wrapper to v8.4. [#1420](https://github.com/microsoft/vscode-gradle/issues/1420), contributed by [@JoseLion](https://github.com/JoseLion)
16+
17+
718
## 3.13.4
819
### Fixed
920
- Store the scan result of the project importer. [PR#1445](https://github.com/microsoft/vscode-gradle/pull/1445)

extension/jdtls.ext/com.microsoft.gradle.bs.importer.target/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.microsoft.gradle.jdtls.ext</groupId>
66
<artifactId>gradle-jdtls-ext-parent</artifactId>
7-
<version>0.1.0</version>
7+
<version>0.2.0</version>
88
</parent>
99
<artifactId>com.microsoft.gradle.bs.importer.tp</artifactId>
1010
<name>${base.name} :: Target Platform</name>

extension/jdtls.ext/com.microsoft.gradle.bs.importer/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: Gradle Build Server Importer
44
Bundle-SymbolicName: com.microsoft.gradle.bs.importer;singleton:=true
5-
Bundle-Version: 0.1.0
5+
Bundle-Version: 0.2.0
66
Bundle-Activator: com.microsoft.gradle.bs.importer.ImporterPlugin
77
Bundle-RequiredExecutionEnvironment: JavaSE-17
88
Bundle-ActivationPolicy: lazy

extension/jdtls.ext/com.microsoft.gradle.bs.importer/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<modelVersion>4.0.0</modelVersion>
55
<parent>
66
<groupId>com.microsoft.gradle.jdtls.ext</groupId>
7-
<artifactId>gradle-jdtls-ext-parent</artifactId>
8-
<version>0.1.0</version>
7+
<artifactId>gradle-jdtls-ext-parent</artifactId>
8+
<version>0.2.0</version>
99
</parent>
1010
<artifactId>com.microsoft.gradle.bs.importer</artifactId>
1111
<packaging>eclipse-plugin</packaging>

extension/jdtls.ext/com.microsoft.gradle.bs.importer/src/com/microsoft/gradle/bs/importer/GradleBuildServerProjectImporter.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ public class GradleBuildServerProjectImporter extends AbstractProjectImporter {
4444

4545
private static final String CLIENT_NAME = "jdtls";
4646

47-
private static final String CLIENT_VERSION = "0.1.0";
48-
4947
private static final String BSP_VERSION = "2.1.0-M4";
5048

5149
private static final String SCHEMA_VERSION_KEY = "bspSchemaVersion";
@@ -163,7 +161,7 @@ public void importToWorkspace(IProgressMonitor monitor) throws OperationCanceled
163161
.orElse(rootFolder.toPath());
164162
InitializeBuildParams params = new InitializeBuildParams(
165163
CLIENT_NAME,
166-
CLIENT_VERSION,
164+
ImporterPlugin.getBundleVersion(),
167165
BSP_VERSION,
168166
inferredRoot.toUri().toString(),
169167
new BuildClientCapabilities(java.util.Collections.singletonList("java"))

extension/jdtls.ext/com.microsoft.gradle.bs.importer/src/com/microsoft/gradle/bs/importer/ImporterPlugin.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,13 @@ public class ImporterPlugin extends Plugin {
3838

3939
private static String bundleDirectory;
4040

41+
private static String bundleVersion = "";
42+
4143
@Override
4244
public void start(BundleContext context) throws Exception {
4345
BuildStateManager.getBuildStateManager().startup();
4446
ImporterPlugin.instance = this;
47+
bundleVersion = context.getBundle().getVersion().toString();
4548
digestStore = new DigestStore(getStateLocation().toFile());
4649
Optional<File> bundleFile = FileLocator.getBundleFileLocation(context.getBundle());
4750
if (!bundleFile.isPresent()) {
@@ -62,6 +65,10 @@ public static ImporterPlugin getInstance() {
6265
return ImporterPlugin.instance;
6366
}
6467

68+
public static String getBundleVersion() {
69+
return bundleVersion;
70+
}
71+
6572
public static DigestStore getDigestStore() {
6673
return instance.digestStore;
6774
}

extension/jdtls.ext/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<groupId>com.microsoft.gradle.jdtls.ext</groupId>
55
<artifactId>gradle-jdtls-ext-parent</artifactId>
66
<name>${base.name} :: Parent</name>
7-
<version>0.1.0</version>
7+
<version>0.2.0</version>
88
<packaging>pom</packaging>
99
<properties>
1010
<base.name>Gradle Build Server Client</base.name>

extension/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

extension/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "vscode-gradle",
33
"displayName": "Gradle for Java",
44
"description": "Manage Gradle Projects, run Gradle tasks and provide better Gradle file authoring experience in VS Code",
5-
"version": "3.13.4",
5+
"version": "3.13.5",
66
"private": true,
77
"publisher": "vscjava",
88
"aiKey": "b4aae7d0-c65b-4819-92bf-1d2f537ae7ce",
@@ -43,7 +43,7 @@
4343
"main": "./dist/index.js",
4444
"contributes": {
4545
"javaExtensions": [
46-
"./server/com.microsoft.gradle.bs.importer-0.1.0.jar"
46+
"./server/com.microsoft.gradle.bs.importer-0.2.0.jar"
4747
],
4848
"languages": [
4949
{

0 commit comments

Comments
 (0)