Skip to content

Commit e6eddbe

Browse files
committed
Upgrade dart and flutter versions
1 parent 236e511 commit e6eddbe

File tree

22 files changed

+142
-133
lines changed

22 files changed

+142
-133
lines changed

arcgis_map_sdk/lib/arcgis_map_sdk.dart

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
// ignore: unnecessary_library_directive
2-
library arcgis_map;
3-
41
export 'package:arcgis_map_sdk/src/arcgis_location_display.dart';
52
export 'package:arcgis_map_sdk/src/arcgis_map_controller.dart';
63
export 'package:arcgis_map_sdk/src/arcgis_map_sdk.dart';

arcgis_map_sdk/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ maintainer: Matthaios Saitakis (@MatthaiosSait), Stefan Schaller (@stefanschalle
66
Pascal Welsch (@passsy), Max Peters (@maxpeters)
77

88
environment:
9-
sdk: ">=3.0.0 <4.0.0"
10-
flutter: ">=3.10.0"
9+
sdk: ">=3.2.0 <4.0.0"
10+
flutter: ">=3.16.0"
1111

1212
dependencies:
1313
arcgis_map_sdk_android: ^0.8.0

arcgis_map_sdk_android/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ repository: https://github.com/fluttercommunity/arcgis_map_sdk
55
maintainer: Stefan Schaller (@stefanschaller), Julian Bissekkou (@JulianBissekkou)
66

77
environment:
8-
sdk: ">=3.0.0 <4.0.0"
9-
flutter: ">=3.10.0"
8+
sdk: ">=3.2.0 <4.0.0"
9+
flutter: ">=3.16.0"
1010

1111
dependencies:
1212
arcgis_map_sdk_method_channel: ^0.8.0

arcgis_map_sdk_ios/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ repository: https://github.com/fluttercommunity/arcgis_map_sdk
55
maintainer: Stefan Schaller (@stefanschaller), Julian Bissekkou (@JulianBissekkou)
66

77
environment:
8-
sdk: ">=3.0.0 <4.0.0"
9-
flutter: ">=3.10.0"
8+
sdk: ">=3.2.0 <4.0.0"
9+
flutter: ">=3.16.0"
1010

1111
dependencies:
1212
arcgis_map_sdk_method_channel: ^0.8.0

arcgis_map_sdk_method_channel/lib/src/method_channel_arcgis_map_plugin.dart

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class MethodChannelArcgisMapPlugin extends ArcgisMapPlatform {
2525
int mapId,
2626
void Function(double)? getZoom,
2727
String layerId,
28-
) async {
28+
) {
2929
throw UnimplementedError('addFeatureLayer() has not been implemented.');
3030
}
3131

@@ -43,7 +43,8 @@ class MethodChannelArcgisMapPlugin extends ArcgisMapPlatform {
4343

4444
@override
4545
Future<void> setAutoPanMode(String autoPanMode, int mapId) {
46-
return _methodChannelBuilder(mapId).invokeMethod("set_auto_pan_mode", autoPanMode);
46+
return _methodChannelBuilder(mapId)
47+
.invokeMethod("set_auto_pan_mode", autoPanMode);
4748
}
4849

4950
@override
@@ -121,7 +122,7 @@ class MethodChannelArcgisMapPlugin extends ArcgisMapPlatform {
121122
required int mapId,
122123
required String featureLayerId,
123124
required List<Graphic> data,
124-
}) async {
125+
}) {
125126
throw UnimplementedError('addFeatureLayer() has not been implemented.');
126127
}
127128

@@ -165,7 +166,7 @@ class MethodChannelArcgisMapPlugin extends ArcgisMapPlatform {
165166
AnimationOptions? animationOptions,
166167
int? threeDHeading,
167168
int? threeDTilt,
168-
}) async {
169+
}) {
169170
return _methodChannelBuilder(mapId).invokeMethod<bool>(
170171
"move_camera",
171172
{
@@ -196,7 +197,7 @@ class MethodChannelArcgisMapPlugin extends ArcgisMapPlatform {
196197
required int lodFactor,
197198
required int mapId,
198199
AnimationOptions? animationOptions,
199-
}) async {
200+
}) {
200201
return _methodChannelBuilder(mapId).invokeMethod<bool>(
201202
"zoom_in",
202203
{"lodFactor": lodFactor},
@@ -208,15 +209,15 @@ class MethodChannelArcgisMapPlugin extends ArcgisMapPlatform {
208209
required int lodFactor,
209210
required int mapId,
210211
AnimationOptions? animationOptions,
211-
}) async {
212+
}) {
212213
return _methodChannelBuilder(mapId).invokeMethod<bool>(
213214
"zoom_out",
214215
{"lodFactor": lodFactor},
215216
).then((value) => value!);
216217
}
217218

218219
@override
219-
Future<void> retryLoad(int mapId) async {
220+
Future<void> retryLoad(int mapId) {
220221
return _methodChannelBuilder(mapId).invokeMethod("retryLoad");
221222
}
222223

arcgis_map_sdk_method_channel/lib/src/model_extension.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ extension on MeshSymbol3D {
110110
{
111111
'type': 'fill',
112112
'material': {
113-
'color': [color.red, color.green, color.blue, colorOpacity],
113+
'color': [color.r, color.g, color.b, colorOpacity],
114114
},
115115
},
116116
],
@@ -174,10 +174,10 @@ Map<String, Object?>? _colorToJson(Color? color) {
174174
if (color == null) return null;
175175

176176
return {
177-
'red': color.red,
178-
'green': color.green,
179-
'blue': color.blue,
180-
'opacity': color.opacity,
177+
'red': color.r,
178+
'green': color.g,
179+
'blue': color.b,
180+
'opacity': color.a / 255,
181181
};
182182
}
183183

arcgis_map_sdk_method_channel/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ repository: https://github.com/fluttercommunity/arcgis_map_sdk
55
maintainer: Stefan Schaller (@stefanschaller), Julian Bissekkou (@JulianBissekkou)
66

77
environment:
8-
sdk: ">=3.0.0 <4.0.0"
9-
flutter: ">=3.10.0"
8+
sdk: ">=3.2.0 <4.0.0"
9+
flutter: ">=3.16.0"
1010

1111
dependencies:
1212
arcgis_map_sdk_platform_interface: ^1.0.1

arcgis_map_sdk_platform_interface/lib/arcgis_map_sdk_platform_interface.dart

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
// ignore: unnecessary_library_directive
2-
library arcgis_map_sdk_platform_interface;
3-
41
export 'package:arcgis_map_sdk_platform_interface/src/arcgis_map_sdk_platform_interface.dart';
52
export 'package:arcgis_map_sdk_platform_interface/src/events/map_event.dart';
63
export 'package:arcgis_map_sdk_platform_interface/src/models/animation_options.dart';

arcgis_map_sdk_platform_interface/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ maintainer: Matthaios Saitakis (@MatthaiosSait), Stefan Schaller (@stefanschalle
66
Pascal Welsch (@passsy), Max Peters (@maxpeters)
77

88
environment:
9-
sdk: ">=3.0.0 <4.0.0"
10-
flutter: ">=3.10.0"
9+
sdk: ">=3.2.0 <4.0.0"
10+
flutter: ">=3.16.0"
1111

1212
dependencies:
1313
flutter:

arcgis_map_sdk_web/lib/arcgis_map_web_js.dart

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
@JS()
2-
library arcgis_map_sdk_web;
3-
42
import 'dart:async';
5-
import 'dart:js_util';
6-
73
import 'package:js/js.dart';
4+
import 'package:js/js_util.dart';
5+
import 'package:web/web.dart';
86

97
export 'package:arcgis_map_sdk_web/src/arcgis_map_sdk_web.dart';
108

@@ -420,12 +418,8 @@ class JsHandle {
420418
@JS()
421419
class Popup {}
422420

423-
@JS()
424-
@staticInterop
425-
class WebGLRenderingContext {}
426-
427421
extension WebGLRenderingContextExtension on WebGLRenderingContext {
428-
external WebglLoseContext? getExtension(String something);
422+
external WebglLoseContext? getCustomExtension(String something);
429423
}
430424

431425
@JS()

0 commit comments

Comments
 (0)