Skip to content

Commit 1d9dd53

Browse files
josxhadependabot[bot]Copilot
authored
feat: jni 0.15.2 (#409)
jni 0.15.1 introduced a breaking change, this pr migrates the code to jni ^0.15.2 dart-lang/native#2777 --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Copilot <[email protected]>
1 parent bacbbcb commit 1d9dd53

File tree

9 files changed

+13
-11
lines changed

9 files changed

+13
-11
lines changed

.github/dependabot.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ updates:
66
schedule:
77
interval: "weekly"
88
- package-ecosystem: "pub"
9-
directories: [ "/", "/example" ]
9+
directories: [ "/example", "/maplibre", "/maplibre_ios", "/" ]
1010
schedule:
1111
interval: "weekly"
1212
ignore:
@@ -23,7 +23,7 @@ updates:
2323
dependencies:
2424
patterns: [ "*" ]
2525
- package-ecosystem: "gradle"
26-
directories: [ "/android" , "/example/android" ]
26+
directories: [ "/maplibre/android" , "/example/android" ]
2727
schedule:
2828
interval: "weekly"
2929
groups:

docs/.yarn/install-state.gz

2.56 KB
Binary file not shown.

docs/yarn.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8469,14 +8469,14 @@ __metadata:
84698469
linkType: hard
84708470

84718471
"js-yaml@npm:^3.13.1":
8472-
version: 3.14.1
8473-
resolution: "js-yaml@npm:3.14.1"
8472+
version: 3.14.2
8473+
resolution: "js-yaml@npm:3.14.2"
84748474
dependencies:
84758475
argparse: "npm:^1.0.7"
84768476
esprima: "npm:^4.0.0"
84778477
bin:
84788478
js-yaml: bin/js-yaml.js
8479-
checksum: 10c0/6746baaaeac312c4db8e75fa22331d9a04cccb7792d126ed8ce6a0bbcfef0cedaddd0c5098fade53db067c09fe00aa1c957674b4765610a8b06a5a189e46433b
8479+
checksum: 10c0/3261f25912f5dd76605e5993d0a126c2b6c346311885d3c483706cd722efe34f697ea0331f654ce27c00a42b426e524518ec89d65ed02ea47df8ad26dcc8ce69
84808480
languageName: node
84818481
linkType: hard
84828482

maplibre/lib/src/platform/android/functions.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ import 'package:jni/jni.dart';
44
import 'package:maplibre/src/platform/android/jni.g.dart';
55

66
/// Get the Android [Context].
7-
Context getJContext() =>
8-
Jni.androidApplicationContext(_engineId).as(Context.type);
7+
Context getJContext() => Jni.androidApplicationContext.as(Context.type);
98

109
/// Get the Android [Activity].
1110
Activity getJActivity() =>

maplibre/lib/src/platform/pigeon.g.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// swiftformat:disable all
2+
// ignore_for_file: type=lint
23
// Autogenerated from Pigeon (v26.0.1), do not edit directly.
34
// See also: https://pub.dev/packages/pigeon
45
// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers

maplibre/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ dependencies:
3131
sdk: flutter
3232
geobase: ^1.5.0
3333
html: ^0.15.4
34-
jni: ^0.15.0
34+
jni: ^0.15.2
3535
maplibre_ios: ^0.3.1
3636
objective_c: ^8.0.0
3737
pointer_interceptor: ^0.10.1+2

maplibre_ios/ios/maplibre_ios/Sources/maplibre_ios/Pigeon.g.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// swiftformat:disable all
2+
// ignore_for_file: type=lint
23
// Autogenerated from Pigeon (v26.0.1), do not edit directly.
34
// See also: https://pub.dev/packages/pigeon
45

pigeons/header.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
swiftformat:disable all
1+
swiftformat:disable all
2+
ignore_for_file: type=lint

pigeons/pigeon.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,8 @@ class MapOptions {
111111
const MapOptions({
112112
required this.style,
113113
required this.zoom,
114-
required this.center,
115114
required this.pitch,
116115
required this.bearing,
117-
required this.maxBounds,
118116
required this.minZoom,
119117
required this.maxZoom,
120118
required this.minPitch,
@@ -123,6 +121,8 @@ class MapOptions {
123121
required this.androidTextureMode,
124122
required this.androidTranslucentTextureSurface,
125123
required this.androidForegroundLoadColor,
124+
required this.center,
125+
required this.maxBounds,
126126
});
127127

128128
/// The URL of the used map style.

0 commit comments

Comments
 (0)