diff --git a/am_sidekick/lib/am_sidekick.dart b/am_sidekick/lib/am_sidekick.dart index 32494e66..91bb0cc3 100644 --- a/am_sidekick/lib/am_sidekick.dart +++ b/am_sidekick/lib/am_sidekick.dart @@ -14,7 +14,7 @@ ArcgisMapProject afProject = ArcgisMapProject(SidekickContext.projectRoot); Future runAm(List args) async { final runner = initializeSidekick( - mainProjectPath: 'arcgis_map', + mainProjectPath: 'arcgis_map_sdk', flutterSdkPath: systemFlutterSdkPath(), ); diff --git a/am_sidekick/lib/src/arcgis_map_project.dart b/am_sidekick/lib/src/arcgis_map_project.dart index 55384a48..50430045 100644 --- a/am_sidekick/lib/src/arcgis_map_project.dart +++ b/am_sidekick/lib/src/arcgis_map_project.dart @@ -5,42 +5,30 @@ class ArcgisMapProject { final Directory root; - DartPackage get arcgisMap => - DartPackage.fromDirectory(root.directory('arcgis_map'))!; + DartPackage get arcgisMapSdk => + DartPackage.fromDirectory(root.directory('arcgis_map_sdk'))!; DartPackage get arcgisMapExample => DartPackage.fromDirectory(root.directory('example'))!; - DartPackage get arcgisMapPlatformInterface => DartPackage.fromDirectory( + DartPackage get arcgisMapSdkPlatformInterface => DartPackage.fromDirectory( root.directory('arcgis_map_sdk_platform_interface'), )!; - DartPackage get arcgisMapWeb => + DartPackage get arcgisMapSdkWeb => DartPackage.fromDirectory(root.directory('arcgis_map_sdk_web'))!; - DartPackage get arcgisMapAndroid => + DartPackage get arcgisMapSdkAndroid => DartPackage.fromDirectory(root.directory('arcgis_map_sdk_android'))!; - DartPackage get arcgisMapIos => + DartPackage get arcgisMapSdkIos => DartPackage.fromDirectory(root.directory('arcgis_map_ios'))!; - DartPackage get arcgisMapMethodChannel => DartPackage.fromDirectory( + DartPackage get arcgisMapSdkMethodChannel => DartPackage.fromDirectory( root.directory('arcgis_map_sdk_method_channel'))!; DartPackage get amSidekickPackage => DartPackage.fromDirectory(root.directory('am_sidekick'))!; File get flutterw => root.file('flutterw'); - - List? _packages; - - List get allPackages { - return _packages ??= root - .directory('') - .listSync() - .whereType() - .mapNotNull((it) => DartPackage.fromDirectory(it)) - .toList() - ..add(arcgisMapExample); - } } diff --git a/am_sidekick/lib/src/commands/release/bump_version_command.dart b/am_sidekick/lib/src/commands/release/bump_version_command.dart index 84b7cdfc..d55af6a4 100644 --- a/am_sidekick/lib/src/commands/release/bump_version_command.dart +++ b/am_sidekick/lib/src/commands/release/bump_version_command.dart @@ -23,7 +23,7 @@ final versionOption = CliOption( class BumpVersionCommand extends Command { @override - final String description = 'Bumps the arcgis_map version'; + final String description = 'Bumps the arcgis_map_sdk version'; @override final String name = 'bump-version'; @@ -78,12 +78,12 @@ class BumpVersionCommand extends Command { final packages = { afProject.arcgisMapExample, - afProject.arcgisMap, - afProject.arcgisMapPlatformInterface, - afProject.arcgisMapWeb, - afProject.arcgisMapAndroid, - afProject.arcgisMapIos, - afProject.arcgisMapMethodChannel, + afProject.arcgisMapSdk, + afProject.arcgisMapSdkPlatformInterface, + afProject.arcgisMapSdkWeb, + afProject.arcgisMapSdkAndroid, + afProject.arcgisMapSdkIos, + afProject.arcgisMapSdkMethodChannel, }; for (final package in packages) { final pubspecFile = package.pubspec; @@ -140,7 +140,7 @@ class BumpVersionCommand extends Command { /// save to disk pubspecFile.replaceFirst(version.toString(), newVersion.toString()); print( - 'Arcgis_map version bumped from ${yellow(version.toString())} => ${green(newVersion.toString())}', + 'arcgis_map_sdk version bumped from ${yellow(version.toString())} => ${green(newVersion.toString())}', ); } } diff --git a/am_sidekick/lib/src/commands/release/edit_dependency_overrides_command.dart b/am_sidekick/lib/src/commands/release/edit_dependency_overrides_command.dart index 90284fad..395a6b1b 100644 --- a/am_sidekick/lib/src/commands/release/edit_dependency_overrides_command.dart +++ b/am_sidekick/lib/src/commands/release/edit_dependency_overrides_command.dart @@ -33,12 +33,12 @@ class EditDependencyOverridesCommand extends Command { final pubspecFiles = { afProject.arcgisMapExample.pubspec, - afProject.arcgisMap.pubspec, - afProject.arcgisMapPlatformInterface.pubspec, - afProject.arcgisMapWeb.pubspec, - afProject.arcgisMapAndroid.pubspec, - afProject.arcgisMapIos.pubspec, - afProject.arcgisMapMethodChannel.pubspec, + afProject.arcgisMapSdk.pubspec, + afProject.arcgisMapSdkPlatformInterface.pubspec, + afProject.arcgisMapSdkWeb.pubspec, + afProject.arcgisMapSdkAndroid.pubspec, + afProject.arcgisMapSdkIos.pubspec, + afProject.arcgisMapSdkMethodChannel.pubspec, }; for (final pubspecFile in pubspecFiles) { diff --git a/am_sidekick/lib/src/commands/release/publish_command.dart b/am_sidekick/lib/src/commands/release/publish_command.dart index 5dc5f950..6366bba0 100644 --- a/am_sidekick/lib/src/commands/release/publish_command.dart +++ b/am_sidekick/lib/src/commands/release/publish_command.dart @@ -36,13 +36,13 @@ class PublishCommand extends Command { final bool dryRun = dryRunFlag.getFrom(argResults); final packages = { - afProject.arcgisMap, + afProject.arcgisMapSdk, afProject.arcgisMapExample, - afProject.arcgisMapPlatformInterface, - afProject.arcgisMapWeb, - afProject.arcgisMapAndroid, - afProject.arcgisMapIos, - afProject.arcgisMapMethodChannel, + afProject.arcgisMapSdkPlatformInterface, + afProject.arcgisMapSdkWeb, + afProject.arcgisMapSdkAndroid, + afProject.arcgisMapSdkIos, + afProject.arcgisMapSdkMethodChannel, }; /// Get the version from the pubspec to tag diff --git a/am_sidekick/lib/src/commands/test_command.dart b/am_sidekick/lib/src/commands/test_command.dart index 28233774..9e805de0 100644 --- a/am_sidekick/lib/src/commands/test_command.dart +++ b/am_sidekick/lib/src/commands/test_command.dart @@ -17,7 +17,8 @@ class TestCommand extends Command { ..addOption( 'package', abbr: 'p', - allowed: afProject.allPackages.map((it) => it.name), + allowed: + findAllPackages(SidekickContext.projectRoot).map((it) => it.name), ); } @@ -35,7 +36,8 @@ class TestCommand extends Command { } // outside of package, fallback to all packages - for (final package in afProject.allPackages) { + final allPackages = findAllPackages(SidekickContext.projectRoot); + for (final package in allPackages) { collector.add(_test(package)); print('\n'); } diff --git a/am_sidekick/lib/src/commands/utils.dart b/am_sidekick/lib/src/commands/utils.dart index 7f83cea9..430f1b8e 100644 --- a/am_sidekick/lib/src/commands/utils.dart +++ b/am_sidekick/lib/src/commands/utils.dart @@ -1,12 +1,12 @@ -import 'package:am_sidekick/am_sidekick.dart'; import 'package:sidekick_core/sidekick_core.dart'; T runForPackage(String name, T Function(DartPackage package) block) { + final allPackages = findAllPackages(SidekickContext.projectRoot); final DartPackage? package = - afProject.allPackages.firstOrNullWhere((it) => it.name == name); + allPackages.firstOrNullWhere((it) => it.name == name); if (package == null) { final packageOptions = - afProject.allPackages.map((it) => it.name).toList(growable: false); + allPackages.map((it) => it.name).toList(growable: false); error( 'Could not find package $name. ' 'Please use one of ${packageOptions.joinToString()}', diff --git a/arcgis_map/lib/arcgis_map.dart b/arcgis_map/lib/arcgis_map.dart deleted file mode 100644 index 94276491..00000000 --- a/arcgis_map/lib/arcgis_map.dart +++ /dev/null @@ -1,5 +0,0 @@ -// ignore: unnecessary_library_directive -library arcgis_map; - -export 'package:arcgis_map/src/arcgis_map.dart'; -export 'package:arcgis_map/src/arcgis_map_controller.dart'; diff --git a/arcgis_map/.gitignore b/arcgis_map_sdk/.gitignore similarity index 100% rename from arcgis_map/.gitignore rename to arcgis_map_sdk/.gitignore diff --git a/arcgis_map/.metadata b/arcgis_map_sdk/.metadata similarity index 100% rename from arcgis_map/.metadata rename to arcgis_map_sdk/.metadata diff --git a/arcgis_map/CHANGELOG.md b/arcgis_map_sdk/CHANGELOG.md similarity index 100% rename from arcgis_map/CHANGELOG.md rename to arcgis_map_sdk/CHANGELOG.md diff --git a/arcgis_map/LICENSE b/arcgis_map_sdk/LICENSE similarity index 100% rename from arcgis_map/LICENSE rename to arcgis_map_sdk/LICENSE diff --git a/arcgis_map/README.md b/arcgis_map_sdk/README.md similarity index 94% rename from arcgis_map/README.md rename to arcgis_map_sdk/README.md index 7f9a99a4..8c636895 100644 --- a/arcgis_map/README.md +++ b/arcgis_map_sdk/README.md @@ -1,6 +1,6 @@ -# arcgis_map for Flutter +# Arcgis Maps SDK for Flutter -[![Flutter Community: arcgis_map](https://fluttercommunity.dev/_github/header/arcgis_map)](https://github.com/fluttercommunity/community) +[![Flutter Community: arcgis_map_sdk](https://fluttercommunity.dev/_github/header/arcgis_map_sdk)](https://github.com/fluttercommunity/community) Arcgis on iPad @@ -14,7 +14,7 @@ In your app's pubspec.yaml dependencies, add: ```yaml dependencies: - arcgis_map: ^0.7.5 + arcgis_map_sdk: ^0.8.0 ``` @@ -30,7 +30,7 @@ dependencies: Integrate the `ArcgisMap` Widget ```dart -import 'package:arcgis_map/arcgis_map.dart'; +import 'package:arcgis_map_sdk/arcgis_map_sdk.dart'; import 'package:arcgis_map_sdk_platform_interface/arcgis_map_sdk_platform_interface.dart'; @override diff --git a/arcgis_map/analysis_options.yaml b/arcgis_map_sdk/analysis_options.yaml similarity index 100% rename from arcgis_map/analysis_options.yaml rename to arcgis_map_sdk/analysis_options.yaml diff --git a/arcgis_map/example/README.md b/arcgis_map_sdk/example/README.md similarity index 87% rename from arcgis_map/example/README.md rename to arcgis_map_sdk/example/README.md index c569c724..763c751b 100644 --- a/arcgis_map/example/README.md +++ b/arcgis_map_sdk/example/README.md @@ -2,4 +2,4 @@ Please visit the `example` project in the root of the repository -[Example project](https://github.com/fluttercommunity/arcgis_map/tree/main/example) \ No newline at end of file +[Example project](https://github.com/fluttercommunity/arcgis_map_sdk/tree/main/example) \ No newline at end of file diff --git a/arcgis_map_sdk/lib/arcgis_map_sdk.dart b/arcgis_map_sdk/lib/arcgis_map_sdk.dart new file mode 100644 index 00000000..eddb742c --- /dev/null +++ b/arcgis_map_sdk/lib/arcgis_map_sdk.dart @@ -0,0 +1,5 @@ +// ignore: unnecessary_library_directive +library arcgis_map; + +export 'package:arcgis_map_sdk/src/arcgis_map_sdk.dart'; +export 'package:arcgis_map_sdk/src/arcgis_map_controller.dart'; diff --git a/arcgis_map/lib/src/arcgis_map_controller.dart b/arcgis_map_sdk/lib/src/arcgis_map_controller.dart similarity index 100% rename from arcgis_map/lib/src/arcgis_map_controller.dart rename to arcgis_map_sdk/lib/src/arcgis_map_controller.dart diff --git a/arcgis_map/lib/src/arcgis_map.dart b/arcgis_map_sdk/lib/src/arcgis_map_sdk.dart similarity index 98% rename from arcgis_map/lib/src/arcgis_map.dart rename to arcgis_map_sdk/lib/src/arcgis_map_sdk.dart index 0dc73a25..1d28fb82 100644 --- a/arcgis_map/lib/src/arcgis_map.dart +++ b/arcgis_map_sdk/lib/src/arcgis_map_sdk.dart @@ -5,7 +5,7 @@ import 'dart:async'; import 'dart:io'; -import 'package:arcgis_map/src/arcgis_map_controller.dart'; +import 'package:arcgis_map_sdk/src/arcgis_map_controller.dart'; import 'package:arcgis_map_sdk_android/arcgis_map_sdk_android.dart'; import 'package:arcgis_map_sdk_ios/arcgis_map_sdk_ios.dart'; import 'package:arcgis_map_sdk_platform_interface/arcgis_map_sdk_platform_interface.dart'; diff --git a/arcgis_map/pubspec.yaml b/arcgis_map_sdk/pubspec.yaml similarity index 90% rename from arcgis_map/pubspec.yaml rename to arcgis_map_sdk/pubspec.yaml index 203f1244..7ad64961 100644 --- a/arcgis_map/pubspec.yaml +++ b/arcgis_map_sdk/pubspec.yaml @@ -1,7 +1,7 @@ -name: arcgis_map +name: arcgis_map_sdk description: Esri ArcGIS map for Flutter for Web, iOS and Android platforms version: 0.7.6 -repository: https://github.com/fluttercommunity/arcgis_map +repository: https://github.com/fluttercommunity/arcgis_map_sdk maintainer: Matthaios Saitakis (@MatthaiosSait), Stefan Schaller (@stefanschaller), Julian Bissekkou (@JulianBissekkou), Pascal Welsch (@passsy), Max Peters (@maxpeters) diff --git a/arcgis_map/pubspec_overrides.yaml b/arcgis_map_sdk/pubspec_overrides.yaml similarity index 100% rename from arcgis_map/pubspec_overrides.yaml rename to arcgis_map_sdk/pubspec_overrides.yaml diff --git a/arcgis_map_sdk_android/README.md b/arcgis_map_sdk_android/README.md index ae8177ec..34d2e849 100644 --- a/arcgis_map_sdk_android/README.md +++ b/arcgis_map_sdk_android/README.md @@ -4,4 +4,4 @@ [![pub package](https://img.shields.io/pub/v/arcgis_map_sdk_android.svg)](https://pub.dev/packages/arcgis_map_sdk_android) -Android implementation of [`arcgis_map`](https://pub.dev/packages/arcgis_map). \ No newline at end of file +Android implementation of [`arcgis_map_sdk`](https://pub.dev/packages/arcgis_map_sdk). \ No newline at end of file diff --git a/arcgis_map_sdk_android/pubspec.yaml b/arcgis_map_sdk_android/pubspec.yaml index 180959fd..1dc81627 100644 --- a/arcgis_map_sdk_android/pubspec.yaml +++ b/arcgis_map_sdk_android/pubspec.yaml @@ -1,7 +1,7 @@ name: arcgis_map_sdk_android description: Esri ArcGIS Flutter Android implementation. version: 0.7.6 -repository: https://github.com/fluttercommunity/arcgis_map +repository: https://github.com/fluttercommunity/arcgis_map_sdk maintainer: Stefan Schaller (@stefanschaller), Julian Bissekkou (@JulianBissekkou) environment: @@ -20,7 +20,7 @@ dev_dependencies: flutter: plugin: - implements: arcgis_map + implements: arcgis_map_sdk platforms: android: package: dev.fluttercommunity.arcgis_map_sdk_android diff --git a/arcgis_map_sdk_ios/README.md b/arcgis_map_sdk_ios/README.md index 68fdc3ac..faafaa53 100644 --- a/arcgis_map_sdk_ios/README.md +++ b/arcgis_map_sdk_ios/README.md @@ -4,4 +4,4 @@ [![pub package](https://img.shields.io/pub/v/arcgis_map_ios.svg)](https://pub.dev/packages/arcgis_map_ios) -iOS implementation of [`arcgis_map`](https://pub.dev/packages/arcgis_map). \ No newline at end of file +iOS implementation of [`arcgis_map_sdk`](https://pub.dev/packages/arcgis_map_sdk). \ No newline at end of file diff --git a/arcgis_map_sdk_ios/pubspec.yaml b/arcgis_map_sdk_ios/pubspec.yaml index 65a14b69..93fc5353 100644 --- a/arcgis_map_sdk_ios/pubspec.yaml +++ b/arcgis_map_sdk_ios/pubspec.yaml @@ -1,7 +1,7 @@ name: arcgis_map_sdk_ios description: Esri ArcGIS Flutter iOS implementation. version: 0.7.6 -repository: https://github.com/fluttercommunity/arcgis_map +repository: https://github.com/fluttercommunity/arcgis_map_sdk maintainer: Stefan Schaller (@stefanschaller), Julian Bissekkou (@JulianBissekkou) environment: @@ -20,7 +20,7 @@ dev_dependencies: flutter: plugin: - implements: arcgis_map + implements: arcgis_map_sdk platforms: ios: pluginClass: ArcgisMapPlugin diff --git a/arcgis_map_sdk_method_channel/README.md b/arcgis_map_sdk_method_channel/README.md index ce1d4b48..77f94d7d 100644 --- a/arcgis_map_sdk_method_channel/README.md +++ b/arcgis_map_sdk_method_channel/README.md @@ -1,7 +1,7 @@ -# arcgis_map method channels +# arcgis_map_sdk method channels [![Flutter Community: arcgis_map_sdk_method_channel](https://fluttercommunity.dev/_github/header/arcgis_map_sdk_method_channel)](https://github.com/fluttercommunity/community) [![pub package](https://img.shields.io/pub/v/arcgis_map_sdk_method_channel.svg)](https://pub.dev/packages/arcgis_map_sdk_method_channel) -Platform channels for [`arcgis_map_ios`](https://pub.dev/packages/arcgis_map_ios) and [`arcgis_map_sdk_android`](https://pub.dev/packages/arcgis_map_sdk_android). +Platform channels for [`arcgis_map_sdk_ios`](https://pub.dev/packages/arcgis_map_sdk_ios) and [`arcgis_map_sdk_android`](https://pub.dev/packages/arcgis_map_sdk_android). diff --git a/arcgis_map_sdk_method_channel/pubspec.yaml b/arcgis_map_sdk_method_channel/pubspec.yaml index b91114d8..c4754f62 100644 --- a/arcgis_map_sdk_method_channel/pubspec.yaml +++ b/arcgis_map_sdk_method_channel/pubspec.yaml @@ -1,7 +1,7 @@ name: arcgis_map_sdk_method_channel description: Esri ArcGIS Flutter method channel implementation. version: 0.7.5 -repository: https://github.com/fluttercommunity/arcgis_map +repository: https://github.com/fluttercommunity/arcgis_map_sdk maintainer: Stefan Schaller (@stefanschaller), Julian Bissekkou (@JulianBissekkou) environment: diff --git a/arcgis_map_sdk_platform_interface/README.md b/arcgis_map_sdk_platform_interface/README.md index cc02501b..20c6acc1 100644 --- a/arcgis_map_sdk_platform_interface/README.md +++ b/arcgis_map_sdk_platform_interface/README.md @@ -4,8 +4,8 @@ [![pub package](https://img.shields.io/pub/v/arcgis_map_sdk_platform_interface.svg)](https://pub.dev/packages/arcgis_map_sdk_platform_interface) -A common platform interface for [`arcgis_map`](https://pub.dev/packages/arcgis_map). +A common platform interface for [`arcgis_map_sdk`](https://pub.dev/packages/arcgis_map_sdk). ## Usage -This package is already included as part of the `arcgis_map` package dependency, and will be included automatically when using `arcgis_map`. \ No newline at end of file +This package is already included as part of the `arcgis_map_sdk` package dependency, and will be included automatically when using `arcgis_map_sdk`. \ No newline at end of file diff --git a/arcgis_map_sdk_platform_interface/pubspec.yaml b/arcgis_map_sdk_platform_interface/pubspec.yaml index 2e68da36..f62e12f1 100644 --- a/arcgis_map_sdk_platform_interface/pubspec.yaml +++ b/arcgis_map_sdk_platform_interface/pubspec.yaml @@ -1,7 +1,7 @@ name: arcgis_map_sdk_platform_interface -description: A common platform interface for the flutter arcgis_map package +description: A common platform interface for the flutter arcgis_map_sdk package version: 1.0.0 -repository: https://github.com/fluttercommunity/arcgis_map +repository: https://github.com/fluttercommunity/arcgis_map_sdk maintainer: Matthaios Saitakis (@MatthaiosSait), Stefan Schaller (@stefanschaller), Julian Bissekkou (@JulianBissekkou), Pascal Welsch (@passsy), Max Peters (@maxpeters) diff --git a/arcgis_map_sdk_web/README.md b/arcgis_map_sdk_web/README.md index 84dcb0e4..5be498f0 100644 --- a/arcgis_map_sdk_web/README.md +++ b/arcgis_map_sdk_web/README.md @@ -4,4 +4,4 @@ [![pub package](https://img.shields.io/pub/v/arcgis_map_sdk_web.svg)](https://pub.dev/packages/arcgis_map_sdk_web) -Web implementation of [`arcgis_map`](https://pub.dev/packages/arcgis_map). \ No newline at end of file +Web implementation of [`arcgis_map_sdk`](https://pub.dev/packages/arcgis_map_sdk). \ No newline at end of file diff --git a/arcgis_map_sdk_web/example/README.md b/arcgis_map_sdk_web/example/README.md index 6d125162..4fa5d56b 100644 --- a/arcgis_map_sdk_web/example/README.md +++ b/arcgis_map_sdk_web/example/README.md @@ -1,4 +1,4 @@ -# How to use arcgis_map in Web +# How to use arcgis_map_sdk in Web No special requirements are needed to use this package. -Just follow the steps of the [arcgis_map](https://pub.dev/packages/arcgis_map) package. \ No newline at end of file +Just follow the steps of the [arcgis_map_sdk](https://pub.dev/packages/arcgis_map_sdk) package. \ No newline at end of file diff --git a/arcgis_map_sdk_web/pubspec.yaml b/arcgis_map_sdk_web/pubspec.yaml index be2827fb..a9a9fa51 100644 --- a/arcgis_map_sdk_web/pubspec.yaml +++ b/arcgis_map_sdk_web/pubspec.yaml @@ -1,7 +1,7 @@ name: arcgis_map_sdk_web description: Esri ArcGIS Flutter web implementation. version: 0.7.5 -repository: https://github.com/fluttercommunity/arcgis_map +repository: https://github.com/fluttercommunity/arcgis_map_sdk maintainer: Matthaios Saitakis (@MatthaiosSait), Pascal Welsch (@passsy), Max Peters (@maxpeters) environment: @@ -23,7 +23,7 @@ dev_dependencies: flutter: plugin: - implements: arcgis_map + implements: arcgis_map_sdk platforms: web: pluginClass: ArcgisMapWeb diff --git a/example/README.md b/example/README.md index 139f9aa0..311e3148 100644 --- a/example/README.md +++ b/example/README.md @@ -1,28 +1,20 @@ # Arcgis example app -An example app for the plugin. Works on web, android and iOs. +An example app for the plugin. Works on web, android and iOS. ## Add the package to your app In your app's pubspec.yaml dependencies, add e.g. for web: -``` - arcgis_map: - git: - url: https://github.com/fluttercommunity/arcgis_map.git - path: arcgis_map - ref: main - arcgis_map_sdk_web: - git: - url: https://github.com/fluttercommunity/arcgis_map.git - path: arcgis_map_sdk_web - ref: main +```yaml +dependencies: + arcgis_map_sdk: ``` Import the package in your dart file ``` -import 'package:arcgis_map/arcgis_map.dart'; +import 'package:arcgis_map_sdk/arcgis_map_sdk.dart'; ``` Finally, use the `ArcgisMap` Widget in similar way as the example. \ No newline at end of file diff --git a/example/lib/main.dart b/example/lib/main.dart index 9a6b97bb..60b48114 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -3,7 +3,7 @@ import 'dart:core'; import 'package:arcgis_example/map_elements.dart'; import 'package:arcgis_example/vector_layer_example_page.dart'; -import 'package:arcgis_map/arcgis_map.dart'; +import 'package:arcgis_map_sdk/arcgis_map_sdk.dart'; import 'package:arcgis_map_sdk_platform_interface/arcgis_map_sdk_platform_interface.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; diff --git a/example/lib/vector_layer_example_page.dart b/example/lib/vector_layer_example_page.dart index d50071ee..c83f37ea 100644 --- a/example/lib/vector_layer_example_page.dart +++ b/example/lib/vector_layer_example_page.dart @@ -1,5 +1,5 @@ import 'package:arcgis_example/main.dart'; -import 'package:arcgis_map/arcgis_map.dart'; +import 'package:arcgis_map_sdk/arcgis_map_sdk.dart'; import 'package:arcgis_map_sdk_platform_interface/arcgis_map_sdk_platform_interface.dart'; import 'package:flutter/material.dart'; diff --git a/example/pubspec.lock b/example/pubspec.lock index 758676ed..c3735ad9 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -1,43 +1,43 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: - arcgis_map: + arcgis_map_sdk: dependency: "direct main" description: - path: "../arcgis_map" + path: "../arcgis_map_sdk" relative: true source: path version: "0.7.6" arcgis_map_sdk_android: - dependency: "direct main" + dependency: "direct overridden" description: path: "../arcgis_map_sdk_android" relative: true source: path version: "0.7.6" arcgis_map_sdk_ios: - dependency: "direct main" + dependency: "direct overridden" description: path: "../arcgis_map_sdk_ios" relative: true source: path version: "0.7.6" arcgis_map_sdk_method_channel: - dependency: "direct main" + dependency: "direct overridden" description: path: "../arcgis_map_sdk_method_channel" relative: true source: path version: "0.7.5" arcgis_map_sdk_platform_interface: - dependency: "direct main" + dependency: "direct overridden" description: path: "../arcgis_map_sdk_platform_interface" relative: true source: path version: "1.0.0" arcgis_map_sdk_web: - dependency: "direct main" + dependency: "direct overridden" description: path: "../arcgis_map_sdk_web" relative: true diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 622bf9e9..9e1e5e3d 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -10,36 +10,7 @@ environment: flutter: ">=3.10.0" dependencies: - arcgis_map: - git: - url: https://github.com/fluttercommunity/arcgis_map.git - path: arcgis_map - ref: v0.7.5 - arcgis_map_sdk_android: - git: - url: https://github.com/fluttercommunity/arcgis_map.git - path: arcgis_map_sdk_android - ref: v0.7.5 - arcgis_map_sdk_ios: - git: - url: https://github.com/fluttercommunity/arcgis_map.git - path: arcgis_map_sdk_ios - ref: v0.7.5 - arcgis_map_sdk_method_channel: - git: - url: https://github.com/fluttercommunity/arcgis_map.git - path: arcgis_map_sdk_method_channel - ref: v0.7.5 - arcgis_map_sdk_platform_interface: - git: - url: https://github.com/fluttercommunity/arcgis_map.git - path: arcgis_map_sdk_platform_interface - ref: v0.7.5 - arcgis_map_sdk_web: - git: - url: https://github.com/fluttercommunity/arcgis_map.git - path: arcgis_map_sdk_web - ref: v0.7.5 + arcgis_map_sdk: cupertino_icons: ^1.0.0 flutter: diff --git a/example/pubspec_overrides.yaml b/example/pubspec_overrides.yaml index 6c215f78..29b51fff 100644 --- a/example/pubspec_overrides.yaml +++ b/example/pubspec_overrides.yaml @@ -1,6 +1,6 @@ dependency_overrides: - arcgis_map: - path: ../arcgis_map + arcgis_map_sdk: + path: ../arcgis_map_sdk arcgis_map_sdk_android: path: ../arcgis_map_sdk_android arcgis_map_sdk_ios: