From 943fa0891a9bc6c585c709a0fb194b86eb55ed40 Mon Sep 17 00:00:00 2001 From: Rainvisitor Date: Thu, 18 May 2023 16:38:58 +0800 Subject: [PATCH 01/23] feat: upgrade `dio` related package to latest version --- pubspec.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pubspec.yaml b/pubspec.yaml index 98b5a9b..b94435e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -28,9 +28,9 @@ dependencies: encrypt: ^5.0.0 sprintf: ^6.0.0 crypto: ^3.0.1 - dio: ^4.0.0 - dio_cookie_manager: ^2.0.0 - cookie_jar: ^3.0.1 + dio: ^5.0.0 + dio_cookie_manager: ^3.0.0 + cookie_jar: ^4.0.1 flutter_inappwebview: ^5.4.3+7 desktop_webview_window: ^0.1.6 webview_windows: ^0.2.0 From dfd546cada9658333415b2071dda6d9da46ea98d Mon Sep 17 00:00:00 2001 From: Rainvisitor Date: Sat, 10 Jun 2023 03:23:46 +0800 Subject: [PATCH 02/23] feat: update `dio` version 5 api change --- lib/api/graduation_helper.dart | 2 +- lib/api/selcrs_helper.dart | 10 +++++----- lib/api/tuition_helper.dart | 2 +- lib/pages/graduation_report_page.dart | 8 +++++--- lib/pages/study/score_page.dart | 8 +++++--- lib/pages/tuition_and_fees_page.dart | 8 +++++--- 6 files changed, 22 insertions(+), 16 deletions(-) diff --git a/lib/api/graduation_helper.dart b/lib/api/graduation_helper.dart index 56b6737..e099c25 100644 --- a/lib/api/graduation_helper.dart +++ b/lib/api/graduation_helper.dart @@ -76,7 +76,7 @@ class GraduationHelper { ); } } on DioError catch (e) { - if (e.type == DioErrorType.response && e.response!.statusCode == 302) { + if (e.type == DioErrorType.badResponse && e.response!.statusCode == 302) { isLogin = true; callback.onSuccess(GeneralResponse.success()); } else { diff --git a/lib/api/selcrs_helper.dart b/lib/api/selcrs_helper.dart index 547d769..46a9776 100644 --- a/lib/api/selcrs_helper.dart +++ b/lib/api/selcrs_helper.dart @@ -42,8 +42,8 @@ class SelcrsHelper { Dio dio = Dio( BaseOptions( responseType: ResponseType.bytes, - sendTimeout: 10000, - receiveTimeout: 10000, + sendTimeout: const Duration(seconds: 10), + receiveTimeout: const Duration(seconds: 10), ), ); CookieJar cookieJar = CookieJar(); @@ -140,7 +140,7 @@ class SelcrsHelper { dumpError('score', text, null); } } on DioError catch (e) { - if (e.type == DioErrorType.response && e.response!.statusCode == 302) { + if (e.type == DioErrorType.badResponse && e.response!.statusCode == 302) { } else { error++; if (error > 5) { @@ -178,7 +178,7 @@ class SelcrsHelper { return dumpError('course', text, callback) as Future; } } on DioError catch (e) { - if (e.type == DioErrorType.response && e.response!.statusCode == 302) { + if (e.type == DioErrorType.badResponse && e.response!.statusCode == 302) { final String _ = big5.decode(e.response!.data as Uint8List); // debugPrint('text = $text'); this.username = username; @@ -459,7 +459,7 @@ class SelcrsHelper { } return callback.onSuccess(scoreSemesterData); } on DioError catch (e) { - if (e.type == DioErrorType.response && e.response!.statusCode == 302) { + if (e.type == DioErrorType.badResponse && e.response!.statusCode == 302) { final String text = big5.decode(e.response!.data as Uint8List); if (text.contains(scoreTimeoutText) && canReLogin) { await reLogin(); diff --git a/lib/api/tuition_helper.dart b/lib/api/tuition_helper.dart index 38b2e50..37e0ed4 100644 --- a/lib/api/tuition_helper.dart +++ b/lib/api/tuition_helper.dart @@ -65,7 +65,7 @@ class TuitionHelper { // debugPrint('Response = $text'); // debugPrint('response.statusCode = ${response.statusCode}'); } on DioError catch (e) { - if (e.type == DioErrorType.response && e.response!.statusCode == 302) { + if (e.type == DioErrorType.badResponse && e.response!.statusCode == 302) { isLogin = true; return callback.onSuccess(GeneralResponse.success()); } else { diff --git a/lib/pages/graduation_report_page.dart b/lib/pages/graduation_report_page.dart index 65d3f0a..054b668 100644 --- a/lib/pages/graduation_report_page.dart +++ b/lib/pages/graduation_report_page.dart @@ -349,13 +349,15 @@ class GraduationReportPageState extends State Function(DioError) get _onFailure => (DioError e) => setState(() { state = _State.error; switch (e.type) { - case DioErrorType.connectTimeout: + case DioErrorType.connectionTimeout: + case DioErrorType.connectionError: case DioErrorType.sendTimeout: case DioErrorType.receiveTimeout: - case DioErrorType.response: + case DioErrorType.badResponse: case DioErrorType.cancel: + case DioErrorType.badCertificate: break; - case DioErrorType.other: + case DioErrorType.unknown: throw e; } }); diff --git a/lib/pages/study/score_page.dart b/lib/pages/study/score_page.dart index ceef3ef..387b40b 100644 --- a/lib/pages/study/score_page.dart +++ b/lib/pages/study/score_page.dart @@ -126,13 +126,15 @@ class ScorePageState extends State { Function(DioError e) get _onFailure => (DioError e) => setState(() { state = ScoreState.error; switch (e.type) { - case DioErrorType.connectTimeout: + case DioErrorType.connectionError: + case DioErrorType.connectionTimeout: case DioErrorType.sendTimeout: case DioErrorType.receiveTimeout: - case DioErrorType.response: + case DioErrorType.badResponse: case DioErrorType.cancel: + case DioErrorType.badCertificate: break; - case DioErrorType.other: + case DioErrorType.unknown: throw e; } }); diff --git a/lib/pages/tuition_and_fees_page.dart b/lib/pages/tuition_and_fees_page.dart index a5d2e64..facb39d 100644 --- a/lib/pages/tuition_and_fees_page.dart +++ b/lib/pages/tuition_and_fees_page.dart @@ -189,13 +189,15 @@ class _TuitionAndFeesPageState extends State { Function(DioError) get _onFailure => (DioError e) => setState(() { state = _State.error; switch (e.type) { - case DioErrorType.connectTimeout: + case DioErrorType.connectionTimeout: + case DioErrorType.connectionError: case DioErrorType.sendTimeout: case DioErrorType.receiveTimeout: - case DioErrorType.response: + case DioErrorType.badResponse: case DioErrorType.cancel: + case DioErrorType.badCertificate: break; - case DioErrorType.other: + case DioErrorType.unknown: throw e; } }); From 1fa5492aea19116ceb779b63fa2faeb96cc99581 Mon Sep 17 00:00:00 2001 From: Rainvisitor Date: Sat, 10 Jun 2023 03:24:21 +0800 Subject: [PATCH 03/23] feat: upgrade FVM flutter version to `3.10.4` --- .fvm/fvm_config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json index 5d1bc03..88fa31a 100644 --- a/.fvm/fvm_config.json +++ b/.fvm/fvm_config.json @@ -1,4 +1,4 @@ { - "flutterSdkVersion": "3.0.5", + "flutterSdkVersion": "3.10.4", "flavors": {} } \ No newline at end of file From fc53a2564706b7b217c7b3bd41880941b6b79bf7 Mon Sep 17 00:00:00 2001 From: Rainvisitor Date: Sat, 10 Jun 2023 03:25:09 +0800 Subject: [PATCH 04/23] feat: upgrade `ap_common` to `v0.23.0-dev.0` --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index b94435e..2c11478 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -14,7 +14,7 @@ dependencies: intl: ^0.17.0 multiple_localization: ^0.3.0 - ap_common: ^0.22.0-dev.1 + ap_common: ^0.23.0-dev.0 ap_common_firebase: ^0.15.0 ap_common_plugin: 0.4.0 # path: ../ap_common_plugin From 6b98c0e65354551579b040119d188ca02bfe83c0 Mon Sep 17 00:00:00 2001 From: Rainvisitor Date: Sat, 10 Jun 2023 04:11:31 +0800 Subject: [PATCH 05/23] feat: update `ap_common` api change --- lib/api/selcrs_helper.dart | 54 +++++++++++--------- lib/pages/home_page.dart | 2 +- lib/pages/study/course_page.dart | 87 ++++++++++++++++---------------- lib/pages/study/score_page.dart | 27 +++++----- 4 files changed, 88 insertions(+), 82 deletions(-) diff --git a/lib/api/selcrs_helper.dart b/lib/api/selcrs_helper.dart index 46a9776..ddb5f45 100644 --- a/lib/api/selcrs_helper.dart +++ b/lib/api/selcrs_helper.dart @@ -1,5 +1,3 @@ -import 'dart:typed_data'; - import 'package:ap_common/callback/general_callback.dart'; import 'package:ap_common/models/course_data.dart'; import 'package:ap_common/models/score_data.dart'; @@ -254,7 +252,7 @@ class SelcrsHelper { UserInfo parserUserInfo(String text) { final dom.Document document = parse(text, encoding: 'BIG-5'); final List tdDoc = document.getElementsByTagName('td'); - UserInfo userInfo = UserInfo(); + UserInfo userInfo = UserInfo.empty(); if (tdDoc.isNotEmpty) { userInfo = UserInfo( department: tdDoc[1].text, @@ -268,6 +266,7 @@ class SelcrsHelper { } Future getCourseSemesterData({ + required Semester defaultSemester, required GeneralCallback callback, }) async { final String url = '$selcrsUrl/menu4/query/stu_slt_up.asp'; @@ -278,6 +277,7 @@ class SelcrsHelper { if (text.contains(courseTimeoutText) && canReLogin) { await reLogin(); return getCourseSemesterData( + defaultSemester: defaultSemester, callback: callback, ); } @@ -288,10 +288,13 @@ class SelcrsHelper { reLoginCount = 0; final dom.Document document = parse(text, encoding: 'BIG-5'); final List options = document.getElementsByTagName('option'); - final SemesterData courseSemesterData = SemesterData(data: []); + final SemesterData courseSemesterData = SemesterData( + data: [], + defaultSemester: defaultSemester, + ); for (int i = 0; i < options.length; i++) { //print('$i => ${tdDoc[i].text}'); - courseSemesterData.data!.add( + courseSemesterData.data.add( Semester( text: options[i].text, year: options[i].attributes['value']!.substring(0, 3), @@ -310,7 +313,7 @@ class SelcrsHelper { Future getCourseData({ required String username, - required TimeCodeConfig? timeCodeConfig, + required TimeCodeConfig timeCodeConfig, required String semester, required GeneralCallback callback, }) async { @@ -346,10 +349,8 @@ class SelcrsHelper { final dom.Document document = parse(text, encoding: 'BIG-5'); final List trDoc = document.getElementsByTagName('tr'); final CourseData courseData = - CourseData(courses: (trDoc.isEmpty) ? null : []); - if (courseData.courses != null) { - courseData.timeCodes = timeCodeConfig!.timeCodes; - } + CourseData(courses: [], timeCodes: timeCodeConfig.timeCodes); + //print(DateTime.now()); for (int i = 1; i < trDoc.length; i++) { final List tdDoc = trDoc[i].getElementsByTagName('td'); @@ -389,14 +390,14 @@ class SelcrsHelper { final List sections = tdDoc[j].text.split(''); if (sections.isNotEmpty && sections[0] != ' ') { for (final String section in sections) { - final int index = timeCodeConfig!.indexOf(section); + final int index = timeCodeConfig.indexOf(section); if (index == -1) continue; - course.times!.add(SectionTime(weekday: j - 9, index: index)); + course.times.add(SectionTime(weekday: j - 9, index: index)); } } } } - courseData.courses!.add(course); + courseData.courses.add(course); } if (trDoc.isNotEmpty) { final int endTime = DateTime.now().millisecondsSinceEpoch; @@ -503,7 +504,7 @@ class SelcrsHelper { final int startTime = DateTime.now().millisecondsSinceEpoch; final dom.Document document = parse(text, encoding: 'BIG-5'); final List list = []; - final Detail detail = Detail(); + Detail detail = Detail(); final List tableDoc = document.getElementsByTagName('tbody'); if (tableDoc.length >= 2) { // for (var i = 0; i < tableDoc.length; i++) { @@ -516,16 +517,18 @@ class SelcrsHelper { if (tableDoc.length == 3) { final List fontDoc = tableDoc[1].getElementsByTagName('font'); - detail.creditTaken = double.parse(fontDoc[0].text.split(':')[1]); - detail.creditEarned = double.parse(fontDoc[1].text.split(':')[1]); - detail.average = double.parse(fontDoc[2].text.split(':')[1]); - detail.classRank = - '${fontDoc[4].text.split(':')[1]}/${fontDoc[5].text.split(':')[1]}'; double percentage = double.parse(fontDoc[4].text.split(':')[1]) / double.parse(fontDoc[5].text.split(':')[1]); percentage = 1.0 - percentage; percentage *= 100; - detail.classPercentage = double.parse(percentage.toStringAsFixed(2)); + detail = Detail( + creditTaken: double.parse(fontDoc[0].text.split(':')[1]), + creditEarned: double.parse(fontDoc[1].text.split(':')[1]), + average: double.parse(fontDoc[2].text.split(':')[1]), + classRank: + '${fontDoc[4].text.split(':')[1]}/${fontDoc[5].text.split(':')[1]}', + classPercentage: double.parse(percentage.toStringAsFixed(2)), + ); } final List trDoc = tableDoc[0].getElementsByTagName('tr'); for (int i = 0; i < trDoc.length; i++) { @@ -533,13 +536,14 @@ class SelcrsHelper { trDoc[i].getElementsByTagName('font'); if (fontDoc.length != 6) continue; if (i != 0) { - final Score score = Score( + Score score = Score( courseNumber: fontDoc[2].text.substring(1, fontDoc[2].text.length - 1), title: //'${trDoc[i].getElementsByTagName('font')[2].text}' fontDoc[3].text, middleScore: fontDoc[4].text, finalScore: fontDoc[5].text, + units: '', ); if (searchPreScore && (score.finalScore == null || @@ -547,8 +551,10 @@ class SelcrsHelper { final PreScore? preScore = await getPreScoreData(score.courseNumber); if (preScore != null) { - score.finalScore = preScore.grades; - score.isPreScore = true; + score = score.copyWith( + finalScore: preScore.grades, + isPreScore: true, + ); } } list.add(score); @@ -578,7 +584,7 @@ class SelcrsHelper { ); return callback.onSuccess(scoreData); } on DioError catch (e) { - if (e.type == DioErrorType.response && e.response!.statusCode == 302) { + if (e.type == DioErrorType.badResponse && e.response!.statusCode == 302) { final String text = big5.decode(e.response!.data as Uint8List); if (text.contains(scoreTimeoutText) && canReLogin) { await reLogin(); diff --git a/lib/pages/home_page.dart b/lib/pages/home_page.dart index 389fa4f..c5f01b3 100644 --- a/lib/pages/home_page.dart +++ b/lib/pages/home_page.dart @@ -409,7 +409,7 @@ class HomePageState extends State { Future _getAllAnnouncement() async { AnnouncementHelper.instance.getAnnouncements( tags: ['nsysu'], - callback: GeneralCallback?>( + callback: GeneralCallback>( onFailure: (_) => setState(() => state = HomeState.error), onError: (_) => setState(() => state = HomeState.error), onSuccess: (List? data) { diff --git a/lib/pages/study/course_page.dart b/lib/pages/study/course_page.dart index c49538d..c857bc2 100644 --- a/lib/pages/study/course_page.dart +++ b/lib/pages/study/course_page.dart @@ -25,10 +25,10 @@ class CoursePageState extends State { CourseState state = CourseState.loading; - TimeCodeConfig? timeCodeConfig; + late TimeCodeConfig timeCodeConfig; SemesterData? semesterData; - CourseData courseData = CourseData(); + CourseData courseData = CourseData.empty(); CourseNotifyData? notifyData; String? customStateHint; @@ -39,7 +39,7 @@ class CoursePageState extends State { String defaultSemesterCode = ''; String get courseNotifyCacheKey => - semesterData?.defaultSemester?.code ?? '1091'; + semesterData?.defaultSemester.code ?? '1091'; @override void initState() { @@ -97,44 +97,50 @@ class CoursePageState extends State { (_) => setState(() => state = CourseState.error); Future _getSemester() async { + FirebaseRemoteConfig remoteConfig; + try { + //TODO improve + remoteConfig = FirebaseRemoteConfigUtils.instance.remoteConfig!; + await remoteConfig.fetch(); + await remoteConfig.activate(); + defaultSemesterCode = + remoteConfig.getString(Constants.defaultCourseSemesterCode); + final String rawTimeCodeConfig = + remoteConfig.getString(Constants.timeCodeConfig); + timeCodeConfig = TimeCodeConfig.fromRawJson(rawTimeCodeConfig); + Preferences.setString( + Constants.defaultCourseSemesterCode, + defaultSemesterCode, + ); + Preferences.setString( + Constants.timeCodeConfig, + rawTimeCodeConfig, + ); + } catch (exception) { + defaultSemesterCode = Preferences.getString( + Constants.defaultCourseSemesterCode, + '${Constants.defaultYear}${Constants.defaultSemester}', + ); + timeCodeConfig = TimeCodeConfig.fromRawJson( + Preferences.getString( + Constants.timeCodeConfig, + //ignore: lines_longer_than_80_chars + '{ "timeCodes":[{"title":"A", "startTime": "7:00" ,"endTime": "7:50" },{ "title":"1", "startTime": "8:10" ,"endTime": "9:00" },{ "title":"2", "startTime": "9:10" ,"endTime": "10:00" },{ "title":"3", "startTime": "10:10" ,"endTime": "11:00" },{ "title":"4", "startTime": "11:10" ,"endTime": "12:00" },{ "title":"B", "startTime": "12:10" ,"endTime": "13:00" },{ "title":"5", "startTime": "13:10" ,"endTime": "14:00" },{ "title":"6", "startTime": "14:10" ,"endTime": "15:00" },{ "title":"7", "startTime": "15:10" ,"endTime": "16:00" },{ "title":"8", "startTime": "16:10" ,"endTime": "17:00" },{ "title":"9", "startTime": "17:10" ,"endTime": "18:00" },{ "title":"C", "startTime": "18:20" ,"endTime": "19:10" },{ "title":"D", "startTime": "19:15" ,"endTime": "20:05" },{ "title":"E", "startTime": "20:10" ,"endTime": "21:00" },{ "title":"F", "startTime": "21:05" ,"endTime": "21:55" }] }', + ), + ); + } + final Semester defaultSemester = Semester( + year: defaultSemesterCode.substring(0, 3), + value: defaultSemesterCode.substring(3), + text: parser(defaultSemesterCode), + ); SelcrsHelper.instance.getCourseSemesterData( + defaultSemester: defaultSemester, callback: GeneralCallback( onFailure: _onFailure, onError: _onError, onSuccess: (SemesterData data) async { semesterData = data; - FirebaseRemoteConfig remoteConfig; - try { - //TODO improve - remoteConfig = FirebaseRemoteConfigUtils.instance.remoteConfig!; - await remoteConfig.fetch(); - await remoteConfig.activate(); - defaultSemesterCode = - remoteConfig.getString(Constants.defaultCourseSemesterCode); - final String rawTimeCodeConfig = - remoteConfig.getString(Constants.timeCodeConfig); - timeCodeConfig = TimeCodeConfig.fromRawJson(rawTimeCodeConfig); - Preferences.setString( - Constants.defaultCourseSemesterCode, - defaultSemesterCode, - ); - Preferences.setString( - Constants.timeCodeConfig, - rawTimeCodeConfig, - ); - } catch (exception) { - defaultSemesterCode = Preferences.getString( - Constants.defaultCourseSemesterCode, - '${Constants.defaultYear}${Constants.defaultSemester}', - ); - timeCodeConfig = TimeCodeConfig.fromRawJson( - Preferences.getString( - Constants.timeCodeConfig, - //ignore: lines_longer_than_80_chars - '{ "timeCodes":[{"title":"A", "startTime": "7:00" ,"endTime": "7:50" },{ "title":"1", "startTime": "8:10" ,"endTime": "9:00" },{ "title":"2", "startTime": "9:10" ,"endTime": "10:00" },{ "title":"3", "startTime": "10:10" ,"endTime": "11:00" },{ "title":"4", "startTime": "11:10" ,"endTime": "12:00" },{ "title":"B", "startTime": "12:10" ,"endTime": "13:00" },{ "title":"5", "startTime": "13:10" ,"endTime": "14:00" },{ "title":"6", "startTime": "14:10" ,"endTime": "15:00" },{ "title":"7", "startTime": "15:10" ,"endTime": "16:00" },{ "title":"8", "startTime": "16:10" ,"endTime": "17:00" },{ "title":"9", "startTime": "17:10" ,"endTime": "18:00" },{ "title":"C", "startTime": "18:20" ,"endTime": "19:10" },{ "title":"D", "startTime": "19:15" ,"endTime": "20:05" },{ "title":"E", "startTime": "20:10" ,"endTime": "21:00" },{ "title":"F", "startTime": "21:05" ,"endTime": "21:55" }] }', - ), - ); - } final String semester = Preferences.getString( ApConstants.currentSemesterCode, ApConstants.semesterLatest, @@ -149,13 +155,8 @@ class CoursePageState extends State { defaultSemesterCode, ); } - semesterData!.defaultSemester = Semester( - year: defaultSemesterCode.substring(0, 3), - value: defaultSemesterCode.substring(3), - text: parser(defaultSemesterCode), - ); - for (final Semester option in semesterData!.data!) { - option.text = parser(option.text!); + for (final Semester option in semesterData!.data) { + option.text = parser(option.text); } semesterData!.currentIndex = semesterData!.defaultIndex; _getCourseTables(); @@ -215,7 +216,7 @@ class CoursePageState extends State { courseData.save(courseNotifyCacheKey); if (mounted) { setState(() { - if (courseData.courses == null || courseData.courses!.isEmpty) { + if (courseData.courses.isEmpty) { state = CourseState.empty; } else { state = CourseState.finish; diff --git a/lib/pages/study/score_page.dart b/lib/pages/study/score_page.dart index 387b40b..6db30d4 100644 --- a/lib/pages/study/score_page.dart +++ b/lib/pages/study/score_page.dart @@ -34,11 +34,10 @@ class ScorePageState extends State { int currentSemesterIndex = 0; bool get hasPreScore { - bool _hasPreScore = false; - scoreData?.scores?.forEach((Score score) { - if (score.isPreScore) _hasPreScore = true; - }); - return _hasPreScore; + for (final Score score in scoreData?.scores ?? []) { + if (score.isPreScore) return true; + } + return false; } @override @@ -100,10 +99,10 @@ class ScorePageState extends State { }, finalScoreBuilder: (int index) { return ScoreTextBorder( - text: scoreData!.scores![index].finalScore, + text: scoreData!.scores[index].finalScore, style: TextStyle( fontSize: 15.0, - color: scoreData!.scores![index].isPreScore + color: scoreData!.scores[index].isPreScore ? ApTheme.of(context).yellow : null, ), @@ -113,12 +112,12 @@ class ScorePageState extends State { ? null : [ '${ap.creditsTakenEarned}:' + - '${scoreData!.detail!.creditTaken ?? ''}' - '${scoreData!.detail!.isCreditEmpty ? '' : ' / '}' - '${scoreData!.detail!.creditEarned ?? ''}', - '${ap.average}:${scoreData!.detail!.average ?? ''}', - '${ap.rank}:${scoreData!.detail!.classRank ?? ''}', - '${ap.percentage}:${scoreData!.detail!.classPercentage ?? ''}', + '${scoreData!.detail.creditTaken ?? ''}' + '${scoreData!.detail.isCreditEmpty ? '' : ' / '}' + '${scoreData!.detail.creditEarned ?? ''}', + '${ap.average}:${scoreData!.detail.average ?? ''}', + '${ap.rank}:${scoreData!.detail.classRank ?? ''}', + '${ap.percentage}:${scoreData!.detail.classPercentage ?? ''}', ], ); } @@ -180,7 +179,7 @@ class ScorePageState extends State { scoreData = data; if (mounted && scoreData != null) { setState(() { - if (scoreData!.scores == null || scoreData!.scores!.isEmpty) { + if (scoreData!.scores.isEmpty) { state = ScoreState.empty; } else { state = ScoreState.finish; From 780af745f1fb5b678632ed1b20baa3c49de12f1e Mon Sep 17 00:00:00 2001 From: Rainvisitor Date: Sat, 10 Jun 2023 04:12:58 +0800 Subject: [PATCH 06/23] feat: update native project by from flutter 3.0 to flutter 3.10 --- android/build.gradle | 2 +- ios/Runner.xcodeproj/project.pbxproj | 5 ++++- ios/Runner/Info.plist | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index e4bdf0f..b47cfa3 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -28,6 +28,6 @@ subprojects { project.evaluationDependsOn(':app') } -task clean(type: Delete) { +tasks.register("clean", Delete) { delete rootProject.buildDir } diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 41876a7..48e25f3 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 50; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -333,10 +333,12 @@ /* Begin PBXShellScriptBuildPhase section */ 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); inputPaths = ( + "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}", ); name = "Thin Binary"; outputPaths = ( @@ -369,6 +371,7 @@ }; 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 33906ee..4f5c5bc 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -83,5 +83,7 @@ CADisableMinimumFrameDurationOnPhone + UIApplicationSupportsIndirectInputEvents + From 4c9288495712ea3f86fae129ee0ee31f8779a4e7 Mon Sep 17 00:00:00 2001 From: Rainvisitor Date: Sat, 10 Jun 2023 04:13:41 +0800 Subject: [PATCH 07/23] feat: upgrade android target version to `33` --- android/app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index ced4c29..40fb62e 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -26,7 +26,7 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 31 + compileSdkVersion 33 sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -39,7 +39,7 @@ android { defaultConfig { applicationId "com.nsysu.ap" minSdkVersion 21 - targetSdkVersion 31 + targetSdkVersion 33 versionCode flutterVersionCode.toInteger() versionName flutterVersionName testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" From ad8e7b63910e4b14e76da666c2b49146f93a7301 Mon Sep 17 00:00:00 2001 From: Rainvisitor Date: Sat, 10 Jun 2023 04:14:13 +0800 Subject: [PATCH 08/23] feat: update permission setting for android 13 api --- android/app/src/main/AndroidManifest.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 83226ad..bb3ce46 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -10,6 +10,14 @@ + + + + From a336e587d4c7dff618a7448a1babc59384a13b20 Mon Sep 17 00:00:00 2001 From: Rainvisitor Date: Sat, 10 Jun 2023 04:15:17 +0800 Subject: [PATCH 09/23] chore: add dev override intl to 0.18.0 to fix flutter 3.10 update --- pubspec.lock | 741 ++++++++++++++++++++++++++++++++------------------- pubspec.yaml | 3 +- 2 files changed, 470 insertions(+), 274 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 691c3d3..73d0f8f 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,518 +5,600 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - url: "https://pub.dartlang.org" + sha256: "8745ddb5f27423c6ba4cc3b182688407239fe38f73ef93a0db0a3497ddf4c2e6" + url: "https://pub.dev" source: hosted version: "46.0.0" add_2_calendar: dependency: transitive description: name: add_2_calendar - url: "https://pub.dartlang.org" + sha256: "840b41d12d70489fbcc0f752fd98cf877c2bbaee0cf5fd92f4fd7846a0274cbd" + url: "https://pub.dev" source: hosted version: "2.1.3" analyzer: dependency: transitive description: name: analyzer - url: "https://pub.dartlang.org" + sha256: "2c93c461a00a27dad2849137304d32b3c6b79c75b1d10ec9547ce329de329524" + url: "https://pub.dev" source: hosted version: "4.6.0" ap_common: dependency: "direct main" description: name: ap_common - url: "https://pub.dartlang.org" + sha256: "452dac42edb9f834da1e818d2893bba086f21a28e9148b578ba1d83a0d7e175f" + url: "https://pub.dev" source: hosted - version: "0.22.0-dev.1" + version: "0.23.0-dev.0" ap_common_firebase: dependency: "direct main" description: name: ap_common_firebase - url: "https://pub.dartlang.org" + sha256: "7ef6ca34dd61aa222ee18d72c99a4cbd0918199edbbfd375d4a44e01fe175686" + url: "https://pub.dev" source: hosted version: "0.15.0" ap_common_plugin: dependency: "direct main" description: name: ap_common_plugin - url: "https://pub.dartlang.org" + sha256: f5b28fe3a1f962c543d2b81d01d87dc590742c08ef2c066023a531b079b9f2bf + url: "https://pub.dev" source: hosted version: "0.4.0" app_tracking_transparency: dependency: transitive description: name: app_tracking_transparency - url: "https://pub.dartlang.org" + sha256: "03e0aa07ed4f5abbdd5c197ee4f9f58f1362aebf82444f043b5ddbbe45e1004a" + url: "https://pub.dev" source: hosted version: "2.0.2+4" archive: dependency: transitive description: name: archive - url: "https://pub.dartlang.org" + sha256: "793964beb8e297995714326628881437d4211f10fc8843534bab54129cd896ee" + url: "https://pub.dev" source: hosted version: "3.3.1" args: dependency: transitive description: name: args - url: "https://pub.dartlang.org" + sha256: b003c3098049a51720352d219b0bb5f219b60fbfb68e7a4748139a06a5676515 + url: "https://pub.dev" source: hosted version: "2.3.1" asn1lib: dependency: transitive description: name: asn1lib - url: "https://pub.dartlang.org" + sha256: c273725e171cea7e69c8953181202a2850297bcc7617916d83b396cd791a2dcd + url: "https://pub.dev" source: hosted version: "1.1.0" async: dependency: transitive description: name: async - url: "https://pub.dartlang.org" + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + url: "https://pub.dev" source: hosted - version: "2.8.2" + version: "2.11.0" auto_size_text_pk: dependency: transitive description: name: auto_size_text_pk - url: "https://pub.dartlang.org" + sha256: ced55de5336fa7f438c1f5a9aa234e25d7a120c1d40d376a7cdc2af28cdb6995 + url: "https://pub.dev" source: hosted version: "3.0.0" barcode: dependency: transitive description: name: barcode - url: "https://pub.dartlang.org" + sha256: "52570564684bbb0240a9f1fdb6bad12adc5e0540103c1c96d6dd550bd928b1c9" + url: "https://pub.dev" source: hosted - version: "2.2.2" + version: "2.2.3" barcode_widget: dependency: transitive description: name: barcode_widget - url: "https://pub.dartlang.org" + sha256: ea0c0578b5db3ca3a583d80e05eb47bfb70419e3a23b920d93ae7968c45c20ce + url: "https://pub.dev" source: hosted version: "2.0.3" + bidi: + dependency: transitive + description: + name: bidi + sha256: dc00274c7edabae2ab30c676e736ea1eb0b1b7a1b436cb5fe372e431ccb39ab0 + url: "https://pub.dev" + source: hosted + version: "2.0.6" boolean_selector: dependency: transitive description: name: boolean_selector - url: "https://pub.dartlang.org" + sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" build: dependency: transitive description: name: build - url: "https://pub.dartlang.org" + sha256: "29a03af98de60b4eb9136acd56608a54e989f6da238a80af739415b05589d6df" + url: "https://pub.dev" source: hosted version: "2.3.0" build_config: dependency: transitive description: name: build_config - url: "https://pub.dartlang.org" + sha256: "5b7355c14258f5e7df24bad1566f7b991de3e54aeacfb94e1a65e5233d9739c1" + url: "https://pub.dev" source: hosted version: "1.1.0" build_daemon: dependency: transitive description: name: build_daemon - url: "https://pub.dartlang.org" + sha256: "6bc5544ea6ce4428266e7ea680e945c68806c4aae2da0eb5e9ccf38df8d6acbf" + url: "https://pub.dev" source: hosted version: "3.1.0" build_resolvers: dependency: transitive description: name: build_resolvers - url: "https://pub.dartlang.org" + sha256: "9aae031a54ab0beebc30a888c93e900d15ae2fd8883d031dbfbd5ebdb57f5a4c" + url: "https://pub.dev" source: hosted version: "2.0.9" build_runner: dependency: "direct dev" description: name: build_runner - url: "https://pub.dartlang.org" + sha256: "56942f8114731d1e79942cd981cfef29501937ff1bccf4dbdce0273f31f13640" + url: "https://pub.dev" source: hosted version: "2.2.0" build_runner_core: dependency: transitive description: name: build_runner_core - url: "https://pub.dartlang.org" + sha256: f4d6244cc071ba842c296cb1c4ee1b31596b9f924300647ac7a1445493471a3f + url: "https://pub.dev" source: hosted version: "7.2.3" built_collection: dependency: transitive description: name: built_collection - url: "https://pub.dartlang.org" + sha256: "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100" + url: "https://pub.dev" source: hosted version: "5.1.1" built_value: dependency: transitive description: name: built_value - url: "https://pub.dartlang.org" + sha256: "8f4772ec1e72822da7213627a0db16029085a8d709a9032e77b9a049209b6cb2" + url: "https://pub.dev" source: hosted version: "8.4.0" cached_network_image: dependency: transitive description: name: cached_network_image - url: "https://pub.dartlang.org" + sha256: e764e48ef036cabdf84319ba7b8b5871b6b43266e14de787cb43f77639089ae5 + url: "https://pub.dev" source: hosted version: "3.2.1" cached_network_image_platform_interface: dependency: transitive description: name: cached_network_image_platform_interface - url: "https://pub.dartlang.org" + sha256: "8e2b5befefec5063bee8f209fda21751f6328d405d4237c70f21104568b2fee7" + url: "https://pub.dev" source: hosted version: "1.0.0" cached_network_image_web: dependency: transitive description: name: cached_network_image_web - url: "https://pub.dartlang.org" + sha256: d4351c7eb16767df129b0474a5ebc4e028870379c063e8ba265a56aa00831e70 + url: "https://pub.dev" source: hosted version: "1.0.1" characters: dependency: transitive description: name: characters - url: "https://pub.dartlang.org" + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.3.0" charcode: dependency: transitive description: name: charcode - url: "https://pub.dartlang.org" + sha256: fb98c0f6d12c920a02ee2d998da788bca066ca5f148492b7085ee23372b12306 + url: "https://pub.dev" source: hosted version: "1.3.1" checked_yaml: dependency: transitive description: name: checked_yaml - url: "https://pub.dartlang.org" + sha256: dd007e4fb8270916820a0d66e24f619266b60773cddd082c6439341645af2659 + url: "https://pub.dev" source: hosted version: "2.0.1" clock: dependency: transitive description: name: clock - url: "https://pub.dartlang.org" + sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.1" code_builder: dependency: transitive description: name: code_builder - url: "https://pub.dartlang.org" + sha256: "43743b95913fd28b95184eb1bed7e4bd85b802b8fad0a52522702dbeda4ee3d5" + url: "https://pub.dev" source: hosted version: "4.2.0" collection: dependency: transitive description: name: collection - url: "https://pub.dartlang.org" + sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" + url: "https://pub.dev" source: hosted - version: "1.16.0" + version: "1.17.1" convert: dependency: transitive description: name: convert - url: "https://pub.dartlang.org" + sha256: "196284f26f69444b7f5c50692b55ec25da86d9e500451dc09333bf2e3ad69259" + url: "https://pub.dev" source: hosted version: "3.0.2" cookie_jar: dependency: "direct main" description: name: cookie_jar - url: "https://pub.dartlang.org" + sha256: "253920541bf248e4eda6eac5df6aa00c19c183e1fe333629925d8df666a27815" + url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "4.0.1" cross_file: dependency: transitive description: name: cross_file - url: "https://pub.dartlang.org" + sha256: "7632a2bcddc8cef4afde3c6f80e69b29a7060e176f01119c229fe4eb3a2a3d4f" + url: "https://pub.dev" source: hosted version: "0.3.3+1" crypto: dependency: "direct main" description: name: crypto - url: "https://pub.dartlang.org" + sha256: aa274aa7774f8964e4f4f38cc994db7b6158dd36e9187aaceaddc994b35c6c67 + url: "https://pub.dev" source: hosted version: "3.0.2" csslib: dependency: transitive description: name: csslib - url: "https://pub.dartlang.org" + sha256: b36c7f7e24c0bdf1bf9a3da461c837d1de64b9f8beb190c9011d8c72a3dfd745 + url: "https://pub.dev" source: hosted version: "0.17.2" cupertino_back_gesture: dependency: transitive description: name: cupertino_back_gesture - url: "https://pub.dartlang.org" + sha256: "64f68f3aadb98e19d85c8c1dd9595a56b5b53b05f455e32df1c52edadad456d8" + url: "https://pub.dev" source: hosted version: "0.1.0" dart_style: dependency: transitive description: name: dart_style - url: "https://pub.dartlang.org" + sha256: "8aff82f9b26fd868992e5430335a9d773bfef01e1d852d7ba71bf4c5d9349351" + url: "https://pub.dev" source: hosted version: "2.2.3" dbus: dependency: transitive description: name: dbus - url: "https://pub.dartlang.org" + sha256: "905ee98622b37bcc4d0685381cd54cf9a58161c40d5e2a489e498014ac1217c3" + url: "https://pub.dev" source: hosted version: "0.7.7" desktop_webview_window: dependency: "direct main" description: name: desktop_webview_window - url: "https://pub.dartlang.org" + sha256: "5dbb13502f0a39e6d41893dc57110ac22e4278c6ef8c46ada56d243441a1e4ca" + url: "https://pub.dev" source: hosted version: "0.1.6" dio: dependency: "direct main" description: name: dio - url: "https://pub.dartlang.org" + sha256: "347d56c26d63519552ef9a569f2a593dda99a81fdbdff13c584b7197cfe05059" + url: "https://pub.dev" source: hosted - version: "4.0.6" + version: "5.1.2" dio_cookie_manager: dependency: "direct main" description: name: dio_cookie_manager - url: "https://pub.dartlang.org" + sha256: ff1755fd56d02485146d95a589fb4ace1f0ae0c0f3ca702a817de2dc1fbb835e + url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "3.0.0" encrypt: dependency: "direct main" description: name: encrypt - url: "https://pub.dartlang.org" + sha256: "4fd4e4fdc21b9d7d4141823e1e6515cd94e7b8d84749504c232999fba25d9bbb" + url: "https://pub.dev" source: hosted version: "5.0.1" fake_async: dependency: transitive description: name: fake_async - url: "https://pub.dartlang.org" + sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.3.1" ffi: dependency: transitive description: name: ffi - url: "https://pub.dartlang.org" + sha256: a38574032c5f1dd06c4aee541789906c12ccaab8ba01446e800d9c5b79c4a978 + url: "https://pub.dev" source: hosted version: "2.0.1" file: dependency: transitive description: name: file - url: "https://pub.dartlang.org" + sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d" + url: "https://pub.dev" source: hosted - version: "6.1.2" + version: "6.1.4" file_selector: dependency: transitive description: name: file_selector - url: "https://pub.dartlang.org" + sha256: "9e34368bfacdf644e2c8a59e2b241cfb722bcbbd09876410e8775ae4905d6a49" + url: "https://pub.dev" source: hosted version: "0.8.4+3" file_selector_linux: dependency: transitive description: name: file_selector_linux - url: "https://pub.dartlang.org" + sha256: d9b12819251f3704a6664c2046c287cd36beca0f2f9bb992ac08f33e9eb2ea51 + url: "https://pub.dev" source: hosted version: "0.0.2+1" file_selector_macos: dependency: transitive description: name: file_selector_macos - url: "https://pub.dartlang.org" + sha256: e87311d719039da30d26ae829aab3ae66f82deb3318cd70ffecb608c99e3da68 + url: "https://pub.dev" source: hosted version: "0.8.2+2" file_selector_platform_interface: dependency: transitive description: name: file_selector_platform_interface - url: "https://pub.dartlang.org" + sha256: "92b924983d18c53d9d354b95be261af869f2a8efa125b293d2db6569c32dd9c3" + url: "https://pub.dev" source: hosted version: "2.1.0" file_selector_web: dependency: transitive description: name: file_selector_web - url: "https://pub.dartlang.org" + sha256: bf166d08f4c3f79286774cdfa39ed301e076c5a903c435f5199818288f24a66d + url: "https://pub.dev" source: hosted version: "0.8.1+5" file_selector_windows: dependency: transitive description: name: file_selector_windows - url: "https://pub.dartlang.org" + sha256: "8bbcc82fe0d3cdf5ae5c289492ddfd703ec028028d9f194dbceae04cfbde1c48" + url: "https://pub.dev" source: hosted version: "0.8.2+2" firebase: dependency: transitive description: name: firebase - url: "https://pub.dartlang.org" + sha256: cbff777369d19bd0535ccca0005518172953394246620ff8c1021072299d452d + url: "https://pub.dev" source: hosted version: "9.0.3" firebase_analytics: dependency: transitive description: name: firebase_analytics - url: "https://pub.dartlang.org" + sha256: "95b9171de98f358068d88a2e39c1ac740115154ef39ea3fdc54d889df3d0d81b" + url: "https://pub.dev" source: hosted version: "9.3.1" firebase_analytics_platform_interface: dependency: transitive description: name: firebase_analytics_platform_interface - url: "https://pub.dartlang.org" + sha256: c0867073a5d1594f4237082fa70458bad4d2244413b707a50c475b27feaebb91 + url: "https://pub.dev" source: hosted version: "3.3.1" firebase_analytics_web: dependency: transitive description: name: firebase_analytics_web - url: "https://pub.dartlang.org" + sha256: a1fd3e57dad6deb111d676dfff724041ba1c56e9b4c171fcef9f941707e3e868 + url: "https://pub.dev" source: hosted version: "0.4.2+1" firebase_core: dependency: transitive description: name: firebase_core - url: "https://pub.dartlang.org" + sha256: "42740c3a2ae8ad363d6dc59ac73c98271ac66b6c5f89be4181efc6334b14e111" + url: "https://pub.dev" source: hosted version: "1.20.1" firebase_core_dart: dependency: transitive description: name: firebase_core_dart - url: "https://pub.dartlang.org" + sha256: ccb96c29ae686f43ad80f8f0893717361b7959a88b276c5e2c3627d12a9f1de8 + url: "https://pub.dev" source: hosted version: "1.0.1" firebase_core_desktop: dependency: "direct main" description: name: firebase_core_desktop - url: "https://pub.dartlang.org" + sha256: "5bb8ba325739c82efe0535f758afb0613a104c50e3ac5c6ecb6de2657cebb4ed" + url: "https://pub.dev" source: hosted version: "1.0.2" firebase_core_platform_interface: dependency: transitive description: name: firebase_core_platform_interface - url: "https://pub.dartlang.org" + sha256: a78327f0f2f5e36073427300633c9036c4499f047f178498d08b0345ae7ad5b4 + url: "https://pub.dev" source: hosted version: "4.5.0" firebase_core_web: dependency: transitive description: name: firebase_core_web - url: "https://pub.dartlang.org" + sha256: "12853276fd2f9c1aed6f1e3470e3edf7caa6c9fbc39a2b0438f8986e1f468a41" + url: "https://pub.dev" source: hosted version: "1.7.1" firebase_crashlytics: dependency: transitive description: name: firebase_crashlytics - url: "https://pub.dartlang.org" + sha256: "916f0f9886ab569b9363aa27365a765dd3e7a73140315c5254460b032f961295" + url: "https://pub.dev" source: hosted version: "2.8.7" firebase_crashlytics_platform_interface: dependency: transitive description: name: firebase_crashlytics_platform_interface - url: "https://pub.dartlang.org" + sha256: "0d9ba9da8e6571a4ad3033672a9c9dcefb9f6132cf3b663d57510b53e433ea6d" + url: "https://pub.dev" source: hosted version: "3.2.13" firebase_messaging: dependency: transitive description: name: firebase_messaging - url: "https://pub.dartlang.org" + sha256: "0e3108e45463fc5de5dc2e84fc15cd9d0e118139a6c5bfcf3ceaad941aaa38a2" + url: "https://pub.dev" source: hosted version: "12.0.2" firebase_messaging_platform_interface: dependency: transitive description: name: firebase_messaging_platform_interface - url: "https://pub.dartlang.org" + sha256: "03d0aaa4ce16a0157b97bbae20ca70586ff9f8cef521fc180d10c5915c4299e7" + url: "https://pub.dev" source: hosted version: "4.1.1" firebase_messaging_web: dependency: transitive description: name: firebase_messaging_web - url: "https://pub.dartlang.org" + sha256: "61269e6187b767e0fbafa7ee4d0e8fc36ce8026b3e18629ec2655c9cc29209b0" + url: "https://pub.dev" source: hosted version: "3.1.1" firebase_performance: dependency: transitive description: name: firebase_performance - url: "https://pub.dartlang.org" + sha256: ea995b7397e7da8febc8feaeb88b944907ccc87a1f1869ce97e02c993e6308ce + url: "https://pub.dev" source: hosted version: "0.8.2+2" firebase_performance_platform_interface: dependency: transitive description: name: firebase_performance_platform_interface - url: "https://pub.dartlang.org" + sha256: "36533abcd0721e57d46100f167fcdefe41846556515f17129f02c7e2ac8fbebf" + url: "https://pub.dev" source: hosted version: "0.1.1+13" firebase_performance_web: dependency: transitive description: name: firebase_performance_web - url: "https://pub.dartlang.org" + sha256: eb081e3b9ab447a7966fdc140c4f66e324f97e2cc9772d5244424624e3100369 + url: "https://pub.dev" source: hosted version: "0.1.1+2" firebase_remote_config: dependency: transitive description: name: firebase_remote_config - url: "https://pub.dartlang.org" + sha256: "7f52dd027b5b75e3f659240b254a6fd9764abafc7d587689089290d9386657a0" + url: "https://pub.dev" source: hosted version: "2.0.14" firebase_remote_config_platform_interface: dependency: transitive description: name: firebase_remote_config_platform_interface - url: "https://pub.dartlang.org" + sha256: "9dc108e249f08a7c221cf217277e0358ba0fb35c1f9dd8c51244efd4c0a3f301" + url: "https://pub.dev" source: hosted version: "1.1.13" firebase_remote_config_web: dependency: transitive description: name: firebase_remote_config_web - url: "https://pub.dartlang.org" + sha256: "251d1c92d0810bbb0e941e313d638bc30612db32d1ac49d98d211afab235a2fd" + url: "https://pub.dev" source: hosted version: "1.1.2" fixnum: dependency: transitive description: name: fixnum - url: "https://pub.dartlang.org" + sha256: "04be3e934c52e082558cc9ee21f42f5c1cd7a1262f4c63cd0357c08d5bba81ec" + url: "https://pub.dev" source: hosted version: "1.0.1" flutter: @@ -528,70 +610,80 @@ packages: dependency: transitive description: name: flutter_blurhash - url: "https://pub.dartlang.org" + sha256: "05001537bd3fac7644fa6558b09ec8c0a3f2eba78c0765f88912882b1331a5c6" + url: "https://pub.dev" source: hosted version: "0.7.0" flutter_cache_manager: dependency: transitive description: name: flutter_cache_manager - url: "https://pub.dartlang.org" + sha256: "32cd900555219333326a2d0653aaaf8671264c29befa65bbd9856d204a4c9fb3" + url: "https://pub.dev" source: hosted version: "3.3.0" flutter_inappwebview: dependency: "direct main" description: name: flutter_inappwebview - url: "https://pub.dartlang.org" + sha256: dcbaeeac2e47d5c4649a456b009a2fe230f9c35e33c3124ca16f868b4c789a2e + url: "https://pub.dev" source: hosted version: "5.4.3+7" flutter_keyboard_visibility: dependency: transitive description: name: flutter_keyboard_visibility - url: "https://pub.dartlang.org" + sha256: "40d25e00e511fc7e0735d79002db28c2d4736773e5933c45bf239ad1fb80661c" + url: "https://pub.dev" source: hosted version: "5.3.0" flutter_keyboard_visibility_platform_interface: dependency: transitive description: name: flutter_keyboard_visibility_platform_interface - url: "https://pub.dartlang.org" + sha256: e43a89845873f7be10cb3884345ceb9aebf00a659f479d1c8f4293fcb37022a4 + url: "https://pub.dev" source: hosted version: "2.0.0" flutter_keyboard_visibility_web: dependency: transitive description: name: flutter_keyboard_visibility_web - url: "https://pub.dartlang.org" + sha256: d3771a2e752880c79203f8d80658401d0c998e4183edca05a149f5098ce6e3d1 + url: "https://pub.dev" source: hosted version: "2.0.0" flutter_linkify: dependency: transitive description: name: flutter_linkify - url: "https://pub.dartlang.org" + sha256: c89fe74de985ec22f23d3538d2249add085a4f37ac1c29fd79e1a207efb81d63 + url: "https://pub.dev" source: hosted version: "5.0.2" flutter_local_notifications: dependency: transitive description: name: flutter_local_notifications - url: "https://pub.dartlang.org" + sha256: "57d0012730780fe137260dd180e072c18a73fbeeb924cdc029c18aaa0f338d64" + url: "https://pub.dev" source: hosted - version: "9.7.0" + version: "9.9.1" flutter_local_notifications_linux: dependency: transitive description: name: flutter_local_notifications_linux - url: "https://pub.dartlang.org" + sha256: b472bfc173791b59ede323661eae20f7fff0b6908fea33dd720a6ef5d576bae8 + url: "https://pub.dev" source: hosted version: "0.5.1" flutter_local_notifications_platform_interface: dependency: transitive description: name: flutter_local_notifications_platform_interface - url: "https://pub.dartlang.org" + sha256: "21bceee103a66a53b30ea9daf677f990e5b9e89b62f222e60dd241cd08d63d3a" + url: "https://pub.dev" source: hosted version: "5.0.0" flutter_localizations: @@ -603,7 +695,8 @@ packages: dependency: transitive description: name: flutter_plugin_android_lifecycle - url: "https://pub.dartlang.org" + sha256: "60fc7b78455b94e6de2333d2f95196d32cf5c22f4b0b0520a628804cb463503b" + url: "https://pub.dev" source: hosted version: "2.0.7" flutter_test: @@ -620,630 +713,696 @@ packages: dependency: transitive description: name: frontend_server_client - url: "https://pub.dartlang.org" + sha256: "4f4a162323c86ffc1245765cfe138872b8f069deb42f7dbb36115fa27f31469b" + url: "https://pub.dev" source: hosted version: "2.1.3" glob: dependency: transitive description: name: glob - url: "https://pub.dartlang.org" + sha256: c51b4fdfee4d281f49b8c957f1add91b815473597f76bcf07377987f66a55729 + url: "https://pub.dev" source: hosted version: "2.1.0" google_sign_in: dependency: transitive description: name: google_sign_in - url: "https://pub.dartlang.org" + sha256: ba86186451b7a8e0b26b5e32cf860b57e74fc5352993fd119ee4a7aa41ff330d + url: "https://pub.dev" source: hosted - version: "5.4.1" + version: "5.3.3" google_sign_in_android: dependency: transitive description: name: google_sign_in_android - url: "https://pub.dartlang.org" + sha256: "12941b9b7db4fab60a657d167fd72d06fd1214275ee3624404a0b222bb89e334" + url: "https://pub.dev" source: hosted - version: "6.0.1" + version: "5.2.8" google_sign_in_dartio: dependency: "direct main" description: name: google_sign_in_dartio - url: "https://pub.dartlang.org" + sha256: "1b55fa0d99552472efd95ca518e7f68405de465adee90c34d75bdcb3fe54c5d2" + url: "https://pub.dev" source: hosted version: "0.2.1" google_sign_in_ios: dependency: transitive description: name: google_sign_in_ios - url: "https://pub.dartlang.org" + sha256: "8b80074ccda41b62553010b311506f5022f7d2701e4f22765546b3125450f9f3" + url: "https://pub.dev" source: hosted version: "5.4.0" google_sign_in_platform_interface: dependency: transitive description: name: google_sign_in_platform_interface - url: "https://pub.dartlang.org" + sha256: "252d0fadcd1e7939f1e00602eca1020b585d448aaa4b87c33137ca8717cd9e87" + url: "https://pub.dev" source: hosted version: "2.2.0" google_sign_in_web: dependency: transitive description: name: google_sign_in_web - url: "https://pub.dartlang.org" + sha256: "5b35c221169a7b3e0fc15043ac09102ef542300ef92f2e1f05d5d8efde263af5" + url: "https://pub.dev" source: hosted version: "0.10.2" graphs: dependency: transitive description: name: graphs - url: "https://pub.dartlang.org" + sha256: ae0b3d956ff324c6f8671f08dcb2dbd71c99cdbf2aa3ca63a14190c47aa6679c + url: "https://pub.dev" source: hosted version: "2.1.0" hive: dependency: transitive description: name: hive - url: "https://pub.dartlang.org" + sha256: "8dcf6db979d7933da8217edcec84e9df1bdb4e4edc7fc77dbd5aa74356d6d941" + url: "https://pub.dev" source: hosted version: "2.2.3" hive_flutter: dependency: transitive description: name: hive_flutter - url: "https://pub.dartlang.org" + sha256: dca1da446b1d808a51689fb5d0c6c9510c0a2ba01e22805d492c73b68e33eecc + url: "https://pub.dev" source: hosted version: "1.1.0" html: dependency: "direct main" description: name: html - url: "https://pub.dartlang.org" + sha256: bfef906cbd4e78ef49ae511d9074aebd1d2251482ef601a280973e8b58b51bbf + url: "https://pub.dev" source: hosted version: "0.15.0" html_unescape: dependency: transitive description: name: html_unescape - url: "https://pub.dartlang.org" + sha256: "15362d7a18f19d7b742ef8dcb811f5fd2a2df98db9f80ea393c075189e0b61e3" + url: "https://pub.dev" source: hosted version: "2.0.0" http: dependency: "direct main" description: name: http - url: "https://pub.dartlang.org" + sha256: "6aa2946395183537c8b880962d935877325d6a09a2867c3970c05c0fed6ac482" + url: "https://pub.dev" source: hosted version: "0.13.5" http_multi_server: dependency: transitive description: name: http_multi_server - url: "https://pub.dartlang.org" + sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b" + url: "https://pub.dev" source: hosted version: "3.2.1" http_parser: dependency: transitive description: name: http_parser - url: "https://pub.dartlang.org" + sha256: db3060f22889f3d9d55f6a217565486737037eec3609f7f3eca4d0c67ee0d8a0 + url: "https://pub.dev" source: hosted version: "4.0.1" image: dependency: transitive description: name: image - url: "https://pub.dartlang.org" + sha256: a72242c9a0ffb65d03de1b7113bc4e189686fc07c7147b8b41811d0dd0e0d9bf + url: "https://pub.dev" source: hosted - version: "3.2.0" + version: "4.0.17" image_picker: dependency: transitive description: name: image_picker - url: "https://pub.dartlang.org" + sha256: f3712cd190227fb92e0960cb0ce22928ba042c7183b16864ade83b259adf8ea6 + url: "https://pub.dev" source: hosted version: "0.8.5+3" image_picker_android: dependency: transitive description: name: image_picker_android - url: "https://pub.dartlang.org" + sha256: "8243d3324e28806671feb358e3756528bae6f63dacafaecf896e6b45b167def9" + url: "https://pub.dev" source: hosted version: "0.8.5+2" image_picker_for_web: dependency: transitive description: name: image_picker_for_web - url: "https://pub.dartlang.org" + sha256: "60f306ffbdcada4bc8b2691acc420258a1b758e102c87c4f94fb568d640f0e0e" + url: "https://pub.dev" source: hosted version: "2.1.8" image_picker_ios: dependency: transitive description: name: image_picker_ios - url: "https://pub.dartlang.org" + sha256: aee8b90c2fb018e18cbb437da661d0531a5346d49cab2d5c4a65ebaf026bbd33 + url: "https://pub.dev" source: hosted version: "0.8.5+6" image_picker_platform_interface: dependency: transitive description: name: image_picker_platform_interface - url: "https://pub.dartlang.org" + sha256: cedb2650709f066ee83fd65a1d99b6ff33e5adf98cea376426dd33c2b22bf6ad + url: "https://pub.dev" source: hosted version: "2.6.1" in_app_review: dependency: transitive description: name: in_app_review - url: "https://pub.dartlang.org" + sha256: "6cb7a8e4a2eecfa5868b35e1e9ac9082341eeead2cefaac8282be514736e9715" + url: "https://pub.dev" source: hosted version: "2.0.4" in_app_review_platform_interface: dependency: transitive description: name: in_app_review_platform_interface - url: "https://pub.dartlang.org" + sha256: "1e5f2fc7d047607bffeb7d35f32651f7d2f328e872105e4f8d323c864aeaceb9" + url: "https://pub.dev" source: hosted version: "2.0.3" intl: dependency: "direct main" description: name: intl - url: "https://pub.dartlang.org" + sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6 + url: "https://pub.dev" source: hosted - version: "0.17.0" + version: "0.18.0" io: dependency: transitive description: name: io - url: "https://pub.dartlang.org" + sha256: "0d4c73c3653ab85bf696d51a9657604c900a370549196a91f33e4c39af760852" + url: "https://pub.dev" source: hosted version: "1.0.3" js: dependency: transitive description: name: js - url: "https://pub.dartlang.org" + sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 + url: "https://pub.dev" source: hosted - version: "0.6.4" + version: "0.6.7" json_annotation: dependency: "direct main" description: name: json_annotation - url: "https://pub.dartlang.org" + sha256: cb314f00b2488de7bc575207e54402cd2f92363f333a7933fd1b0631af226baa + url: "https://pub.dev" source: hosted version: "4.6.0" json_serializable: dependency: "direct dev" description: name: json_serializable - url: "https://pub.dartlang.org" + sha256: "0cec7060459254cf1ff980c08dedca6fa50917724a3c3ec8c5026cb88dee8238" + url: "https://pub.dev" source: hosted version: "6.3.1" jwt_decoder: dependency: transitive description: name: jwt_decoder - url: "https://pub.dartlang.org" + sha256: "54774aebf83f2923b99e6416b4ea915d47af3bde56884eb622de85feabbc559f" + url: "https://pub.dev" source: hosted version: "2.0.1" linkify: dependency: transitive description: name: linkify - url: "https://pub.dartlang.org" + sha256: bdfbdafec6cdc9cd0ebb333a868cafc046714ad508e48be8095208c54691d959 + url: "https://pub.dev" source: hosted version: "4.1.0" lint: dependency: "direct dev" description: name: lint - url: "https://pub.dartlang.org" + sha256: "4a539aa34ec5721a2c7574ae2ca0336738ea4adc2a34887d54b7596310b33c85" + url: "https://pub.dev" source: hosted version: "1.10.0" logging: dependency: transitive description: name: logging - url: "https://pub.dartlang.org" + sha256: "293ae2d49fd79d4c04944c3a26dfd313382d5f52e821ec57119230ae16031ad4" + url: "https://pub.dev" source: hosted version: "1.0.2" matcher: dependency: transitive description: name: matcher - url: "https://pub.dartlang.org" + sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" + url: "https://pub.dev" source: hosted - version: "0.12.11" + version: "0.12.15" material_color_utilities: dependency: transitive description: name: material_color_utilities - url: "https://pub.dartlang.org" + sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + url: "https://pub.dev" source: hosted - version: "0.1.4" + version: "0.2.0" meta: dependency: transitive description: name: meta - url: "https://pub.dartlang.org" + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + url: "https://pub.dev" source: hosted - version: "1.7.0" + version: "1.9.1" mime: dependency: transitive description: name: mime - url: "https://pub.dartlang.org" + sha256: dab22e92b41aa1255ea90ddc4bc2feaf35544fd0728e209638cad041a6e3928a + url: "https://pub.dev" source: hosted version: "1.0.2" multiple_localization: dependency: "direct main" description: name: multiple_localization - url: "https://pub.dartlang.org" + sha256: "0178b9999878f52595493a957742034f0976fc4a399cd363f8f0a59dfb1e281f" + url: "https://pub.dev" source: hosted version: "0.3.0" octo_image: dependency: transitive description: name: octo_image - url: "https://pub.dartlang.org" + sha256: "107f3ed1330006a3bea63615e81cf637433f5135a52466c7caa0e7152bca9143" + url: "https://pub.dev" source: hosted version: "1.0.2" package_config: dependency: transitive description: name: package_config - url: "https://pub.dartlang.org" + sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd" + url: "https://pub.dev" source: hosted version: "2.1.0" package_info_plus: dependency: transitive description: name: package_info_plus - url: "https://pub.dartlang.org" - source: hosted - version: "1.4.3+1" - package_info_plus_linux: - dependency: transitive - description: - name: package_info_plus_linux - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.5" - package_info_plus_macos: - dependency: transitive - description: - name: package_info_plus_macos - url: "https://pub.dartlang.org" + sha256: "28386bbe89ab5a7919a47cea99cdd1128e5a6e0bbd7eaafe20440ead84a15de3" + url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "4.0.1" package_info_plus_platform_interface: dependency: transitive description: name: package_info_plus_platform_interface - url: "https://pub.dartlang.org" + sha256: "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6" + url: "https://pub.dev" source: hosted - version: "1.0.2" - package_info_plus_web: - dependency: transitive - description: - name: package_info_plus_web - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.5" - package_info_plus_windows: - dependency: transitive - description: - name: package_info_plus_windows - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.0" + version: "2.0.1" path: dependency: transitive description: name: path - url: "https://pub.dartlang.org" + sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + url: "https://pub.dev" source: hosted - version: "1.8.1" + version: "1.8.3" path_parsing: dependency: transitive description: name: path_parsing - url: "https://pub.dartlang.org" + sha256: e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf + url: "https://pub.dev" source: hosted version: "1.0.1" path_provider: dependency: transitive description: name: path_provider - url: "https://pub.dartlang.org" + sha256: "050e8e85e4b7fecdf2bb3682c1c64c4887a183720c802d323de8a5fd76d372dd" + url: "https://pub.dev" source: hosted version: "2.0.11" path_provider_android: dependency: transitive description: name: path_provider_android - url: "https://pub.dartlang.org" + sha256: "482308523e21a90eccb2146fefb2ae9ea392740c539e35d1cd34916d2ee5492b" + url: "https://pub.dev" source: hosted version: "2.0.19" path_provider_ios: dependency: transitive description: name: path_provider_ios - url: "https://pub.dartlang.org" + sha256: "03d639406f5343478352433f00d3c4394d52dac8df3d847869c5e2333e0bbce8" + url: "https://pub.dev" source: hosted version: "2.0.11" path_provider_linux: dependency: transitive description: name: path_provider_linux - url: "https://pub.dartlang.org" + sha256: ab0987bf95bc591da42dffb38c77398fc43309f0b9b894dcc5d6f40c4b26c379 + url: "https://pub.dev" source: hosted version: "2.1.7" path_provider_macos: dependency: transitive description: name: path_provider_macos - url: "https://pub.dartlang.org" + sha256: "2a97e7fbb7ae9dcd0dfc1220a78e9ec3e71da691912e617e8715ff2a13086ae8" + url: "https://pub.dev" source: hosted version: "2.0.6" path_provider_platform_interface: dependency: transitive description: name: path_provider_platform_interface - url: "https://pub.dartlang.org" + sha256: "27dc7a224fcd07444cb5e0e60423ccacea3e13cf00fc5282ac2c918132da931d" + url: "https://pub.dev" source: hosted version: "2.0.4" path_provider_windows: dependency: transitive description: name: path_provider_windows - url: "https://pub.dartlang.org" + sha256: d3f80b32e83ec208ac95253e0cd4d298e104fbc63cb29c5c69edaed43b0c69d6 + url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.6" pdf: dependency: transitive description: name: pdf - url: "https://pub.dartlang.org" + sha256: "586d3debf5432e5377044754032cfa53ab45e9abf371d4865e9ad5019570e246" + url: "https://pub.dev" + source: hosted + version: "3.10.1" + pdf_widget_wrapper: + dependency: transitive + description: + name: pdf_widget_wrapper + sha256: e9d31fd7782ce28ae346b127ea7d1cd748d799bddee379f31191693610e23749 + url: "https://pub.dev" source: hosted - version: "3.8.2" + version: "1.0.1" pedantic: dependency: transitive description: name: pedantic - url: "https://pub.dartlang.org" + sha256: "67fc27ed9639506c856c840ccce7594d0bdcd91bc8d53d6e52359449a1d50602" + url: "https://pub.dev" source: hosted version: "1.11.1" petitparser: dependency: transitive description: name: petitparser - url: "https://pub.dartlang.org" + sha256: "2ebb289dc4764ec397f5cd3ca9881c6d17196130a7d646ed022a0dd9c2e25a71" + url: "https://pub.dev" source: hosted version: "5.0.0" photo_manager: dependency: transitive description: name: photo_manager - url: "https://pub.dartlang.org" + sha256: bdc4ab1fa9fb064d8ccfea6ab44119f55b220293d7ce2e19eb5a5f998db86c88 + url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.6.0" photo_view: dependency: transitive description: name: photo_view - url: "https://pub.dartlang.org" + sha256: "8036802a00bae2a78fc197af8a158e3e2f7b500561ed23b4c458107685e645bb" + url: "https://pub.dev" source: hosted version: "0.14.0" platform: dependency: transitive description: name: platform - url: "https://pub.dartlang.org" + sha256: "4a451831508d7d6ca779f7ac6e212b4023dd5a7d08a27a63da33756410e32b76" + url: "https://pub.dev" source: hosted version: "3.1.0" plugin_platform_interface: dependency: transitive description: name: plugin_platform_interface - url: "https://pub.dartlang.org" + sha256: "075f927ebbab4262ace8d0b283929ac5410c0ac4e7fc123c76429564facfb757" + url: "https://pub.dev" source: hosted version: "2.1.2" pointycastle: dependency: transitive description: name: pointycastle - url: "https://pub.dartlang.org" + sha256: "041b249f5c70e8983ebbaff4fdea252c2af8d4912ba64b649edb17615349afef" + url: "https://pub.dev" source: hosted version: "3.6.1" pool: dependency: transitive description: name: pool - url: "https://pub.dartlang.org" + sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a" + url: "https://pub.dev" source: hosted version: "1.5.1" printing: dependency: transitive description: name: printing - url: "https://pub.dartlang.org" + sha256: "6aa86779d51f1c60608defee7b231e1133ab9b00f63b3b71abfa85cb39898571" + url: "https://pub.dev" source: hosted - version: "5.9.2" + version: "5.10.4" process: dependency: transitive description: name: process - url: "https://pub.dartlang.org" + sha256: "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09" + url: "https://pub.dev" source: hosted version: "4.2.4" pub_semver: dependency: transitive description: name: pub_semver - url: "https://pub.dartlang.org" + sha256: "816c1a640e952d213ddd223b3e7aafae08cd9f8e1f6864eed304cc13b0272b07" + url: "https://pub.dev" source: hosted version: "2.1.1" pubspec_parse: dependency: transitive description: name: pubspec_parse - url: "https://pub.dartlang.org" + sha256: "3686efe4a4613a4449b1a4ae08670aadbd3376f2e78d93e3f8f0919db02a7256" + url: "https://pub.dev" source: hosted version: "1.2.0" qr: dependency: transitive description: name: qr - url: "https://pub.dartlang.org" + sha256: "64957a3930367bf97cc211a5af99551d630f2f4625e38af10edd6b19131b64b3" + url: "https://pub.dev" source: hosted version: "3.0.1" quiver: dependency: transitive description: name: quiver - url: "https://pub.dartlang.org" + sha256: "93982981971e812c94d4a6fa3a57b89f9ec12b38b6380cd3c1370c3b01e4580e" + url: "https://pub.dev" source: hosted version: "3.1.0" rxdart: dependency: transitive description: name: rxdart - url: "https://pub.dartlang.org" + sha256: "5d22055fd443806c03ef24a02000637cf51eae49c2a0168d38a43fc166b0209c" + url: "https://pub.dev" source: hosted version: "0.27.5" share_plus: dependency: transitive description: name: share_plus - url: "https://pub.dartlang.org" + sha256: "58326c632cc668e4c45b5da064325a2d850759cc760d12f85aff645b7c8c2a47" + url: "https://pub.dev" source: hosted version: "4.0.10+1" share_plus_linux: dependency: transitive description: name: share_plus_linux - url: "https://pub.dartlang.org" + sha256: "308853d0472048e4c9b58ccc7faee6937732dc9fee7ab8e09f28bcd8d00a7a03" + url: "https://pub.dev" source: hosted version: "3.0.0" share_plus_macos: dependency: transitive description: name: share_plus_macos - url: "https://pub.dartlang.org" + sha256: "44daa946f2845045ecd7abb3569b61cd9a55ae9cc4cbec9895b2067b270697ae" + url: "https://pub.dev" source: hosted version: "3.0.1" share_plus_platform_interface: dependency: transitive description: name: share_plus_platform_interface - url: "https://pub.dartlang.org" + sha256: "04e7c8398fdb776943bb61d7ff109c84db15d1adffaac06696fb46761939be47" + url: "https://pub.dev" source: hosted version: "3.0.3" share_plus_web: dependency: transitive description: name: share_plus_web - url: "https://pub.dartlang.org" + sha256: d53953fc009365d7256b55adeda1fff2d579057796649c7e29812c1efb442dd4 + url: "https://pub.dev" source: hosted version: "3.0.1" share_plus_windows: dependency: transitive description: name: share_plus_windows - url: "https://pub.dartlang.org" + sha256: "3a21515ae7d46988d42130cd53294849e280a5de6ace24bae6912a1bffd757d4" + url: "https://pub.dev" source: hosted version: "3.0.1" shared_preferences: dependency: transitive description: name: shared_preferences - url: "https://pub.dartlang.org" + sha256: "76917b7d4b9526b2ba416808a7eb9fb2863c1a09cf63ec85f1453da240fa818a" + url: "https://pub.dev" source: hosted version: "2.0.15" shared_preferences_android: dependency: transitive description: name: shared_preferences_android - url: "https://pub.dartlang.org" + sha256: "853801ce6ba7429ec4e923e37317f32a57c903de50b8c33ffcfbdb7e6f0dd39c" + url: "https://pub.dev" source: hosted version: "2.0.12" shared_preferences_ios: dependency: transitive description: name: shared_preferences_ios - url: "https://pub.dartlang.org" + sha256: "585a14cefec7da8c9c2fb8cd283a3bb726b4155c0952afe6a0caaa7b2272de34" + url: "https://pub.dev" source: hosted version: "2.1.1" shared_preferences_linux: dependency: transitive description: name: shared_preferences_linux - url: "https://pub.dartlang.org" + sha256: "28aefc1261746e7bad3d09799496054beb84e8c4ffcdfed7734e17b4ada459a5" + url: "https://pub.dev" source: hosted version: "2.1.1" shared_preferences_macos: dependency: transitive description: name: shared_preferences_macos - url: "https://pub.dartlang.org" + sha256: fbb94bf296576f49be37a1496d5951796211a8db0aa22cc0d68c46440dad808c + url: "https://pub.dev" source: hosted version: "2.0.4" shared_preferences_platform_interface: dependency: transitive description: name: shared_preferences_platform_interface - url: "https://pub.dartlang.org" + sha256: "992f0fdc46d0a3c0ac2e5859f2de0e577bbe51f78a77ee8f357cbe626a2ad32d" + url: "https://pub.dev" source: hosted version: "2.0.0" shared_preferences_web: dependency: transitive description: name: shared_preferences_web - url: "https://pub.dartlang.org" + sha256: a4b5bc37fe1b368bbc81f953197d55e12f49d0296e7e412dfe2d2d77d6929958 + url: "https://pub.dev" source: hosted version: "2.0.4" shared_preferences_windows: dependency: transitive description: name: shared_preferences_windows - url: "https://pub.dartlang.org" + sha256: "97f7ab9a7da96d9cf19581f5de520ceb529548498bd6b5e0ccd02d68a0d15eba" + url: "https://pub.dev" source: hosted version: "2.1.1" shelf: dependency: transitive description: name: shelf - url: "https://pub.dartlang.org" + sha256: "8ec607599dd0a78931a5114cdac7d609b6dbbf479a38acc9a6dba024b2a30ea0" + url: "https://pub.dev" source: hosted version: "1.3.2" shelf_web_socket: dependency: transitive description: name: shelf_web_socket - url: "https://pub.dartlang.org" + sha256: "6db16374bc3497d21aa0eebe674d3db9fdf82082aac0f04dc7b44e4af5b08afc" + url: "https://pub.dev" source: hosted version: "1.0.2" sign_in_with_apple: dependency: transitive description: name: sign_in_with_apple - url: "https://pub.dartlang.org" + sha256: "425cf29f6c8730314d08d62a3193319b84f40940f1f6f0d9cea703aaf3205a03" + url: "https://pub.dev" source: hosted version: "4.1.0" sign_in_with_apple_platform_interface: dependency: transitive description: name: sign_in_with_apple_platform_interface - url: "https://pub.dartlang.org" + sha256: a5883edee09ed6be19de19e7d9f618a617fe41a6fa03f76d082dfb787e9ea18d + url: "https://pub.dev" source: hosted version: "1.0.0" sign_in_with_apple_web: dependency: transitive description: name: sign_in_with_apple_web - url: "https://pub.dartlang.org" + sha256: "44b66528f576e77847c14999d5e881e17e7223b7b0625a185417829e5306f47a" + url: "https://pub.dev" source: hosted version: "1.0.1" sky_engine: @@ -1255,254 +1414,290 @@ packages: dependency: transitive description: name: source_gen - url: "https://pub.dartlang.org" + sha256: "00f8b6b586f724a8c769c96f1d517511a41661c0aede644544d8d86a1ab11142" + url: "https://pub.dev" source: hosted version: "1.2.2" source_helper: dependency: transitive description: name: source_helper - url: "https://pub.dartlang.org" + sha256: "522d9b05c40ec14f479ce4428337d106c0465fedab42f514582c198460a784fe" + url: "https://pub.dev" source: hosted version: "1.3.2" source_span: dependency: transitive description: name: source_span - url: "https://pub.dartlang.org" + sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + url: "https://pub.dev" source: hosted - version: "1.8.2" + version: "1.9.1" sprintf: dependency: "direct main" description: name: sprintf - url: "https://pub.dartlang.org" + sha256: ec76d38910b6f1c854ce1353c62d37e7ef82b53dc5ab048c25400d35970776d1 + url: "https://pub.dev" source: hosted version: "6.0.2" sqflite: dependency: transitive description: name: sqflite - url: "https://pub.dartlang.org" + sha256: b3a8307b9519af28518e271e548594bdc435225fc77e8fb22e71a296c69281cf + url: "https://pub.dev" source: hosted version: "2.0.3+1" sqflite_common: dependency: transitive description: name: sqflite_common - url: "https://pub.dartlang.org" + sha256: b504fc5b4576a05586a0bb99d9bcc0d37a78d9d5ed68b96c361d5d3a8e538275 + url: "https://pub.dev" source: hosted version: "2.2.1+1" stack_trace: dependency: transitive description: name: stack_trace - url: "https://pub.dartlang.org" + sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.11.0" stream_channel: dependency: transitive description: name: stream_channel - url: "https://pub.dartlang.org" + sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" stream_transform: dependency: transitive description: name: stream_transform - url: "https://pub.dartlang.org" + sha256: ed464977cb26a1f41537e177e190c67223dbd9f4f683489b6ab2e5d211ec564e + url: "https://pub.dev" source: hosted version: "2.0.0" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.dartlang.org" + sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.2.0" synchronized: dependency: transitive description: name: synchronized - url: "https://pub.dartlang.org" + sha256: a7f0790927c0806ae0d5eb061c713748fa6070ef0037e391a2d53c3844c09dc2 + url: "https://pub.dev" source: hosted version: "3.0.0+2" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.dartlang.org" + sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.2.1" test_api: dependency: transitive description: name: test_api - url: "https://pub.dartlang.org" + sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb + url: "https://pub.dev" source: hosted - version: "0.4.9" + version: "0.5.1" timeago: dependency: "direct main" description: name: timeago - url: "https://pub.dartlang.org" + sha256: "46c128312ab0ea144b146c0ac6426ddd96810efec2de3fccc425d00179cd8254" + url: "https://pub.dev" source: hosted version: "3.3.0" timezone: dependency: transitive description: name: timezone - url: "https://pub.dartlang.org" + sha256: "57b35f6e8ef731f18529695bffc62f92c6189fac2e52c12d478dec1931afb66e" + url: "https://pub.dev" source: hosted version: "0.8.0" timing: dependency: transitive description: name: timing - url: "https://pub.dartlang.org" + sha256: c386d07d7f5efc613479a7c4d9d64b03710b03cfaa7e8ad5f2bfb295a1f0dfad + url: "https://pub.dev" source: hosted version: "1.0.0" typed_data: dependency: transitive description: name: typed_data - url: "https://pub.dartlang.org" + sha256: "26f87ade979c47a150c9eaab93ccd2bebe70a27dc0b4b29517f2904f04eb11a5" + url: "https://pub.dev" source: hosted version: "1.3.1" universal_html: dependency: transitive description: name: universal_html - url: "https://pub.dartlang.org" + sha256: "5ff50b7c14d201421cf5230ec389a0591c4deb5c817c9d7ccca3b26fe5f31e34" + url: "https://pub.dev" source: hosted version: "2.0.8" universal_io: dependency: transitive description: name: universal_io - url: "https://pub.dartlang.org" + sha256: "79f78ddad839ee3aae3ec7c01eb4575faf0d5c860f8e5223bc9f9c17f7f03cef" + url: "https://pub.dev" source: hosted version: "2.0.4" url_launcher: dependency: "direct main" description: name: url_launcher - url: "https://pub.dartlang.org" + sha256: "4f0d5f9bf7efba3da5a7ff03bd33cc898c84bac978c068e1c94483828e709592" + url: "https://pub.dev" source: hosted version: "6.1.5" url_launcher_android: dependency: transitive description: name: url_launcher_android - url: "https://pub.dartlang.org" + sha256: "1ccd353c1bff66b49863527c02759f4d06b92744bd9777c96a00ca6a9e8e1d2f" + url: "https://pub.dev" source: hosted version: "6.0.17" url_launcher_ios: dependency: transitive description: name: url_launcher_ios - url: "https://pub.dartlang.org" + sha256: "6ba7dddee26c9fae27c9203c424631109d73c8fa26cfa7bc3e35e751cb87f62e" + url: "https://pub.dev" source: hosted version: "6.0.17" url_launcher_linux: dependency: transitive description: name: url_launcher_linux - url: "https://pub.dartlang.org" + sha256: "360fa359ab06bcb4f7c5cd3123a2a9a4d3364d4575d27c4b33468bd4497dd094" + url: "https://pub.dev" source: hosted version: "3.0.1" url_launcher_macos: dependency: transitive description: name: url_launcher_macos - url: "https://pub.dartlang.org" + sha256: "8fd9ae3ab5e0f96cea7dd66c4ea65e39e3477067f4997c1ec8225d553e8bb8ea" + url: "https://pub.dev" source: hosted version: "2.0.3" url_launcher_platform_interface: dependency: transitive description: name: url_launcher_platform_interface - url: "https://pub.dartlang.org" + sha256: "80b860b31a11ebbcbe51b8fe887efc204f3af91522f3b51bcda4622d276d2120" + url: "https://pub.dev" source: hosted version: "2.1.0" url_launcher_web: dependency: transitive description: name: url_launcher_web - url: "https://pub.dartlang.org" + sha256: "5669882643b96bb6d5786637cac727c6e918a790053b09245fd4513b8a07df2a" + url: "https://pub.dev" source: hosted version: "2.0.13" url_launcher_windows: dependency: transitive description: name: url_launcher_windows - url: "https://pub.dartlang.org" + sha256: e3c3b16d3104260c10eea3b0e34272aaa57921f83148b0619f74c2eced9b7ef1 + url: "https://pub.dev" source: hosted version: "3.0.1" uuid: dependency: transitive description: name: uuid - url: "https://pub.dartlang.org" + sha256: "2469694ad079893e3b434a627970c33f2fa5adc46dfe03c9617546969a9a8afc" + url: "https://pub.dev" source: hosted version: "3.0.6" vector_math: dependency: transitive description: name: vector_math - url: "https://pub.dartlang.org" + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" watcher: dependency: transitive description: name: watcher - url: "https://pub.dartlang.org" + sha256: e42dfcc48f67618344da967b10f62de57e04bae01d9d3af4c2596f3712a88c99 + url: "https://pub.dev" source: hosted version: "1.0.1" web_socket_channel: dependency: transitive description: name: web_socket_channel - url: "https://pub.dartlang.org" + sha256: "3a969ddcc204a3e34e863d204b29c0752716f78b6f9cc8235083208d268a4ccd" + url: "https://pub.dev" source: hosted version: "2.2.0" webview_windows: dependency: "direct main" description: name: webview_windows - url: "https://pub.dartlang.org" + sha256: d6f2b8473756a5aa45f2361ddbc8ecf7bde7ba0a5a04975bbcde8a1615d74144 + url: "https://pub.dev" source: hosted version: "0.2.1" win32: dependency: transitive description: name: win32 - url: "https://pub.dartlang.org" + sha256: "5a751eddf9db89b3e5f9d50c20ab8612296e4e8db69009788d6c8b060a84191c" + url: "https://pub.dev" source: hosted - version: "2.7.0" + version: "4.1.4" xdg_directories: dependency: transitive description: name: xdg_directories - url: "https://pub.dartlang.org" + sha256: "060b6e1c891d956f72b5ac9463466c37cce3fa962a921532fc001e86fe93438e" + url: "https://pub.dev" source: hosted version: "0.2.0+1" xml: dependency: transitive description: name: xml - url: "https://pub.dartlang.org" + sha256: ac0e3f4bf00ba2708c33fbabbbe766300e509f8c82dbd4ab6525039813f7e2fb + url: "https://pub.dev" source: hosted version: "6.1.0" yaml: dependency: transitive description: name: yaml - url: "https://pub.dartlang.org" + sha256: "23812a9b125b48d4007117254bca50abb6c712352927eece9e155207b1db2370" + url: "https://pub.dev" source: hosted version: "3.1.1" sdks: - dart: ">=2.17.0 <3.0.0" - flutter: ">=3.0.0" + dart: ">=3.0.0-0 <4.0.0" + flutter: ">=3.9.0" diff --git a/pubspec.yaml b/pubspec.yaml index 2c11478..2725d1f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -47,11 +47,12 @@ dev_dependencies: build_runner: ^2.1.5 json_serializable: ^6.0.1 -#dependency_overrides: +dependency_overrides: # ap_common: # path: ../../GitHub-NKUST-ITC/ap_common # ap_common_firebase: # path: ../ap_common_firebase + intl: 0.18.0 flutter: From a38aa5326b25760e66f8550f35b899555060b8de Mon Sep 17 00:00:00 2001 From: Rainvisitor Date: Sat, 10 Jun 2023 04:47:55 +0800 Subject: [PATCH 10/23] fix: update some crawler encoding from `BIG-5` to `UTF-8` - course system - graduation system - tuition system --- lib/api/graduation_helper.dart | 9 ++++----- lib/api/selcrs_helper.dart | 18 ++++++++++-------- lib/api/tuition_helper.dart | 6 +++--- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/lib/api/graduation_helper.dart b/lib/api/graduation_helper.dart index e099c25..651bf97 100644 --- a/lib/api/graduation_helper.dart +++ b/lib/api/graduation_helper.dart @@ -1,4 +1,4 @@ -import 'dart:typed_data'; +import 'dart:convert'; import 'package:ap_common/callback/general_callback.dart'; import 'package:cookie_jar/cookie_jar.dart'; @@ -8,7 +8,6 @@ import 'package:html/dom.dart'; import 'package:html/parser.dart'; import 'package:nsysu_ap/api/selcrs_helper.dart'; import 'package:nsysu_ap/models/graduation_report_data.dart'; -import 'package:nsysu_ap/utils/big5/big5.dart'; import 'package:nsysu_ap/utils/utils.dart'; class GraduationHelper { @@ -63,7 +62,7 @@ class GraduationHelper { 'ACTION': '0', }, ); - final String text = big5.decode(response.data!); + final String text = const Utf8Decoder().convert(response.data!); // print('Response = $text'); // print('response.statusCode = ${response.statusCode}'); if (text.contains('資料錯誤請重新輸入')) { @@ -108,11 +107,11 @@ class GraduationHelper { generalEducationCourse: [], otherEducationsCourse: [], ); - final String text = big5.decode(response.data!); + final String text = const Utf8Decoder().convert(response.data!); final int startTime = DateTime.now().millisecondsSinceEpoch; // debugPrint('text = $text'); // debugPrint(DateTime.now().toString()); - final Document document = parse(text, encoding: 'BIG-5'); + final Document document = parse(text); final List tableDoc = document.getElementsByTagName('tbody'); if (tableDoc.length >= 2) { for (int i = 0; i < tableDoc.length; i++) { diff --git a/lib/api/selcrs_helper.dart b/lib/api/selcrs_helper.dart index ddb5f45..9920005 100644 --- a/lib/api/selcrs_helper.dart +++ b/lib/api/selcrs_helper.dart @@ -1,3 +1,5 @@ +import 'dart:convert'; + import 'package:ap_common/callback/general_callback.dart'; import 'package:ap_common/models/course_data.dart'; import 'package:ap_common/models/score_data.dart'; @@ -161,7 +163,7 @@ class SelcrsHelper { 'SPassword': base64md5Password, }, ); - final String text = big5.decode(courseResponse.data!); + final String text = const Utf8Decoder().convert(courseResponse.data!); // debugPrint('course = $text'); if (text.contains('學號碼密碼不符')) { return callback?.onError( @@ -223,7 +225,7 @@ class SelcrsHelper { final Response response = await dio.get( '$selcrsUrl/menu4/tools/changedat.asp', ); - final String text = big5.decode(response.data!); + final String text = const Utf8Decoder().convert(response.data!); if (text.contains(courseTimeoutText) && canReLogin) { await reLogin(); return getUserInfo( @@ -250,7 +252,7 @@ class SelcrsHelper { } UserInfo parserUserInfo(String text) { - final dom.Document document = parse(text, encoding: 'BIG-5'); + final dom.Document document = parse(text); final List tdDoc = document.getElementsByTagName('td'); UserInfo userInfo = UserInfo.empty(); if (tdDoc.isNotEmpty) { @@ -272,7 +274,7 @@ class SelcrsHelper { final String url = '$selcrsUrl/menu4/query/stu_slt_up.asp'; try { final Response response = await dio.post(url); - final String text = big5.decode(response.data!); + final String text = const Utf8Decoder().convert(response.data!); // print('text = ${text}'); if (text.contains(courseTimeoutText) && canReLogin) { await reLogin(); @@ -286,7 +288,7 @@ class SelcrsHelper { return; } reLoginCount = 0; - final dom.Document document = parse(text, encoding: 'BIG-5'); + final dom.Document document = parse(text); final List options = document.getElementsByTagName('option'); final SemesterData courseSemesterData = SemesterData( data: [], @@ -329,7 +331,7 @@ class SelcrsHelper { }, options: _courseOption, ); - final String text = big5.decode(response.data!); + final String text = const Utf8Decoder().convert(response.data!); // debugPrint('text = ${text}'); if (text.contains(courseTimeoutText) && canReLogin) { await reLogin(); @@ -346,7 +348,7 @@ class SelcrsHelper { } reLoginCount = 0; final int startTime = DateTime.now().millisecondsSinceEpoch; - final dom.Document document = parse(text, encoding: 'BIG-5'); + final dom.Document document = parse(text); final List trDoc = document.getElementsByTagName('tr'); final CourseData courseData = CourseData(courses: [], timeCodes: timeCodeConfig.timeCodes); @@ -688,7 +690,7 @@ class SelcrsHelper { 'T1': mail, }, ); - final String text = big5.decode(response.data!); + final String text = const Utf8Decoder().convert(response.data!); if (text.contains(courseTimeoutText) && canReLogin) { await reLogin(); return changeMail( diff --git a/lib/api/tuition_helper.dart b/lib/api/tuition_helper.dart index 37e0ed4..6c4665f 100644 --- a/lib/api/tuition_helper.dart +++ b/lib/api/tuition_helper.dart @@ -1,3 +1,4 @@ +import 'dart:convert'; import 'dart:typed_data'; import 'package:ap_common/callback/general_callback.dart'; @@ -6,7 +7,6 @@ import 'package:dio_cookie_manager/dio_cookie_manager.dart'; import 'package:html/dom.dart'; import 'package:html/parser.dart'; import 'package:nsysu_ap/models/tuition_and_fees.dart'; -import 'package:nsysu_ap/utils/big5/big5.dart'; class TuitionHelper { static const String basePATH = 'https://tfstu.nsysu.edu.tw'; @@ -60,7 +60,7 @@ class TuitionHelper { 'passwd': password, }, ); - final String _ = big5.decode(response.data!); + final String _ = const Utf8Decoder().convert(response.data!); // debugPrint('Request = ${response.request.data}'); // debugPrint('Response = $text'); // debugPrint('response.statusCode = ${response.statusCode}'); @@ -87,7 +87,7 @@ class TuitionHelper { url, options: _tfOption, ); - final String text = big5.decode(response.data!); + final String text = const Utf8Decoder().convert(response.data!); // debugPrint('text = ${text}'); if (text.contains('沒有合乎查詢條件的資料')) { callback.onSuccess([]); From ffdcfec528d8e9b12eebd85d2f28bee932513531 Mon Sep 17 00:00:00 2001 From: Rainvisitor Date: Sat, 10 Jun 2023 04:50:08 +0800 Subject: [PATCH 11/23] feat: upgrade `flutter_inappwebview` to fix Xcode 13 error --- pubspec.lock | 4 ++-- pubspec.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 73d0f8f..e2fdff0 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -626,10 +626,10 @@ packages: dependency: "direct main" description: name: flutter_inappwebview - sha256: dcbaeeac2e47d5c4649a456b009a2fe230f9c35e33c3124ca16f868b4c789a2e + sha256: f73505c792cf083d5566e1a94002311be497d984b5607f25be36d685cf6361cf url: "https://pub.dev" source: hosted - version: "5.4.3+7" + version: "5.7.2+3" flutter_keyboard_visibility: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 2725d1f..f528abc 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -31,7 +31,7 @@ dependencies: dio: ^5.0.0 dio_cookie_manager: ^3.0.0 cookie_jar: ^4.0.1 - flutter_inappwebview: ^5.4.3+7 + flutter_inappwebview: ^5.7.2+3 desktop_webview_window: ^0.1.6 webview_windows: ^0.2.0 timeago: ^3.0.2 From 68cebd8a4791e63f9d0d42fa666c77921e48c421 Mon Sep 17 00:00:00 2001 From: Rainvisitor Date: Sat, 10 Jun 2023 04:50:42 +0800 Subject: [PATCH 12/23] chore: update `Podfile.lock` --- ios/Podfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 52e0b9b..dc78752 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -349,7 +349,7 @@ SPEC CHECKSUMS: FirebaseMessaging: 2f6e38b6133059eb796ec224104f09379298a8c3 FirebasePerformance: 18bb0984808ec429fae69fb5f1da4a68f57605b1 FirebaseRemoteConfig: 0a644c924b3339bcf3bc3ea253206f171672308e - Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a + Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 flutter_inappwebview: bfd58618f49dc62f2676de690fc6dcda1d6c3721 flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069 flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743 @@ -365,10 +365,10 @@ SPEC CHECKSUMS: in_app_review: 4a97249f7a2f539a0f294c2d9196b7fe35e49541 nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431 OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c - package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e + package_info_plus: fd030dabf36271f146f1f3beacd48f564b0f17f7 path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02 photo_manager: 4f6810b7dfc4feb03b461ac1a70dacf91fba7604 - printing: eafa00acb682c0ca029d4d98d0798f55a1e27102 + printing: 233e1b73bd1f4a05615548e9b5a324c98588640b PromisesObjC: ab77feca74fa2823e7af4249b8326368e61014cb share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68 shared_preferences_ios: 548a61f8053b9b8a49ac19c1ffbc8b92c50d68ad @@ -378,4 +378,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: ba3ac0caee9e970ba540358a9a3913d97e932f5d -COCOAPODS: 1.11.3 +COCOAPODS: 1.12.1 From 673d17e80ac7cda59be88abdbeca8c9fb3bce77d Mon Sep 17 00:00:00 2001 From: Rainvisitor Date: Sat, 10 Jun 2023 15:17:35 +0800 Subject: [PATCH 13/23] feat: upgrade CI flutter version to `3.10.x` --- .github/workflows/workflow.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 268e64d..5ab8880 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -29,7 +29,7 @@ jobs: KEYS_SECRET_PASSPHRASE: ${{ secrets.KEYS_SECRET_PASSPHRASE }} - uses: subosito/flutter-action@v2 with: - flutter-version: '3.0.x' + flutter-version: '3.10.x' channel: 'stable' - name: Decrypt dev configs run: sh ./scripts/decrypt_dev_configs.sh @@ -50,7 +50,7 @@ jobs: - name: Run Flutter tasks uses: subosito/flutter-action@v2 with: - flutter-version: '3.0.x' + flutter-version: '3.10.x' channel: 'stable' - name: Decrypt dev configs run: sh ./scripts/decrypt_dev_configs.sh @@ -68,7 +68,7 @@ jobs: - uses: actions/checkout@v3 - uses: subosito/flutter-action@v2 with: - flutter-version: '3.0.x' + flutter-version: '3.10.x' channel: 'stable' - name: Decrypt dev configs run: sh ./scripts/decrypt_dev_configs.sh @@ -91,7 +91,7 @@ jobs: # - name: Run Flutter tasks # uses: subosito/flutter-action@v2 # with: -# flutter-version: '3.0.x' +# flutter-version: '3.10.x' # channel: 'stable' # - name: Decrypt dev configs # run: sh ./scripts/decrypt_dev_configs.sh @@ -114,7 +114,7 @@ jobs: - name: Run Flutter tasks uses: subosito/flutter-action@v2 with: - flutter-version: '3.0.x' + flutter-version: '3.10.x' channel: 'stable' - name: Decrypt dev configs run: sh ./scripts/decrypt_dev_configs.sh @@ -146,7 +146,7 @@ jobs: - name: Run Flutter tasks uses: subosito/flutter-action@v2 with: - flutter-version: '3.0.x' + flutter-version: '3.10.x' channel: 'stable' - name: Decrypt dev configs run: sh ./scripts/decrypt_dev_configs.sh From 72873e2e22d5baf6199a81ae51b990473589eb44 Mon Sep 17 00:00:00 2001 From: Rainvisitor Date: Sat, 10 Jun 2023 17:19:48 +0800 Subject: [PATCH 14/23] feat: enable CI flutter action cache --- .github/workflows/workflow.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 5ab8880..a36608e 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -31,6 +31,8 @@ jobs: with: flutter-version: '3.10.x' channel: 'stable' + cache: true + cache-key: 'flutter-:os:-:channel:-:version:-:arch:-:hash:' - name: Decrypt dev configs run: sh ./scripts/decrypt_dev_configs.sh env: @@ -52,6 +54,8 @@ jobs: with: flutter-version: '3.10.x' channel: 'stable' + cache: true + cache-key: 'flutter-:os:-:channel:-:version:-:arch:-:hash:' - name: Decrypt dev configs run: sh ./scripts/decrypt_dev_configs.sh env: @@ -70,6 +74,8 @@ jobs: with: flutter-version: '3.10.x' channel: 'stable' + cache: true + cache-key: 'flutter-:os:-:channel:-:version:-:arch:-:hash:' - name: Decrypt dev configs run: sh ./scripts/decrypt_dev_configs.sh env: @@ -116,6 +122,8 @@ jobs: with: flutter-version: '3.10.x' channel: 'stable' + cache: true + cache-key: 'flutter-:os:-:channel:-:version:-:arch:-:hash:' - name: Decrypt dev configs run: sh ./scripts/decrypt_dev_configs.sh env: @@ -148,6 +156,8 @@ jobs: with: flutter-version: '3.10.x' channel: 'stable' + cache: true + cache-key: 'flutter-:os:-:channel:-:version:-:arch:-:hash:' - name: Decrypt dev configs run: sh ./scripts/decrypt_dev_configs.sh env: From c3adadcdbcb45586a5f0752db7dd5b786afff886 Mon Sep 17 00:00:00 2001 From: Rainvisitor Date: Sat, 10 Jun 2023 17:30:26 +0800 Subject: [PATCH 15/23] feat: upgrade `cookie_jar` to fix web build error --- pubspec.lock | 8 ++++---- pubspec.yaml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index e2fdff0..5c98c71 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -277,10 +277,10 @@ packages: dependency: "direct main" description: name: cookie_jar - sha256: "253920541bf248e4eda6eac5df6aa00c19c183e1fe333629925d8df666a27815" + sha256: "823fd13d22c5cf0c846e8a31c9b276f768f423cca134990c22c33045462f8ef9" url: "https://pub.dev" source: hosted - version: "4.0.1" + version: "4.0.3" cross_file: dependency: transitive description: @@ -1558,10 +1558,10 @@ packages: dependency: transitive description: name: universal_io - sha256: "79f78ddad839ee3aae3ec7c01eb4575faf0d5c860f8e5223bc9f9c17f7f03cef" + sha256: "1722b2dcc462b4b2f3ee7d188dad008b6eb4c40bbd03a3de451d82c78bba9aad" url: "https://pub.dev" source: hosted - version: "2.0.4" + version: "2.2.2" url_launcher: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index f528abc..f9c7e09 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -30,7 +30,7 @@ dependencies: crypto: ^3.0.1 dio: ^5.0.0 dio_cookie_manager: ^3.0.0 - cookie_jar: ^4.0.1 + cookie_jar: ^4.0.3 flutter_inappwebview: ^5.7.2+3 desktop_webview_window: ^0.1.6 webview_windows: ^0.2.0 From a65fd2864a57fe9cba2cef767a776a4a7cf16e4e Mon Sep 17 00:00:00 2001 From: Rainvisitor Date: Sat, 10 Jun 2023 17:34:53 +0800 Subject: [PATCH 16/23] feat: upgrade `lint` to latest version --- analysis_options.yaml | 2 +- pubspec.lock | 6 +++--- pubspec.yaml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/analysis_options.yaml b/analysis_options.yaml index efb1a36..9e6c759 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -1,4 +1,4 @@ -include: package:lint/analysis_options.yaml +include: package:lint/strict.yaml analyzer: exclude: diff --git a/pubspec.lock b/pubspec.lock index 5c98c71..3a5d46d 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -961,10 +961,10 @@ packages: dependency: "direct dev" description: name: lint - sha256: "4a539aa34ec5721a2c7574ae2ca0336738ea4adc2a34887d54b7596310b33c85" + sha256: f4bd4dbaa39f4ae8836f2d1275f2f32bc68b3a8cce0a0735dd1f7a601f06682a url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "2.1.2" logging: dependency: transitive description: @@ -1699,5 +1699,5 @@ packages: source: hosted version: "3.1.1" sdks: - dart: ">=3.0.0-0 <4.0.0" + dart: ">=3.0.0 <4.0.0" flutter: ">=3.9.0" diff --git a/pubspec.yaml b/pubspec.yaml index f9c7e09..46ba1ce 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -43,7 +43,7 @@ dev_dependencies: flutter_test: sdk: flutter - lint: ^1.8.2 + lint: ^2.1.2 build_runner: ^2.1.5 json_serializable: ^6.0.1 From 7f896d78728fd0ac12fb0639cfe6ac307c69ea3d Mon Sep 17 00:00:00 2001 From: Rainvisitor Date: Sat, 10 Jun 2023 17:35:09 +0800 Subject: [PATCH 17/23] chore: code tune by lint --- lib/api/selcrs_helper.dart | 1 - lib/pages/graduation_report_page.dart | 5 ----- lib/pages/home_page.dart | 4 ++++ lib/utils/big5/table.dart | 2 -- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/lib/api/selcrs_helper.dart b/lib/api/selcrs_helper.dart index 9920005..916d253 100644 --- a/lib/api/selcrs_helper.dart +++ b/lib/api/selcrs_helper.dart @@ -205,7 +205,6 @@ class SelcrsHelper { } } } - return null; } Future reLogin() async { diff --git a/lib/pages/graduation_report_page.dart b/lib/pages/graduation_report_page.dart index 054b668..5924adc 100644 --- a/lib/pages/graduation_report_page.dart +++ b/lib/pages/graduation_report_page.dart @@ -47,11 +47,6 @@ class GraduationReportPageState extends State } } - @override - void dispose() { - super.dispose(); - } - @override Widget build(BuildContext context) { ap = ApLocalizations.of(context); diff --git a/lib/pages/home_page.dart b/lib/pages/home_page.dart index c5f01b3..7fbd33c 100644 --- a/lib/pages/home_page.dart +++ b/lib/pages/home_page.dart @@ -101,6 +101,8 @@ class HomePageState extends State { } if (await AppTrackingUtils.trackingAuthorizationStatus == TrackingStatus.notDetermined) { + //ignore: use_build_context_synchronously + if (!context.mounted) return; AppTrackingUtils.show(context: context); } }); @@ -519,6 +521,8 @@ class HomePageState extends State { await remoteConfig.fetch(); await remoteConfig.activate(); final VersionInfo versionInfo = remoteConfig.versionInfo; + //ignore: use_build_context_synchronously + if (!context.mounted) return; DialogUtils.showNewVersionContent( context: context, iOSAppId: '146752219', diff --git a/lib/utils/big5/table.dart b/lib/utils/big5/table.dart index 03aeb0e..dc9b556 100644 --- a/lib/utils/big5/table.dart +++ b/lib/utils/big5/table.dart @@ -1,5 +1,3 @@ -part of big5; - // this decode table is copy from https://gist.github.com/shiedman/5477198 // decode table line 13 // encode0 table line 13729 From d8adc0196b285a93af50edc6b7734e22a20dab77 Mon Sep 17 00:00:00 2001 From: Rainvisitor Date: Sat, 10 Jun 2023 17:35:34 +0800 Subject: [PATCH 18/23] feat: remove iOS firebase old version reference --- ios/Runner.xcodeproj/project.pbxproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 48e25f3..b25d5a1 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -14,7 +14,6 @@ 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; - A48806BB22AC109700608B9C /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = A48806BA22AC109600608B9C /* GoogleService-Info.plist */; }; A48806BE22AEBE2F00608B9C /* AdSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A48806BD22AEBE2F00608B9C /* AdSupport.framework */; }; A48806D022AEC0E100608B9C /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = A48806D222AEC0E100608B9C /* InfoPlist.strings */; }; A4E3F60E2525B59600343570 /* WidgetKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A4E3F60D2525B59600343570 /* WidgetKit.framework */; }; @@ -80,7 +79,6 @@ 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; A47A35CB254121950070DC6B /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/InfoPlist.strings"; sourceTree = ""; }; - A48806BA22AC109600608B9C /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; A48806BC22ACB4FB00608B9C /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = ""; }; A48806BD22AEBE2F00608B9C /* AdSupport.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AdSupport.framework; path = System/Library/Frameworks/AdSupport.framework; sourceTree = SDKROOT; }; A48806D822AEC10B00608B9C /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; @@ -155,7 +153,6 @@ isa = PBXGroup; children = ( A48806BC22ACB4FB00608B9C /* Runner.entitlements */, - A48806BA22AC109600608B9C /* GoogleService-Info.plist */, 97C146FA1CF9000F007C117D /* Main.storyboard */, 97C146FD1CF9000F007C117D /* Assets.xcassets */, 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */, @@ -316,7 +313,6 @@ 9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */, 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */, 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */, - A48806BB22AC109700608B9C /* GoogleService-Info.plist in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; From 9759b4c82904f72e4c2c39a52619792d2bf7a0d5 Mon Sep 17 00:00:00 2001 From: Rainvisitor Date: Sat, 10 Jun 2023 17:39:33 +0800 Subject: [PATCH 19/23] fix: part of error --- lib/utils/big5/big5.dart | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/utils/big5/big5.dart b/lib/utils/big5/big5.dart index 920ee54..e9d66eb 100644 --- a/lib/utils/big5/big5.dart +++ b/lib/utils/big5/big5.dart @@ -1,9 +1,7 @@ -library big5; - -part 'table.dart'; - // only non-sream version +import 'package:nsysu_ap/utils/big5/table.dart'; + const Big5Codec big5 = Big5Codec(); class Big5Codec { From 53e8728458a0ff41e013e39fe7777972f0e1cbca Mon Sep 17 00:00:00 2001 From: Rainvisitor Date: Sat, 10 Jun 2023 18:48:56 +0800 Subject: [PATCH 20/23] feat: update iOS platform version to `11` for firebase SDK update --- ios/Podfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/Podfile b/ios/Podfile index ecb0ca8..f99972a 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -1,5 +1,5 @@ # Uncomment this line to define a global platform for your project -platform :ios, '10.0' +platform :ios, '11.0' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' From edd604133a9243553425ba46f959ccd46e2ee183 Mon Sep 17 00:00:00 2001 From: Rainvisitor Date: Sat, 10 Jun 2023 18:50:21 +0800 Subject: [PATCH 21/23] feat: upgrade `ap_common_firebase` to `v0.16.0-dev.0` --- pubspec.lock | 94 ++++++++++++++++++++++++++-------------------------- pubspec.yaml | 2 +- 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 3a5d46d..997eba1 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -9,6 +9,14 @@ packages: url: "https://pub.dev" source: hosted version: "46.0.0" + _flutterfire_internals: + dependency: transitive + description: + name: _flutterfire_internals + sha256: "9ebe81588e666f7e2b21309f2b5653bd9642d7f27fd0a6894278d2ff40cb9481" + url: "https://pub.dev" + source: hosted + version: "1.3.2" add_2_calendar: dependency: transitive description: @@ -37,10 +45,10 @@ packages: dependency: "direct main" description: name: ap_common_firebase - sha256: "7ef6ca34dd61aa222ee18d72c99a4cbd0918199edbbfd375d4a44e01fe175686" + sha256: "1bd010eadcaea7c7ffc0dacdce6055cf1a6570db7fcada5eb10543df249b8aa3" url: "https://pub.dev" source: hosted - version: "0.15.0" + version: "0.16.0-dev.0" ap_common_plugin: dependency: "direct main" description: @@ -433,46 +441,38 @@ packages: url: "https://pub.dev" source: hosted version: "0.8.2+2" - firebase: - dependency: transitive - description: - name: firebase - sha256: cbff777369d19bd0535ccca0005518172953394246620ff8c1021072299d452d - url: "https://pub.dev" - source: hosted - version: "9.0.3" firebase_analytics: dependency: transitive description: name: firebase_analytics - sha256: "95b9171de98f358068d88a2e39c1ac740115154ef39ea3fdc54d889df3d0d81b" + sha256: f9d130eb6cf04b58e94358053aba3aebe546dca541e9ac5f076f8a7bc1e5c21e url: "https://pub.dev" source: hosted - version: "9.3.1" + version: "10.4.2" firebase_analytics_platform_interface: dependency: transitive description: name: firebase_analytics_platform_interface - sha256: c0867073a5d1594f4237082fa70458bad4d2244413b707a50c475b27feaebb91 + sha256: "16b3c49dbf26b25cd69b9dc52e8a2e21e48ee13d5b4bb563db55a82300213d1e" url: "https://pub.dev" source: hosted - version: "3.3.1" + version: "3.6.2" firebase_analytics_web: dependency: transitive description: name: firebase_analytics_web - sha256: a1fd3e57dad6deb111d676dfff724041ba1c56e9b4c171fcef9f941707e3e868 + sha256: "8163a020ee358c64b6c4f686102d09e21f5abf361352addc68aa419fc4bc029c" url: "https://pub.dev" source: hosted - version: "0.4.2+1" + version: "0.5.4+2" firebase_core: dependency: transitive description: name: firebase_core - sha256: "42740c3a2ae8ad363d6dc59ac73c98271ac66b6c5f89be4181efc6334b14e111" + sha256: e9b36b391690cf329c6fb1de220045e97c13784c303820cd33962319580a56c6 url: "https://pub.dev" source: hosted - version: "1.20.1" + version: "2.13.1" firebase_core_dart: dependency: transitive description: @@ -493,106 +493,106 @@ packages: dependency: transitive description: name: firebase_core_platform_interface - sha256: a78327f0f2f5e36073427300633c9036c4499f047f178498d08b0345ae7ad5b4 + sha256: b63e3be6c96ef5c33bdec1aab23c91eb00696f6452f0519401d640938c94cba2 url: "https://pub.dev" source: hosted - version: "4.5.0" + version: "4.8.0" firebase_core_web: dependency: transitive description: name: firebase_core_web - sha256: "12853276fd2f9c1aed6f1e3470e3edf7caa6c9fbc39a2b0438f8986e1f468a41" + sha256: "8c0f4c87d20e2d001a5915df238c1f9c88704231f591324205f5a5d2a7740a45" url: "https://pub.dev" source: hosted - version: "1.7.1" + version: "2.5.0" firebase_crashlytics: dependency: transitive description: name: firebase_crashlytics - sha256: "916f0f9886ab569b9363aa27365a765dd3e7a73140315c5254460b032f961295" + sha256: "603f23a74995c193cae89a784b8da529b1e6a91c03bc63f885f36456e9e867a0" url: "https://pub.dev" source: hosted - version: "2.8.7" + version: "3.3.2" firebase_crashlytics_platform_interface: dependency: transitive description: name: firebase_crashlytics_platform_interface - sha256: "0d9ba9da8e6571a4ad3033672a9c9dcefb9f6132cf3b663d57510b53e433ea6d" + sha256: cefeeeb98abdb9d848581603bd1e33a2a8e6d3ed937586cb84437e606049071b url: "https://pub.dev" source: hosted - version: "3.2.13" + version: "3.6.2" firebase_messaging: dependency: transitive description: name: firebase_messaging - sha256: "0e3108e45463fc5de5dc2e84fc15cd9d0e118139a6c5bfcf3ceaad941aaa38a2" + sha256: a01d7b9eb43a4bad54a411edb2b4124089d88eab029191893e83c39e18ab19f7 url: "https://pub.dev" source: hosted - version: "12.0.2" + version: "14.6.2" firebase_messaging_platform_interface: dependency: transitive description: name: firebase_messaging_platform_interface - sha256: "03d0aaa4ce16a0157b97bbae20ca70586ff9f8cef521fc180d10c5915c4299e7" + sha256: c2fef3e30fbfa3a71d74477df102d1c2f5aad860bb68bb4086b0af3b12abedf3 url: "https://pub.dev" source: hosted - version: "4.1.1" + version: "4.5.2" firebase_messaging_web: dependency: transitive description: name: firebase_messaging_web - sha256: "61269e6187b767e0fbafa7ee4d0e8fc36ce8026b3e18629ec2655c9cc29209b0" + sha256: "8d280f0110ca4946b9863e578b9879874066ac486ffa596a609aab329fb6fa7e" url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.5.2" firebase_performance: dependency: transitive description: name: firebase_performance - sha256: ea995b7397e7da8febc8feaeb88b944907ccc87a1f1869ce97e02c993e6308ce + sha256: "2fcada27e0150ec06fae6cb6eb89727525032d0af906b5cf49893ea352cc5312" url: "https://pub.dev" source: hosted - version: "0.8.2+2" + version: "0.9.2+2" firebase_performance_platform_interface: dependency: transitive description: name: firebase_performance_platform_interface - sha256: "36533abcd0721e57d46100f167fcdefe41846556515f17129f02c7e2ac8fbebf" + sha256: "0c020ecb79048a8647e8231837a5a9077b2f64b1e5dda069f7da504d6514553f" url: "https://pub.dev" source: hosted - version: "0.1.1+13" + version: "0.1.4+2" firebase_performance_web: dependency: transitive description: name: firebase_performance_web - sha256: eb081e3b9ab447a7966fdc140c4f66e324f97e2cc9772d5244424624e3100369 + sha256: "74072ca565adffaf332ce47c9faf2dc6d8060663046d4ac56c7f8f5ba4be0a03" url: "https://pub.dev" source: hosted - version: "0.1.1+2" + version: "0.1.4+2" firebase_remote_config: dependency: transitive description: name: firebase_remote_config - sha256: "7f52dd027b5b75e3f659240b254a6fd9764abafc7d587689089290d9386657a0" + sha256: d1534688dcee35acbca15853aad19952231a891015b3a62020423f9526e11d87 url: "https://pub.dev" source: hosted - version: "2.0.14" + version: "4.2.2" firebase_remote_config_platform_interface: dependency: transitive description: name: firebase_remote_config_platform_interface - sha256: "9dc108e249f08a7c221cf217277e0358ba0fb35c1f9dd8c51244efd4c0a3f301" + sha256: "90f619236a30b821a344524b54ad9ab5f8d1b57931db3fa0876a5c44f0298e58" url: "https://pub.dev" source: hosted - version: "1.1.13" + version: "1.4.2" firebase_remote_config_web: dependency: transitive description: name: firebase_remote_config_web - sha256: "251d1c92d0810bbb0e941e313d638bc30612db32d1ac49d98d211afab235a2fd" + sha256: "025590017299082e9add595e078ef0f10ffa2d9b58c382a70bbbc8e94e3407e4" url: "https://pub.dev" source: hosted - version: "1.1.2" + version: "1.4.2" fixnum: dependency: transitive description: @@ -1177,10 +1177,10 @@ packages: dependency: transitive description: name: plugin_platform_interface - sha256: "075f927ebbab4262ace8d0b283929ac5410c0ac4e7fc123c76429564facfb757" + sha256: "6a2128648c854906c53fa8e33986fc0247a1116122f9534dd20e3ab9e16a32bc" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" pointycastle: dependency: transitive description: @@ -1700,4 +1700,4 @@ packages: version: "3.1.1" sdks: dart: ">=3.0.0 <4.0.0" - flutter: ">=3.9.0" + flutter: ">=3.10.0" diff --git a/pubspec.yaml b/pubspec.yaml index 46ba1ce..5eb634c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,7 +15,7 @@ dependencies: multiple_localization: ^0.3.0 ap_common: ^0.23.0-dev.0 - ap_common_firebase: ^0.15.0 + ap_common_firebase: ^0.16.0-dev.0 ap_common_plugin: 0.4.0 # path: ../ap_common_plugin From 6acdd941d70bd411f47d11dce6354fc69472222b Mon Sep 17 00:00:00 2001 From: Rainvisitor Date: Sat, 10 Jun 2023 19:06:10 +0800 Subject: [PATCH 22/23] feat: update native project by flutterfire cli and build update --- ios/Podfile.lock | 316 +++++++++--------- ios/Runner.xcodeproj/project.pbxproj | 12 +- macos/Flutter/GeneratedPluginRegistrant.swift | 2 +- macos/Podfile.lock | 275 +++++++-------- macos/Runner.xcodeproj/project.pbxproj | 29 +- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- .../flutter/generated_plugin_registrant.cc | 3 + windows/flutter/generated_plugins.cmake | 1 + 8 files changed, 340 insertions(+), 300 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index dc78752..2e01e5a 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -5,122 +5,128 @@ PODS: - Flutter - app_tracking_transparency (0.0.1): - Flutter - - AppAuth (1.5.0): - - AppAuth/Core (= 1.5.0) - - AppAuth/ExternalUserAgent (= 1.5.0) - - AppAuth/Core (1.5.0) - - AppAuth/ExternalUserAgent (1.5.0): + - AppAuth (1.6.2): + - AppAuth/Core (= 1.6.2) + - AppAuth/ExternalUserAgent (= 1.6.2) + - AppAuth/Core (1.6.2) + - AppAuth/ExternalUserAgent (1.6.2): - AppAuth/Core - - Firebase/Analytics (9.3.0): + - Firebase/Analytics (10.9.0): - Firebase/Core - - Firebase/Core (9.3.0): + - Firebase/Core (10.9.0): - Firebase/CoreOnly - - FirebaseAnalytics (~> 9.3.0) - - Firebase/CoreOnly (9.3.0): - - FirebaseCore (= 9.3.0) - - Firebase/Crashlytics (9.3.0): + - FirebaseAnalytics (~> 10.9.0) + - Firebase/CoreOnly (10.9.0): + - FirebaseCore (= 10.9.0) + - Firebase/Crashlytics (10.9.0): - Firebase/CoreOnly - - FirebaseCrashlytics (~> 9.3.0) - - Firebase/Messaging (9.3.0): + - FirebaseCrashlytics (~> 10.9.0) + - Firebase/Messaging (10.9.0): - Firebase/CoreOnly - - FirebaseMessaging (~> 9.3.0) - - Firebase/Performance (9.3.0): + - FirebaseMessaging (~> 10.9.0) + - Firebase/Performance (10.9.0): - Firebase/CoreOnly - - FirebasePerformance (~> 9.3.0) - - Firebase/RemoteConfig (9.3.0): + - FirebasePerformance (~> 10.9.0) + - Firebase/RemoteConfig (10.9.0): - Firebase/CoreOnly - - FirebaseRemoteConfig (~> 9.3.0) - - firebase_analytics (9.3.1): - - Firebase/Analytics (= 9.3.0) + - FirebaseRemoteConfig (~> 10.9.0) + - firebase_analytics (10.4.2): + - Firebase/Analytics (= 10.9.0) - firebase_core - Flutter - - firebase_core (1.20.1): - - Firebase/CoreOnly (= 9.3.0) + - firebase_core (2.13.1): + - Firebase/CoreOnly (= 10.9.0) - Flutter - - firebase_crashlytics (2.8.7): - - Firebase/Crashlytics (= 9.3.0) + - firebase_crashlytics (3.3.2): + - Firebase/Crashlytics (= 10.9.0) - firebase_core - Flutter - - firebase_messaging (12.0.2): - - Firebase/Messaging (= 9.3.0) + - firebase_messaging (14.6.2): + - Firebase/Messaging (= 10.9.0) - firebase_core - Flutter - - firebase_performance (0.8.2-2): - - Firebase/Performance (= 9.3.0) + - firebase_performance (0.9.2-2): + - Firebase/Performance (= 10.9.0) - firebase_core - Flutter - - firebase_remote_config (2.0.14): - - Firebase/RemoteConfig (= 9.3.0) + - firebase_remote_config (4.2.2): + - Firebase/RemoteConfig (= 10.9.0) - firebase_core - Flutter - - FirebaseABTesting (9.4.0): - - FirebaseCore (~> 9.0) - - FirebaseAnalytics (9.3.0): - - FirebaseAnalytics/AdIdSupport (= 9.3.0) - - FirebaseCore (~> 9.0) - - FirebaseInstallations (~> 9.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.7) - - GoogleUtilities/MethodSwizzler (~> 7.7) - - GoogleUtilities/Network (~> 7.7) - - "GoogleUtilities/NSData+zlib (~> 7.7)" + - FirebaseABTesting (10.10.0): + - FirebaseCore (~> 10.0) + - FirebaseAnalytics (10.9.0): + - FirebaseAnalytics/AdIdSupport (= 10.9.0) + - FirebaseCore (~> 10.0) + - FirebaseInstallations (~> 10.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.11) + - GoogleUtilities/MethodSwizzler (~> 7.11) + - GoogleUtilities/Network (~> 7.11) + - "GoogleUtilities/NSData+zlib (~> 7.11)" - nanopb (< 2.30910.0, >= 2.30908.0) - - FirebaseAnalytics/AdIdSupport (9.3.0): - - FirebaseCore (~> 9.0) - - FirebaseInstallations (~> 9.0) - - GoogleAppMeasurement (= 9.3.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.7) - - GoogleUtilities/MethodSwizzler (~> 7.7) - - GoogleUtilities/Network (~> 7.7) - - "GoogleUtilities/NSData+zlib (~> 7.7)" + - FirebaseAnalytics/AdIdSupport (10.9.0): + - FirebaseCore (~> 10.0) + - FirebaseInstallations (~> 10.0) + - GoogleAppMeasurement (= 10.9.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.11) + - GoogleUtilities/MethodSwizzler (~> 7.11) + - GoogleUtilities/Network (~> 7.11) + - "GoogleUtilities/NSData+zlib (~> 7.11)" - nanopb (< 2.30910.0, >= 2.30908.0) - - FirebaseCore (9.3.0): - - FirebaseCoreDiagnostics (~> 9.0) - - FirebaseCoreInternal (~> 9.0) - - GoogleUtilities/Environment (~> 7.7) - - GoogleUtilities/Logger (~> 7.7) - - FirebaseCoreDiagnostics (9.4.0): - - GoogleDataTransport (< 10.0.0, >= 9.1.4) - - GoogleUtilities/Environment (~> 7.7) - - GoogleUtilities/Logger (~> 7.7) - - nanopb (< 2.30910.0, >= 2.30908.0) - - FirebaseCoreInternal (9.4.0): - - "GoogleUtilities/NSData+zlib (~> 7.7)" - - FirebaseCrashlytics (9.3.0): - - FirebaseCore (~> 9.0) - - FirebaseInstallations (~> 9.0) - - GoogleDataTransport (< 10.0.0, >= 9.1.4) - - GoogleUtilities/Environment (~> 7.7) + - FirebaseCore (10.9.0): + - FirebaseCoreInternal (~> 10.0) + - GoogleUtilities/Environment (~> 7.8) + - GoogleUtilities/Logger (~> 7.8) + - FirebaseCoreExtension (10.10.0): + - FirebaseCore (~> 10.0) + - FirebaseCoreInternal (10.10.0): + - "GoogleUtilities/NSData+zlib (~> 7.8)" + - FirebaseCrashlytics (10.9.0): + - FirebaseCore (~> 10.5) + - FirebaseInstallations (~> 10.0) + - FirebaseSessions (~> 10.5) + - GoogleDataTransport (~> 9.2) + - GoogleUtilities/Environment (~> 7.8) - nanopb (< 2.30910.0, >= 2.30908.0) - PromisesObjC (~> 2.1) - - FirebaseInstallations (9.4.0): - - FirebaseCore (~> 9.0) - - GoogleUtilities/Environment (~> 7.7) - - GoogleUtilities/UserDefaults (~> 7.7) + - FirebaseInstallations (10.10.0): + - FirebaseCore (~> 10.0) + - GoogleUtilities/Environment (~> 7.8) + - GoogleUtilities/UserDefaults (~> 7.8) - PromisesObjC (~> 2.1) - - FirebaseMessaging (9.3.0): - - FirebaseCore (~> 9.0) - - FirebaseInstallations (~> 9.0) - - GoogleDataTransport (< 10.0.0, >= 9.1.4) - - GoogleUtilities/AppDelegateSwizzler (~> 7.7) - - GoogleUtilities/Environment (~> 7.7) - - GoogleUtilities/Reachability (~> 7.7) - - GoogleUtilities/UserDefaults (~> 7.7) + - FirebaseMessaging (10.9.0): + - FirebaseCore (~> 10.0) + - FirebaseInstallations (~> 10.0) + - GoogleDataTransport (~> 9.2) + - GoogleUtilities/AppDelegateSwizzler (~> 7.8) + - GoogleUtilities/Environment (~> 7.8) + - GoogleUtilities/Reachability (~> 7.8) + - GoogleUtilities/UserDefaults (~> 7.8) - nanopb (< 2.30910.0, >= 2.30908.0) - - FirebasePerformance (9.3.0): - - FirebaseCore (~> 9.0) - - FirebaseInstallations (~> 9.0) - - FirebaseRemoteConfig (~> 9.0) - - GoogleDataTransport (< 10.0.0, >= 9.1.4) - - GoogleUtilities/Environment (~> 7.7) - - GoogleUtilities/ISASwizzler (~> 7.7) - - GoogleUtilities/MethodSwizzler (~> 7.7) + - FirebasePerformance (10.9.0): + - FirebaseCore (~> 10.5) + - FirebaseInstallations (~> 10.0) + - FirebaseRemoteConfig (~> 10.0) + - FirebaseSessions (~> 10.5) + - GoogleDataTransport (~> 9.2) + - GoogleUtilities/Environment (~> 7.8) + - GoogleUtilities/ISASwizzler (~> 7.8) + - GoogleUtilities/MethodSwizzler (~> 7.8) - nanopb (< 2.30910.0, >= 2.30908.0) - - FirebaseRemoteConfig (9.3.0): - - FirebaseABTesting (~> 9.0) - - FirebaseCore (~> 9.0) - - FirebaseInstallations (~> 9.0) - - GoogleUtilities/Environment (~> 7.7) - - "GoogleUtilities/NSData+zlib (~> 7.7)" + - FirebaseRemoteConfig (10.9.0): + - FirebaseABTesting (~> 10.0) + - FirebaseCore (~> 10.0) + - FirebaseInstallations (~> 10.0) + - GoogleUtilities/Environment (~> 7.8) + - "GoogleUtilities/NSData+zlib (~> 7.8)" + - FirebaseSessions (10.10.0): + - FirebaseCore (~> 10.5) + - FirebaseCoreExtension (~> 10.0) + - FirebaseInstallations (~> 10.0) + - GoogleDataTransport (~> 9.2) + - GoogleUtilities/Environment (~> 7.10) + - nanopb (< 2.30910.0, >= 2.30908.0) + - PromisesSwift (~> 2.1) - Flutter (1.0.0) - flutter_inappwebview (0.0.1): - Flutter @@ -139,58 +145,58 @@ PODS: - google_sign_in_ios (0.0.1): - Flutter - GoogleSignIn (~> 6.2) - - GoogleAppMeasurement (9.3.0): - - GoogleAppMeasurement/AdIdSupport (= 9.3.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.7) - - GoogleUtilities/MethodSwizzler (~> 7.7) - - GoogleUtilities/Network (~> 7.7) - - "GoogleUtilities/NSData+zlib (~> 7.7)" + - GoogleAppMeasurement (10.9.0): + - GoogleAppMeasurement/AdIdSupport (= 10.9.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.11) + - GoogleUtilities/MethodSwizzler (~> 7.11) + - GoogleUtilities/Network (~> 7.11) + - "GoogleUtilities/NSData+zlib (~> 7.11)" - nanopb (< 2.30910.0, >= 2.30908.0) - - GoogleAppMeasurement/AdIdSupport (9.3.0): - - GoogleAppMeasurement/WithoutAdIdSupport (= 9.3.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.7) - - GoogleUtilities/MethodSwizzler (~> 7.7) - - GoogleUtilities/Network (~> 7.7) - - "GoogleUtilities/NSData+zlib (~> 7.7)" + - GoogleAppMeasurement/AdIdSupport (10.9.0): + - GoogleAppMeasurement/WithoutAdIdSupport (= 10.9.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.11) + - GoogleUtilities/MethodSwizzler (~> 7.11) + - GoogleUtilities/Network (~> 7.11) + - "GoogleUtilities/NSData+zlib (~> 7.11)" - nanopb (< 2.30910.0, >= 2.30908.0) - - GoogleAppMeasurement/WithoutAdIdSupport (9.3.0): - - GoogleUtilities/AppDelegateSwizzler (~> 7.7) - - GoogleUtilities/MethodSwizzler (~> 7.7) - - GoogleUtilities/Network (~> 7.7) - - "GoogleUtilities/NSData+zlib (~> 7.7)" + - GoogleAppMeasurement/WithoutAdIdSupport (10.9.0): + - GoogleUtilities/AppDelegateSwizzler (~> 7.11) + - GoogleUtilities/MethodSwizzler (~> 7.11) + - GoogleUtilities/Network (~> 7.11) + - "GoogleUtilities/NSData+zlib (~> 7.11)" - nanopb (< 2.30910.0, >= 2.30908.0) - - GoogleDataTransport (9.2.0): + - GoogleDataTransport (9.2.3): - GoogleUtilities/Environment (~> 7.7) - nanopb (< 2.30910.0, >= 2.30908.0) - PromisesObjC (< 3.0, >= 1.2) - - GoogleSignIn (6.2.2): + - GoogleSignIn (6.2.4): - AppAuth (~> 1.5) - GTMAppAuth (~> 1.3) - - GTMSessionFetcher/Core (~> 1.1) - - GoogleUtilities/AppDelegateSwizzler (7.7.0): + - GTMSessionFetcher/Core (< 3.0, >= 1.1) + - GoogleUtilities/AppDelegateSwizzler (7.11.1): - GoogleUtilities/Environment - GoogleUtilities/Logger - GoogleUtilities/Network - - GoogleUtilities/Environment (7.7.0): + - GoogleUtilities/Environment (7.11.1): - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/ISASwizzler (7.7.0) - - GoogleUtilities/Logger (7.7.0): + - GoogleUtilities/ISASwizzler (7.11.1) + - GoogleUtilities/Logger (7.11.1): - GoogleUtilities/Environment - - GoogleUtilities/MethodSwizzler (7.7.0): + - GoogleUtilities/MethodSwizzler (7.11.1): - GoogleUtilities/Logger - - GoogleUtilities/Network (7.7.0): + - GoogleUtilities/Network (7.11.1): - GoogleUtilities/Logger - "GoogleUtilities/NSData+zlib" - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (7.7.0)" - - GoogleUtilities/Reachability (7.7.0): + - "GoogleUtilities/NSData+zlib (7.11.1)" + - GoogleUtilities/Reachability (7.11.1): - GoogleUtilities/Logger - - GoogleUtilities/UserDefaults (7.7.0): + - GoogleUtilities/UserDefaults (7.11.1): - GoogleUtilities/Logger - - GTMAppAuth (1.3.0): - - AppAuth/Core (~> 1.4) - - GTMSessionFetcher/Core (~> 1.5) - - GTMSessionFetcher/Core (1.7.2) + - GTMAppAuth (1.3.1): + - AppAuth/Core (~> 1.6) + - GTMSessionFetcher/Core (< 3.0, >= 1.5) + - GTMSessionFetcher/Core (2.3.0) - image_picker_ios (0.0.1): - Flutter - in_app_review (0.2.0): @@ -210,7 +216,9 @@ PODS: - FlutterMacOS - printing (1.0.0): - Flutter - - PromisesObjC (2.1.1) + - PromisesObjC (2.2.0) + - PromisesSwift (2.2.0): + - PromisesObjC (= 2.2.0) - share_plus (0.0.1): - Flutter - shared_preferences_ios (0.0.1): @@ -257,13 +265,14 @@ SPEC REPOS: - FirebaseABTesting - FirebaseAnalytics - FirebaseCore - - FirebaseCoreDiagnostics + - FirebaseCoreExtension - FirebaseCoreInternal - FirebaseCrashlytics - FirebaseInstallations - FirebaseMessaging - FirebasePerformance - FirebaseRemoteConfig + - FirebaseSessions - FMDB - GoogleAppMeasurement - GoogleDataTransport @@ -274,6 +283,7 @@ SPEC REPOS: - nanopb - OrderedSet - PromisesObjC + - PromisesSwift EXTERNAL SOURCES: add_2_calendar: @@ -331,36 +341,37 @@ SPEC CHECKSUMS: add_2_calendar: e9d68636aed37fb18e12f5a3d74c2e0589487af0 ap_common_plugin: f5861976eed0e60431f1eb939796a0eb93d73e69 app_tracking_transparency: 5b1745ef9ade815f7455cb6a0848349589afb7c5 - AppAuth: 80317d99ac7ff2801a2f18ff86b48cd315ed465d - Firebase: ef75abb1cdbc746d5a38f4e26c422c807b189b8c - firebase_analytics: 76a3a81b95ea32c1f8dbd900ec751b342d26d543 - firebase_core: e66a443ec996cb5e364dc70b4cfc1809c32cbb2e - firebase_crashlytics: 95cb124fe8ba64e9cedad8816b8aee6204f8dbeb - firebase_messaging: b414881f438b3b0b1bf1b0dd4b6767c4cfcf4dc7 - firebase_performance: 39e081d1a507aeac5a84dff1027a01ede988a5bd - firebase_remote_config: 16b065982a52fd1c6246a8980e66b5fa244cd680 - FirebaseABTesting: e59eec91fafce74a0f5261809ed0025b7e450db1 - FirebaseAnalytics: bf46f5163f44097ce2c789de0b3e6f87f1da834a - FirebaseCore: c088995ece701a021a48a1348ea0174877de2a6a - FirebaseCoreDiagnostics: aaa87098082c4d4bdd1a9557b1186d18ca85ce8c - FirebaseCoreInternal: a13302b0088fbf5f38b79b6ece49c2af7d3e05d6 - FirebaseCrashlytics: 65a5b349e664e986e6c7486b0a9b5ed8c11d0491 - FirebaseInstallations: 61db1054e688d2bdc4e2b3f744c1b086e913b742 - FirebaseMessaging: 2f6e38b6133059eb796ec224104f09379298a8c3 - FirebasePerformance: 18bb0984808ec429fae69fb5f1da4a68f57605b1 - FirebaseRemoteConfig: 0a644c924b3339bcf3bc3ea253206f171672308e + AppAuth: 3bb1d1cd9340bd09f5ed189fb00b1cc28e1e8570 + Firebase: bd152f0f3d278c4060c5c71359db08ebcfd5a3e2 + firebase_analytics: 48ed4a230abf9f585f7e7b477791effe96f5a791 + firebase_core: ce64b0941c6d87c6ef5022ae9116a158236c8c94 + firebase_crashlytics: 9b80d1944507cc07fa1c4455797f7d2eb7c8873f + firebase_messaging: 42912365e62efc1ea3e00724e5eecba6068ddb88 + firebase_performance: d11d1fd9591547f6b75f325aaadd6550eaf7e090 + firebase_remote_config: a4d88ffa663b3ccd09115c90680b813203cb9184 + FirebaseABTesting: b2a87808d90f02766fcffb3957d3e397e7accc15 + FirebaseAnalytics: 5ea0db4893825e7b0149d575352cd838236313dc + FirebaseCore: b68d3616526ec02e4d155166bbafb8eca64af557 + FirebaseCoreExtension: 8d93ebbf6838a874b4ed82a564c9d6705f8365dd + FirebaseCoreInternal: 971029061d326000d65bfdc21f5502c75c8b0893 + FirebaseCrashlytics: b60329455285aff853e54139d8ddbfe1e5f2b9f9 + FirebaseInstallations: 52153982b057d3afcb4e1fbb3eb0b6d00611e681 + FirebaseMessaging: 6b7052cc3da7bc8e5f72bef871243e8f04a14eed + FirebasePerformance: eee2f5da94fd7e5d15487649f8fe10a90c87c174 + FirebaseRemoteConfig: 5ea5834e8c518f377bf1af2d97ebd611914ebf2d + FirebaseSessions: 5f9e62cd4096e24d2011cbd845b0efceffaee1ec Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 flutter_inappwebview: bfd58618f49dc62f2676de690fc6dcda1d6c3721 flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069 flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743 FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a google_sign_in_ios: 4f85eb9f937450765c8573bb85fd8cd6a5af675c - GoogleAppMeasurement: b907bdad775b6975a8108762345b2cfbf1a93c37 - GoogleDataTransport: 1c8145da7117bd68bbbed00cf304edb6a24de00f - GoogleSignIn: 3c68388ac221f379676e8f1cb115df3aaf73b93f - GoogleUtilities: e0913149f6b0625b553d70dae12b49fc62914fd1 - GTMAppAuth: 4d8f864896f3646f0c33baf38a28362f4c601e15 - GTMSessionFetcher: 5595ec75acf5be50814f81e9189490412bad82ba + GoogleAppMeasurement: 373bcbead1bb6a85be7a64d5d8f96284b762ea9c + GoogleDataTransport: f0308f5905a745f94fb91fea9c6cbaf3831cb1bd + GoogleSignIn: 5651ce3a61e56ca864160e79b484cd9ed3f49b7a + GoogleUtilities: 9aa0ad5a7bc171f8bae016300bfcfa3fb8425749 + GTMAppAuth: 0ff230db599948a9ad7470ca667337803b3fc4dd + GTMSessionFetcher: 3a63d75eecd6aa32c2fc79f578064e1214dfdec2 image_picker_ios: b786a5dcf033a8336a657191401bfdf12017dabb in_app_review: 4a97249f7a2f539a0f294c2d9196b7fe35e49541 nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431 @@ -369,13 +380,14 @@ SPEC CHECKSUMS: path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02 photo_manager: 4f6810b7dfc4feb03b461ac1a70dacf91fba7604 printing: 233e1b73bd1f4a05615548e9b5a324c98588640b - PromisesObjC: ab77feca74fa2823e7af4249b8326368e61014cb + PromisesObjC: 09985d6d70fbe7878040aa746d78236e6946d2ef + PromisesSwift: cf9eb58666a43bbe007302226e510b16c1e10959 share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68 shared_preferences_ios: 548a61f8053b9b8a49ac19c1ffbc8b92c50d68ad sign_in_with_apple: f3bf75217ea4c2c8b91823f225d70230119b8440 sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904 url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de -PODFILE CHECKSUM: ba3ac0caee9e970ba540358a9a3913d97e932f5d +PODFILE CHECKSUM: 13dcb1df7b04aa50abd9132a5b5c1a6ce68fee94 COCOAPODS: 1.12.1 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index b25d5a1..72fb593 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -25,6 +25,7 @@ A4E3F61C2525B59800343570 /* CourseAppWidgetExtension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = A4E3F60C2525B59600343570 /* CourseAppWidgetExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; A4E3F6242525B5C300343570 /* CourseData.swift in Sources */ = {isa = PBXBuildFile; fileRef = A4E3F6232525B5C300343570 /* CourseData.swift */; }; AD25CACD5C4E83CD51716E94 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 365FBA24D7FECAB3188F547B /* Pods_Runner.framework */; }; + EB6B149754392BEFE8D12B1A /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 92CD18BE6B8BD93FBE74FEE2 /* GoogleService-Info.plist */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -71,6 +72,7 @@ 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; 876C04607E6FE35643FE62BF /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + 92CD18BE6B8BD93FBE74FEE2 /* GoogleService-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "Runner/GoogleService-Info.plist"; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -137,6 +139,7 @@ 97C146EF1CF9000F007C117D /* Products */, FC560AFD5ADFA9F9BAB177F5 /* Pods */, E10FCCE7B13A8A1FE9B11C76 /* Frameworks */, + 92CD18BE6B8BD93FBE74FEE2 /* GoogleService-Info.plist */, ); sourceTree = ""; }; @@ -313,6 +316,7 @@ 9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */, 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */, 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */, + EB6B149754392BEFE8D12B1A /* GoogleService-Info.plist in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -426,13 +430,14 @@ "${BUILT_PRODUCTS_DIR}/FMDB/FMDB.framework", "${BUILT_PRODUCTS_DIR}/FirebaseABTesting/FirebaseABTesting.framework", "${BUILT_PRODUCTS_DIR}/FirebaseCore/FirebaseCore.framework", - "${BUILT_PRODUCTS_DIR}/FirebaseCoreDiagnostics/FirebaseCoreDiagnostics.framework", + "${BUILT_PRODUCTS_DIR}/FirebaseCoreExtension/FirebaseCoreExtension.framework", "${BUILT_PRODUCTS_DIR}/FirebaseCoreInternal/FirebaseCoreInternal.framework", "${BUILT_PRODUCTS_DIR}/FirebaseCrashlytics/FirebaseCrashlytics.framework", "${BUILT_PRODUCTS_DIR}/FirebaseInstallations/FirebaseInstallations.framework", "${BUILT_PRODUCTS_DIR}/FirebaseMessaging/FirebaseMessaging.framework", "${BUILT_PRODUCTS_DIR}/FirebasePerformance/FirebasePerformance.framework", "${BUILT_PRODUCTS_DIR}/FirebaseRemoteConfig/FirebaseRemoteConfig.framework", + "${BUILT_PRODUCTS_DIR}/FirebaseSessions/FirebaseSessions.framework", "${BUILT_PRODUCTS_DIR}/GTMAppAuth/GTMAppAuth.framework", "${BUILT_PRODUCTS_DIR}/GTMSessionFetcher/GTMSessionFetcher.framework", "${BUILT_PRODUCTS_DIR}/GoogleDataTransport/GoogleDataTransport.framework", @@ -440,6 +445,7 @@ "${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework", "${BUILT_PRODUCTS_DIR}/OrderedSet/OrderedSet.framework", "${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework", + "${BUILT_PRODUCTS_DIR}/PromisesSwift/Promises.framework", "${BUILT_PRODUCTS_DIR}/add_2_calendar/add_2_calendar.framework", "${BUILT_PRODUCTS_DIR}/ap_common_plugin/ap_common_plugin.framework", "${BUILT_PRODUCTS_DIR}/app_tracking_transparency/app_tracking_transparency.framework", @@ -465,13 +471,14 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FMDB.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseABTesting.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCore.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreDiagnostics.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreExtension.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreInternal.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCrashlytics.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseInstallations.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseMessaging.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebasePerformance.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseRemoteConfig.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseSessions.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GTMAppAuth.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GTMSessionFetcher.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleDataTransport.framework", @@ -479,6 +486,7 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OrderedSet.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Promises.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/add_2_calendar.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ap_common_plugin.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/app_tracking_transparency.framework", diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index 184e5bc..e616479 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -14,7 +14,7 @@ import firebase_messaging import firebase_remote_config import flutter_local_notifications import in_app_review -import package_info_plus_macos +import package_info_plus import path_provider_macos import photo_manager import printing diff --git a/macos/Podfile.lock b/macos/Podfile.lock index a89bc7a..2768a48 100644 --- a/macos/Podfile.lock +++ b/macos/Podfile.lock @@ -3,151 +3,156 @@ PODS: - FlutterMacOS - file_selector_macos (0.0.1): - FlutterMacOS - - Firebase/Analytics (9.3.0): + - Firebase/Analytics (10.9.0): - Firebase/Core - - Firebase/Core (9.3.0): + - Firebase/Core (10.9.0): - Firebase/CoreOnly - - FirebaseAnalytics (~> 9.3.0) - - Firebase/CoreOnly (9.3.0): - - FirebaseCore (= 9.3.0) - - Firebase/Crashlytics (9.3.0): + - FirebaseAnalytics (~> 10.9.0) + - Firebase/CoreOnly (10.9.0): + - FirebaseCore (= 10.9.0) + - Firebase/Crashlytics (10.9.0): - Firebase/CoreOnly - - FirebaseCrashlytics (~> 9.3.0) - - Firebase/Messaging (9.3.0): + - FirebaseCrashlytics (~> 10.9.0) + - Firebase/Messaging (10.9.0): - Firebase/CoreOnly - - FirebaseMessaging (~> 9.3.0) - - Firebase/RemoteConfig (9.3.0): + - FirebaseMessaging (~> 10.9.0) + - Firebase/RemoteConfig (10.9.0): - Firebase/CoreOnly - - FirebaseRemoteConfig (~> 9.3.0) - - firebase_analytics (9.3.1): - - Firebase/Analytics (= 9.3.0) + - FirebaseRemoteConfig (~> 10.9.0) + - firebase_analytics (10.4.2): + - Firebase/Analytics (= 10.9.0) - firebase_core - FlutterMacOS - - firebase_core (1.20.1): - - Firebase/CoreOnly (~> 9.3.0) + - firebase_core (2.13.1): + - Firebase/CoreOnly (~> 10.9.0) - FlutterMacOS - - firebase_crashlytics (2.8.7): - - Firebase/CoreOnly (~> 9.3.0) - - Firebase/Crashlytics (~> 9.3.0) + - firebase_crashlytics (3.3.2): + - Firebase/CoreOnly (~> 10.9.0) + - Firebase/Crashlytics (~> 10.9.0) - firebase_core - FlutterMacOS - - firebase_messaging (12.0.2): - - Firebase/CoreOnly (~> 9.3.0) - - Firebase/Messaging (~> 9.3.0) + - firebase_messaging (14.6.2): + - Firebase/CoreOnly (~> 10.9.0) + - Firebase/Messaging (~> 10.9.0) - firebase_core - FlutterMacOS - - firebase_remote_config (2.0.14): - - Firebase/CoreOnly (~> 9.3.0) - - Firebase/RemoteConfig (~> 9.3.0) + - firebase_remote_config (4.2.2): + - Firebase/CoreOnly (~> 10.9.0) + - Firebase/RemoteConfig (~> 10.9.0) - firebase_core - FlutterMacOS - - FirebaseABTesting (9.4.0): - - FirebaseCore (~> 9.0) - - FirebaseAnalytics (9.3.0): - - FirebaseAnalytics/AdIdSupport (= 9.3.0) - - FirebaseCore (~> 9.0) - - FirebaseInstallations (~> 9.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.7) - - GoogleUtilities/MethodSwizzler (~> 7.7) - - GoogleUtilities/Network (~> 7.7) - - "GoogleUtilities/NSData+zlib (~> 7.7)" + - FirebaseABTesting (10.10.0): + - FirebaseCore (~> 10.0) + - FirebaseAnalytics (10.9.0): + - FirebaseAnalytics/AdIdSupport (= 10.9.0) + - FirebaseCore (~> 10.0) + - FirebaseInstallations (~> 10.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.11) + - GoogleUtilities/MethodSwizzler (~> 7.11) + - GoogleUtilities/Network (~> 7.11) + - "GoogleUtilities/NSData+zlib (~> 7.11)" - nanopb (< 2.30910.0, >= 2.30908.0) - - FirebaseAnalytics/AdIdSupport (9.3.0): - - FirebaseCore (~> 9.0) - - FirebaseInstallations (~> 9.0) - - GoogleAppMeasurement (= 9.3.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.7) - - GoogleUtilities/MethodSwizzler (~> 7.7) - - GoogleUtilities/Network (~> 7.7) - - "GoogleUtilities/NSData+zlib (~> 7.7)" + - FirebaseAnalytics/AdIdSupport (10.9.0): + - FirebaseCore (~> 10.0) + - FirebaseInstallations (~> 10.0) + - GoogleAppMeasurement (= 10.9.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.11) + - GoogleUtilities/MethodSwizzler (~> 7.11) + - GoogleUtilities/Network (~> 7.11) + - "GoogleUtilities/NSData+zlib (~> 7.11)" - nanopb (< 2.30910.0, >= 2.30908.0) - - FirebaseCore (9.3.0): - - FirebaseCoreDiagnostics (~> 9.0) - - FirebaseCoreInternal (~> 9.0) - - GoogleUtilities/Environment (~> 7.7) - - GoogleUtilities/Logger (~> 7.7) - - FirebaseCoreDiagnostics (9.4.0): - - GoogleDataTransport (< 10.0.0, >= 9.1.4) - - GoogleUtilities/Environment (~> 7.7) - - GoogleUtilities/Logger (~> 7.7) - - nanopb (< 2.30910.0, >= 2.30908.0) - - FirebaseCoreInternal (9.4.0): - - "GoogleUtilities/NSData+zlib (~> 7.7)" - - FirebaseCrashlytics (9.3.0): - - FirebaseCore (~> 9.0) - - FirebaseInstallations (~> 9.0) - - GoogleDataTransport (< 10.0.0, >= 9.1.4) - - GoogleUtilities/Environment (~> 7.7) + - FirebaseCore (10.9.0): + - FirebaseCoreInternal (~> 10.0) + - GoogleUtilities/Environment (~> 7.8) + - GoogleUtilities/Logger (~> 7.8) + - FirebaseCoreExtension (10.10.0): + - FirebaseCore (~> 10.0) + - FirebaseCoreInternal (10.10.0): + - "GoogleUtilities/NSData+zlib (~> 7.8)" + - FirebaseCrashlytics (10.9.0): + - FirebaseCore (~> 10.5) + - FirebaseInstallations (~> 10.0) + - FirebaseSessions (~> 10.5) + - GoogleDataTransport (~> 9.2) + - GoogleUtilities/Environment (~> 7.8) - nanopb (< 2.30910.0, >= 2.30908.0) - PromisesObjC (~> 2.1) - - FirebaseInstallations (9.4.0): - - FirebaseCore (~> 9.0) - - GoogleUtilities/Environment (~> 7.7) - - GoogleUtilities/UserDefaults (~> 7.7) + - FirebaseInstallations (10.10.0): + - FirebaseCore (~> 10.0) + - GoogleUtilities/Environment (~> 7.8) + - GoogleUtilities/UserDefaults (~> 7.8) - PromisesObjC (~> 2.1) - - FirebaseMessaging (9.3.0): - - FirebaseCore (~> 9.0) - - FirebaseInstallations (~> 9.0) - - GoogleDataTransport (< 10.0.0, >= 9.1.4) - - GoogleUtilities/AppDelegateSwizzler (~> 7.7) - - GoogleUtilities/Environment (~> 7.7) - - GoogleUtilities/Reachability (~> 7.7) - - GoogleUtilities/UserDefaults (~> 7.7) + - FirebaseMessaging (10.9.0): + - FirebaseCore (~> 10.0) + - FirebaseInstallations (~> 10.0) + - GoogleDataTransport (~> 9.2) + - GoogleUtilities/AppDelegateSwizzler (~> 7.8) + - GoogleUtilities/Environment (~> 7.8) + - GoogleUtilities/Reachability (~> 7.8) + - GoogleUtilities/UserDefaults (~> 7.8) - nanopb (< 2.30910.0, >= 2.30908.0) - - FirebaseRemoteConfig (9.3.0): - - FirebaseABTesting (~> 9.0) - - FirebaseCore (~> 9.0) - - FirebaseInstallations (~> 9.0) - - GoogleUtilities/Environment (~> 7.7) - - "GoogleUtilities/NSData+zlib (~> 7.7)" + - FirebaseRemoteConfig (10.9.0): + - FirebaseABTesting (~> 10.0) + - FirebaseCore (~> 10.0) + - FirebaseInstallations (~> 10.0) + - GoogleUtilities/Environment (~> 7.8) + - "GoogleUtilities/NSData+zlib (~> 7.8)" + - FirebaseSessions (10.10.0): + - FirebaseCore (~> 10.5) + - FirebaseCoreExtension (~> 10.0) + - FirebaseInstallations (~> 10.0) + - GoogleDataTransport (~> 9.2) + - GoogleUtilities/Environment (~> 7.10) + - nanopb (< 2.30910.0, >= 2.30908.0) + - PromisesSwift (~> 2.1) - flutter_local_notifications (0.0.1): - FlutterMacOS - FlutterMacOS (1.0.0) - FMDB (2.7.5): - FMDB/standard (= 2.7.5) - FMDB/standard (2.7.5) - - GoogleAppMeasurement (9.3.0): - - GoogleAppMeasurement/AdIdSupport (= 9.3.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.7) - - GoogleUtilities/MethodSwizzler (~> 7.7) - - GoogleUtilities/Network (~> 7.7) - - "GoogleUtilities/NSData+zlib (~> 7.7)" + - GoogleAppMeasurement (10.9.0): + - GoogleAppMeasurement/AdIdSupport (= 10.9.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.11) + - GoogleUtilities/MethodSwizzler (~> 7.11) + - GoogleUtilities/Network (~> 7.11) + - "GoogleUtilities/NSData+zlib (~> 7.11)" - nanopb (< 2.30910.0, >= 2.30908.0) - - GoogleAppMeasurement/AdIdSupport (9.3.0): - - GoogleAppMeasurement/WithoutAdIdSupport (= 9.3.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.7) - - GoogleUtilities/MethodSwizzler (~> 7.7) - - GoogleUtilities/Network (~> 7.7) - - "GoogleUtilities/NSData+zlib (~> 7.7)" + - GoogleAppMeasurement/AdIdSupport (10.9.0): + - GoogleAppMeasurement/WithoutAdIdSupport (= 10.9.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.11) + - GoogleUtilities/MethodSwizzler (~> 7.11) + - GoogleUtilities/Network (~> 7.11) + - "GoogleUtilities/NSData+zlib (~> 7.11)" - nanopb (< 2.30910.0, >= 2.30908.0) - - GoogleAppMeasurement/WithoutAdIdSupport (9.3.0): - - GoogleUtilities/AppDelegateSwizzler (~> 7.7) - - GoogleUtilities/MethodSwizzler (~> 7.7) - - GoogleUtilities/Network (~> 7.7) - - "GoogleUtilities/NSData+zlib (~> 7.7)" + - GoogleAppMeasurement/WithoutAdIdSupport (10.9.0): + - GoogleUtilities/AppDelegateSwizzler (~> 7.11) + - GoogleUtilities/MethodSwizzler (~> 7.11) + - GoogleUtilities/Network (~> 7.11) + - "GoogleUtilities/NSData+zlib (~> 7.11)" - nanopb (< 2.30910.0, >= 2.30908.0) - - GoogleDataTransport (9.2.0): + - GoogleDataTransport (9.2.3): - GoogleUtilities/Environment (~> 7.7) - nanopb (< 2.30910.0, >= 2.30908.0) - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/AppDelegateSwizzler (7.7.0): + - GoogleUtilities/AppDelegateSwizzler (7.11.1): - GoogleUtilities/Environment - GoogleUtilities/Logger - GoogleUtilities/Network - - GoogleUtilities/Environment (7.7.0): + - GoogleUtilities/Environment (7.11.1): - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/Logger (7.7.0): + - GoogleUtilities/Logger (7.11.1): - GoogleUtilities/Environment - - GoogleUtilities/MethodSwizzler (7.7.0): + - GoogleUtilities/MethodSwizzler (7.11.1): - GoogleUtilities/Logger - - GoogleUtilities/Network (7.7.0): + - GoogleUtilities/Network (7.11.1): - GoogleUtilities/Logger - "GoogleUtilities/NSData+zlib" - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (7.7.0)" - - GoogleUtilities/Reachability (7.7.0): + - "GoogleUtilities/NSData+zlib (7.11.1)" + - GoogleUtilities/Reachability (7.11.1): - GoogleUtilities/Logger - - GoogleUtilities/UserDefaults (7.7.0): + - GoogleUtilities/UserDefaults (7.11.1): - GoogleUtilities/Logger - in_app_review (0.2.0): - FlutterMacOS @@ -156,7 +161,7 @@ PODS: - nanopb/encode (= 2.30909.0) - nanopb/decode (2.30909.0) - nanopb/encode (2.30909.0) - - package_info_plus_macos (0.0.1): + - package_info_plus (0.0.1): - FlutterMacOS - path_provider_macos (0.0.1): - FlutterMacOS @@ -165,7 +170,9 @@ PODS: - FlutterMacOS - printing (1.0.0): - FlutterMacOS - - PromisesObjC (2.1.1) + - PromisesObjC (2.2.0) + - PromisesSwift (2.2.0): + - PromisesObjC (= 2.2.0) - share_plus_macos (0.0.1): - FlutterMacOS - shared_preferences_macos (0.0.1): @@ -189,7 +196,7 @@ DEPENDENCIES: - flutter_local_notifications (from `Flutter/ephemeral/.symlinks/plugins/flutter_local_notifications/macos`) - FlutterMacOS (from `Flutter/ephemeral`) - in_app_review (from `Flutter/ephemeral/.symlinks/plugins/in_app_review/macos`) - - package_info_plus_macos (from `Flutter/ephemeral/.symlinks/plugins/package_info_plus_macos/macos`) + - package_info_plus (from `Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos`) - path_provider_macos (from `Flutter/ephemeral/.symlinks/plugins/path_provider_macos/macos`) - photo_manager (from `Flutter/ephemeral/.symlinks/plugins/photo_manager/macos`) - printing (from `Flutter/ephemeral/.symlinks/plugins/printing/macos`) @@ -205,18 +212,20 @@ SPEC REPOS: - FirebaseABTesting - FirebaseAnalytics - FirebaseCore - - FirebaseCoreDiagnostics + - FirebaseCoreExtension - FirebaseCoreInternal - FirebaseCrashlytics - FirebaseInstallations - FirebaseMessaging - FirebaseRemoteConfig + - FirebaseSessions - FMDB - GoogleAppMeasurement - GoogleDataTransport - GoogleUtilities - nanopb - PromisesObjC + - PromisesSwift EXTERNAL SOURCES: desktop_webview_window: @@ -239,8 +248,8 @@ EXTERNAL SOURCES: :path: Flutter/ephemeral in_app_review: :path: Flutter/ephemeral/.symlinks/plugins/in_app_review/macos - package_info_plus_macos: - :path: Flutter/ephemeral/.symlinks/plugins/package_info_plus_macos/macos + package_info_plus: + :path: Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos path_provider_macos: :path: Flutter/ephemeral/.symlinks/plugins/path_provider_macos/macos photo_manager: @@ -261,34 +270,36 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: desktop_webview_window: d4365e71bcd4e1aa0c14cf0377aa24db0c16a7e2 file_selector_macos: f1b08a781e66103e3ba279fd5d4024a2478b3af6 - Firebase: ef75abb1cdbc746d5a38f4e26c422c807b189b8c - firebase_analytics: 7223eb68c982e3d3c441daecd6a3b93366b876a2 - firebase_core: 9b95e859a721511ad34fbaa4248fb6a49a6178b2 - firebase_crashlytics: 417c5e27133b02c88fd5828f53c6f922da7c4cc5 - firebase_messaging: cc47614a079d98cf84d01398a00a933ee314dfa6 - firebase_remote_config: d80dab14204e518d58d196135a0e70282855fb67 - FirebaseABTesting: e59eec91fafce74a0f5261809ed0025b7e450db1 - FirebaseAnalytics: bf46f5163f44097ce2c789de0b3e6f87f1da834a - FirebaseCore: c088995ece701a021a48a1348ea0174877de2a6a - FirebaseCoreDiagnostics: aaa87098082c4d4bdd1a9557b1186d18ca85ce8c - FirebaseCoreInternal: a13302b0088fbf5f38b79b6ece49c2af7d3e05d6 - FirebaseCrashlytics: 65a5b349e664e986e6c7486b0a9b5ed8c11d0491 - FirebaseInstallations: 61db1054e688d2bdc4e2b3f744c1b086e913b742 - FirebaseMessaging: 2f6e38b6133059eb796ec224104f09379298a8c3 - FirebaseRemoteConfig: 0a644c924b3339bcf3bc3ea253206f171672308e + Firebase: bd152f0f3d278c4060c5c71359db08ebcfd5a3e2 + firebase_analytics: f088393712d56cb3a9380d94a3143a0a6c8b8b49 + firebase_core: bef54c6955ffe824bb73ec34090f4013b6921bc1 + firebase_crashlytics: effbfab05bc829de381d0ff731114800cd473990 + firebase_messaging: 5fb518ebbce926b8828c283509d68da4cf238eac + firebase_remote_config: 8ae9580fce792eaa5a5277d8accf225cd86dc11d + FirebaseABTesting: b2a87808d90f02766fcffb3957d3e397e7accc15 + FirebaseAnalytics: 5ea0db4893825e7b0149d575352cd838236313dc + FirebaseCore: b68d3616526ec02e4d155166bbafb8eca64af557 + FirebaseCoreExtension: 8d93ebbf6838a874b4ed82a564c9d6705f8365dd + FirebaseCoreInternal: 971029061d326000d65bfdc21f5502c75c8b0893 + FirebaseCrashlytics: b60329455285aff853e54139d8ddbfe1e5f2b9f9 + FirebaseInstallations: 52153982b057d3afcb4e1fbb3eb0b6d00611e681 + FirebaseMessaging: 6b7052cc3da7bc8e5f72bef871243e8f04a14eed + FirebaseRemoteConfig: 5ea5834e8c518f377bf1af2d97ebd611914ebf2d + FirebaseSessions: 5f9e62cd4096e24d2011cbd845b0efceffaee1ec flutter_local_notifications: 3805ca215b2fb7f397d78b66db91f6a747af52e4 - FlutterMacOS: 57701585bf7de1b3fc2bb61f6378d73bbdea8424 + FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24 FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a - GoogleAppMeasurement: b907bdad775b6975a8108762345b2cfbf1a93c37 - GoogleDataTransport: 1c8145da7117bd68bbbed00cf304edb6a24de00f - GoogleUtilities: e0913149f6b0625b553d70dae12b49fc62914fd1 + GoogleAppMeasurement: 373bcbead1bb6a85be7a64d5d8f96284b762ea9c + GoogleDataTransport: f0308f5905a745f94fb91fea9c6cbaf3831cb1bd + GoogleUtilities: 9aa0ad5a7bc171f8bae016300bfcfa3fb8425749 in_app_review: a850789fad746e89bce03d4aeee8078b45a53fd0 nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431 - package_info_plus_macos: f010621b07802a241d96d01876d6705f15e77c1c + package_info_plus: 02d7a575e80f194102bef286361c6c326e4c29ce path_provider_macos: 3c0c3b4b0d4a76d2bf989a913c2de869c5641a19 photo_manager: 4f6810b7dfc4feb03b461ac1a70dacf91fba7604 - printing: e4b7e232ff3d5d50a70b20d959aa71035a5c31f9 - PromisesObjC: ab77feca74fa2823e7af4249b8326368e61014cb + printing: 1dd6a1fce2209ec240698e2439a4adbb9b427637 + PromisesObjC: 09985d6d70fbe7878040aa746d78236e6946d2ef + PromisesSwift: cf9eb58666a43bbe007302226e510b16c1e10959 share_plus_macos: 853ee48e7dce06b633998ca0735d482dd671ade4 shared_preferences_macos: a64dc611287ed6cbe28fd1297898db1336975727 sign_in_with_apple: a9e97e744e8edc36aefc2723111f652102a7a727 @@ -297,4 +308,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 0d3963a09fc94f580682bd88480486da345dc3f0 -COCOAPODS: 1.11.3 +COCOAPODS: 1.12.1 diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index c1a8c9d..ed8d60e 100644 --- a/macos/Runner.xcodeproj/project.pbxproj +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 51; + objectVersion = 54; objects = { /* Begin PBXAggregateTarget section */ @@ -217,7 +217,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0920; - LastUpgradeCheck = 0930; + LastUpgradeCheck = 1300; ORGANIZATIONNAME = "Google LLC"; TargetAttributes = { 33CC10EC2044A3C60003C045 = { @@ -273,6 +273,7 @@ /* Begin PBXShellScriptBuildPhase section */ 3399D490228B24CF009A79C7 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -338,21 +339,23 @@ "${BUILT_PRODUCTS_DIR}/FMDB/FMDB.framework", "${BUILT_PRODUCTS_DIR}/FirebaseABTesting/FirebaseABTesting.framework", "${BUILT_PRODUCTS_DIR}/FirebaseCore/FirebaseCore.framework", - "${BUILT_PRODUCTS_DIR}/FirebaseCoreDiagnostics/FirebaseCoreDiagnostics.framework", + "${BUILT_PRODUCTS_DIR}/FirebaseCoreExtension/FirebaseCoreExtension.framework", "${BUILT_PRODUCTS_DIR}/FirebaseCoreInternal/FirebaseCoreInternal.framework", "${BUILT_PRODUCTS_DIR}/FirebaseCrashlytics/FirebaseCrashlytics.framework", "${BUILT_PRODUCTS_DIR}/FirebaseInstallations/FirebaseInstallations.framework", "${BUILT_PRODUCTS_DIR}/FirebaseMessaging/FirebaseMessaging.framework", "${BUILT_PRODUCTS_DIR}/FirebaseRemoteConfig/FirebaseRemoteConfig.framework", + "${BUILT_PRODUCTS_DIR}/FirebaseSessions/FirebaseSessions.framework", "${BUILT_PRODUCTS_DIR}/GoogleDataTransport/GoogleDataTransport.framework", "${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework", "${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework", + "${BUILT_PRODUCTS_DIR}/PromisesSwift/Promises.framework", "${BUILT_PRODUCTS_DIR}/desktop_webview_window/desktop_webview_window.framework", "${BUILT_PRODUCTS_DIR}/file_selector_macos/file_selector_macos.framework", "${BUILT_PRODUCTS_DIR}/flutter_local_notifications/flutter_local_notifications.framework", "${BUILT_PRODUCTS_DIR}/in_app_review/in_app_review.framework", "${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework", - "${BUILT_PRODUCTS_DIR}/package_info_plus_macos/package_info_plus_macos.framework", + "${BUILT_PRODUCTS_DIR}/package_info_plus/package_info_plus.framework", "${BUILT_PRODUCTS_DIR}/path_provider_macos/path_provider_macos.framework", "${BUILT_PRODUCTS_DIR}/photo_manager/photo_manager.framework", "${BUILT_PRODUCTS_DIR}/printing/printing.framework", @@ -367,21 +370,23 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FMDB.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseABTesting.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCore.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreDiagnostics.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreExtension.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreInternal.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCrashlytics.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseInstallations.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseMessaging.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseRemoteConfig.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseSessions.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleDataTransport.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Promises.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/desktop_webview_window.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/file_selector_macos.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_local_notifications.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/in_app_review.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/package_info_plus_macos.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/package_info_plus.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider_macos.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/photo_manager.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/printing.framework", @@ -510,7 +515,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.12; + MACOSX_DEPLOYMENT_TARGET = 10.14; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule; @@ -538,7 +543,7 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 10.13; + MACOSX_DEPLOYMENT_TARGET = 10.14; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; }; @@ -597,7 +602,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.12; + MACOSX_DEPLOYMENT_TARGET = 10.14; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; @@ -645,7 +650,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.12; + MACOSX_DEPLOYMENT_TARGET = 10.14; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule; @@ -673,7 +678,7 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 10.13; + MACOSX_DEPLOYMENT_TARGET = 10.14; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; @@ -700,7 +705,7 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 10.13; + MACOSX_DEPLOYMENT_TARGET = 10.14; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; }; diff --git a/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index b62063a..7934074 100644 --- a/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ #include +#include #include #include #include @@ -17,6 +18,8 @@ void RegisterPlugins(flutter::PluginRegistry* registry) { registry->GetRegistrarForPlugin("DesktopWebviewWindowPlugin")); FileSelectorWindowsRegisterWithRegistrar( registry->GetRegistrarForPlugin("FileSelectorWindows")); + FirebaseCorePluginCApiRegisterWithRegistrar( + registry->GetRegistrarForPlugin("FirebaseCorePluginCApi")); PrintingPluginRegisterWithRegistrar( registry->GetRegistrarForPlugin("PrintingPlugin")); UrlLauncherWindowsRegisterWithRegistrar( diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake index e90d074..6459ca0 100644 --- a/windows/flutter/generated_plugins.cmake +++ b/windows/flutter/generated_plugins.cmake @@ -5,6 +5,7 @@ list(APPEND FLUTTER_PLUGIN_LIST desktop_webview_window file_selector_windows + firebase_core printing url_launcher_windows webview_windows From eb3efa63bc8051dfaf36ed9f247672edbf7a3e3e Mon Sep 17 00:00:00 2001 From: Rainvisitor Date: Sat, 10 Jun 2023 19:53:33 +0800 Subject: [PATCH 23/23] fix: loss iOS build files --- dev_configs.zip.gpg | Bin 3178 -> 4672 bytes scripts/zip_dev_configs.sh | 2 ++ 2 files changed, 2 insertions(+) diff --git a/dev_configs.zip.gpg b/dev_configs.zip.gpg index bc83833113bd4203a1dcc4772a429e5f17bff828..7c750636563a36296166e0e4cb0924bc74f75a32 100644 GIT binary patch literal 4672 zcmV-G62I+?4Fm}T2&Bhaa*2|YG5XTcZUF{szOEmglrv7Zf|;{&2DPGt*`zF%V1VYf z71BdVZWA43kq?;=rDR}Ir$h}e)KQsKAI9aEJe1BON27p1V;8-YECY_EcNQWg6S2nm zn$I-O50$!2#d&5K=bmY~mA_qb5&+?6T_(eLI7WLlR(EJ-y>p(`nTz~!3-5Ozzx$n{ z30=U0NWv0%5FIXpjS{G3XX*7^tZ$C3CTjzFp2?BBSL41M$iPSaZJx)PQv9&DBb0<1 z(OykE%>bjapf%|trASNBz2*e`l1BAx%|Ikc9u)_e7#~g+JD6fJwn_@lav~C+|CRZ1 znWB7P6J19WdH%t)ZdJit)(dCsT{`agFzh3yv%g!M`nffZ6E2*BD*0^OZlJbgY40?* z(l*SI<0z!i9@l~EESy+AeZ%voUT*V8+js_EoTVLM&lM z_EN&O*E`tkk|8Rij4Ukm71&8(A%;~l&Tw;H$3|^zavnqsS8Om90z`kT;4I=o9Mif6@8gZecaS`4)-)9j~23IHR zVGqCB6#Q$3mUj_n#prjv&`#= z2kiBGtrg9GeufoUN2v(&=P$R;>A2V3XuaK83~`$~AR&g6Fxw4`ipP$RKe9t=reEFe zIh@CqKHzx5Hx*;N#CuZSa%VgnRYfb3w&JoS;ye8~ddMK3;C;d&|Vr^*S}7KPnot*Nz}YB=e;7EmtgEe8?E1Q&+C9FOE8Sn zzZMJW8&3FY$eBDUt}ewAX!jC57qZ2HQm57SvC3g06k?E z=?ped4uC>h*@Dt-)pHyx%hN#d^0Ofi573W*n+z@p2Ej2L&v_NDo1n9}v08X}&gEM5 z!6O@rvT8FCrLgLEXH(dEPySy;XAS*b8rVP$7qL2p3TzhpcBvWq6H!hN zl?k=!Xer?3m?v$VzjZY(Cy z6}BCrrn;gR-=Wfl*}H4S7OM$Kz0>m*#(u^y%hXGO`Gh8ioQKB8#O zC+*a}EfP}AyRpAnCmPLCGr-Rbes4H^(4Lm6K9PlRU0aH4!RAPQxmSoS|FL}s*JGM% z-7W1Gd#S|*VH_Ipwe|ord$!9l)kzl>FK3WUj!K2+(>ZtpLDGQ^`@BC{4Y$L>cAs>l zl80pr(k%~(TZk*K3B_X+gr0RE-T!zTvI=*(VAK#=yj0KI{NJD*?ck2`8pS1ytGIaO z5w$+%!*tk9r}@{rr|C3od)zYBoi!wJ$>U_H*@>FPY;$gCWqxNIH941~bAL5ILlVpPShXUTt6v;ge zu8M85Vir8!yV+;rt}Rz6(& zDg?B$s<_@_TaZz#aNh~FsD|)a!>}#-E+K-Y2JgbZtS{?j{^H#Rc+R|?a8l}a&gTyx zJ_kNUUxYM!m0nYn^xpxCdIXLzQIganCgc2MSF=(7{t(w0_A|v+&Ud*&VaNDI#MTJH zMOJKwL0&jhl17cX&TyoG&0A(yHxPkqSf30x?lD3DxK*G$`Aw|bGF}9TSe?@5H`)>^ zI0?#%NVPKv#mwP7-J~sf8zj0UvWp%lvAzAK&c;wjak8qS*DaweZUvSURkp0k9zlhH zOu^Hdz|&5 z#(W?D34=Pcle?QFYcC|r58h3 zD=clv(}U+>W}SypJB_*`okJ^!_08f*)&J8$VWPTIsu`Uzfv7Fo@2oT#>9qJ|dz~w? z&mdat_-z)~DfX%eB5%kfuRC8y{dMNaFu+FV9kElLK%>{XL6(QxI8(*NEhnq3(L>_y zwAf;%n2$aHYbJx8=xtTAd_eM((8;n86IJ>u{r#0R2slJG38p3Z@%7=@N1SmX?4=HmBlpOEO5oc{Z42bC`W z!a)J!X}f$MmElP71LyTbBvViez7F`P8=Poc&~hC7M&FE^8%I|;TXBAU=u?6{Z<+=5 z{isnJkmxD2S=fJnpTtPv(>8_z6#>Npt0A1G z-j!FfGU!QRM4=trQ}m^eostD&#GU7Retkk2+w& z3Y~uzf87GT&{)>^C)Qk&!^fvh2-s<_eG)>|Z}EVZIncTv8B=7=as$e1~|QM=}hp`TNhZVA4xHf^&yH(?9co^s#Fj*5XJa)qpbVO9(k%@KJq$gAsV0 zwWaTZuIcq-CZVt+i6o21ZL2@~J4BmA(F}?e5JZEo=YEZc&9e=uv>Gb|S%SD%Yzb}r zhj`Ok*qBBGV)RoO!xU)!pXW8rIID;<2z2k;DD&3h*iu>c>0O~<`%v{l5*c|&Xu8F) zxa!%%MB_GwO8@=pS6q>e6BV!0u31<(Vvn4!A`BvyJCFjJhZFHb&Zfa%l`K@bMRObBEbAdHg3F) z?*ss?6u^et>#3Z!5-D3~16|?49_E6L^+oBa5dn{HM%JWlGli4Bo|9!=BA*`}Yifa) zc##`s8y9%x$aH#+{D*WP+ctjDLlBQb26KUM^88D>(pX|D{RJd&^KnU^7U_WHD1v8< zPnsi)5(UH}vW*=;Il+{XC%dQD;K@uN@e5mt{#X+d_eWPG(dJ{zN`vpMO*O9$pofzdZ0fQ!g^=Q%EC$-nwf1V7|i>L1Q@P+|?o9!9mE*|!n7!`#kA z=+g#~fSED~wT=r%qPQ;VY=sibEJIyr*|J=0dA$}-pLp#b{~(o(wj9d+@BqjKX@!QY z*MV8<@CVKHpB>-L%s|}6iy464o5tAW$Bsa1iF?LXX@+z8BgJzhbRvC1P_fU9kGBZ% z4Oy_~FLHVzgLZTlo+j@kQiBAyxTH%EQlMI7_d>G%z(yz;8=6-&QpKjw$LpJth7gSw z`jliaGGaSFW`$ zFAaXV7#jAyVG=0~&62wB9~y~^H943`9~v9#B`e8vzJqLDO7&_MyNezFFgTYRnFg(> zheu5n`+9zoM*o0O?FcSy|4%iEtv$f51y93BdKGlG$sp;_i`BYJD-^ICd>ykd!1Vb-sHz7o}aoyrg@BH8wk*P?=i#@7%xFmu|3z)9IzaLvUJ*Qlk}w4;NJ5 zry&+0WV*c!>#k+ zQ6Xj-&j2QffJh3(LH{_=iL=EoC?>Su-uBDWjKO2CH@qbJ1MoL?RZk6hFtJAw!eFN% zb)!g|=o!h)E!}kN!kDZ#Qi5j7O^jm^)7pwGSrn}gy!`mDSf{LTgEm!=Lv7cveKUD+ zRF)23y9%m_$idYWF39G^Zdr06L#fzBJZX3-aVTt=2^R9l5`z@Xsl4 za7#=pn^?`*58R7~Uat!-@Gm!;4wMQd?f^cR`>zmt|88x0;rNFF0a=em(62;&-Es$iH@p{5y;BqYrJd56B-25+MiyYc9-tnas^2oi zR}uAd)xhQ7^7(M`&NpeA(hqelr6+e|viqB_X9Dlr6QVv93IU1Tt7}0`p2OLDmR3w3 zv&}c&p%fn$L+um?4%L4I>T{yP@m+{jKawOE%iTayOl99NnMUdv>=@Bq>vRa~`{_Vru8&0f@?u|5vC;Y+}!|`8r%aEAfb_ z=xP4LPb?f@Pvy!Fv$hpdyBP1JmnihRUZ?*h^_HB+aTjpYJzWsKvRj|n>NkM#z0@!9Z*q30XShg5(B%whuNEVky)mT3dwv(pSu%_JPhGEQ$%gxVPh=8vG0>-w;%dBIT^Vklr74mP=tQl?NON6z znWB@4cJc3Gl`6tH+|zyuxq#6Vhk24s$-^+lQVvFXg7G=RDQUp-*1Pk;5JmieaRAr6 z*Y)a_YJo8jFG0Rc0kt3X#>4hG?pGi|L6zQnW^}v0Rh>UOMy=2UPcYFRP{HiZU3>x# zt=^?zhW&ISC#Z;BT;2}~A0cOnO-G2RxClG%i0xWKI zQ7xGOj$*M30JwCBjRdA@*la_?e^;-{4V-aOi_H|wx76X^IT6)mi@?Bo+L z3Ugd5fe`Z%j1jj)ge!yqW7o9!!T8$6BON`Og=5vs`;EJIEX>;}m0Batle{5{1t+*I zziEM^s8!_fqu_Y!QIwMT3PHqOF1WQ7I8}o?&Dzg?3Ik+Dq-B7o#`zxU6P)lmteI)l zrB^(~9AYDw##r~AY(vW~h*)Q+haWS;AxQ`ENQi;m@A0zjmzs1!;xr8}w{cNPh(dK`Xi~_%6Q6#@y|mxh>vRTMmNA^>Liz=31NMU9Bqfqucp5Xo zRw|QoWxcqMb}7#@?t_3G?4dMR%-J(E2ndtbIJcO4L~q)R7^C}zUA?S%L73?K=pEI< z1y`L32dc4GH}+ebr*(j>rR3KIH;PaCMFgGiSrwxp>m^WPmbBA#<)8QlIq*cs&(4FU ze+r5UdY*XWEhgCjqidT(vjwQplee!|bcUhwP(8Ey;^ZegYlh4sioXvtM^uMtZaQx- z0-DKD4%Dry5Mn?hV^aQ!k`PTNUqX6yGQUVj3q(}xdq?LL*yG}7>*)Bul-vb` z>zhQDk~>{?J`YQ+kZM*=wOzf+%63r8sqPx1Om?_S8cO)4k`&uMOF`!WuWKhMc&W%W zK>iQI-3d5Qr@qaT1OmB7`zPna2*g%c;>ZmH4BHeRl^Bvqs45hZ_QjF(fr zP?q{SE2J08(t0=o;q(nmY)#Qy2ORpaeWufy)#F&9whjgi{yX1#$${Z{rm)lxKRo*i z$AYOpV;n)|?Cu$Xyu?BbAJS57kyiiX9N${x;#?~&iHJ4Zjqj)Kg45lB5t>L7+&%%T0%+IBKYQQ?+f4C(07Zf!glQ@UN!b* z=z~bCcg66c} z*(_yVSH3S=tp)Zb{V+xB4>jqvyly86a>J*HTbF`LXl2S?aw%s~L1;smZqXKsWNQRp zTd8|T_@iE6#+CkadA~Uf)m9=2<8%0)yhNvOFD^zqOKq_?g$km@28%~dMNsb{eJ)Sf zA9Qr&8E$5hDM>k`HsRM#>)L=6TDvUuCB`^=I+XR};GVui^ujz4SYSa5r1Z+G_7u$R zP!!G?F*}ia50sVOiT5U5wm zC2Izdg^t#YB|{+A1vA*G_vadaA{3PGXKlZ?vDLjgGP|1vEn7RIHTx7vCJC6m{D0QZ zIm*UKO~Df8D#)!pncb|e_*BCVQJsRlp7RBMpu$V~O05SOnqUm2m0ye?2T~lI3G^Mi zo!p304iB!CZQ|s!(kV{=Ng>N_4M1MP?HZLrWMhNE>3^Y1%TNian(7f1s>Fd`6IU<_ z7TxQPsqmI0XoTuC*4CI5!0tQ~6JhOHnmgSb3 zDp5tPIxDk*699vKf?qgryd-d?FD?V_W4+QRZ-1m{^z+oQ;#hA+wSE_A&FcE85#CUY z_5T_W=nGRjIFkJaXsd+9-lorX`)PR;6hjy;#4x{lN01}gAN7_(hb2)GTTLG2jj-l&Pfm3D3dlF{R7J@O;a1|NaB41J@A93Sf_!|j z1mzL-pM@{Hu=P?u{s)t<`H5T)FJD7b=mh%^p&qsZdr0D>))4;bMEM}Ho#CFnmpD{) zmsH0~1ad?83=U6YGSaCc==L>AzTBhM?f>d2dm~*F_}(G(o&DVQXqz8X2?H4YHQANE5tKhJA5^Hy>pZ1Co-DMGb07QU!dnd*Lne2FQggZAbbS)Qwtv2uD?>%B1SAoLb(HKSTybhW#<^ zcJ**4@|dSnQH8e7;mKQ>MojfGDDK%;niK3i&8m~kyiU3n0!ky2`_V~7 z6U({lMME;=+b645=4Dl=7$*NDaHcMLnPDV(?nl5<>}8-g4lQ>l193IYJ;8|!ewMid z#pm`xdCrrc^vRp)Yb&{X0i*!aG*?YJW*<2SiEMzkZ3tnNZagPom-V@l|FIVI0(SRN zke|M8XT`LUM@^x4dRPBRGXL7dDAZYdq5%(H=rhw$t6;92QkFLu)_h z1CSKWVp^hqzCnXmhyhFhkt5Dcv1P_>g}6rvgx+GH!cR2n-?`ZP=z*8;It}~8OFWU; zz+$ASKbkcgjk6zPNO#;@#ePc#KIrxh2;Cs;`S62N@XqIsFa$#z0OS=W3{0vT2`Vx8 zNKe0|yNbF+G=!1e!LTQ&?dhd&zpLW2DJ;;@lX=>F7%=7;?7(fS-Ts@rtanp9^Un$Y zs~THRNOY)k98!Y5gND+}#~rk^gtSO*r@|k6QQdrUZ0rkgbC>IMR_sTH-;xu+l`Voi zv9MH7n*>@nv-x`$;f)6D@m#<#gghBEAyow{0nMte@j~Fu3AKz&P)kovdJrAb>De>0 zQcYEfF7cp0#ZJxT-Cv?IkWd~T-$9s0PY3c_-(kR_GdfpSkMUS3wPT>s7!>&xk5yAd z_2&tYIdoI8o1*si7O&J-1I1B%P6p;`mM5t~(^K_llWV`~6`0fHzzLAH;L*%ZoNPb^ zO<^hSa}Vik`tjOq0J`r{bzk1->GZQ5F7*u*Ew;Q~G*6eV`m6PR=br(e+Kfw%2mpl! z1yIY4$&znhw}C^Xxp_e)MAR$ zjLLHdGN`rB=~mwte2JVHuIsZ3{!h1!@OqV@Ty%a!dT-5^y~t2xy|5#2YIyr@&FrK4 Qcu)IY+7t|xU(YNWw<&rQKL7v# diff --git a/scripts/zip_dev_configs.sh b/scripts/zip_dev_configs.sh index 1487f04..b8a0485 100644 --- a/scripts/zip_dev_configs.sh +++ b/scripts/zip_dev_configs.sh @@ -4,5 +4,7 @@ zip -r dev_configs.zip \ lib/firebase_options.dart \ lib/config/sdk_constants.dart \ android/app/google-services.json \ + ios/Runner/GoogleService-Info.plist \ ios/firebase_app_id_file.json \ + macos/Runner/GoogleService-Info.plist \ macos/firebase_app_id_file.json \ No newline at end of file