Merge pull request #50 from fluttercommunity/rename-package

.gitignore

@@ -37,13 +37,13 @@ arcgis_webpack/node_modules
 build/
 
 # Android related
-arcgis_map_android/android/**/gradle-wrapper.jar
-arcgis_map_android/android/.gradle
-arcgis_map_android/android/captures/
-arcgis_map_android/android/gradlew
-arcgis_map_android/android/gradlew.bat
-arcgis_map_android/android/local.properties
-arcgis_map_android/android/**/GeneratedPluginRegistrant.java
+arcgis_map_sdk_android/android/**/gradle-wrapper.jar
+arcgis_map_sdk_android/android/.gradle
+arcgis_map_sdk_android/android/captures/
+arcgis_map_sdk_android/android/gradlew
+arcgis_map_sdk_android/android/gradlew.bat
+arcgis_map_sdk_android/android/local.properties
+arcgis_map_sdk_android/android/**/GeneratedPluginRegistrant.java
 
 # iOS/XCode related
 **/ios/**/*.mode1v3

README.md

@@ -1 +1 @@
-arcgis_map/README.md
+arcgis_map_sdk/README.md

am_sidekick/lib/am_sidekick.dart

@@ -14,7 +14,7 @@ ArcgisMapProject afProject = ArcgisMapProject(SidekickContext.projectRoot);
 
 Future<void> runAm(List<String> args) async {
   final runner = initializeSidekick(
-    mainProjectPath: 'arcgis_map',
+    mainProjectPath: 'arcgis_map_sdk',
     flutterSdkPath: systemFlutterSdkPath(),
   );
 

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(
-        root.directory('arcgis_map_platform_interface'),
+  DartPackage get arcgisMapSdkPlatformInterface => DartPackage.fromDirectory(
+        root.directory('arcgis_map_sdk_platform_interface'),
       )!;
 
-  DartPackage get arcgisMapWeb =>
-      DartPackage.fromDirectory(root.directory('arcgis_map_web'))!;
+  DartPackage get arcgisMapSdkWeb =>
+      DartPackage.fromDirectory(root.directory('arcgis_map_sdk_web'))!;
 
-  DartPackage get arcgisMapAndroid =>
-      DartPackage.fromDirectory(root.directory('arcgis_map_android'))!;
+  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(root.directory('arcgis_map_method_channel'))!;
+  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<DartPackage>? _packages;
-
-  List<DartPackage> get allPackages {
-    return _packages ??= root
-        .directory('')
-        .listSync()
-        .whereType<Directory>()
-        .mapNotNull((it) => DartPackage.fromDirectory(it))
-        .toList()
-      ..add(arcgisMapExample);
-  }
 }

am_sidekick/lib/src/commands/generate_arcgis_webpack.dart

@@ -14,7 +14,7 @@ class GenerateArcgisWebpack extends Command {
   Future<void> run() async {
     final root = afProject.root;
     final arcgisWebpackPath = root.directory('arcgis_webpack').path;
-    final arcgisMapWebPath = root.directory('arcgis_map_web').path;
+    final arcgisMapWebPath = root.directory('arcgis_map_sdk_web').path;
     print('Root path: $arcgisWebpackPath');
 
     /// Check if NPM is installed

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())}',
       );
     }
   }

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) {

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

am_sidekick/lib/src/commands/test_command.dart

@@ -1,4 +1,3 @@
-import 'package:am_sidekick/am_sidekick.dart';
 import 'package:am_sidekick/src/commands/utils.dart';
 import 'package:pub_semver/pub_semver.dart';
 import 'package:sidekick_core/sidekick_core.dart';
@@ -17,7 +16,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 +35,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');
     }

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<T>(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()}',

arcgis_map/README.md → 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)
 
 
 <img src="https://github.com/fluttercommunity/arcgis_map/assets/1096485/14bd3d39-0770-4fd0-9d94-c6bce679fcd4" alt="Arcgis on iPad" width="600" />
@@ -14,24 +14,24 @@ In your app's pubspec.yaml dependencies, add:
 
 ```yaml
 dependencies:
-  arcgis_map: ^0.7.5
+  arcgis_map_sdk: ^0.8.0
 ```
 
 
 ### Android only setup
 (Android) In `<app>/android/app/proguard-rules.pro` add:
 
 ```
--keep class esri.arcgis.flutter_plugin.** { *; }
+-keep class dev.fluttercommunity.arcgis_map_sdk.** { *; }
 ```
 
 
 ### Use ArcgisMap
 Integrate the `ArcgisMap` Widget
 
 ```dart 
-import 'package:arcgis_map/arcgis_map.dart';
-import 'package:arcgis_map_platform_interface/arcgis_map_platform_interface.dart';
+import 'package:arcgis_map_sdk/arcgis_map_sdk.dart';
+import 'package:arcgis_map_sdk_platform_interface/arcgis_map_sdk_platform_interface.dart';
 
   @override
   Widget build(BuildContext context) {

arcgis_map/example/README.md → 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)
+[Example project](https://github.com/fluttercommunity/arcgis_map_sdk/tree/main/example)

arcgis_map_sdk/lib/arcgis_map_sdk.dart

@@ -0,0 +1,6 @@
+// ignore: unnecessary_library_directive
+library arcgis_map;
+
+export 'package:arcgis_map_sdk/src/arcgis_map_controller.dart';
+export 'package:arcgis_map_sdk/src/arcgis_map_sdk.dart';
+export 'package:arcgis_map_sdk_platform_interface/arcgis_map_sdk_platform_interface.dart';

arcgis_map/lib/src/arcgis_map_controller.dart → arcgis_map_sdk/lib/src/arcgis_map_controller.dart

@@ -1,4 +1,4 @@
-import 'package:arcgis_map_platform_interface/arcgis_map_platform_interface.dart';
+import 'package:arcgis_map_sdk_platform_interface/arcgis_map_sdk_platform_interface.dart';
 import 'package:flutter/services.dart';
 
 class ArcgisMapController {

arcgis_map/lib/src/arcgis_map.dart → arcgis_map_sdk/lib/src/arcgis_map_sdk.dart

@@ -5,10 +5,10 @@
 import 'dart:async';
 import 'dart:io';
 
-import 'package:arcgis_map/src/arcgis_map_controller.dart';
-import 'package:arcgis_map_android/arcgis_map_android.dart';
-import 'package:arcgis_map_ios/arcgis_map_ios.dart';
-import 'package:arcgis_map_platform_interface/arcgis_map_platform_interface.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';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';