Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
46 changes: 35 additions & 11 deletions .github/workflows/branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v4
uses: actions/checkout@v5
- name: Setup Flutter
uses: subosito/flutter-action@v2
with:
Expand All @@ -30,7 +30,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v4
uses: actions/checkout@v5
- name: Setup Flutter Environment
uses: subosito/flutter-action@v2
with:
Expand All @@ -46,44 +46,54 @@ jobs:
run-tests:
name: "Run Tests"
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
sdk: [ '3.27.0', '' ]
steps:
- name: Checkout Repository
uses: actions/checkout@v4
uses: actions/checkout@v5
- name: Setup Flutter Environment
uses: subosito/flutter-action@v2
with:
channel: "stable"
flutter-version: ${{ matrix.sdk }}
cache: true
- name: Run Tests with Coverage
run: flutter test -r expanded --coverage
- name: Run Codecov
if: ${{ matrix.sdk == '' }}
uses: codecov/codecov-action@v5
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

build-android:
name: "Build Android Example App"
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
sdk: [ '3.27.0', '' ]
defaults:
run:
working-directory: ./example
steps:
- name: Checkout Repository
uses: actions/checkout@v4
uses: actions/checkout@v5
- name: Setup Java 21 Environment
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
distribution: "temurin"
java-version: "21"
cache: 'gradle'
- name: Setup Flutter Environment
uses: subosito/flutter-action@v2
with:
channel: "stable"
flutter-version: ${{ matrix.sdk }}
cache: true
- name: Build Android Application
run: flutter build apk --dart-define=COMMIT_SHA=${{ github.sha }} --dart-define=flutter.flutter_map.unblockOSM="${{ secrets.UNBLOCK_OSM }}"
- name: Archive Artifact
if: ${{ matrix.sdk == '' }}
uses: actions/upload-artifact@v4
with:
name: apk-build
Expand All @@ -93,23 +103,32 @@ jobs:
build-windows:
name: "Build Windows Example App"
runs-on: windows-latest
strategy:
fail-fast: false
matrix:
sdk: [ '3.27.0', '' ]
defaults:
run:
working-directory: ./example
steps:
- name: Checkout Repository
uses: actions/checkout@v4
uses: actions/checkout@v5
- name: Setup Flutter Environment
uses: subosito/flutter-action@v2
with:
channel: "stable"
flutter-version: ${{ matrix.sdk }}
cache: true
- name: Build Windows Application
run: flutter build windows --dart-define=COMMIT_SHA=${{ github.sha }} --dart-define=flutter.flutter_map.unblockOSM="${{ secrets.UNBLOCK_OSM }}"
- name: Install Inno Setup
if: ${{ matrix.sdk == '' }}
run: choco install innosetup --yes --no-progress
- name: Create Windows Application Installer
if: ${{ matrix.sdk == '' }}
run: iscc "windowsApplicationInstallerSetup.iss"
working-directory: .
- name: Archive Artifact
if: ${{ matrix.sdk == '' }}
uses: actions/upload-artifact@v4
with:
name: exe-build
Expand All @@ -119,21 +138,26 @@ jobs:
build-web:
name: "Build Web Example App"
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
sdk: [ '3.27.0', '' ]
defaults:
run:
working-directory: ./example
steps:
- name: Checkout Repository
uses: actions/checkout@v4
uses: actions/checkout@v5
- name: Setup Flutter Environment
uses: subosito/flutter-action@v2
with:
channel: "stable"
flutter-version: ${{ matrix.sdk }}
cache: true
- name: Build Web Application
run: flutter build web --wasm --dart-define=COMMIT_SHA=${{ github.sha }} --dart-define=flutter.flutter_map.unblockOSM="${{ secrets.UNBLOCK_OSM }}"
- name: Archive Artifact
uses: actions/upload-artifact@v4
if: ${{ matrix.sdk == '' }}
with:
name: web-build
path: example/build/web
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/daily.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
issues: write
pull-requests: write
steps:
- uses: actions/stale@v9
- uses: actions/stale@v10
with:
days-before-issue-stale: 21
days-before-issue-close: 7
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/issue-comment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
steps:
- name: Check labels of issue
id: check_labels
uses: actions/github-script@v7
uses: actions/github-script@v8
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
Expand Down Expand Up @@ -42,7 +42,7 @@ jobs:
# action removes the label when the automatic reminder message gets sent.
- name: Remove `waiting for user response` label if exists
if: steps.check_labels.outputs.result == 'true'
uses: actions/github-script@v7
uses: actions/github-script@v8
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v4
uses: actions/checkout@v5
- name: Setup Flutter Environment
uses: subosito/flutter-action@v2
with:
Expand All @@ -38,9 +38,9 @@ jobs:
working-directory: ./example
steps:
- name: Checkout Repository
uses: actions/checkout@v4
uses: actions/checkout@v5
- name: Setup Java 21 Environment
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
distribution: "temurin"
java-version: "21"
Expand Down Expand Up @@ -69,14 +69,15 @@ jobs:
working-directory: ./example
steps:
- name: Checkout Repository
uses: actions/checkout@v4
uses: actions/checkout@v5
- name: Setup Flutter Environment
uses: subosito/flutter-action@v2
with:
channel: "stable"
cache: true
- name: Build Windows Application
run: flutter build windows --dart-define=COMMIT_SHA=${{ github.sha }} --dart-define=flutter.flutter_map.unblockOSM="${{ secrets.UNBLOCK_OSM }}"
- name: Install Inno Setup
run: choco install innosetup --yes --no-progress
- name: Create Windows Application Installer
run: iscc "windowsApplicationInstallerSetup.iss"
working-directory: .
Expand All @@ -97,7 +98,7 @@ jobs:
working-directory: ./example
steps:
- name: Checkout Repository
uses: actions/checkout@v4
uses: actions/checkout@v5
- name: Setup Flutter Environment
uses: subosito/flutter-action@v2
with:
Expand Down
2 changes: 2 additions & 0 deletions example/macos/Flutter/GeneratedPluginRegistrant.swift
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@
import FlutterMacOS
import Foundation

import path_provider_foundation
import shared_preferences_foundation
import url_launcher_macos

func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
}
44 changes: 22 additions & 22 deletions example/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -139,10 +139,10 @@ packages:
dependency: "direct main"
description:
name: http
sha256: "559ab0d950643c9a04512f4c4bd1c435dcb5af1aa9c848f3bf5867347044328a"
sha256: bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007
url: "https://pub.dev"
source: hosted
version: "1.5.0-beta"
version: "1.5.0"
http_parser:
dependency: transitive
description:
Expand Down Expand Up @@ -171,10 +171,10 @@ packages:
dependency: transitive
description:
name: leak_tracker
sha256: "8dcda04c3fc16c14f48a7bb586d4be1f0d1572731b6d81d51772ef47c02081e0"
sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de"
url: "https://pub.dev"
source: hosted
version: "11.0.1"
version: "11.0.2"
leak_tracker_flutter_testing:
dependency: transitive
description:
Expand Down Expand Up @@ -211,10 +211,10 @@ packages:
dependency: transitive
description:
name: logger
sha256: "2621da01aabaf223f8f961e751f2c943dbb374dc3559b982f200ccedadaa6999"
sha256: "55d6c23a6c15db14920e037fe7e0dc32e7cdaf3b64b4b25df2d541b5b6b81c0c"
url: "https://pub.dev"
source: hosted
version: "2.6.0"
version: "2.6.1"
matcher:
dependency: transitive
description:
Expand Down Expand Up @@ -267,18 +267,18 @@ packages:
dependency: transitive
description:
name: path_provider_android
sha256: d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9
sha256: "993381400e94d18469750e5b9dcb8206f15bc09f9da86b9e44a9b0092a0066db"
url: "https://pub.dev"
source: hosted
version: "2.2.17"
version: "2.2.18"
path_provider_foundation:
dependency: transitive
description:
name: path_provider_foundation
sha256: "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942"
sha256: "16eef174aacb07e09c351502740fa6254c165757638eba1e9116b0a781201bbd"
url: "https://pub.dev"
source: hosted
version: "2.4.1"
version: "2.4.2"
path_provider_linux:
dependency: transitive
description:
Expand Down Expand Up @@ -339,10 +339,10 @@ packages:
dependency: transitive
description:
name: shared_preferences_android
sha256: "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac"
sha256: a2608114b1ffdcbc9c120eb71a0e207c71da56202852d4aab8a5e30a82269e74
url: "https://pub.dev"
source: hosted
version: "2.4.10"
version: "2.4.12"
shared_preferences_foundation:
dependency: transitive
description:
Expand Down Expand Up @@ -464,26 +464,26 @@ packages:
dependency: "direct main"
description:
name: url_launcher
sha256: "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603"
sha256: f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8
url: "https://pub.dev"
source: hosted
version: "6.3.1"
version: "6.3.2"
url_launcher_android:
dependency: transitive
description:
name: url_launcher_android
sha256: "8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79"
sha256: "199bc33e746088546a39cc5f36bac5a278c5e53b40cb3196f99e7345fdcfae6b"
url: "https://pub.dev"
source: hosted
version: "6.3.16"
version: "6.3.22"
url_launcher_ios:
dependency: transitive
description:
name: url_launcher_ios
sha256: "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb"
sha256: d80b3f567a617cb923546034cc94bfe44eb15f989fe670b37f26abdb9d939cb7
url: "https://pub.dev"
source: hosted
version: "6.3.3"
version: "6.3.4"
url_launcher_linux:
dependency: transitive
description:
Expand All @@ -496,10 +496,10 @@ packages:
dependency: transitive
description:
name: url_launcher_macos
sha256: "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2"
sha256: c043a77d6600ac9c38300567f33ef12b0ef4f4783a2c1f00231d2b1941fea13f
url: "https://pub.dev"
source: hosted
version: "3.2.2"
version: "3.2.3"
url_launcher_platform_interface:
dependency: transitive
description:
Expand Down Expand Up @@ -573,5 +573,5 @@ packages:
source: hosted
version: "1.1.0"
sdks:
dart: ">=3.8.0 <4.0.0"
flutter: ">=3.27.0"
dart: ">=3.9.0 <4.0.0"
flutter: ">=3.35.0"
2 changes: 1 addition & 1 deletion example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ dependency_overrides:
path: ../

dev_dependencies:
flutter_lints: ^6.0.0
flutter_lints: ">=5.0.0 <7.0.0"
flutter_test:
sdk: flutter
geojson_vi: ^2.2.5
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@ import 'dart:async';
import 'dart:convert';
import 'dart:io';
import 'dart:isolate';
// ignore: unnecessary_import
import 'dart:typed_data';

import 'package:flutter/foundation.dart';
import 'package:flutter_map/flutter_map.dart';
import 'package:flutter_map/src/layer/tile_layer/tile_provider/network/caching/built_in/impl/native/workers/tile_and_size_monitor_writer.dart';
// ignore: unnecessary_import
import 'package:meta/meta.dart';
import 'package:path/path.dart' as p;
import 'package:path_provider/path_provider.dart';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import 'dart:convert';

import 'package:flutter/foundation.dart';
import 'package:http/http.dart';
// ignore: unnecessary_import
import 'package:meta/meta.dart';

/// Efficiently converts the response body of an [Response] into a
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import 'package:flutter_map/flutter_map.dart';
import 'package:flutter_map/src/layer/tile_layer/tile_provider/network/image_provider/consolidate_response.dart';
import 'package:http/http.dart';
import 'package:logger/logger.dart';
// ignore: unnecessary_import
import 'package:meta/meta.dart';

/// Dedicated [ImageProvider] to fetch tiles from the network
Expand Down
Loading
Loading