upgraded flutter to beta v2.2.0-10.1.pre

This commit is contained in:
Thibault Deckers 2021-04-16 18:37:12 +09:00
parent fbd9ff5734
commit a5243a1276
20 changed files with 74 additions and 92 deletions

View file

@ -15,7 +15,7 @@ jobs:
- uses: subosito/flutter-action@v1
with:
channel: beta
flutter-version: '2.1.0-12.2.pre'
flutter-version: '2.2.0-10.1.pre'
- name: Clone the repository.
uses: actions/checkout@v2

View file

@ -17,7 +17,7 @@ jobs:
- uses: subosito/flutter-action@v1
with:
channel: beta
flutter-version: '2.1.0-12.2.pre'
flutter-version: '2.2.0-10.1.pre'
# Workaround for this Android Gradle Plugin issue (supposedly fixed in AGP 4.1):
# https://issuetracker.google.com/issues/144111441
@ -50,8 +50,8 @@ jobs:
echo "${{ secrets.KEY_JKS }}" > release.keystore.asc
gpg -d --passphrase "${{ secrets.KEY_JKS_PASSPHRASE }}" --batch release.keystore.asc > $AVES_STORE_FILE
rm release.keystore.asc
flutter build apk --bundle-sksl-path shaders_2.1.0-12.2.pre.sksl.json
flutter build appbundle --bundle-sksl-path shaders_2.1.0-12.2.pre.sksl.json
flutter build apk --bundle-sksl-path shaders_2.2.0-10.1.pre.sksl.json
flutter build appbundle --bundle-sksl-path shaders_2.2.0-10.1.pre.sksl.json
rm $AVES_STORE_FILE
env:
AVES_STORE_FILE: ${{ github.workspace }}/key.jks

View file

@ -2,6 +2,8 @@
All notable changes to this project will be documented in this file.
## [Unreleased]
### Changed
- Upgraded Flutter to beta v2.2.0-10.1.pre
## [v1.4.0] - 2021-04-16
### Added

View file

@ -4,7 +4,7 @@ import 'package:aves/geo/topojson.dart';
import 'package:country_code/country_code.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/services.dart';
import 'package:latlong/latlong.dart';
import 'package:latlong2/latlong.dart';
final CountryTopology countryTopology = CountryTopology._private();

View file

@ -1,6 +1,6 @@
import 'package:aves/utils/math_utils.dart';
import 'package:intl/intl.dart';
import 'package:latlong/latlong.dart';
import 'package:latlong2/latlong.dart';
String _decimal2sexagesimal(final double degDecimal) {
List<int> _split(final double value) {

View file

@ -17,7 +17,7 @@ import 'package:collection/collection.dart';
import 'package:country_code/country_code.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:latlong/latlong.dart';
import 'package:latlong2/latlong.dart';
import '../ref/mime_types.dart';

View file

@ -1,7 +1,7 @@
import 'package:aves/geo/format.dart';
import 'package:aves/widgets/common/extensions/build_context.dart';
import 'package:flutter/widgets.dart';
import 'package:latlong/latlong.dart';
import 'package:latlong2/latlong.dart';
import 'enums.dart';

View file

@ -3,7 +3,7 @@ import 'dart:async';
import 'package:flutter/foundation.dart';
import 'package:flutter/services.dart';
import 'package:flutter/widgets.dart';
import 'package:latlong/latlong.dart';
import 'package:latlong2/latlong.dart';
class GeocodingService {
static const platform = MethodChannel('deckers.thibault/aves/geocoding');

View file

@ -2,7 +2,7 @@ import 'dart:ui';
import 'package:flutter/material.dart';
import 'package:flutter/painting.dart';
import 'package:latlong/latlong.dart';
import 'package:latlong2/latlong.dart';
class Constants {
// as of Flutter v1.22.3, overflowing `Text` miscalculates height and some text (e.g. 'Å') is clipped

View file

@ -1,5 +1,3 @@
import 'dart:ui';
import 'package:aves/widgets/common/extensions/build_context.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';

View file

@ -1,5 +1,4 @@
import 'dart:math';
import 'dart:ui';
import 'package:aves/model/entry.dart';
import 'package:aves/model/filters/album.dart';

View file

@ -7,7 +7,7 @@ import 'package:aves/widgets/viewer/info/maps/scale_layer.dart';
import 'package:flutter/material.dart';
import 'package:flutter_map/flutter_map.dart';
import 'package:flutter_markdown/flutter_markdown.dart';
import 'package:latlong/latlong.dart';
import 'package:latlong2/latlong.dart';
import 'package:provider/provider.dart';
import 'package:url_launcher/url_launcher.dart';
@ -71,7 +71,7 @@ class _EntryLeafletMapState extends State<EntryLeafletMap> with AutomaticKeepAli
options: MapOptions(
center: widget.latLng,
zoom: widget.initialZoom,
interactive: false,
interactiveFlags: InteractiveFlag.none,
),
mapController: _mapController,
children: [

View file

@ -31,8 +31,8 @@ class ScaleLayerWidget extends StatelessWidget {
@override
Widget build(BuildContext context) {
final mapState = MapState.of(context);
return ScaleLayer(options, mapState, mapState.onMoved);
final mapState = MapState.maybeOf(context);
return mapState != null ? ScaleLayer(options, mapState, mapState.onMoved) : SizedBox();
}
}

View file

@ -1,7 +1,7 @@
import 'dart:math';
import 'package:aves/utils/math_utils.dart';
import 'package:latlong/latlong.dart';
import 'package:latlong2/latlong.dart';
LatLng calculateEndingGlobalCoordinates(LatLng start, double startBearing, double distance) {
var mSemiMajorAxis = 6378137.0; //WGS84 major axis

View file

@ -7,21 +7,14 @@ packages:
name: _fe_analyzer_shared
url: "https://pub.dartlang.org"
source: hosted
version: "19.0.0"
version: "20.0.0"
analyzer:
dependency: transitive
description:
name: analyzer
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.0"
ansicolor:
dependency: transitive
description:
name: ansicolor
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.1"
version: "1.4.0"
archive:
dependency: transitive
description:
@ -134,13 +127,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.1"
console_log_handler:
dependency: transitive
description:
name: console_log_handler
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.6"
convert:
dependency: transitive
description:
@ -161,7 +147,7 @@ packages:
name: coverage
url: "https://pub.dartlang.org"
source: hosted
version: "0.15.2"
version: "1.0.2"
crypto:
dependency: transitive
description:
@ -235,28 +221,28 @@ packages:
name: firebase_analytics
url: "https://pub.dartlang.org"
source: hosted
version: "7.1.1"
version: "8.0.0"
firebase_analytics_platform_interface:
dependency: transitive
description:
name: firebase_analytics_platform_interface
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.0"
version: "2.0.0"
firebase_analytics_web:
dependency: transitive
description:
name: firebase_analytics_web
url: "https://pub.dartlang.org"
source: hosted
version: "0.2.0+1"
version: "0.3.0"
firebase_core:
dependency: "direct main"
description:
name: firebase_core
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.2"
version: "1.0.3"
firebase_core_platform_interface:
dependency: transitive
description:
@ -277,14 +263,14 @@ packages:
name: firebase_crashlytics
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.0"
version: "2.0.0"
firebase_crashlytics_platform_interface:
dependency: transitive
description:
name: firebase_crashlytics_platform_interface
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.0"
version: "3.0.0"
flutter:
dependency: "direct main"
description: flutter
@ -324,9 +310,11 @@ packages:
flutter_map:
dependency: "direct main"
description:
name: flutter_map
url: "https://pub.dartlang.org"
source: hosted
path: "."
ref: "issues/829-nullsafety"
resolved-ref: "2ff083d5f57cc372a8b5b46c8d8fe806326a1bcb"
url: "git://github.com/fleaflet/flutter_map.git"
source: git
version: "0.12.0"
flutter_markdown:
dependency: "direct main"
@ -355,7 +343,7 @@ packages:
name: flutter_svg
url: "https://pub.dartlang.org"
source: hosted
version: "0.21.0-nullsafety.0"
version: "0.21.0+1"
flutter_test:
dependency: "direct dev"
description: flutter
@ -377,14 +365,14 @@ packages:
name: get_it
url: "https://pub.dartlang.org"
source: hosted
version: "6.0.0"
version: "6.1.1"
github:
dependency: "direct main"
description:
name: github
url: "https://pub.dartlang.org"
source: hosted
version: "8.0.1"
version: "8.1.0"
glob:
dependency: transitive
description:
@ -405,7 +393,7 @@ packages:
name: google_maps_flutter
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.2"
version: "2.0.3"
google_maps_flutter_platform_interface:
dependency: transitive
description:
@ -433,7 +421,7 @@ packages:
name: http_multi_server
url: "https://pub.dartlang.org"
source: hosted
version: "3.0.0"
version: "3.0.1"
http_parser:
dependency: transitive
description:
@ -476,27 +464,27 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "4.0.1"
latlong:
latlong2:
dependency: "direct main"
description:
name: latlong
name: latlong2
url: "https://pub.dartlang.org"
source: hosted
version: "0.6.1"
version: "0.8.0"
lists:
dependency: transitive
description:
name: lists
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.6"
version: "1.0.0"
logging:
dependency: transitive
description:
name: logging
url: "https://pub.dartlang.org"
source: hosted
version: "0.11.4"
version: "1.0.1"
markdown:
dependency: transitive
description:
@ -531,7 +519,7 @@ packages:
name: mgrs_dart
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.1"
version: "2.0.0"
mime:
dependency: transitive
description:
@ -559,7 +547,7 @@ packages:
name: node_preamble
url: "https://pub.dartlang.org"
source: hosted
version: "1.4.13"
version: "2.0.0"
overlay_support:
dependency: "direct main"
description:
@ -608,14 +596,14 @@ packages:
name: path_drawing
url: "https://pub.dartlang.org"
source: hosted
version: "0.5.0-nullsafety.0"
version: "0.5.0"
path_parsing:
dependency: transitive
description:
name: path_parsing
url: "https://pub.dartlang.org"
source: hosted
version: "0.2.0-nullsafety.0"
version: "0.2.0"
path_provider_linux:
dependency: transitive
description:
@ -643,7 +631,7 @@ packages:
name: pdf
url: "https://pub.dartlang.org"
source: hosted
version: "3.1.0"
version: "3.2.0"
pedantic:
dependency: "direct main"
description:
@ -664,21 +652,21 @@ packages:
name: permission_handler
url: "https://pub.dartlang.org"
source: hosted
version: "6.1.1"
version: "6.1.3"
permission_handler_platform_interface:
dependency: transitive
description:
name: permission_handler_platform_interface
url: "https://pub.dartlang.org"
source: hosted
version: "3.1.1"
version: "3.1.3"
petitparser:
dependency: transitive
description:
name: petitparser
url: "https://pub.dartlang.org"
source: hosted
version: "4.0.2"
version: "4.1.0"
platform:
dependency: transitive
description:
@ -700,34 +688,34 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "1.5.0"
positioned_tap_detector:
positioned_tap_detector_2:
dependency: transitive
description:
name: positioned_tap_detector
name: positioned_tap_detector_2
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.3"
version: "1.0.0"
printing:
dependency: "direct main"
description:
name: printing
url: "https://pub.dartlang.org"
source: hosted
version: "5.0.4"
version: "5.1.0"
process:
dependency: transitive
description:
name: process
url: "https://pub.dartlang.org"
source: hosted
version: "4.1.0"
version: "4.2.1"
proj4dart:
dependency: transitive
description:
name: proj4dart
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.5"
version: "2.0.0"
provider:
dependency: "direct main"
description:
@ -755,7 +743,7 @@ packages:
name: quiver
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.5"
version: "3.0.1"
shared_preferences:
dependency: "direct main"
description:
@ -928,35 +916,35 @@ packages:
name: test
url: "https://pub.dartlang.org"
source: hosted
version: "1.16.5"
version: "1.16.8"
test_api:
dependency: transitive
description:
name: test_api
url: "https://pub.dartlang.org"
source: hosted
version: "0.2.19"
version: "0.3.0"
test_core:
dependency: transitive
description:
name: test_core
url: "https://pub.dartlang.org"
source: hosted
version: "0.3.15"
version: "0.3.19"
transparent_image:
dependency: transitive
description:
name: transparent_image
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.0"
version: "2.0.0"
tuple:
dependency: "direct main"
description:
name: tuple
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.3"
version: "2.0.0"
typed_data:
dependency: transitive
description:
@ -970,7 +958,7 @@ packages:
name: unicode
url: "https://pub.dartlang.org"
source: hosted
version: "0.2.4"
version: "0.3.0"
url_launcher:
dependency: "direct main"
description:
@ -1013,13 +1001,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.0"
validate:
dependency: transitive
description:
name: validate
url: "https://pub.dartlang.org"
source: hosted
version: "1.7.0"
vector_math:
dependency: transitive
description:
@ -1040,7 +1021,7 @@ packages:
name: vm_service
url: "https://pub.dartlang.org"
source: hosted
version: "6.0.1-nullsafety.1"
version: "6.1.0+1"
watcher:
dependency: transitive
description:
@ -1068,7 +1049,7 @@ packages:
name: webkit_inspection_protocol
url: "https://pub.dartlang.org"
source: hosted
version: "0.7.5"
version: "1.0.0"
win32:
dependency: transitive
description:
@ -1082,7 +1063,7 @@ packages:
name: wkt_parser
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.7"
version: "2.0.0"
xdg_directories:
dependency: transitive
description:
@ -1096,7 +1077,7 @@ packages:
name: xml
url: "https://pub.dartlang.org"
source: hosted
version: "5.0.2"
version: "5.1.0"
yaml:
dependency: transitive
description:

View file

@ -13,11 +13,10 @@ environment:
# bump `crypto` and others - 2021/02/05 https://github.com/flutter/flutter/commit/bc1cf4945841ba5874f5262b8146d52750e7c11f
# bump `archive` from 3.0.0 to 3.1.2 - 2021/03/04 https://github.com/flutter/flutter/commit/ddcb8d7d6d3fcedc906b2f1bf26b73c018d3dc28
# not null safe, as of 2021/03/13
# not null safe, as of 2021/04/16
# `charts_flutter` - https://github.com/google/charts/issues/579
# `fijkplayer` - https://github.com/befovy/fijkplayer/issues/381
# `flutter_map` - https://github.com/fleaflet/flutter_map/issues/829
# `latlong` - archived - migrate to maps_toolkit? cf https://github.com/fleaflet/flutter_map/pull/750
# `streams_channel` - unmaintained? - no issue/PR
dependencies:
@ -43,6 +42,9 @@ dependencies:
firebase_crashlytics:
flutter_highlight:
flutter_map:
git:
url: git://github.com/fleaflet/flutter_map.git
ref: issues/829-nullsafety
flutter_markdown:
flutter_staggered_animations:
flutter_svg:
@ -51,7 +53,7 @@ dependencies:
google_api_availability:
google_maps_flutter:
intl:
latlong:
latlong2:
material_design_icons_flutter:
overlay_support:
package_info:

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -1,7 +1,7 @@
import 'package:aves/geo/countries.dart';
import 'package:aves/geo/topojson.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:latlong/latlong.dart';
import 'package:latlong2/latlong.dart';
void main() {
// [lng, lat, z]

View file

@ -1,5 +1,5 @@
import 'package:aves/geo/format.dart';
import 'package:latlong/latlong.dart';
import 'package:latlong2/latlong.dart';
import 'package:test/test.dart';
void main() {