Skip to content

Commit b028ee2

Browse files
committed
0.0.2 version of compass bazel java extenstion
1 parent 48910e3 commit b028ee2

2 files changed

Lines changed: 33 additions & 12 deletions

File tree

gulpfile.js

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -144,13 +144,33 @@ function downloadServerImpl() {
144144

145145
function buildServerImpl() {
146146
fs.rmSync('./server', { recursive: true, force: true });
147-
cp.execSync(mvnw() + ' clean package -DskipTests=true', {
148-
cwd: BAZEL_ECLIPSE_DIR,
149-
stdio: [0, 1, 2],
150-
});
147+
const jdtlsJar = fs
148+
.readdirSync(
149+
BAZEL_ECLIPSE_DIR + '/releng/p2repository/target/repository/plugins/'
150+
)
151+
.find(
152+
(file) =>
153+
file.startsWith('com.salesforce.bazel.eclipse.jdtls') &&
154+
file.endsWith('.jar')
155+
);
156+
157+
if (jdtlsJar) {
158+
console.log(
159+
'NOTE: skipping build and re-using existing "' +
160+
jdtlsJar +
161+
'" from ../bazel-eclipse/releng/p2repository/target/repository/plugins'
162+
);
163+
} else {
164+
cp.execSync(mvnw() + ' clean package -DskipTests=true', {
165+
cwd: BAZEL_ECLIPSE_DIR,
166+
stdio: [0, 1, 2],
167+
});
168+
}
151169
gulp
152170
.src(
153-
BAZEL_ECLIPSE_DIR + '/releng/p2repository/target/repository/plugins/*.jar'
171+
BAZEL_ECLIPSE_DIR +
172+
'/releng/p2repository/target/repository/plugins/*.jar',
173+
{ encoding: false } // prevent gulp from reading the content as it's not needed
154174
)
155175
.pipe(DROP_JAR_VERSION)
156176
.pipe(jarIsIncludedInPackageJson)

package.json

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
2-
"name": "bazel-java",
3-
"displayName": "Bazel extension for Java(TM) Language Support by Salesforce OSS",
2+
"name": "java-bazel-extension",
3+
"displayName": "Bazel extension for Java(TM) Language Support by Compass",
44
"description": "Bazel support for Java Linting, Intellisense, formatting, refactoring and more...",
5-
"author": "Salesforce OSS",
5+
"author": "Compass",
66
"license": "BSD-3-Clause",
7-
"version": "1.5.0",
8-
"publisher": "sfdc-eng",
9-
"bugs": "https://github.com/salesforce/bazel-vscode-java/issues",
7+
"version": "0.0.2",
8+
"publisher": "COMP",
9+
"bugs": "https://github.com/zhirui1994/bazel-vscode-java/issues",
1010
"preview": true,
1111
"engines": {
1212
"vscode": "^1.100.0"
1313
},
1414
"repository": {
1515
"type": "git",
16-
"url": "https://github.com/salesforce/bazel-vscode-java"
16+
"url": "https://github.com/zhirui1994/bazel-vscode-java"
1717
},
1818
"categories": [
1919
"Programming Languages",
@@ -39,6 +39,7 @@
3939
"javaExtensions": [
4040
"./server/org.eclipse.equinox.event.jar",
4141
"./server/com.github.ben-manes.caffeine.jar",
42+
"./server/org.apache.velocity.engine-core.jar",
4243
"./server/org.jsr-305.jar",
4344
"./server/org.fusesource.jansi.jar",
4445
"./server/com.google.protobuf.jar",

0 commit comments

Comments
 (0)