Skip to content

Commit 65599c8

Browse files
badsyntaxbadsyntax
committed
Rename GradleTasks* to Gradle*
1 parent 89eee7e commit 65599c8

Some content is hidden

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

50 files changed

+227
-183
lines changed

‎.github/workflows/build-and-test.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Build & Analyse
2525
uses: eskatos/gradle-command-action@v1
2626
with:
27-
arguments: tasks-server:build sonarqube -x :test -x extension:test -x npm-package:test
27+
arguments: gradle-server:build sonarqube -x :test -x extension:test -x npm-package:test
2828
env:
2929
GITHUB_TOKEN: ${{ secrets.GITHUB_SONARCLOUD_TOKEN }}
3030
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
@@ -74,7 +74,7 @@ jobs:
7474
if: matrix.os == 'ubuntu-latest'
7575
- name: Set permissions
7676
run: |
77-
chmod +x extension/lib/tasks-server
77+
chmod +x extension/lib/gradle-server
7878
unset npm_config_prefix
7979
if: matrix.os != 'windows-latest'
8080
- name: Prepare gradle-groovy-custom-build-file

‎.vscode/launch.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
"type": "java",
1919
"name": "Debug Server",
2020
"request": "launch",
21-
"mainClass": "com.github.badsyntax.gradletasks.GradleTasksServer",
22-
"projectName": "tasks-server",
23-
"cwd": "${workspaceFolder}/tasks-server",
21+
"mainClass": "com.github.badsyntax.gradle.GradleServer",
22+
"projectName": "gradle-server",
23+
"cwd": "${workspaceFolder}/gradle-server",
2424
"presentation": {
2525
"group": "debug",
2626
"order": 2

‎extension/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ task buildProd(type: CrossPlatformExec) {
160160
}
161161

162162
task bundle() {
163-
dependsOn ':tasks-server:build', buildProd, ':npm-package:build'
163+
dependsOn ':gradle-server:build', buildProd, ':npm-package:build'
164164
group 'build'
165165
description 'Bundles the extension files for release'
166166
}

‎extension/src/api.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import * as vscode from 'vscode';
2-
import { Output } from './proto/gradle_tasks_pb';
2+
import { Output } from './proto/gradle_pb';
33
import { logger } from './logger';
44
import { GradleTasksTreeDataProvider } from './views/GradleTasksTreeDataProvider';
55
import { GradleTaskProvider } from './tasks/GradleTaskProvider';
66
import { GradleTaskDefinition } from './tasks/GradleTaskDefinition';
7-
import { GradleTasksClient } from './client/GradleTasksClient';
7+
import { GradleClient } from './client/GradleClient';
88

99
export interface RunTaskOpts {
1010
projectFolder: string;
@@ -25,7 +25,7 @@ export class Api {
2525
public logger = logger;
2626

2727
constructor(
28-
private readonly client: GradleTasksClient,
28+
private readonly client: GradleClient,
2929
private readonly taskProvider: GradleTaskProvider,
3030
private readonly treeDataProvider: GradleTasksTreeDataProvider
3131
) {}

‎extension/src/client/GradleTasksClient.ts ‎extension/src/client/GradleClient.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,19 @@ import {
2424
StopDaemonsRequest,
2525
StopDaemonRequest,
2626
StopDaemonReply,
27-
} from '../proto/gradle_tasks_pb';
27+
} from '../proto/gradle_pb';
2828

29-
import { GradleTasksClient as GrpcClient } from '../proto/gradle_tasks_grpc_pb';
29+
import { GradleClient as GrpcClient } from '../proto/gradle_grpc_pb';
3030
import { EventWaiter } from '../events/EventWaiter';
31-
import { GradleTasksServer } from '../server/GradleTasksServer';
31+
import { GradleServer } from '../server/GradleServer';
3232
import { logger } from '../logger';
3333
import { LoggerStream } from '../logger/LoggerSteam';
3434
import { COMMAND_CANCEL_TASK } from '../commands';
3535
import { getGradleConfig } from '../config';
3636
import { GradleTaskDefinition } from '../tasks/GradleTaskDefinition';
3737
import { removeCancellingTask } from '../tasks/taskUtil';
3838

39-
export class GradleTasksClient implements vscode.Disposable {
39+
export class GradleClient implements vscode.Disposable {
4040
private connectDeadline = 20; // seconds
4141
private grpcClient: GrpcClient | null = null;
4242
private _onConnect: vscode.EventEmitter<null> = new vscode.EventEmitter<
@@ -51,7 +51,7 @@ export class GradleTasksClient implements vscode.Disposable {
5151
private readonly waitForConnect = new EventWaiter(this.onConnect).wait;
5252

5353
public constructor(
54-
private readonly server: GradleTasksServer,
54+
private readonly server: GradleServer,
5555
private readonly statusBarItem: vscode.StatusBarItem
5656
) {
5757
this.server.onReady(this.handleServerReady);

‎extension/src/client/index.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import * as vscode from 'vscode';
22

33
import { COMMAND_LOAD_TASKS } from '../commands';
4-
import { GradleTasksServer } from '../server/GradleTasksServer';
5-
import { GradleTasksClient } from './GradleTasksClient';
4+
import { GradleServer } from '../server/GradleServer';
5+
import { GradleClient } from './GradleClient';
66

77
export function registerClient(
8-
server: GradleTasksServer,
8+
server: GradleServer,
99
context: vscode.ExtensionContext
10-
): GradleTasksClient {
10+
): GradleClient {
1111
const statusBarItem = vscode.window.createStatusBarItem();
12-
const client = new GradleTasksClient(server, statusBarItem);
12+
const client = new GradleClient(server, statusBarItem);
1313
context.subscriptions.push(client, statusBarItem);
1414
client.onConnect(() => {
1515
vscode.commands.executeCommand(COMMAND_LOAD_TASKS);

‎extension/src/commands.ts

+11-13
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ import {
1515
invalidateTasksCache,
1616
} from './tasks/GradleTaskProvider';
1717
import { GradleDaemonsTreeDataProvider } from './views/GradleDaemonsTreeDataProvider';
18-
import { StopDaemonsReply } from './proto/gradle_tasks_pb';
18+
import { StopDaemonsReply } from './proto/gradle_pb';
1919
import { GradleDaemonTreeItem } from './views/GradleDaemonTreeItem';
20-
import { GradleTasksClient } from './client/GradleTasksClient';
20+
import { GradleClient } from './client/GradleClient';
2121
import {
2222
runTask,
2323
getTaskExecution,
@@ -72,7 +72,7 @@ function registerShowTasks(
7272
);
7373
}
7474

75-
function registerRunTaskCommand(client: GradleTasksClient): vscode.Disposable {
75+
function registerRunTaskCommand(client: GradleClient): vscode.Disposable {
7676
return vscode.commands.registerCommand(
7777
COMMAND_RUN_TASK,
7878
(treeItem: GradleTaskTreeItem) => {
@@ -83,9 +83,7 @@ function registerRunTaskCommand(client: GradleTasksClient): vscode.Disposable {
8383
);
8484
}
8585

86-
function registerDebugTaskCommand(
87-
client: GradleTasksClient
88-
): vscode.Disposable {
86+
function registerDebugTaskCommand(client: GradleClient): vscode.Disposable {
8987
return vscode.commands.registerCommand(
9088
COMMAND_DEBUG_TASK,
9189
async (treeItem: GradleTaskTreeItem, args = '') => {
@@ -97,7 +95,7 @@ function registerDebugTaskCommand(
9795
}
9896

9997
function registerRestartTaskCommand(
100-
client: GradleTasksClient,
98+
client: GradleClient,
10199
gradleTasksTreeDataProvider: GradleTasksTreeDataProvider
102100
): vscode.Disposable {
103101
return vscode.commands.registerCommand(
@@ -118,7 +116,7 @@ function registerRestartTaskCommand(
118116
}
119117

120118
function registerRunTaskWithArgsCommand(
121-
client: GradleTasksClient
119+
client: GradleClient
122120
): vscode.Disposable {
123121
return vscode.commands.registerCommand(
124122
COMMAND_RUN_TASK_WITH_ARGS,
@@ -135,7 +133,7 @@ function registerRunTaskWithArgsCommand(
135133
}
136134

137135
function registerDebugTaskWithArgsCommand(
138-
client: GradleTasksClient
136+
client: GradleClient
139137
): vscode.Disposable {
140138
return vscode.commands.registerCommand(
141139
COMMAND_DEBUG_TASK_WITH_ARGS,
@@ -163,7 +161,7 @@ function registerRenderTaskCommand(
163161
}
164162

165163
function registerCancelTaskCommand(
166-
client: GradleTasksClient,
164+
client: GradleClient,
167165
gradleTasksTreeDataProvider: GradleTasksTreeDataProvider
168166
): vscode.Disposable {
169167
return vscode.commands.registerCommand(
@@ -237,7 +235,7 @@ async function cancelStopDaemons(): Promise<boolean | undefined> {
237235
}
238236
}
239237

240-
function registerStopDaemons(client: GradleTasksClient): vscode.Disposable {
238+
function registerStopDaemons(client: GradleClient): vscode.Disposable {
241239
return vscode.commands.registerCommand(
242240
COMMAND_STOP_DAEMONS,
243241
async (): Promise<void> => {
@@ -261,7 +259,7 @@ function registerStopDaemons(client: GradleTasksClient): vscode.Disposable {
261259
);
262260
}
263261

264-
function registerStopDaemon(client: GradleTasksClient): vscode.Disposable {
262+
function registerStopDaemon(client: GradleClient): vscode.Disposable {
265263
return vscode.commands.registerCommand(
266264
COMMAND_STOP_DAEMON,
267265
async (treeItem: GradleDaemonTreeItem): Promise<void> => {
@@ -357,7 +355,7 @@ function registerShowLogsCommand(): vscode.Disposable {
357355
export function registerCommands(
358356
context: vscode.ExtensionContext,
359357
statusBarItem: vscode.StatusBarItem,
360-
client: GradleTasksClient,
358+
client: GradleClient,
361359
gradleTasksTreeDataProvider: GradleTasksTreeDataProvider,
362360
gradleDaemonsTreeDataProvider: GradleDaemonsTreeDataProvider,
363361
treeView: vscode.TreeView<vscode.TreeItem>,

‎extension/src/config.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as vscode from 'vscode';
2-
import { GradleConfig } from './proto/gradle_tasks_pb';
2+
import { GradleConfig } from './proto/gradle_pb';
33

44
type AutoDetect = 'on' | 'off';
55

‎extension/src/server/GradleTasksServer.ts ‎extension/src/server/GradleServer.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export interface ServerOptions {
88
host: string;
99
}
1010

11-
export class GradleTasksServer implements vscode.Disposable {
11+
export class GradleServer implements vscode.Disposable {
1212
private taskExecution?: vscode.TaskExecution;
1313
private _onReady: vscode.EventEmitter<null> = new vscode.EventEmitter<null>();
1414
private _onStop: vscode.EventEmitter<null> = new vscode.EventEmitter<null>();

‎extension/src/server/index.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import * as vscode from 'vscode';
2-
import { ServerOptions, GradleTasksServer } from './GradleTasksServer';
2+
import { ServerOptions, GradleServer } from './GradleServer';
33

44
export function registerServer(
55
opts: ServerOptions,
66
context: vscode.ExtensionContext
7-
): GradleTasksServer {
8-
const server = new GradleTasksServer(opts, context);
7+
): GradleServer {
8+
const server = new GradleServer(opts, context);
99
context.subscriptions.push(
1010
server,
1111
vscode.workspace.onDidChangeConfiguration(

‎extension/src/server/serverUtil.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import { getConfigJavaHome } from '../config';
44

55
export const SERVER_TASK_NAME = 'Gradle Tasks Server';
66

7-
export function getGradleTasksServerCommand(): string {
7+
export function getGradleServerCommand(): string {
88
const platform = process.platform;
99
if (platform === 'win32') {
10-
return '.\\tasks-server.bat';
10+
return '.\\gradle-server.bat';
1111
} else if (platform === 'linux' || platform === 'darwin') {
12-
return './tasks-server';
12+
return './gradle-server';
1313
} else {
1414
throw new Error('Unsupported platform');
1515
}
@@ -20,7 +20,7 @@ export function buildGradleServerTask(
2020
cwd: string,
2121
args: string[] = []
2222
): vscode.Task {
23-
const cmd = `"${getGradleTasksServerCommand()}"`;
23+
const cmd = `"${getGradleServerCommand()}"`;
2424
logger.debug(`Gradle Tasks Server dir: ${cwd}`);
2525
logger.debug(`Gradle Tasks Server cmd: ${cmd} ${args.join(' ')}`);
2626
const taskType = 'gradle';

‎extension/src/tasks/CustomBuildTaskTerminal.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ import * as getPort from 'get-port';
55
import { waitOnTcp, isTest } from '../util';
66
import { logger } from '../logger';
77
import { LoggerStream } from '../logger/LoggerSteam';
8-
import { Output } from '../proto/gradle_tasks_pb';
8+
import { Output } from '../proto/gradle_pb';
99
import {
1010
COMMAND_CANCEL_TASK,
1111
COMMAND_UPDATE_JAVA_PROJECT_CONFIGURATION,
1212
} from '../commands';
1313
import { isTaskRunning } from './taskUtil';
14-
import { GradleTasksClient } from '../client/GradleTasksClient';
14+
import { GradleClient } from '../client/GradleClient';
1515

1616
export class CustomBuildTaskTerminal implements vscode.Pseudoterminal {
1717
private writeEmitter = new vscode.EventEmitter<string>();
@@ -22,7 +22,7 @@ export class CustomBuildTaskTerminal implements vscode.Pseudoterminal {
2222

2323
constructor(
2424
private readonly workspaceFolder: vscode.WorkspaceFolder,
25-
private readonly client: GradleTasksClient,
25+
private readonly client: GradleClient,
2626
private readonly projectFolder: string
2727
) {}
2828

‎extension/src/tasks/GradleTaskProvider.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import * as vscode from 'vscode';
33
import { logger } from '../logger';
44
import { EventWaiter } from '../events/EventWaiter';
55
import { loadTasksForFolders } from './taskUtil';
6-
import { GradleTasksClient } from '../client/GradleTasksClient';
6+
import { GradleClient } from '../client/GradleClient';
77
import { COMMAND_REFRESH_DAEMON_STATUS } from '../commands';
88

99
let cachedTasks: vscode.Task[] = [];
@@ -31,7 +31,7 @@ export class GradleTaskProvider
3131
public readonly waitForTasksLoaded = new EventWaiter(this.onTasksLoaded).wait;
3232
private loadTasksPromise?: Promise<vscode.Task[]>;
3333

34-
constructor(private readonly client: GradleTasksClient) {}
34+
constructor(private readonly client: GradleClient) {}
3535

3636
async provideTasks(): Promise<vscode.Task[] | undefined> {
3737
return this.loadTasks();

‎extension/src/tasks/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import * as vscode from 'vscode';
33
import { GradleTaskProvider } from './GradleTaskProvider';
44
import { COMMAND_REFRESH, COMMAND_REFRESH_DAEMON_STATUS } from '../commands';
55
import { isGradleTask, restartQueuedTask } from './taskUtil';
6-
import { GradleTasksClient } from '../client/GradleTasksClient';
6+
import { GradleClient } from '../client/GradleClient';
77
import { GradleTaskManager } from './GradleTaskManager';
88

99
function handleWorkspaceFoldersChange(): void {
@@ -12,7 +12,7 @@ function handleWorkspaceFoldersChange(): void {
1212

1313
export function registerTaskProvider(
1414
context: vscode.ExtensionContext,
15-
client: GradleTasksClient
15+
client: GradleClient
1616
): GradleTaskProvider {
1717
const provider = new GradleTaskProvider(client);
1818
context.subscriptions.push(

0 commit comments

Comments
 (0)