Skip to content

Commit 4f4a692

Browse files
committed
Bump packages to latest versions and update CI
1 parent 7a31612 commit 4f4a692

File tree

6 files changed

+168
-156
lines changed

6 files changed

+168
-156
lines changed

.github/workflows/flutter-build.yml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ jobs:
77
name: Linux & Android
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v3
11-
- uses: actions/setup-java@v3
10+
- uses: actions/checkout@v4
11+
- uses: actions/setup-java@v4
1212
with:
13-
distribution: 'zulu'
14-
java-version: '17'
15-
- uses: subosito/flutter-action@v2.16.0
13+
distribution: "zulu"
14+
java-version: "21"
15+
- uses: subosito/flutter-action@v2.21.0
1616
with:
17-
channel: 'stable'
18-
flutter-version: '3.22.x'
17+
channel: "stable"
18+
flutter-version: "3.32.x"
1919
- name: Install dependencies
2020
run: |
2121
sudo apt-get update -y
@@ -36,12 +36,12 @@ jobs:
3636
cp build/app/outputs/flutter-apk/app-release.apk thingset-app_${{github.ref_name}}.apk
3737
cp build/app/outputs/bundle/release/app-release.aab thingset-app_${{github.ref_name}}.aab
3838
- name: Upload Linux artifacts
39-
uses: actions/upload-artifact@v3
39+
uses: actions/upload-artifact@v4
4040
with:
4141
name: thingset-app-linux
4242
path: build/linux/x64/release/bundle/*
4343
- name: Upload Android artifacts
44-
uses: actions/upload-artifact@v3
44+
uses: actions/upload-artifact@v4
4545
with:
4646
name: thingset-app-android
4747
path: |
@@ -62,30 +62,30 @@ jobs:
6262
name: Windows
6363
runs-on: windows-latest
6464
steps:
65-
- uses: actions/checkout@v3
66-
- uses: subosito/flutter-action@v2.16.0
65+
- uses: actions/checkout@v4
66+
- uses: subosito/flutter-action@v2.21.0
6767
with:
68-
channel: 'stable'
69-
flutter-version: '3.22.x'
68+
channel: "stable"
69+
flutter-version: "3.32.x"
7070
- name: Install dependencies
7171
run: flutter pub get
7272
- name: Build Windows app
7373
run: |
7474
flutter config --enable-windows-desktop
7575
flutter build windows --release
7676
- name: Upload Windows artifacts
77-
uses: actions/upload-artifact@v3
77+
uses: actions/upload-artifact@v4
7878
with:
7979
name: thingset-app-windows
8080
path: build/windows/x64/runner/Release/*
8181
- name: Archive release
8282
uses: thedoctor0/zip-release@master
8383
with:
84-
type: 'zip'
84+
type: "zip"
8585
filename: thingset-app_${{github.ref_name}}-windows.zip
8686
directory: build/windows/x64/runner/Release
8787
- name: Upload release files
88-
uses: softprops/action-gh-release@v1
88+
uses: softprops/action-gh-release@v2
8989
if: startsWith(github.ref, 'refs/tags/')
9090
env:
9191
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -96,11 +96,11 @@ jobs:
9696
# name: macOS & iOS
9797
# runs-on: macos-latest
9898
# steps:
99-
# - uses: actions/checkout@v3
100-
# - uses: subosito/flutter-action@v2
99+
# - uses: actions/checkout@v4
100+
# - uses: subosito/flutter-action@v2.21.0
101101
# with:
102102
# channel: 'stable'
103-
# flutter-version: '3.22.x'
103+
# flutter-version: '3.32.x'
104104
# architecture: x64
105105
# - name: Install dependencies
106106
# run: flutter pub get
@@ -112,7 +112,7 @@ jobs:
112112
# run: |
113113
# flutter build ios --release --no-codesign
114114
# - name: Upload macOS artifacts
115-
# uses: actions/upload-artifact@v3
115+
# uses: actions/upload-artifact@v4
116116
# with:
117117
# name: thingset-app-macos
118118
# path: build/macos/Build/Products/Release/*
@@ -123,7 +123,7 @@ jobs:
123123
# filename: thingset-app_${{github.ref_name}}-macos.zip
124124
# directory: build/macos/Build/Products/Release
125125
# - name: macOS Release
126-
# uses: softprops/action-gh-release@v1
126+
# uses: softprops/action-gh-release@v2
127127
# if: startsWith(github.ref, 'refs/tags/')
128128
# env:
129129
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
36
zipStoreBase=GRADLE_USER_HOME
47
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip

lib/screens/chart.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ class LiveChart extends StatelessWidget {
9191
text = Container();
9292
}
9393
return SideTitleWidget(
94-
axisSide: meta.axisSide,
94+
meta: meta,
9595
child: text,
9696
);
9797
}

macos/Flutter/GeneratedPluginRegistrant.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,14 @@ import Foundation
77

88
import flutter_libserialport
99
import package_info_plus
10+
import reactive_ble_mobile
1011
import url_launcher_macos
1112
import window_size
1213

1314
func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
1415
FlutterLibserialportPlugin.register(with: registry.registrar(forPlugin: "FlutterLibserialportPlugin"))
1516
FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
17+
ReactiveBlePlugin.register(with: registry.registrar(forPlugin: "ReactiveBlePlugin"))
1618
UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
1719
WindowSizePlugin.register(with: registry.registrar(forPlugin: "WindowSizePlugin"))
1820
}

0 commit comments

Comments
 (0)