-
Notifications
You must be signed in to change notification settings - Fork 80
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Historically, the js api and ide projects were separate, under the assumption that distinct JS files might be exposed to different consumers. That never happened, and for DHC the web-client-ide jar is down to only three .java files. This PR moves those files to web-client-api, and then removes the build wiring made redundant with only one JS library.
- Loading branch information
1 parent
0f65df1
commit 71f3bd7
Showing
18 changed files
with
48 additions
and
84 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,20 +1,44 @@ | ||
plugins { | ||
id 'io.deephaven.project.register' | ||
id 'java-library' | ||
} | ||
|
||
apply from: "$rootDir/gradle/web-client.gradle" | ||
|
||
configurations { | ||
js | ||
} | ||
|
||
dependencies { | ||
api project(':web-shared-beans') | ||
implementation project(':web-shared-beans') | ||
implementation project(':web-client-backplane') | ||
|
||
api 'com.vertispan.nio:gwt-nio:1.0-alpha-1' | ||
implementation 'com.vertispan.nio:gwt-nio:1.0-alpha-1' | ||
|
||
js project(path: ':proto:raw-js-openapi', configuration: 'js') | ||
} | ||
Classpaths.inheritElemental(project, 'elemental2-core', 'implementation') | ||
Classpaths.inheritElemental(project, 'elemental2-promise', 'implementation') | ||
Classpaths.inheritElemental(project, 'elemental2-dom', 'implementation') | ||
|
||
GwtTools.gwtCompile project, 'io.deephaven.web.DeephavenApi', 'Create a jar of client JS API' | ||
|
||
def jsOutput = layout.buildDirectory.dir('js') | ||
def gwtOutput = tasks.register('gwtOutput', Sync) { | ||
includeEmptyDirs = false | ||
from(tasks.getByName('gwtCompile').outputs.files) { | ||
// only copy the dhapi module, and don't give it a wrapper directory | ||
include 'dhapi/**' | ||
eachFile { it.path = 'jsapi/' + it.path.substring('dhapi/'.length()) } | ||
} | ||
into jsOutput | ||
} | ||
|
||
artifacts { | ||
js(jsOutput) { | ||
builtBy gwtOutput | ||
} | ||
} | ||
Classpaths.inheritElemental(project, 'elemental2-core', 'api') | ||
Classpaths.inheritElemental(project, 'elemental2-promise', 'api') | ||
Classpaths.inheritElemental(project, 'elemental2-dom', 'api') | ||
|
||
GwtTools.gwtLib project | ||
project.tasks.getByName('quick').dependsOn project.tasks.withType(de.esoco.gwt.gradle.task.GwtCompileTask) | ||
|
||
apply from: "$rootDir/gradle/web-gwt-test.gradle" |
6 changes: 0 additions & 6 deletions
6
web/client-api/src/main/java/io/deephaven/ide/IdeShared.gwt.xml
This file was deleted.
Oops, something went wrong.
3 changes: 1 addition & 2 deletions
3
web/client-api/src/main/java/io/deephaven/web/DeephavenApi.gwt.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
web/client-api/src/main/java/io/deephaven/web/DeephavenApiDev.gwt.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
.../io/deephaven/ide/shared/CommandInfo.java → ...deephaven/web/client/ide/CommandInfo.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 1 addition & 2 deletions
3
...va/io/deephaven/ide/client/IdeClient.java → ...o/deephaven/web/client/ide/IdeClient.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 8 additions & 4 deletions
12
...o/deephaven/ide/client/IdeConnection.java → ...ephaven/web/client/ide/IdeConnection.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 1 addition & 2 deletions
3
...aven/ide/client/IdeConnectionOptions.java → .../web/client/ide/IdeConnectionOptions.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...a/io/deephaven/ide/shared/IdeSession.java → .../deephaven/web/client/ide/IdeSession.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...io/deephaven/ide/shared/LspTranslate.java → ...eephaven/web/client/ide/LspTranslate.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
6 changes: 0 additions & 6 deletions
6
web/client-ide/src/main/java/io/deephaven/ide/DeephavenIde.gwt.xml
This file was deleted.
Oops, something went wrong.
6 changes: 0 additions & 6 deletions
6
web/client-ide/src/main/java/io/deephaven/ide/DeephavenIdeDev.gwt.xml
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters