From 2dcb728bf0572d1a55b81abdc5f4c0734fb2e5e6 Mon Sep 17 00:00:00 2001 From: Goddchen Date: Thu, 19 Dec 2024 13:58:47 +0100 Subject: [PATCH 1/4] feat(binary,fvm): upgrade to binary 4.0.0 and use fvm Signed-off-by: Goddchen --- .fvmrc | 3 +++ .gitignore | 3 +++ .vscode/settings.json | 4 ++++ CHANGELOG.md | 4 ++++ lib/src/protocol/pointer_event_message.dart | 18 +++++++++--------- pubspec.yaml | 4 ++-- test/protocol/pointer_event_message_test.dart | 2 +- 7 files changed, 26 insertions(+), 12 deletions(-) create mode 100644 .fvmrc create mode 100644 .vscode/settings.json diff --git a/.fvmrc b/.fvmrc new file mode 100644 index 0000000..103785d --- /dev/null +++ b/.fvmrc @@ -0,0 +1,3 @@ +{ + "flutter": "3.24.5@stable" +} \ No newline at end of file diff --git a/.gitignore b/.gitignore index dbef116..16cc011 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,6 @@ doc/api/ *.js_ *.js.deps *.js.map + +# FVM Version Cache +.fvm/ \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..39e0371 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,4 @@ +{ + "dart.flutterSdkPath": ".fvm/versions/3.24.5@stable", + "dart.sdkPath": ".fvm/versions/3.24.5@stable/bin/cache/dart-sdk" +} \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 9338390..ed0125d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -44,3 +44,7 @@ ## 0.7.0 - Refactoring: replace `startReadLoop()` with `Stream incomingMessages` and `void handleIncomingMessages()` + +## 0.8.0 +- Upgrade `binary` to 4.0.0 +- Manage Dart SDK via `fvm` \ No newline at end of file diff --git a/lib/src/protocol/pointer_event_message.dart b/lib/src/protocol/pointer_event_message.dart index 72fc79b..3c9011f 100644 --- a/lib/src/protocol/pointer_event_message.dart +++ b/lib/src/protocol/pointer_event_message.dart @@ -26,32 +26,32 @@ class RemoteFrameBufferPointerEventMessage ByteData toBytes() { Uint8 buttonMask = Uint8(0); if (button1Down) { - buttonMask = buttonMask.setBit(0); + buttonMask = buttonMask.setNthBit(0); } if (button2Down) { - buttonMask = buttonMask.setBit(1); + buttonMask = buttonMask.setNthBit(1); } if (button3Down) { - buttonMask = buttonMask.setBit(2); + buttonMask = buttonMask.setNthBit(2); } if (button4Down) { - buttonMask = buttonMask.setBit(3); + buttonMask = buttonMask.setNthBit(3); } if (button5Down) { - buttonMask = buttonMask.setBit(4); + buttonMask = buttonMask.setNthBit(4); } if (button6Down) { - buttonMask = buttonMask.setBit(5); + buttonMask = buttonMask.setNthBit(5); } if (button7Down) { - buttonMask = buttonMask.setBit(6); + buttonMask = buttonMask.setNthBit(6); } if (button8Down) { - buttonMask = buttonMask.setBit(7); + buttonMask = buttonMask.setNthBit(7); } return ByteData(6) ..setUint8(0, 5) - ..setUint8(1, buttonMask.value) + ..setUint8(1, buttonMask) ..setUint16(2, x) ..setUint16(4, y); } diff --git a/pubspec.yaml b/pubspec.yaml index e2a6d4d..64d28bd 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ description: Implementation of The Remote Framebuffer Protocol (RFC 6143, aka VNC protocol) name: dart_rfb repository: https://github.com/Goddchen/dart-rfb -version: 0.7.0 +version: 0.8.0 environment: sdk: ">=3.1.0 <4.0.0" @@ -15,7 +15,7 @@ dev_dependencies: mockito: ^5.4.3 test: ^1.16.0 dependencies: - binary: ^3.0.1 + binary: ^4.0.0 collection: ^1.16.0 dart_des: ^1.0.2 fpdart: ^0.4.0 diff --git a/test/protocol/pointer_event_message_test.dart b/test/protocol/pointer_event_message_test.dart index b698124..2c50a1f 100644 --- a/test/protocol/pointer_event_message_test.dart +++ b/test/protocol/pointer_event_message_test.dart @@ -46,7 +46,7 @@ void main() { equals( (ByteData(6) ..setUint8(0, 5) - ..setUint8(1, Uint8(0).setBit(0).value) + ..setUint8(1, Uint8(0).setNthBit(0)) ..setUint16(2, 0) ..setUint16(4, 0)) .buffer From f25581995ff2e0673021dc313eb63e911c815489 Mon Sep 17 00:00:00 2001 From: Goddchen Date: Thu, 19 Dec 2024 14:00:46 +0100 Subject: [PATCH 2/4] ci: upgrade Flutter versions Signed-off-by: Goddchen --- .github/workflows/main.yml | 6 +++--- .github/workflows/pr.yml | 6 +++--- .github/workflows/publish.yml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8f16e38..3a5cac5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,7 +10,7 @@ jobs: - uses: actions/checkout@v3 - uses: dart-lang/setup-dart@v1.3 with: - sdk: 3.1.0 + sdk: 3.24.5@stable - run: dart pub get - run: dart analyze --fatal-infos --fatal-warnings format: @@ -19,7 +19,7 @@ jobs: - uses: actions/checkout@v3 - uses: dart-lang/setup-dart@v1.3 with: - sdk: 3.1.0 + sdk: 3.24.5@stable - run: dart format --output none --set-exit-if-changed .\example\ .\lib\ .\test\ test: runs-on: ubuntu-22.04 @@ -27,5 +27,5 @@ jobs: - uses: actions/checkout@v3 - uses: dart-lang/setup-dart@v1.3 with: - sdk: 3.1.0 + sdk: 3.24.5@stable - run: dart test diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index da25479..3fb89e1 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -8,7 +8,7 @@ jobs: - uses: actions/checkout@v3 - uses: dart-lang/setup-dart@v1.3 with: - sdk: 3.1.0 + sdk: 3.24.5@stable - run: dart pub get - run: dart analyze --fatal-infos --fatal-warnings format: @@ -17,7 +17,7 @@ jobs: - uses: actions/checkout@v3 - uses: dart-lang/setup-dart@v1.3 with: - sdk: 3.1.0 + sdk: 3.24.5@stable - run: dart format --output none --set-exit-if-changed .\example\ .\lib\ .\test\ test: runs-on: ubuntu-22.04 @@ -25,5 +25,5 @@ jobs: - uses: actions/checkout@v3 - uses: dart-lang/setup-dart@v1.3 with: - sdk: 3.1.0 + sdk: 3.24.5@stable - run: dart test diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index ab650b0..e4ddf76 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -10,7 +10,7 @@ jobs: - uses: actions/checkout@v3 - uses: subosito/flutter-action@v2 with: - flutter-version: "3.3.10" + flutter-version: "3.24.5@stable" - name: Setup credentials env: PUB_DEV_CREDENTIALS: ${{ secrets.PUB_DEV_CREDENTIALS }} From f9f48d6633d3335348903c1f49e38c0026d433c7 Mon Sep 17 00:00:00 2001 From: Goddchen Date: Thu, 19 Dec 2024 14:03:18 +0100 Subject: [PATCH 3/4] ci: upgrade Flutter versions Signed-off-by: Goddchen --- .github/workflows/main.yml | 6 +++--- .github/workflows/pr.yml | 6 +++--- .github/workflows/publish.yml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3a5cac5..f8768c3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,7 +10,7 @@ jobs: - uses: actions/checkout@v3 - uses: dart-lang/setup-dart@v1.3 with: - sdk: 3.24.5@stable + sdk: 3.24.5 - run: dart pub get - run: dart analyze --fatal-infos --fatal-warnings format: @@ -19,7 +19,7 @@ jobs: - uses: actions/checkout@v3 - uses: dart-lang/setup-dart@v1.3 with: - sdk: 3.24.5@stable + sdk: 3.24.5 - run: dart format --output none --set-exit-if-changed .\example\ .\lib\ .\test\ test: runs-on: ubuntu-22.04 @@ -27,5 +27,5 @@ jobs: - uses: actions/checkout@v3 - uses: dart-lang/setup-dart@v1.3 with: - sdk: 3.24.5@stable + sdk: 3.24.5 - run: dart test diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 3fb89e1..0b1c4ea 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -8,7 +8,7 @@ jobs: - uses: actions/checkout@v3 - uses: dart-lang/setup-dart@v1.3 with: - sdk: 3.24.5@stable + sdk: 3.24.5 - run: dart pub get - run: dart analyze --fatal-infos --fatal-warnings format: @@ -17,7 +17,7 @@ jobs: - uses: actions/checkout@v3 - uses: dart-lang/setup-dart@v1.3 with: - sdk: 3.24.5@stable + sdk: 3.24.5 - run: dart format --output none --set-exit-if-changed .\example\ .\lib\ .\test\ test: runs-on: ubuntu-22.04 @@ -25,5 +25,5 @@ jobs: - uses: actions/checkout@v3 - uses: dart-lang/setup-dart@v1.3 with: - sdk: 3.24.5@stable + sdk: 3.24.5 - run: dart test diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index e4ddf76..e9b8207 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -10,7 +10,7 @@ jobs: - uses: actions/checkout@v3 - uses: subosito/flutter-action@v2 with: - flutter-version: "3.24.5@stable" + flutter-version: "3.24.5" - name: Setup credentials env: PUB_DEV_CREDENTIALS: ${{ secrets.PUB_DEV_CREDENTIALS }} From 1315281154b8320aa39701b2beb588f601ffa3e3 Mon Sep 17 00:00:00 2001 From: Goddchen Date: Thu, 19 Dec 2024 14:04:43 +0100 Subject: [PATCH 4/4] ci: upgrade Flutter versions Signed-off-by: Goddchen --- .github/workflows/main.yml | 6 +++--- .github/workflows/pr.yml | 6 +++--- .github/workflows/publish.yml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f8768c3..915f50f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,7 +10,7 @@ jobs: - uses: actions/checkout@v3 - uses: dart-lang/setup-dart@v1.3 with: - sdk: 3.24.5 + sdk: 3.5.4 - run: dart pub get - run: dart analyze --fatal-infos --fatal-warnings format: @@ -19,7 +19,7 @@ jobs: - uses: actions/checkout@v3 - uses: dart-lang/setup-dart@v1.3 with: - sdk: 3.24.5 + sdk: 3.5.4 - run: dart format --output none --set-exit-if-changed .\example\ .\lib\ .\test\ test: runs-on: ubuntu-22.04 @@ -27,5 +27,5 @@ jobs: - uses: actions/checkout@v3 - uses: dart-lang/setup-dart@v1.3 with: - sdk: 3.24.5 + sdk: 3.5.4 - run: dart test diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 0b1c4ea..239ba24 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -8,7 +8,7 @@ jobs: - uses: actions/checkout@v3 - uses: dart-lang/setup-dart@v1.3 with: - sdk: 3.24.5 + sdk: 3.5.4 - run: dart pub get - run: dart analyze --fatal-infos --fatal-warnings format: @@ -17,7 +17,7 @@ jobs: - uses: actions/checkout@v3 - uses: dart-lang/setup-dart@v1.3 with: - sdk: 3.24.5 + sdk: 3.5.4 - run: dart format --output none --set-exit-if-changed .\example\ .\lib\ .\test\ test: runs-on: ubuntu-22.04 @@ -25,5 +25,5 @@ jobs: - uses: actions/checkout@v3 - uses: dart-lang/setup-dart@v1.3 with: - sdk: 3.24.5 + sdk: 3.5.4 - run: dart test diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index e9b8207..7e62b55 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -10,7 +10,7 @@ jobs: - uses: actions/checkout@v3 - uses: subosito/flutter-action@v2 with: - flutter-version: "3.24.5" + flutter-version: "3.5.4" - name: Setup credentials env: PUB_DEV_CREDENTIALS: ${{ secrets.PUB_DEV_CREDENTIALS }}