diff --git a/ci/flutter-build/Dockerfile b/ci/flutter-build/Dockerfile index dca41f85..5d03bc17 100644 --- a/ci/flutter-build/Dockerfile +++ b/ci/flutter-build/Dockerfile @@ -1,5 +1,4 @@ -FROM cirrusci/flutter - +FROM ghcr.io/cirruslabs/flutter WORKDIR /app/game COPY game . diff --git a/ci/flutter-format/Dockerfile b/ci/flutter-format/Dockerfile index 56b13480..b649267a 100644 --- a/ci/flutter-format/Dockerfile +++ b/ci/flutter-format/Dockerfile @@ -1,6 +1,6 @@ -FROM cirrusci/flutter +FROM ghcr.io/cirruslabs/flutter WORKDIR /app/game COPY game . -RUN flutter format lib | grep '0 changed' +RUN dart format lib | grep '0 changed' diff --git a/game/android/build.gradle b/game/android/build.gradle index 47030253..f23afa8e 100644 --- a/game/android/build.gradle +++ b/game/android/build.gradle @@ -25,6 +25,6 @@ subprojects { project.evaluationDependsOn(':app') } -task clean(type: Delete) { +tasks.register("clean", Delete) { delete rootProject.buildDir } diff --git a/game/lib/utils/utility_functions.dart b/game/lib/utils/utility_functions.dart index a9e61fe4..99bd3022 100644 --- a/game/lib/utils/utility_functions.dart +++ b/game/lib/utils/utility_functions.dart @@ -40,7 +40,7 @@ Future getId() async { return iosDeviceInfo.identifierForVendor; // unique ID on iOS } else if (Platform.isAndroid) { var androidDeviceInfo = await deviceInfo.androidInfo; - return androidDeviceInfo.androidId; // unique ID on Android + return androidDeviceInfo.id; // unique ID on Android } } diff --git a/game/pubspec.yaml b/game/pubspec.yaml index ad1d7d99..225280d7 100644 --- a/game/pubspec.yaml +++ b/game/pubspec.yaml @@ -18,7 +18,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev version: 1.0.1+5 environment: - sdk: ">=2.12.0 <3.0.0" + sdk: ">=3.0.0 <4.0.0" dependencies: flutter: @@ -26,26 +26,26 @@ dependencies: flutter_localizations: sdk: flutter sliding_up_panel: ^2.0.0+1 - velocity_x: ^3.3.0 + velocity_x: ^4.1.1 flutter_blurhash: cached_network_image: ^3.1.0 - google_fonts: 2.2.0 + google_fonts: 6.1.0 url_launcher: - confetti: ^0.6.0 + confetti: ^0.7.0 google_sign_in: - simple_animations: ^4.0.1 + simple_animations: ^5.0.2 socket_io_client: ^2.0.0-beta.4-nullsafety.0 - provider: ^5.0.0 - flutter_secure_storage: ^5.0.2 - geolocator: 8.0.1 - http: ^0.13.4 + provider: ^6.0.5 + flutter_secure_storage: ^9.0.0 + geolocator: ^10.1.0 + http: flutter_signin_button: ^2.0.0 - permission_handler: ^9.2.0 - fluttertoast: 8.0.9 + permission_handler: ^11.0.1 + fluttertoast: ^8.2.2 profanity_filter: ^2.0.0 intl: - flutter_linkify: ^5.0.2 - device_info_plus: ^3.2.3 + flutter_linkify: ^6.0.0 + device_info_plus: ^9.0.3 flutter_icons: android: true