Skip to content

Commit

Permalink
Prepared for v6.2.0/1 (re-)release
Browse files Browse the repository at this point in the history
fix: remove deprecated members (for Flutter 3.22) (#1883)

(cherry picked from commit 4f6b524)

Updated CHANGELOG
Updated versioning
  • Loading branch information
josxha authored and JaffaKetchup committed May 27, 2024
1 parent d744b89 commit 01f2314
Show file tree
Hide file tree
Showing 9 changed files with 34 additions and 22 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,17 @@

Please consider [donating](https://docs.fleaflet.dev/supporters#support-us) or [contributing](https://docs.fleaflet.dev/credits#contributing) if you're a fan of what we're doing and you'd like to support future releases!

This CHANGELOG does not include every commit and/or PR - it is a hand picked selection of the most important ones. For a full list of changes, please check the GitHub repository releases/tags.

## [6.2.1] - 2024/05/27

> If possible, prefer to update directly to v7. This version is provided only to enable Flutter 3.22 compatibility without requiring a breaking change.
Contains the following user-affecting changes:

- Added support for Flutter 2.22 - [#1883](https://github.com/fleaflet/flutter_map/pull/1883)

> v6.2.0 was released containing breaking changes inadvertently. v6.2.1 is its replacement, and v6.2.0 has been retracted.
## [6.1.0] - 2023/12/02

Contains the following user-affecting changes:
Expand Down
2 changes: 1 addition & 1 deletion example/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ if (flutterVersionCode == null) {

def flutterVersionName = localProperties.getProperty('flutter.versionName')
if (flutterVersionName == null) {
flutterVersionName = '6.1.0'
flutterVersionName = '6.2.0'
}

android {
Expand Down
2 changes: 1 addition & 1 deletion example/lib/widgets/drawer/floating_menu_button.dart
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class FloatingMenuButton extends StatelessWidget {
child: SafeArea(
child: Container(
decoration: BoxDecoration(
color: Theme.of(context).colorScheme.background,
color: Theme.of(context).colorScheme.surface,
borderRadius: BorderRadius.circular(999),
),
padding: const EdgeInsets.all(8),
Expand Down
12 changes: 6 additions & 6 deletions example/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: flutter_map_example
description: Example application for 'flutter_map' package
publish_to: "none"
version: 6.1.0
version: 6.2.1

environment:
sdk: ">=3.0.0 <4.0.0"
Expand All @@ -12,13 +12,13 @@ dependencies:
sdk: flutter
flutter_map:
flutter_map_cancellable_tile_provider:
latlong2: ^0.9.0
latlong2: ^0.9.1
proj4dart: ^2.1.0
url_launcher: ^6.1.14
shared_preferences: ^2.2.1
url_launcher: ^6.2.6
shared_preferences: ^2.2.3
url_strategy: ^0.2.0
http: ^1.1.0
vector_math: ^2.1.2
http: ^1.2.1
vector_math: ^2.1.4

dependency_overrides:
flutter_map_cancellable_tile_provider:
Expand Down
1 change: 1 addition & 0 deletions lib/src/gestures/positioned_tap_detector_2.dart
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@ class TapPosition {
final Offset? relative;

@override
// ignore: non_nullable_equals_parameter
bool operator ==(dynamic other) {
if (other is! TapPosition) return false;
final typedOther = other;
Expand Down
2 changes: 1 addition & 1 deletion lib/src/layer/attribution_layer/rich/widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ class _RichAttributionWidgetState extends State<RichAttributionWidget> {
child: Container(
decoration: BoxDecoration(
color: widget.popupBackgroundColor ??
Theme.of(context).colorScheme.background,
Theme.of(context).colorScheme.surface,
border: Border.all(width: 0, style: BorderStyle.none),
borderRadius: widget.popupBorderRadius ??
BorderRadius.only(
Expand Down
2 changes: 1 addition & 1 deletion lib/src/layer/attribution_layer/simple.dart
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class SimpleAttributionWidget extends StatelessWidget {
Widget build(BuildContext context) => Align(
alignment: alignment,
child: ColoredBox(
color: backgroundColor ?? Theme.of(context).colorScheme.background,
color: backgroundColor ?? Theme.of(context).colorScheme.surface,
child: GestureDetector(
onTap: onTap,
child: Padding(
Expand Down
22 changes: 11 additions & 11 deletions pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: flutter_map
description: A versatile mapping package for Flutter, that's simple and easy to learn, yet completely customizable and configurable
version: 6.1.0
version: 6.2.1

repository: https://github.com/fleaflet/flutter_map
issue_tracker: https://github.com/fleaflet/flutter_map/issues
Expand All @@ -26,24 +26,24 @@ environment:
flutter: ">=3.10.0"

dependencies:
async: ^2.9.0
collection: ^1.17.1
async: ^2.11.0
collection: ^1.18.0
flutter:
sdk: flutter
http: ^1.0.0
latlong2: ^0.9.0
logger: ^2.0.1
meta: ^1.9.1
http: ^1.2.1
latlong2: ^0.9.1
logger: ^2.3.0
meta: ^1.12.0
polylabel: ^1.0.1
proj4dart: ^2.1.0
vector_math: ^2.1.2
vector_math: ^2.1.4

dev_dependencies:
flutter_lints: ^3.0.0
flutter_lints: ^4.0.0
flutter_test:
sdk: flutter
mocktail: ^1.0.1
test: ^1.24.3
mocktail: ^1.0.3
test: ^1.25.0

flutter:
assets:
Expand Down
2 changes: 1 addition & 1 deletion windowsApplicationInstallerSetup.iss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!

#define MyAppName "flutter_map Demo"
#define MyAppVersion "for 6.1.0"
#define MyAppVersion "for 6.2.0"
#define MyAppPublisher "fleaflet"
#define MyAppURL "https://github.com/fleaflet/flutter_map"
#define MyAppSupportURL "https://github.com/fleaflet/flutter_map/issues"
Expand Down

0 comments on commit 01f2314

Please sign in to comment.