Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Bump flutter to v3.13.0 #1462

Merged
merged 9 commits into from
Sep 22, 2023
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .flutter
Submodule .flutter updated 1857 files
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Encointer wallet and client for mobile phones

### Requirements
- Dart sdk: ">=3.0.1 <3.0.0"
- Flutter: "3.10.3"
- Flutter: "3.13.0"
- Android: minSdkVersion 17
- iOS: --ios-language swift, Xcode version >= 14.0.0

Expand Down
22 changes: 11 additions & 11 deletions app/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ PODS:
- path_provider_foundation (0.0.1):
- Flutter
- FlutterMacOS
- permission_handler_apple (9.1.0):
- permission_handler_apple (9.1.1):
- Flutter
- printing (1.0.0):
- Flutter
Expand All @@ -105,7 +105,7 @@ PODS:
- FlutterMacOS
- url_launcher_ios (0.0.1):
- Flutter
- wakelock (0.0.1):
- wakelock_plus (0.0.1):
- Flutter

DEPENDENCIES:
Expand All @@ -130,7 +130,7 @@ DEPENDENCIES:
- share_plus (from `.symlinks/plugins/share_plus/ios`)
- shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
- url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
- wakelock (from `.symlinks/plugins/wakelock/ios`)
- wakelock_plus (from `.symlinks/plugins/wakelock_plus/ios`)

SPEC REPOS:
trunk:
Expand Down Expand Up @@ -192,15 +192,15 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/shared_preferences_foundation/darwin"
url_launcher_ios:
:path: ".symlinks/plugins/url_launcher_ios/ios"
wakelock:
:path: ".symlinks/plugins/wakelock/ios"
wakelock_plus:
:path: ".symlinks/plugins/wakelock_plus/ios"

SPEC CHECKSUMS:
add_2_calendar: e9d68636aed37fb18e12f5a3d74c2e0589487af0
aes_ecb_pkcs5_flutter: a82e6ecc47654000805ad9d094a8cd29e4bf9667
app_links: 5ef33d0d295a89d9d16bb81b0e3b0d5f70d6c875
connectivity_plus: 07c49e96d7fc92bc9920617b83238c4d178b446a
device_info_plus: e5c5da33f982a436e103237c0c85f9031142abed
device_info_plus: 7545d84d8d1b896cb16a4ff98c19f07ec4b298ea
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
flutter_inappwebview: 4fe74e5e65809c3d363febfd9e2b21aa79bb0f1c
flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743
Expand All @@ -221,18 +221,18 @@ SPEC CHECKSUMS:
mobile_scanner: 47056db0c04027ea5f41a716385542da28574662
nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431
OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c
package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e
package_info_plus: fd030dabf36271f146f1f3beacd48f564b0f17f7
path_provider_foundation: eaf5b3e458fc0e5fbb9940fb09980e853fe058b8
permission_handler_apple: 8f116445eff3c0e7c65ad60f5fef5490aa94b4e4
permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
printing: 233e1b73bd1f4a05615548e9b5a324c98588640b
PromisesObjC: 09985d6d70fbe7878040aa746d78236e6946d2ef
ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
screen_brightness_ios: 715ca807df953bf676d339f11464e438143ee625
share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68
share_plus: 599aa54e4ea31d4b4c0e9c911bcc26c55e791028
shared_preferences_foundation: e2dae3258e06f44cc55f49d42024fd8dd03c590c
url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4
wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f
wakelock_plus: 8b09852c8876491e4b6d179e17dfe2a0b5f60d47

PODFILE CHECKSUM: 90aee035b683484f7e14ac9a57b7dc9185377dcb

COCOAPODS: 1.12.1
COCOAPODS: 1.12.0
6 changes: 3 additions & 3 deletions app/ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
97C146E61CF9000F007C117D /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 1300;
LastUpgradeCheck = 1430;
ORGANIZATIONNAME = "The Chromium Authors";
TargetAttributes = {
97C146ED1CF9000F007C117D = {
Expand Down Expand Up @@ -255,7 +255,7 @@
"${BUILT_PRODUCTS_DIR}/share_plus/share_plus.framework",
"${BUILT_PRODUCTS_DIR}/shared_preferences_foundation/shared_preferences_foundation.framework",
"${BUILT_PRODUCTS_DIR}/url_launcher_ios/url_launcher_ios.framework",
"${BUILT_PRODUCTS_DIR}/wakelock/wakelock.framework",
"${BUILT_PRODUCTS_DIR}/wakelock_plus/wakelock_plus.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
Expand Down Expand Up @@ -285,7 +285,7 @@
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/share_plus.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences_foundation.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher_ios.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/wakelock.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/wakelock_plus.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1300"
LastUpgradeVersion = "1430"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion app/lib/common/components/map/encointer_map.dart
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class EncointerMap extends StatelessWidget {
return FlutterMap(
mapController: mapController,
options: MapOptions(
center: center ?? LatLng(47.389712, 8.517076),
center: center ?? const LatLng(47.389712, 8.517076),
zoom: initialZoom,
maxZoom: maxZoom,
onPointerDown: onPointerDown,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:screen_brightness/screen_brightness.dart';
import 'package:wakelock/wakelock.dart';
import 'package:wakelock_plus/wakelock_plus.dart';
clangenb marked this conversation as resolved.
Show resolved Hide resolved

import 'package:encointer_wallet/service/log/log_service.dart';

Expand Down Expand Up @@ -46,13 +46,13 @@ class _WakeLockAndBrightnessEnhancerState extends State<WakeLockAndBrightnessEnh
void initState() {
super.initState();

Wakelock.enable();
WakelockPlus.enable();
setBrightness(widget.brightness);
}

@override
void dispose() {
Wakelock.disable();
WakelockPlus.disable();
resetBrightness();
super.dispose();
}
Expand Down
2 changes: 1 addition & 1 deletion app/lib/models/ceremonies/ceremonies.dart
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,6 @@ Map<int, CommunityReputation> reputationsFromList(List<dynamic> reputationsList)
final reputations = reputationsList.cast<List<dynamic>>();

return {
for (var cr in reputations) cr[0] as int: CommunityReputation.fromJson(cr[1] as Map<String, dynamic>),
for (final cr in reputations) cr[0] as int: CommunityReputation.fromJson(cr[1] as Map<String, dynamic>),
clangenb marked this conversation as resolved.
Show resolved Hide resolved
};
}
4 changes: 2 additions & 2 deletions app/lib/page-encointer/common/community_chooser_on_map.dart
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class _CommunityChooserOnMapState extends State<CommunityChooserOnMap> {
body: (locations.isNotEmpty && communityDataAt.isNotEmpty)
? EncointerMap(
locations: locations,
center: LatLng(47.389712, 8.517076),
center: const LatLng(47.389712, 8.517076),
clangenb marked this conversation as resolved.
Show resolved Hide resolved
initialZoom: 2,
popupBuilder: (BuildContext context, Marker marker) {
return PopupBuilder(
Expand Down Expand Up @@ -109,7 +109,7 @@ LatLng coordinatesOf(CidName community) {
/// and very hard to choose it from map
/// thus moved little bit to the left on map
if (community.name == 'EdisonPaula') {
return LatLng(47.3962467, 8.4815019);
return const LatLng(47.3962467, 8.4815019);
}
final coordinates = GeoHash(utf8.decode(community.cid.geohash));
return LatLng(coordinates.latitude(), coordinates.longitude());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class EncointerDartApi {
Future<Map<CommunityIdentifier, BalanceEntry>> getAllBalances(String account) {
return _dartApi.rpc<List<dynamic>>('encointer_getAllBalances', [account]).then((data) {
return {
for (var bal in data)
for (final bal in data)
CommunityIdentifier.fromJson((bal as List<dynamic>)[0] as Map<String, dynamic>):
BalanceEntry.fromJson(bal[1] as Map<String, dynamic>),
};
Expand Down
Loading
Loading