From d227042c221eb8cc2b5e040c959da3479f00a74f Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bart@iconica.nl>
Date: Fri, 30 Aug 2024 09:26:38 +0200
Subject: [PATCH] chore: ready the package for deployment to the pub server

Dart warns about leaking API keys. Although I'm ignoring it for now
(it's too late anyway) it is right about it and we should change the
keys and make sure it's not in git in the future
---
 example/lib/main.dart                         |  2 +-
 example/pubspec.lock                          | 24 +++++++++----------
 ...rt => flutter_google_track_and_trace.dart} |  0
 lib/src/marker_generator.dart                 |  4 ++--
 pubspec.yaml                                  |  9 ++++++-
 5 files changed, 23 insertions(+), 16 deletions(-)
 rename lib/{google_track_trace.dart => flutter_google_track_and_trace.dart} (100%)

diff --git a/example/lib/main.dart b/example/lib/main.dart
index 477ff7a..e6df32e 100644
--- a/example/lib/main.dart
+++ b/example/lib/main.dart
@@ -3,7 +3,7 @@ import 'dart:math';
 
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart' show rootBundle;
-import 'package:flutter_google_track_and_trace/google_track_trace.dart';
+import 'package:flutter_google_track_and_trace/flutter_google_track_and_trace.dart';
 
 class TrackTraceDemo extends StatefulWidget {
   const TrackTraceDemo({Key? key}) : super(key: key);
diff --git a/example/pubspec.lock b/example/pubspec.lock
index dfe3427..71ab0a1 100644
--- a/example/pubspec.lock
+++ b/example/pubspec.lock
@@ -195,18 +195,18 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
+      sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.5"
+    version: "10.0.4"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
+      sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.5"
+    version: "3.0.3"
   leak_tracker_testing:
     dependency: transitive
     description:
@@ -235,18 +235,18 @@ packages:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
+      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
       url: "https://pub.dev"
     source: hosted
-    version: "0.11.1"
+    version: "0.8.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
+      sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
       url: "https://pub.dev"
     source: hosted
-    version: "1.15.0"
+    version: "1.12.0"
   path:
     dependency: transitive
     description:
@@ -328,10 +328,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
+      sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.2"
+    version: "0.7.0"
   typed_data:
     dependency: transitive
     description:
@@ -352,10 +352,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
+      sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
       url: "https://pub.dev"
     source: hosted
-    version: "14.2.5"
+    version: "14.2.1"
   web:
     dependency: transitive
     description:
diff --git a/lib/google_track_trace.dart b/lib/flutter_google_track_and_trace.dart
similarity index 100%
rename from lib/google_track_trace.dart
rename to lib/flutter_google_track_and_trace.dart
diff --git a/lib/src/marker_generator.dart b/lib/src/marker_generator.dart
index bb3bb10..ef07a81 100644
--- a/lib/src/marker_generator.dart
+++ b/lib/src/marker_generator.dart
@@ -98,7 +98,7 @@ Future<BitmapDescriptor> convertBytesToCustomBitmapDescriptor(
   var data = await _image.toByteData(format: ui.ImageByteFormat.png);
 
   //convert PNG bytes as BitmapDescriptor
-  return BitmapDescriptor.fromBytes(data!.buffer.asUint8List());
+  return BitmapDescriptor.bytes(data!.buffer.asUint8List());
 }
 
 /// https://medium.com/@JBXBergDev/how-to-use-googlemap-markers-with-flutter-material-icons-38c4c975e928
@@ -120,7 +120,7 @@ Future<BitmapDescriptor> createBitmapDescriptorFromIconData(
   var image = await picture.toImage(markerSize.round(), markerSize.round());
   var bytes = await image.toByteData(format: ui.ImageByteFormat.png);
 
-  return BitmapDescriptor.fromBytes(bytes!.buffer.asUint8List());
+  return BitmapDescriptor.bytes(bytes!.buffer.asUint8List());
 }
 
 /// Paints the icon background
diff --git a/pubspec.yaml b/pubspec.yaml
index 25699f9..f2a7cac 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,9 @@
 name: flutter_google_track_and_trace
 description: An Iconica Flutter plugin for Track & Trace Package
 version: 2.1.0
+repository: https://github.com/Iconica-Development/flutter_google_track_and_trace
+
+publish_to: https://forgejo.internal.iconica.nl/api/packages/internal/pub
 
 environment:
   sdk: ">=3.3.0 <4.0.0"
@@ -19,4 +22,8 @@ dev_dependencies:
     sdk: flutter
   flutter_lints: ^1.0.0
 
-flutter:
\ No newline at end of file
+flutter:
+
+false_secrets:
+  - example/lib/main.dart
+  - example/android/app/src/main/AndroidManifest.xml