Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Flutter 3.22.1 #247

Merged
merged 10 commits into from
Jun 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/benchmark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Setup Flutter
uses: subosito/flutter-action@v2.8.0
with:
flutter-version: '3.19.5'
flutter-version: '3.22.1'
channel: 'stable'

- name: Setup Dependencies
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Setup Flutter
uses: subosito/flutter-action@v2.8.0
with:
flutter-version: '3.19.5'
flutter-version: '3.22.1'
channel: 'stable'

- name: Configure Flutter
Expand Down Expand Up @@ -48,7 +48,7 @@ jobs:
- name: Setup Flutter
uses: subosito/flutter-action@v2.8.0
with:
flutter-version: '3.19.5'
flutter-version: '3.22.1'
channel: 'stable'

- name: Setup Java
Expand Down Expand Up @@ -82,7 +82,7 @@ jobs:
- name: Setup Flutter
uses: subosito/flutter-action@v2.8.0
with:
flutter-version: '3.19.5'
flutter-version: '3.22.1'
channel: 'stable'

- name: Setup Java
Expand Down Expand Up @@ -117,7 +117,7 @@ jobs:
- name: Setup Flutter
uses: subosito/flutter-action@v2.8.0
with:
flutter-version: '3.19.5'
flutter-version: '3.22.1'
channel: 'stable'

- name: Setup Tools
Expand Down Expand Up @@ -146,7 +146,7 @@ jobs:
- name: Setup Flutter
uses: subosito/flutter-action@v2.8.0
with:
flutter-version: '3.19.5'
flutter-version: '3.22.1'
channel: 'stable'

- name: Setup Tools
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Setup Flutter ╰(✿˙ᗜ˙)੭━☆゚.*・。゚
uses: subosito/flutter-action@v2.8.0
with:
flutter-version: '3.19.5'
flutter-version: '3.22.1'
channel: 'stable'

- name: Setup Tools ᕙ|” ◉ ◡ ◉ ”|ᕗ
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Setup Flutter
uses: subosito/flutter-action@v2.8.0
with:
flutter-version: '3.19.5'
flutter-version: '3.22.1'
channel: 'stable'

- name: Clone Olm
Expand Down Expand Up @@ -81,7 +81,7 @@ jobs:
- name: Setup Flutter
uses: subosito/flutter-action@v2.8.0
with:
flutter-version: '3.19.5'
flutter-version: '3.22.1'
channel: 'stable'

- name: Setup Java
Expand Down Expand Up @@ -131,7 +131,7 @@ jobs:
- name: Setup Flutter
uses: subosito/flutter-action@v2.8.0
with:
flutter-version: '3.19.5'
flutter-version: '3.22.1'
channel: 'stable'

- name: Setup Java
Expand Down Expand Up @@ -182,7 +182,7 @@ jobs:
- name: Setup Flutter
uses: subosito/flutter-action@v2.8.0
with:
flutter-version: '3.19.5'
flutter-version: '3.22.1'
channel: 'stable'

- name: Setup Tools
Expand Down Expand Up @@ -232,7 +232,7 @@ jobs:
- name: Setup Flutter
uses: subosito/flutter-action@v2.8.0
with:
flutter-version: '3.19.5'
flutter-version: '3.22.1'
channel: 'stable'

- name: Setup Tools
Expand Down Expand Up @@ -286,7 +286,7 @@ jobs:
- name: Setup Flutter
uses: subosito/flutter-action@v2.8.0
with:
flutter-version: '3.19.5'
flutter-version: '3.22.1'
channel: 'stable'

- name: Setup Tools
Expand Down Expand Up @@ -331,7 +331,7 @@ jobs:
- name: Setup Flutter
uses: subosito/flutter-action@v2.8.0
with:
flutter-version: '3.19.5'
flutter-version: '3.22.1'
channel: 'stable'

- name: Setup Tools
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Setup Flutter ╰(✿˙ᗜ˙)੭━☆゚.*・。゚
uses: subosito/flutter-action@v2.8.0
with:
flutter-version: '3.19.5'
flutter-version: '3.22.1'
channel: 'stable'

- name: Setup Tools ᕙ|” ◉ ◡ ◉ ”|ᕗ
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Help translate Commet to your language on [Weblate](https://hosted.weblate.org/p
</a>

# Development
Commet is built using [Flutter](https://flutter.dev), currently v3.19.5
Commet is built using [Flutter](https://flutter.dev), currently v3.22.1

This repo currently has a monorepo structure, containing two flutter projects: Commet and Tiamat. Commet is the main client, and Tiamat is a sort of wrapper around Material with some extra goodies, which is used to maintain a consistent style across the app. Tiamat may eventually be moved to its own repo, but for now it is maintained here for ease of development.
## Building
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,10 @@ import io.flutter.embedding.engine.FlutterEngine
import io.flutter.plugins.GeneratedPluginRegistrant

import android.content.Context
import androidx.multidex.MultiDex

class MainActivity: FlutterActivity() {
override fun attachBaseContext(base: Context) {
super.attachBaseContext(base)
MultiDex.install(this)
}

override fun provideFlutterEngine(context: Context): FlutterEngine? {
Expand Down
49 changes: 24 additions & 25 deletions commet/integration_test/extensions/common_flows.dart
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
import 'dart:io';

import 'package:commet/client/matrix/matrix_client.dart';
import 'package:commet/config/app_config.dart';
import 'package:commet/ui/organisms/side_navigation_bar.dart';
import 'package:commet/ui/pages/login/login_page.dart';
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:commet/main.dart';
import 'package:matrix/encryption/utils/key_verification.dart';
import 'package:matrix/matrix.dart';
import 'package:path_provider/path_provider.dart';

Expand Down Expand Up @@ -112,29 +110,30 @@ extension CommonFlows on WidgetTester {
}

Future<Client> createTestClient() async {
var otherClient = Client(
"Commet Integration Tester",
verificationMethods: {
KeyVerificationMethod.emoji,
KeyVerificationMethod.numbers
},
nativeImplementations: MatrixClient.nativeImplementations,
logLevel: Level.verbose,
databaseBuilder: (client) async {
final db = HiveCollectionsDatabase(
client.clientName, await AppConfig.getDatabasePath());
await db.open();
return db;
},
);

await otherClient.checkHomeserver(Uri.http(homeserver));

await otherClient.login(LoginType.mLoginPassword,
identifier: AuthenticationUserIdentifier(user: username),
password: password);

return otherClient;
throw UnimplementedError();
// var otherClient = Client(
// "Commet Integration Tester",
// verificationMethods: {
// KeyVerificationMethod.emoji,
// KeyVerificationMethod.numbers
// },
// nativeImplementations: MatrixClient.nativeImplementations,
// logLevel: Level.verbose,
// databaseBuilder: (client) async {
// final db = HiveCollectionsDatabase(
// client.clientName, await AppConfig.getDatabasePath());
// await db.open();
// return db;
// },
// );

// await otherClient.checkHomeserver(Uri.http(homeserver));

// await otherClient.login(LoginType.mLoginPassword,
// identifier: AuthenticationUserIdentifier(user: username),
// password: password);

// return otherClient;
}

Future<void> openSettings(App app) async {
Expand Down
16 changes: 0 additions & 16 deletions commet/lib/cache/cached_file.dart

This file was deleted.

Loading
Loading