diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef9a93a47..0b65450bb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## [1.0.0+dev.2](https://github.com/ably/ably-flutter/tree/1.0.0-dev.2)
+
+Conforming to pub.dev recommendations, following initial upload to the platform.
+
 ## [1.0.0+dev.1](https://github.com/ably/ably-flutter/tree/1.0.0-dev.1)
 
 The first, development preview of our Flutter plugin, wrapping our
diff --git a/example/pubspec.lock b/example/pubspec.lock
index af173d474..f6e969e01 100644
--- a/example/pubspec.lock
+++ b/example/pubspec.lock
@@ -7,7 +7,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "1.0.0+dev.1"
+    version: "1.0.0+dev.2"
   async:
     dependency: transitive
     description:
@@ -101,7 +101,7 @@ packages:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0-nullsafety.3"
+    version: "1.3.0-nullsafety.4"
   path:
     dependency: transitive
     description:
@@ -115,7 +115,7 @@ packages:
       name: pedantic
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0+1"
+    version: "1.9.2"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -134,7 +134,7 @@ packages:
       name: stack_trace
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.10.0-nullsafety.1"
+    version: "1.10.0-nullsafety.2"
   stream_channel:
     dependency: transitive
     description:
@@ -178,5 +178,5 @@ packages:
     source: hosted
     version: "2.1.0-nullsafety.3"
 sdks:
-  dart: ">=2.10.0-110 <2.11.0"
+  dart: ">=2.10.0-110 <=2.11.0-213.1.beta"
   flutter: ">=1.17.0 <2.0.0"
diff --git a/lib/src/codec.dart b/lib/src/codec.dart
index c3e20afc1..99cace51e 100644
--- a/lib/src/codec.dart
+++ b/lib/src/codec.dart
@@ -1,9 +1,9 @@
-import 'package:ably_flutter_plugin/src/generated/platformconstants.dart';
-import 'package:ably_flutter_plugin/src/impl/message.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 
 import '../ably_flutter_plugin.dart';
+import '../src/generated/platformconstants.dart';
+import '../src/impl/message.dart';
 
 
 /// a [_Encoder] encodes custom type and converts it to a Map which will
diff --git a/lib/src/impl/platform_object.dart b/lib/src/impl/platform_object.dart
index ec53c0d27..5392a51bb 100644
--- a/lib/src/impl/platform_object.dart
+++ b/lib/src/impl/platform_object.dart
@@ -1,10 +1,10 @@
 import 'dart:async';
 
-import 'package:ably_flutter_plugin/src/impl/message.dart';
-import 'package:ably_flutter_plugin/src/platform.dart' as platform;
 import 'package:flutter/services.dart';
 import 'package:meta/meta.dart';
 
+import '../platform.dart' as platform;
+import 'message.dart';
 import 'streams_channel.dart';
 
 /// An object which has a live counterpart in the Platform client library SDK,
diff --git a/lib/src/impl/realtime/channels.dart b/lib/src/impl/realtime/channels.dart
index 5c3fc2a97..2060639b3 100644
--- a/lib/src/impl/realtime/channels.dart
+++ b/lib/src/impl/realtime/channels.dart
@@ -1,14 +1,14 @@
 import 'dart:async';
 import 'dart:collection';
 
-import 'package:ably_flutter_plugin/ably_flutter_plugin.dart';
-import 'package:ably_flutter_plugin/src/impl/realtime/realtime.dart';
-import 'package:ably_flutter_plugin/src/spec/push/channels.dart';
-import 'package:ably_flutter_plugin/src/spec/spec.dart' as spec;
 import 'package:flutter/services.dart';
 import 'package:pedantic/pedantic.dart';
 
+import '../../../ably_flutter_plugin.dart';
+import '../../spec/push/channels.dart';
+import '../../spec/spec.dart' as spec;
 import '../platform_object.dart';
+import 'realtime.dart';
 
 class RealtimePlatformChannel extends PlatformObject
     implements spec.RealtimeChannel {
diff --git a/lib/src/impl/realtime/connection.dart b/lib/src/impl/realtime/connection.dart
index 39b19d034..633e402e4 100644
--- a/lib/src/impl/realtime/connection.dart
+++ b/lib/src/impl/realtime/connection.dart
@@ -1,10 +1,9 @@
 import 'dart:async';
 
-import 'package:ably_flutter_plugin/ably_flutter_plugin.dart';
-import 'package:ably_flutter_plugin/src/impl/realtime/realtime.dart';
-
+import '../../../ably_flutter_plugin.dart';
 import '../../spec/spec.dart' show Connection, ConnectionState, ErrorInfo;
 import '../platform_object.dart';
+import 'realtime.dart';
 
 class ConnectionPlatformObject extends PlatformObject implements Connection {
   Realtime realtimePlatformObject;
diff --git a/lib/src/impl/realtime/realtime.dart b/lib/src/impl/realtime/realtime.dart
index b12f9861a..bd99a37ef 100644
--- a/lib/src/impl/realtime/realtime.dart
+++ b/lib/src/impl/realtime/realtime.dart
@@ -1,13 +1,13 @@
 import 'dart:async';
 import 'dart:collection';
 
-import 'package:ably_flutter_plugin/src/impl/message.dart';
-import 'package:ably_flutter_plugin/src/impl/realtime/channels.dart';
 import 'package:pedantic/pedantic.dart';
 
 import '../../../ably_flutter_plugin.dart';
 import '../../spec/spec.dart' as spec;
+import '../message.dart';
 import '../platform_object.dart';
+import 'channels.dart';
 import 'connection.dart';
 
 Map<int, Realtime> _realtimeInstances = {};
diff --git a/lib/src/impl/rest/channels.dart b/lib/src/impl/rest/channels.dart
index ae94eefa5..95446977a 100644
--- a/lib/src/impl/rest/channels.dart
+++ b/lib/src/impl/rest/channels.dart
@@ -1,13 +1,13 @@
 import 'dart:async';
 import 'dart:collection';
 
-import 'package:ably_flutter_plugin/ably_flutter_plugin.dart';
-import 'package:ably_flutter_plugin/src/impl/rest/rest.dart';
-import 'package:ably_flutter_plugin/src/spec/spec.dart' as spec;
 import 'package:flutter/services.dart';
 import 'package:pedantic/pedantic.dart';
 
+import '../../../ably_flutter_plugin.dart';
+import '../../spec/spec.dart' as spec;
 import '../platform_object.dart';
+import 'rest.dart';
 
 class RestPlatformChannel extends PlatformObject implements spec.RestChannel {
   /// [Rest] instance
diff --git a/lib/src/impl/rest/rest.dart b/lib/src/impl/rest/rest.dart
index 71274c6f0..9acc20641 100644
--- a/lib/src/impl/rest/rest.dart
+++ b/lib/src/impl/rest/rest.dart
@@ -1,10 +1,9 @@
 import 'dart:async';
 import 'dart:collection';
 
-import 'package:ably_flutter_plugin/src/impl/message.dart';
-
 import '../../../ably_flutter_plugin.dart';
 import '../../spec/spec.dart' as spec;
+import '../message.dart';
 import '../platform_object.dart';
 import 'channels.dart';
 
diff --git a/lib/src/info.dart b/lib/src/info.dart
index a68ab4f31..d52fbf2f7 100644
--- a/lib/src/info.dart
+++ b/lib/src/info.dart
@@ -1,4 +1,4 @@
-import 'package:ably_flutter_plugin/src/generated/platformconstants.dart' show PlatformMethod;
+import 'generated/platformconstants.dart' show PlatformMethod;
 
 import 'platform.dart' show invoke;
 
diff --git a/lib/src/method_call_handler.dart b/lib/src/method_call_handler.dart
index 0c4bcf94f..84dae292e 100644
--- a/lib/src/method_call_handler.dart
+++ b/lib/src/method_call_handler.dart
@@ -1,8 +1,9 @@
-import 'package:ably_flutter_plugin/ably_flutter_plugin.dart' as ably;
-import 'package:ably_flutter_plugin/src/generated/platformconstants.dart';
-import 'package:ably_flutter_plugin/src/impl/message.dart';
 import 'package:flutter/services.dart';
 
+import '../ably_flutter_plugin.dart' as ably;
+import 'generated/platformconstants.dart';
+import 'impl/message.dart';
+
 class AblyMethodCallHandler {
   AblyMethodCallHandler(MethodChannel channel) {
     channel.setMethodCallHandler((call) async {
diff --git a/lib/src/platform.dart b/lib/src/platform.dart
index 95a2e6cb0..5f756b364 100644
--- a/lib/src/platform.dart
+++ b/lib/src/platform.dart
@@ -1,11 +1,11 @@
 import 'dart:async';
 
-import 'package:ably_flutter_plugin/src/generated/platformconstants.dart' show PlatformMethod;
-import 'package:ably_flutter_plugin/src/method_call_handler.dart';
 import 'package:flutter/services.dart';
 
 import 'codec.dart';
+import 'generated/platformconstants.dart' show PlatformMethod;
 import 'impl/streams_channel.dart';
+import 'method_call_handler.dart';
 
 
 /// instance of [StandardMethodCodec] with custom [MessageCodec] for
diff --git a/lib/src/spec/realtime/channels.dart b/lib/src/spec/realtime/channels.dart
index 4b20c45bf..150cdd18d 100644
--- a/lib/src/spec/realtime/channels.dart
+++ b/lib/src/spec/realtime/channels.dart
@@ -1,10 +1,9 @@
-import 'package:ably_flutter_plugin/src/spec/push/channels.dart';
-import 'package:ably_flutter_plugin/src/spec/rest/ably_base.dart';
-import 'package:ably_flutter_plugin/src/spec/rest/channels.dart';
-
 import '../common.dart';
 import '../enums.dart';
 import '../message.dart';
+import '../push/channels.dart';
+import '../rest/ably_base.dart';
+import '../rest/channels.dart';
 import 'presence.dart';
 
 
diff --git a/lib/src/spec/rest/channels.dart b/lib/src/spec/rest/channels.dart
index 912ec30e7..9ef9be99e 100644
--- a/lib/src/spec/rest/channels.dart
+++ b/lib/src/spec/rest/channels.dart
@@ -1,5 +1,3 @@
-import 'package:ably_flutter_plugin/src/spec/rest/ably_base.dart';
-
 import '../common.dart';
 import '../message.dart';
 import 'ably_base.dart';
diff --git a/lib/src/spec/rest/options.dart b/lib/src/spec/rest/options.dart
index 1abcff22c..38b2cb417 100644
--- a/lib/src/spec/rest/options.dart
+++ b/lib/src/spec/rest/options.dart
@@ -1,5 +1,4 @@
-import 'package:ably_flutter_plugin/ably_flutter_plugin.dart';
-
+import '../../../ably_flutter_plugin.dart';
 import '../common.dart';
 import '../enums.dart';
 
diff --git a/pubspec.lock b/pubspec.lock
index 6390bf233..e36229162 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -28,28 +28,28 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.4.2"
+    version: "2.5.0-nullsafety.1"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "2.1.0-nullsafety.1"
   characters:
     dependency: transitive
     description:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.0"
+    version: "1.1.0-nullsafety.3"
   charcode:
     dependency: transitive
     description:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.3"
+    version: "1.2.0-nullsafety.1"
   cli_util:
     dependency: transitive
     description:
@@ -63,14 +63,14 @@ packages:
       name: clock
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.1"
+    version: "1.1.0-nullsafety.1"
   collection:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.14.13"
+    version: "1.15.0-nullsafety.3"
   convert:
     dependency: transitive
     description:
@@ -105,7 +105,7 @@ packages:
       name: fake_async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0-nullsafety.1"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -164,7 +164,7 @@ packages:
       name: js
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.6.2"
+    version: "0.6.3-nullsafety.2"
   logging:
     dependency: transitive
     description:
@@ -178,14 +178,14 @@ packages:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.8"
+    version: "0.12.10-nullsafety.1"
   meta:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.8"
+    version: "1.3.0-nullsafety.4"
   mime:
     dependency: transitive
     description:
@@ -227,21 +227,21 @@ packages:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.7.0"
+    version: "1.8.0-nullsafety.1"
   pedantic:
-    dependency: "direct dev"
+    dependency: "direct main"
     description:
       name: pedantic
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.9.0"
+    version: "1.10.0-nullsafety.2"
   pool:
     dependency: transitive
     description:
       name: pool
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.4.0"
+    version: "1.5.0-nullsafety.2"
   pub_semver:
     dependency: transitive
     description:
@@ -288,84 +288,84 @@ packages:
       name: source_map_stack_trace
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "2.1.0-nullsafety.3"
   source_maps:
     dependency: transitive
     description:
       name: source_maps
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.10.9"
+    version: "0.10.10-nullsafety.2"
   source_span:
     dependency: transitive
     description:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.7.0"
+    version: "1.8.0-nullsafety.2"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.9.5"
+    version: "1.10.0-nullsafety.2"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "2.1.0-nullsafety.1"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.5"
+    version: "1.1.0-nullsafety.1"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0-nullsafety.1"
   test:
     dependency: "direct dev"
     description:
       name: test
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.15.2"
+    version: "1.16.0-nullsafety.5"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.17"
+    version: "0.2.19-nullsafety.2"
   test_core:
     dependency: transitive
     description:
       name: test_core
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.10"
+    version: "0.3.12-nullsafety.5"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.0-nullsafety.3"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.8"
+    version: "2.1.0-nullsafety.3"
   vm_service:
     dependency: transitive
     description:
@@ -402,5 +402,5 @@ packages:
     source: hosted
     version: "2.2.1"
 sdks:
-  dart: ">=2.9.0-14.0.dev <3.0.0"
+  dart: ">=2.10.0-110 <=2.11.0-213.1.beta"
   flutter: ">=1.17.0 <2.0.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index a4fd8464c..b3989f2a2 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: ably_flutter_plugin
 description: A wrapper around Ably's Cocoa and Java client library SDKs, providing iOS and Android support.
-version: 1.0.0+dev.1
+version: 1.0.0+dev.2
 repository: https://github.com/ably/ably-flutter
 
 environment:
@@ -10,12 +10,9 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  meta:
-    sdk: flutter
-  pedantic:
-    sdk: flutter
-  collection:
-    sdk: flutter
+  meta: ^1.2.3
+  pedantic: ^1.9.2
+  collection: ^1.14.13
 
 dev_dependencies:
   fake_async: ^1.1.0
@@ -26,8 +23,6 @@ dev_dependencies:
   # because the flutter_test package needs an older version of test_api.
   test: ^1.9.4
 
-  # Stricter Linting
-  pedantic: ^1.0.0
 
 flutter:
   plugin:
diff --git a/test_integration/pubspec.lock b/test_integration/pubspec.lock
index e73292a77..3358c7012 100644
--- a/test_integration/pubspec.lock
+++ b/test_integration/pubspec.lock
@@ -14,7 +14,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "1.0.0+dev.1"
+    version: "1.0.0+dev.2"
   analyzer:
     dependency: transitive
     description:
@@ -223,7 +223,7 @@ packages:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0-nullsafety.3"
+    version: "1.3.0-nullsafety.4"
   mime:
     dependency: transitive
     description:
@@ -361,7 +361,7 @@ packages:
       name: stack_trace
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.10.0-nullsafety.1"
+    version: "1.10.0-nullsafety.2"
   stream_channel:
     dependency: transitive
     description:
@@ -475,5 +475,5 @@ packages:
     source: hosted
     version: "2.2.1"
 sdks:
-  dart: ">=2.10.0-110 <2.11.0"
+  dart: ">=2.10.0-110 <=2.11.0-213.1.beta"
   flutter: ">=1.17.0 <2.0.0"