Skip to content

Commit

Permalink
Update plugins, tasks, build.yml and branding
Browse files Browse the repository at this point in the history
Update plantuml.jar on build
Add tasks for bash, pwsh, powershell and cmd (all on path)
Minor branding fixes
Remove groovy lint plugin, add vscode.groovy
  • Loading branch information
giflw committed Nov 25, 2022
1 parent 9954d71 commit 7630b83
Show file tree
Hide file tree
Showing 8 changed files with 48 additions and 15 deletions.
1 change: 1 addition & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ jobs:
npm install -g yarn
yarn --skip-integrity-check --network-timeout 100000
yarn electron package
yarn eos plugins:plantuml
yarn eos package
mkdir applications/electron/dist/uploads
mv applications/electron/dist/EosThesisIDE.* applications/electron/dist/uploads
Expand Down
44 changes: 38 additions & 6 deletions applications/data/backend/tasks.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,42 @@
{
"version": "2.0.0",
"tasks": [
{
"label": "echo tasks.json",
"type": "shell",
"command": "echo Hello"
}
]
{
"label": "Bash (on PATH)",
"type": "shell",
"command": "bash",
"problemMatcher": [],
"presentation": {
"reveal": "always",
"focus": true
}
},{
"label": "PowerShell Core (on PATH)",
"type": "shell",
"command": "pwsh",
"problemMatcher": [],
"presentation": {
"reveal": "always",
"focus": true
}
},{
"label": "Windows PowerShell (on PATH)",
"type": "shell",
"command": "powershell",
"problemMatcher": [],
"presentation": {
"reveal": "always",
"focus": true
}
},{
"label": "Command Prompt (on PATH)",
"type": "shell",
"command": "cmd",
"problemMatcher": [],
"presentation": {
"reveal": "always",
"focus": true
}
}
]
}
2 changes: 1 addition & 1 deletion applications/data/plugins.list
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ mtxr.sqltools-driver-mysql
mtxr.sqltools-driver-pg
mtxr.sqltools-driver-sqlite
muhammad-sammy.csharp
NicolasVuillamy.vscode-groovy-lint
njzy.stats-bar
olifink.fedora-gnome-light-dark
panekj.powershell
Expand Down Expand Up @@ -62,6 +61,7 @@ vscode.debug-auto-launch
vscode.debug-server-ready
vscode.emmet
vscode.git
vscode.groovy
vscode.handlebars
vscode.html
vscode.html-language-features
Expand Down
4 changes: 2 additions & 2 deletions applications/electron/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -156,15 +156,14 @@
"MehediDracula.php-namespace-resolver": "https://open-vsx.org/api/MehediDracula/php-namespace-resolver/1.1.9/file/MehediDracula.php-namespace-resolver-1.1.9.vsix",
"mike-flanigan.daobeam": "https://open-vsx.org/api/mike-flanigan/daobeam/1.3.12/file/mike-flanigan.daobeam-1.3.12.vsix",
"mikestead.dotenv": "https://open-vsx.org/api/mikestead/dotenv/1.0.1/file/mikestead.dotenv-1.0.1.vsix",
"ms-vscode.js-debug": "https://open-vsx.org/api/ms-vscode/js-debug/1.72.1/file/ms-vscode.js-debug-1.72.1.vsix",
"ms-vscode.js-debug": "https://open-vsx.org/api/ms-vscode/js-debug/1.50.2/file/ms-vscode.js-debug-1.50.2.vsix",
"ms-vscode.references-view": "https://open-vsx.org/api/ms-vscode/references-view/0.0.89/file/ms-vscode.references-view-0.0.89.vsix",
"mtxr.sqltools": "https://open-vsx.org/api/mtxr/sqltools/0.26.0/file/mtxr.sqltools-0.26.0.vsix",
"mtxr.sqltools-driver-mssql": "https://open-vsx.org/api/mtxr/sqltools-driver-mssql/0.2.0/file/mtxr.sqltools-driver-mssql-0.2.0.vsix",
"mtxr.sqltools-driver-mysql": "https://open-vsx.org/api/mtxr/sqltools-driver-mysql/0.2.0/file/mtxr.sqltools-driver-mysql-0.2.0.vsix",
"mtxr.sqltools-driver-pg": "https://open-vsx.org/api/mtxr/sqltools-driver-pg/0.2.0/file/mtxr.sqltools-driver-pg-0.2.0.vsix",
"mtxr.sqltools-driver-sqlite": "https://open-vsx.org/api/mtxr/sqltools-driver-sqlite/0.2.0/file/mtxr.sqltools-driver-sqlite-0.2.0.vsix",
"muhammad-sammy.csharp": "https://open-vsx.org/api/muhammad-sammy/csharp/1.25.0/file/muhammad-sammy.csharp-1.25.0.vsix",
"NicolasVuillamy.vscode-groovy-lint": "https://open-vsx.org/api/NicolasVuillamy/vscode-groovy-lint/2.0.0/file/NicolasVuillamy.vscode-groovy-lint-2.0.0.vsix",
"njzy.stats-bar": "https://open-vsx.org/api/njzy/stats-bar/0.5.2/file/njzy.stats-bar-0.5.2.vsix",
"olifink.fedora-gnome-light-dark": "https://open-vsx.org/api/olifink/fedora-gnome-light-dark/0.0.4/file/olifink.fedora-gnome-light-dark-0.0.4.vsix",
"panekj.powershell": "https://open-vsx.org/api/panekj/powershell/2021.10.0/file/panekj.powershell-2021.10.0.vsix",
Expand Down Expand Up @@ -192,6 +191,7 @@
"vscode.debug-auto-launch": "https://open-vsx.org/api/vscode/debug-auto-launch/1.62.3/file/vscode.debug-auto-launch-1.62.3.vsix",
"vscode.debug-server-ready": "https://open-vsx.org/api/vscode/debug-server-ready/1.62.3/file/vscode.debug-server-ready-1.62.3.vsix",
"vscode.emmet": "https://open-vsx.org/api/vscode/emmet/1.62.3/file/vscode.emmet-1.62.3.vsix",
"vscode.groovy": "https://open-vsx.org/api/vscode/groovy/1.62.3/file/vscode.groovy-1.62.3.vsix",
"vscode.handlebars": "https://open-vsx.org/api/vscode/handlebars/1.62.3/file/vscode.handlebars-1.62.3.vsix",
"vscode.html": "https://open-vsx.org/api/vscode/html/1.62.3/file/vscode.html-1.62.3.vsix",
"vscode.html-language-features": "https://open-vsx.org/api/vscode/html-language-features/1.62.3/file/vscode.html-language-features-1.62.3.vsix",
Expand Down
4 changes: 2 additions & 2 deletions applications/electron/resources/preload.html
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@
animation-delay: 0;
animation-duration: 5s;
animation-iteration-count: infinite;
animation-name: blueprint-spinner;
animation-name: eos-thesis-spinner;
animation-timing-function: ease;
}

@keyframes blueprint-spinner {
@keyframes eos-thesis-spinner {
0% {
/*filter: invert(49%) sepia(71%) saturate(5980%) hue-rotate(199deg) brightness(103%) contrast(101%);*/
filter: brightness(100%);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,15 +166,15 @@ function GSPreferences(props: PreferencesProps): JSX.Element {
const preflistener = props.preferenceService.onPreferenceChanged(change => {
if (change.preferenceName === EosThesisPreferences.alwaysShowWelcomePage) {
const prefValue: boolean = change.newValue;
console.info('Set blueprint.alwaysShowWelcomePage checkbox state to ' + prefValue);
console.info('Set eosThesis.alwaysShowWelcomePage checkbox state to ' + prefValue);
setAlwaysShowWelcomePage(prefValue);
}
});
return () => preflistener.dispose();
}, [props.preferenceService]);
const handleChange = (e: React.ChangeEvent<HTMLInputElement>) => {
const newChecked = e.target.checked;
console.info('Set blueprint.alwaysShowWelcomePage pref to ' + newChecked);
console.info('Set eosThesis.alwaysShowWelcomePage pref to ' + newChecked);
props.preferenceService.updateValue(EosThesisPreferences.alwaysShowWelcomePage, newChecked);
};
return <div className='gs-preference'>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ export class TheiaUpdaterFrontendContribution implements CommandContribution, Me
if (answer === 'Yes') {
this.stopProgress();
this.progress = await this.messageService.showProgress({
text: 'Blueprint Update'
text: 'Eos Thesis Update'
});
let dots = 0;
this.intervalId = setInterval(() => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ export class TheiaUpdaterImpl implements TheiaUpdater, ElectronMainApplicationCo
autoUpdater.downloadUpdate();

// record download stat, ignore errors
fs.mkdtemp(path.join(os.tmpdir(), 'theia-blueprint-updater-'))
fs.mkdtemp(path.join(os.tmpdir(), 'eos-thesis-updater-'))
.then(tmpDir => {
const file = fs.createWriteStream(path.join(tmpDir, 'update'));
http.get('https://www.eclipse.org/downloads/download.php?file=/theia/update&r=1', response => {
Expand Down

0 comments on commit 7630b83

Please sign in to comment.