build: Prepare for 3.13.5 (#1452)

Signed-off-by: Sheng Chen <sheche@microsoft.com>
microsoft · Nov 27, 2023 · e1cf562 · e1cf562
1 parent 8a9771a
commit e1cf562
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,17 @@ 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.13.5
+### Added
+- Implement onWillUpdate() in GradleBuildServerBuildSupport. [PR#1405](https://github.com/microsoft/vscode-gradle/pull/1405)
+
+### Fixed
+- Disable manually applying configuration files on import temporarily. [PR#1451](https://github.com/microsoft/vscode-gradle/pull/1451)
+
+### Changed
+- Bump Gradle wrapper to v8.4. [#1420](https://github.com/microsoft/vscode-gradle/issues/1420), contributed by [@JoseLion](https://github.com/JoseLion)
+
+
 ## 3.13.4
 ### Fixed
 - Store the scan result of the project importer. [PR#1445](https://github.com/microsoft/vscode-gradle/pull/1445)

diff --git a/extension/jdtls.ext/com.microsoft.gradle.bs.importer.target/pom.xml b/extension/jdtls.ext/com.microsoft.gradle.bs.importer.target/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.microsoft.gradle.jdtls.ext</groupId>
 		<artifactId>gradle-jdtls-ext-parent</artifactId>
-		<version>0.1.0</version>
+		<version>0.2.0</version>
 	</parent>
 	<artifactId>com.microsoft.gradle.bs.importer.tp</artifactId>
 	<name>${base.name} :: Target Platform</name>

diff --git a/extension/jdtls.ext/com.microsoft.gradle.bs.importer/META-INF/MANIFEST.MF b/extension/jdtls.ext/com.microsoft.gradle.bs.importer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Gradle Build Server Importer
 Bundle-SymbolicName: com.microsoft.gradle.bs.importer;singleton:=true
-Bundle-Version: 0.1.0
+Bundle-Version: 0.2.0
 Bundle-Activator: com.microsoft.gradle.bs.importer.ImporterPlugin
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy

diff --git a/extension/jdtls.ext/com.microsoft.gradle.bs.importer/pom.xml b/extension/jdtls.ext/com.microsoft.gradle.bs.importer/pom.xml
@@ -4,8 +4,8 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.microsoft.gradle.jdtls.ext</groupId>
-		<artifactId>gradle-jdtls-ext-parent</artifactId>
-		<version>0.1.0</version>
+        <artifactId>gradle-jdtls-ext-parent</artifactId>
+        <version>0.2.0</version>
     </parent>
     <artifactId>com.microsoft.gradle.bs.importer</artifactId>
     <packaging>eclipse-plugin</packaging>

diff --git a/...le.bs.importer/src/com/microsoft/gradle/bs/importer/GradleBuildServerProjectImporter.java b/...le.bs.importer/src/com/microsoft/gradle/bs/importer/GradleBuildServerProjectImporter.java
@@ -44,8 +44,6 @@ public class GradleBuildServerProjectImporter extends AbstractProjectImporter {
 
     private static final String CLIENT_NAME = "jdtls";
 
-    private static final String CLIENT_VERSION = "0.1.0";
-
     private static final String BSP_VERSION = "2.1.0-M4";
 
     private static final String SCHEMA_VERSION_KEY = "bspSchemaVersion";
@@ -163,7 +161,7 @@ public void importToWorkspace(IProgressMonitor monitor) throws OperationCanceled
                 .orElse(rootFolder.toPath());
         InitializeBuildParams params = new InitializeBuildParams(
                 CLIENT_NAME,
-                CLIENT_VERSION,
+                ImporterPlugin.getBundleVersion(),
                 BSP_VERSION,
                 inferredRoot.toUri().toString(),
                 new BuildClientCapabilities(java.util.Collections.singletonList("java"))

diff --git a/...com.microsoft.gradle.bs.importer/src/com/microsoft/gradle/bs/importer/ImporterPlugin.java b/...com.microsoft.gradle.bs.importer/src/com/microsoft/gradle/bs/importer/ImporterPlugin.java
@@ -38,10 +38,13 @@ public class ImporterPlugin extends Plugin {
 
     private static String bundleDirectory;
 
+    private static String bundleVersion = "";
+
     @Override
     public void start(BundleContext context) throws Exception {
         BuildStateManager.getBuildStateManager().startup();
         ImporterPlugin.instance = this;
+        bundleVersion = context.getBundle().getVersion().toString();
         digestStore = new DigestStore(getStateLocation().toFile());
         Optional<File> bundleFile = FileLocator.getBundleFileLocation(context.getBundle());
         if (!bundleFile.isPresent()) {
@@ -62,6 +65,10 @@ public static ImporterPlugin getInstance() {
         return ImporterPlugin.instance;
     }
 
+    public static String getBundleVersion() {
+        return bundleVersion;
+    }
+
     public static DigestStore getDigestStore() {
         return instance.digestStore;
     }

diff --git a/extension/jdtls.ext/pom.xml b/extension/jdtls.ext/pom.xml
@@ -4,7 +4,7 @@
     <groupId>com.microsoft.gradle.jdtls.ext</groupId>
     <artifactId>gradle-jdtls-ext-parent</artifactId>
     <name>${base.name} :: Parent</name>
-    <version>0.1.0</version>
+    <version>0.2.0</version>
     <packaging>pom</packaging>
     <properties>
         <base.name>Gradle Build Server Client</base.name>

diff --git a/extension/package-lock.json b/extension/package-lock.json
diff --git a/extension/package.json b/extension/package.json
@@ -2,7 +2,7 @@
   "name": "vscode-gradle",
   "displayName": "Gradle for Java",
   "description": "Manage Gradle Projects, run Gradle tasks and provide better Gradle file authoring experience in VS Code",
-  "version": "3.13.4",
+  "version": "3.13.5",
   "private": true,
   "publisher": "vscjava",
   "aiKey": "b4aae7d0-c65b-4819-92bf-1d2f537ae7ce",
@@ -43,7 +43,7 @@
   "main": "./dist/index.js",
   "contributes": {
     "javaExtensions": [
-      "./server/com.microsoft.gradle.bs.importer-0.1.0.jar"
+      "./server/com.microsoft.gradle.bs.importer-0.2.0.jar"
     ],
     "languages": [
       {