Skip to content

Commit 7630d0a

Browse files
authored
Merge branch 'arduino:main' into main
2 parents ed66479 + 24dc0bb commit 7630d0a

Some content is hidden

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

81 files changed

+4653
-1981
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ on:
2929

3030
env:
3131
# See vars.GO_VERSION field of https://github.com/arduino/arduino-cli/blob/master/DistTasks.yml
32-
GO_VERSION: "1.17"
32+
GO_VERSION: "1.19"
3333
JOB_TRANSFER_ARTIFACT: build-artifacts
3434
CHANGELOG_ARTIFACTS: changelog
3535

@@ -235,7 +235,7 @@ jobs:
235235
echo "TAG_NAME=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
236236
237237
- name: Publish Release [GitHub]
238-
uses: svenstaro/upload-release-action@2.4.1
238+
uses: svenstaro/upload-release-action@2.5.0
239239
with:
240240
repo_token: ${{ secrets.GITHUB_TOKEN }}
241241
release_name: ${{ steps.tag_name.outputs.TAG_NAME }}

.github/workflows/check-i18n-task.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Check Internationalization
22

33
env:
44
# See vars.GO_VERSION field of https://github.com/arduino/arduino-cli/blob/master/DistTasks.yml
5-
GO_VERSION: "1.17"
5+
GO_VERSION: "1.19"
66

77
# See: https://docs.github.com/en/actions/reference/events-that-trigger-workflows
88
on:

.github/workflows/i18n-nightly-push.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: i18n-nightly-push
22

33
env:
44
# See vars.GO_VERSION field of https://github.com/arduino/arduino-cli/blob/master/DistTasks.yml
5-
GO_VERSION: "1.17"
5+
GO_VERSION: "1.19"
66

77
on:
88
schedule:

.github/workflows/i18n-weekly-pull.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: i18n-weekly-pull
22

33
env:
44
# See vars.GO_VERSION field of https://github.com/arduino/arduino-cli/blob/master/DistTasks.yml
5-
GO_VERSION: "1.17"
5+
GO_VERSION: "1.19"
66

77
on:
88
schedule:

.github/workflows/themes-weekly-pull.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
env:
1010
# See vars.GO_VERSION field of https://github.com/arduino/arduino-cli/blob/master/DistTasks.yml
11-
GO_VERSION: "1.17"
11+
GO_VERSION: "1.19"
1212
NODE_VERSION: 16.x
1313

1414
jobs:

arduino-ide-extension/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "arduino-ide-extension",
3-
"version": "2.0.4",
3+
"version": "2.0.5",
44
"description": "An extension for Theia building the Arduino IDE",
55
"license": "AGPL-3.0-or-later",
66
"scripts": {
@@ -163,7 +163,7 @@
163163
],
164164
"arduino": {
165165
"cli": {
166-
"version": "0.29.0"
166+
"version": "0.31.0"
167167
},
168168
"fwuploader": {
169169
"version": "2.2.2"

arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@ import {
1010
MenuContribution,
1111
MenuModelRegistry,
1212
} from '@theia/core';
13-
import {
14-
FrontendApplication,
15-
FrontendApplicationContribution,
16-
} from '@theia/core/lib/browser';
13+
import { FrontendApplicationContribution } from '@theia/core/lib/browser';
1714
import { ColorContribution } from '@theia/core/lib/browser/color-application-contribution';
1815
import { ColorRegistry } from '@theia/core/lib/browser/color-registry';
1916
import { CommonMenus } from '@theia/core/lib/browser/common-frontend-contribution';
@@ -77,7 +74,7 @@ export class ArduinoFrontendContribution
7774
}
7875
}
7976

80-
onStart(app: FrontendApplication): void {
77+
onStart(): void {
8178
this.electronWindowPreferences.onPreferenceChanged((event) => {
8279
if (event.newValue !== event.oldValue) {
8380
switch (event.preferenceName) {
@@ -98,8 +95,6 @@ export class ArduinoFrontendContribution
9895
webContents.setZoomLevel(zoomLevel);
9996
})
10097
);
101-
// Removes the _Settings_ (cog) icon from the left sidebar
102-
app.shell.leftPanelHandler.removeBottomMenu('settings-menu');
10398
}
10499

105100
registerToolbarItems(registry: TabBarToolbarRegistry): void {

arduino-ide-extension/src/browser/arduino-ide-frontend-module.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -349,6 +349,9 @@ import { ConfigServiceClient } from './config/config-service-client';
349349
import { ValidateSketch } from './contributions/validate-sketch';
350350
import { RenameCloudSketch } from './contributions/rename-cloud-sketch';
351351
import { CreateFeatures } from './create/create-features';
352+
import { Account } from './contributions/account';
353+
import { SidebarBottomMenuWidget } from './theia/core/sidebar-bottom-menu-widget';
354+
import { SidebarBottomMenuWidget as TheiaSidebarBottomMenuWidget } from '@theia/core/lib/browser/shell/sidebar-bottom-menu-widget';
352355

353356
export default new ContainerModule((bind, unbind, isBound, rebind) => {
354357
// Commands and toolbar items
@@ -751,6 +754,7 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
751754
Contribution.configure(bind, NewCloudSketch);
752755
Contribution.configure(bind, ValidateSketch);
753756
Contribution.configure(bind, RenameCloudSketch);
757+
Contribution.configure(bind, Account);
754758

755759
bindContributionProvider(bind, StartupTaskProvider);
756760
bind(StartupTaskProvider).toService(BoardsServiceProvider); // to reuse the boards config in another window
@@ -1031,4 +1035,7 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
10311035
},
10321036
}))
10331037
.inSingletonScope();
1038+
1039+
bind(SidebarBottomMenuWidget).toSelf();
1040+
rebind(TheiaSidebarBottomMenuWidget).toService(SidebarBottomMenuWidget);
10341041
});

arduino-ide-extension/src/browser/auth/authentication-client-service.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,13 @@ export class AuthenticationClientService
8383
registerCommands(registry: CommandRegistry): void {
8484
registry.registerCommand(CloudUserCommands.LOGIN, {
8585
execute: () => this.service.login(),
86+
isEnabled: () => !this._session,
87+
isVisible: () => !this._session,
8688
});
8789
registry.registerCommand(CloudUserCommands.LOGOUT, {
8890
execute: () => this.service.logout(),
91+
isEnabled: () => !!this._session,
92+
isVisible: () => !!this._session,
8993
});
9094
}
9195

arduino-ide-extension/src/browser/auth/cloud-user-commands.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
import { Command } from '@theia/core/lib/common/command';
22

3+
export const LEARN_MORE_URL =
4+
'https://docs.arduino.cc/software/ide-v2/tutorials/ide-v2-cloud-sketch-sync';
5+
36
export namespace CloudUserCommands {
47
export const LOGIN = Command.toLocalizedCommand(
58
{
@@ -16,9 +19,4 @@ export namespace CloudUserCommands {
1619
},
1720
'arduino/cloud/signOut'
1821
);
19-
20-
export const OPEN_PROFILE_CONTEXT_MENU: Command = {
21-
id: 'arduino-cloud-sketchbook--open-profile-menu',
22-
label: 'Contextual menu',
23-
};
2422
}

0 commit comments

Comments
 (0)