Skip to content
This repository has been archived by the owner on Apr 3, 2023. It is now read-only.

Commit

Permalink
Upgrade to Flutter 2.8.1
Browse files Browse the repository at this point in the history
  • Loading branch information
cuong0993 committed Dec 28, 2021
1 parent 2e72ac6 commit f0301d8
Show file tree
Hide file tree
Showing 21 changed files with 378 additions and 226 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: Build
branches:
- master
env:
flutter_version: 2.5.3
flutter_version: 2.8.1
jobs:
build:
name: Build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: Release
tags:
- '*'
env:
flutter_version: 2.5.3
flutter_version: 2.8.1
jobs:
build:
name: Build
Expand Down
6 changes: 3 additions & 3 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
buildscript {
ext.kotlin_version = '1.5.31'
ext.kotlin_version = '1.6.10'
repositories {
google()
mavenCentral()
}

dependencies {
classpath 'com.android.tools.build:gradle:7.0.3'
classpath 'com.android.tools.build:gradle:7.0.4'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.google.gms:google-services:4.3.10'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.1'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1'
}
}

Expand Down
112 changes: 56 additions & 56 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -349,24 +349,24 @@ PODS:
- BoringSSL-GRPC/Implementation (0.0.7):
- BoringSSL-GRPC/Interface (= 0.0.7)
- BoringSSL-GRPC/Interface (0.0.7)
- cloud_firestore (3.1.0):
- cloud_firestore (3.1.5):
- Firebase/Firestore (= 8.9.0)
- firebase_core
- Flutter
- cloud_functions (3.1.0):
- cloud_functions (3.2.4):
- Firebase/Functions (= 8.9.0)
- firebase_core
- Flutter
- device_info (0.0.1):
- device_info_plus (0.0.1):
- Flutter
- FBAEMKit (12.0.2):
- FBSDKCoreKit_Basics (= 12.0.2)
- FBSDKCoreKit (12.0.2):
- FBAEMKit (= 12.0.2)
- FBSDKCoreKit_Basics (= 12.0.2)
- FBSDKCoreKit_Basics (12.0.2)
- FBSDKLoginKit (12.0.2):
- FBSDKCoreKit (= 12.0.2)
- FBAEMKit (12.1.0):
- FBSDKCoreKit_Basics (= 12.1.0)
- FBSDKCoreKit (12.1.0):
- FBAEMKit (= 12.1.0)
- FBSDKCoreKit_Basics (= 12.1.0)
- FBSDKCoreKit_Basics (12.1.0)
- FBSDKLoginKit (12.1.0):
- FBSDKCoreKit (= 12.1.0)
- Firebase/Auth (8.9.0):
- Firebase/CoreOnly
- FirebaseAuth (~> 8.9.0)
Expand All @@ -384,18 +384,18 @@ PODS:
- Firebase/Storage (8.9.0):
- Firebase/CoreOnly
- FirebaseStorage (~> 8.9.0)
- firebase_auth (3.2.0):
- firebase_auth (3.3.4):
- Firebase/Auth (= 8.9.0)
- firebase_core
- Flutter
- firebase_core (1.10.0):
- firebase_core (1.10.6):
- Firebase/CoreOnly (= 8.9.0)
- Flutter
- firebase_crashlytics (2.3.0):
- firebase_crashlytics (2.4.4):
- Firebase/Crashlytics (= 8.9.0)
- firebase_core
- Flutter
- firebase_storage (10.1.0):
- firebase_storage (10.2.4):
- Firebase/Storage (= 8.9.0)
- firebase_core
- Flutter
Expand All @@ -408,7 +408,7 @@ PODS:
- FirebaseCoreDiagnostics (~> 8.0)
- GoogleUtilities/Environment (~> 7.6)
- GoogleUtilities/Logger (~> 7.6)
- FirebaseCoreDiagnostics (8.9.0):
- FirebaseCoreDiagnostics (8.10.0):
- GoogleDataTransport (~> 9.1)
- GoogleUtilities/Environment (~> 7.6)
- GoogleUtilities/Logger (~> 7.6)
Expand Down Expand Up @@ -436,7 +436,7 @@ PODS:
- FirebaseFunctions (8.9.0):
- FirebaseCore (~> 8.0)
- GTMSessionFetcher/Core (~> 1.5)
- FirebaseInstallations (8.9.0):
- FirebaseInstallations (8.10.0):
- FirebaseCore (~> 8.0)
- GoogleUtilities/Environment (~> 7.6)
- GoogleUtilities/UserDefaults (~> 7.6)
Expand All @@ -448,8 +448,8 @@ PODS:
- flutter_email_sender (0.0.1):
- Flutter
- flutter_facebook_auth (3.5.3):
- FBSDKCoreKit (~> 12.0.2)
- FBSDKLoginKit (~> 12.0.2)
- FBSDKCoreKit (~> 12.1.0)
- FBSDKLoginKit (~> 12.1.0)
- Flutter
- FMDB (2.7.5):
- FMDB/standard (= 2.7.5)
Expand Down Expand Up @@ -518,23 +518,23 @@ PODS:
- nanopb/encode (= 2.30908.0)
- nanopb/decode (2.30908.0)
- nanopb/encode (2.30908.0)
- package_info (0.0.1):
- package_info_plus (0.4.5):
- Flutter
- path_provider (0.0.1):
- path_provider_ios (0.0.1):
- Flutter
- PromisesObjC (2.0.0)
- shared_preferences (0.0.1):
- shared_preferences_ios (0.0.1):
- Flutter
- sqflite (0.0.2):
- Flutter
- FMDB (>= 2.7.5)
- url_launcher (0.0.1):
- url_launcher_ios (0.0.1):
- Flutter

DEPENDENCIES:
- cloud_firestore (from `.symlinks/plugins/cloud_firestore/ios`)
- cloud_functions (from `.symlinks/plugins/cloud_functions/ios`)
- device_info (from `.symlinks/plugins/device_info/ios`)
- device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
- firebase_auth (from `.symlinks/plugins/firebase_auth/ios`)
- firebase_core (from `.symlinks/plugins/firebase_core/ios`)
- firebase_crashlytics (from `.symlinks/plugins/firebase_crashlytics/ios`)
Expand All @@ -544,11 +544,11 @@ DEPENDENCIES:
- flutter_facebook_auth (from `.symlinks/plugins/flutter_facebook_auth/ios`)
- google_sign_in (from `.symlinks/plugins/google_sign_in/ios`)
- in_app_review (from `.symlinks/plugins/in_app_review/ios`)
- package_info (from `.symlinks/plugins/package_info/ios`)
- path_provider (from `.symlinks/plugins/path_provider/ios`)
- shared_preferences (from `.symlinks/plugins/shared_preferences/ios`)
- package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
- path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`)
- shared_preferences_ios (from `.symlinks/plugins/shared_preferences_ios/ios`)
- sqflite (from `.symlinks/plugins/sqflite/ios`)
- url_launcher (from `.symlinks/plugins/url_launcher/ios`)
- url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)

SPEC REPOS:
trunk:
Expand Down Expand Up @@ -585,8 +585,8 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/cloud_firestore/ios"
cloud_functions:
:path: ".symlinks/plugins/cloud_functions/ios"
device_info:
:path: ".symlinks/plugins/device_info/ios"
device_info_plus:
:path: ".symlinks/plugins/device_info_plus/ios"
firebase_auth:
:path: ".symlinks/plugins/firebase_auth/ios"
firebase_core:
Expand All @@ -605,44 +605,44 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/google_sign_in/ios"
in_app_review:
:path: ".symlinks/plugins/in_app_review/ios"
package_info:
:path: ".symlinks/plugins/package_info/ios"
path_provider:
:path: ".symlinks/plugins/path_provider/ios"
shared_preferences:
:path: ".symlinks/plugins/shared_preferences/ios"
package_info_plus:
:path: ".symlinks/plugins/package_info_plus/ios"
path_provider_ios:
:path: ".symlinks/plugins/path_provider_ios/ios"
shared_preferences_ios:
:path: ".symlinks/plugins/shared_preferences_ios/ios"
sqflite:
:path: ".symlinks/plugins/sqflite/ios"
url_launcher:
:path: ".symlinks/plugins/url_launcher/ios"
url_launcher_ios:
:path: ".symlinks/plugins/url_launcher_ios/ios"

SPEC CHECKSUMS:
abseil: 6c8eb7892aefa08d929b39f9bb108e5367e3228f
AppAuth: 31bcec809a638d7bd2f86ea8a52bd45f6e81e7c7
BoringSSL-GRPC: 8edf627ee524575e2f8d19d56f068b448eea3879
cloud_firestore: 2cff0618e560f435fc05da5c94c2d213eb7ba640
cloud_functions: e7c23b62967917c4eb47911b90f798c4415ad0d4
device_info: d7d233b645a32c40dfdc212de5cf646ca482f175
FBAEMKit: c6b8ddf8371640fcd1a3b844d0f8884c8f334cea
FBSDKCoreKit: 506c0fd1c09a3075f62be8fa36bdd921c563daa9
FBSDKCoreKit_Basics: c0701d1634c944d60dd3c6361d66dbd0e707a456
FBSDKLoginKit: d7c9f6ddff20d7b04c94d1f1f065dc7a441d44a0
cloud_firestore: 338122a6149c14ca376ad363626b5bf3037a5056
cloud_functions: d06612b3b0f30419e8305620f1382df43bdf4003
device_info_plus: e5c5da33f982a436e103237c0c85f9031142abed
FBAEMKit: 56c0bb9b42e3747cd82b67934f0c2b19325382ea
FBSDKCoreKit: 75368765d9c2303073145a7925dfaa9d60bcd77b
FBSDKCoreKit_Basics: 39865aff97e5f6951a78fb3e89dc4460e35e1895
FBSDKLoginKit: e993f97c7cc794c5da4056d8aec3c3d66033a727
Firebase: 13d8d96499e2635428d5bf0ec675df21f95d9a95
firebase_auth: 0d56cc4d105ff70d1547a7fcb10ee574ad05adf5
firebase_core: f770e033e790657b3505f04be4cb24c482912f11
firebase_crashlytics: ed8c1d66dc407d617cbed798f05a5d9115da7494
firebase_storage: a3bbe618ef41930ae31da8f4691d37e4ed84f14d
firebase_auth: e875a50b81aefb20f305dfede425647e9675c19e
firebase_core: c263d7daf1dc92fcd9895e6abdc04872b0ee07ff
firebase_crashlytics: 9cbd5d9e8560b218f02fce3c7359567ac822d05f
firebase_storage: 2ed331c6bd5bfa6d64f1a6c57f01151f4f146c16
FirebaseAuth: 2b78b2a32c07b3ecfa4970bdf1d3632b8304099b
FirebaseCore: 599ee609343eaf4941bd188f85e3aa077ffe325b
FirebaseCoreDiagnostics: 5daa63f1c1409d981a2d5007daa100b36eac6a34
FirebaseCoreDiagnostics: 56fb7216d87e0e6ec2feddefa9d8a392fe8b2c18
FirebaseCrashlytics: 40efbd81157dae307ec95612fa1328347284d2c2
FirebaseFirestore: 15ae9648476436efed698a909e44c4737498f9b4
FirebaseFunctions: c78ec2f93cd453f25fb5e4c694c830f7a31ab349
FirebaseInstallations: caa7c8e0d3e2345b8829d2fa9ca1b4dfbf2fcc85
FirebaseInstallations: 830327b45345ffc859eaa9c17bcd5ae893fd5425
FirebaseStorage: 452c98c31ccb40b819764bf3039426c4388d9939
Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
flutter_email_sender: 02d7443217d8c41483223627972bfdc09f74276b
flutter_facebook_auth: 5638a1a8cc23016ec6f72945ba879f4482870c69
flutter_facebook_auth: dfd6b2563406c538098e2127512d385c9ffd70ad
FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
google_sign_in: c5cecea71f3be43282263550556e311c4cc03582
GoogleDataTransport: 629c20a4d363167143f30ea78320d5a7eb8bd940
Expand All @@ -655,12 +655,12 @@ SPEC CHECKSUMS:
in_app_review: 4a97249f7a2f539a0f294c2d9196b7fe35e49541
leveldb-library: 50c7b45cbd7bf543c81a468fe557a16ae3db8729
nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96
package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62
path_provider: d1e9807085df1f9cc9318206cd649dc0b76be3de
package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e
path_provider_ios: 7d7ce634493af4477d156294792024ec3485acd5
PromisesObjC: 68159ce6952d93e17b2dfe273b8c40907db5ba58
shared_preferences: 5033afbb22d372e15aff8ff766df9021b845f273
shared_preferences_ios: aef470a42dc4675a1cdd50e3158b42e3d1232b32
sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
url_launcher: b6e016d912f04be9f5bf6e8e82dc599b7ba59649
url_launcher_ios: 02f1989d4e14e998335b02b67a7590fa34f971af

PODFILE CHECKSUM: 52850884bc4fe89b720ca304751837c651c6cba9

Expand Down
1 change: 0 additions & 1 deletion lib/app.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import 'package:auto_route/auto_route.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
// ignore: depend_on_referenced_packages
import 'package:flutter_gen/gen_l10n/l10n.dart';
Expand Down
8 changes: 1 addition & 7 deletions lib/game/center_text_paint.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import 'dart:ui';

import 'package:flame/components.dart';
import 'package:flutter/material.dart';

Expand All @@ -8,15 +6,11 @@ class CenterTextPaint extends TextPaint {
double fontSize = 24.0,
Color color = Colors.black,
String fontFamily = 'Arial',
TextDirection textDirection = TextDirection.ltr,
double? lineHeight,
}) : super(
config: TextPaintConfig(
style: TextStyle(
fontSize: fontSize,
color: color,
fontFamily: fontFamily,
textDirection: textDirection,
lineHeight: lineHeight,
),
);

Expand Down
11 changes: 7 additions & 4 deletions lib/game/game_reward.freezed.dart
Original file line number Diff line number Diff line change
Expand Up @@ -141,13 +141,16 @@ class _$_GameReward implements _GameReward {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
other is _GameReward &&
(identical(other.stars, stars) || other.stars == stars) &&
(identical(other.playedNotes, playedNotes) ||
other.playedNotes == playedNotes));
const DeepCollectionEquality().equals(other.stars, stars) &&
const DeepCollectionEquality()
.equals(other.playedNotes, playedNotes));
}

@override
int get hashCode => Object.hash(runtimeType, stars, playedNotes);
int get hashCode => Object.hash(
runtimeType,
const DeepCollectionEquality().hash(stars),
const DeepCollectionEquality().hash(playedNotes));

@JsonKey(ignore: true)
@override
Expand Down
18 changes: 10 additions & 8 deletions lib/game/game_state.freezed.dart
Original file line number Diff line number Diff line change
Expand Up @@ -283,14 +283,15 @@ class _$GameStatePlaying implements GameStatePlaying {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
other is GameStatePlaying &&
(identical(other.duration, duration) ||
other.duration == duration) &&
(identical(other.songName, songName) ||
other.songName == songName));
const DeepCollectionEquality().equals(other.duration, duration) &&
const DeepCollectionEquality().equals(other.songName, songName));
}

@override
int get hashCode => Object.hash(runtimeType, duration, songName);
int get hashCode => Object.hash(
runtimeType,
const DeepCollectionEquality().hash(duration),
const DeepCollectionEquality().hash(songName));

@JsonKey(ignore: true)
@override
Expand Down Expand Up @@ -558,12 +559,13 @@ class _$GameStateCompleted implements GameStateCompleted {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
other is GameStateCompleted &&
(identical(other.gameReward, gameReward) ||
other.gameReward == gameReward));
const DeepCollectionEquality()
.equals(other.gameReward, gameReward));
}

@override
int get hashCode => Object.hash(runtimeType, gameReward);
int get hashCode =>
Object.hash(runtimeType, const DeepCollectionEquality().hash(gameReward));

@JsonKey(ignore: true)
@override
Expand Down
10 changes: 6 additions & 4 deletions lib/game/note/note.freezed.dart
Original file line number Diff line number Diff line change
Expand Up @@ -125,13 +125,15 @@ class _$_Note implements _Note {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
other is _Note &&
(identical(other.note, note) || other.note == note) &&
(identical(other.startTick, startTick) ||
other.startTick == startTick));
const DeepCollectionEquality().equals(other.note, note) &&
const DeepCollectionEquality().equals(other.startTick, startTick));
}

@override
int get hashCode => Object.hash(runtimeType, note, startTick);
int get hashCode => Object.hash(
runtimeType,
const DeepCollectionEquality().hash(note),
const DeepCollectionEquality().hash(startTick));

@JsonKey(ignore: true)
@override
Expand Down
1 change: 0 additions & 1 deletion lib/game/ripple_effect.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import 'dart:ui';

import 'package:flame/components.dart';
import 'package:flame/flame.dart';
import 'package:flame/sprite.dart';

import 'colors.dart';
import 'effect.dart';
Expand Down
Loading

0 comments on commit f0301d8

Please sign in to comment.