Merge branch 'master' into master

CHANGELOG.md

@@ -1,10 +1,4 @@
-## 0.5.0
-
-* Updated gradle build tool chains
-* Fixed plugin to use non-deprecated Java function within plugin
-
 ## 0.4.0
-
 * Use deviceName (unique and not null) for equal operator and hashCode.
 
 ## 0.3.0
@@ -49,18 +43,18 @@
 
 ## 0.1.1
 
-* Merged pull request 1: Fix for NoSuchMethodException thrown on api level less than 21
-  during device enumeration.
+* Merged pull request 1: Fix for NoSuchMethodException thrown on api level less than 21 
+  during device enumeration. 
 
 ## 0.1.0
 
-* Modified the USB Attached/Detach stream from Stream<String> to Stream<UsbEvent> to
-  carry additional information about the device being added or removed.
+* Modified the USB Attached/Detach stream from Stream<String> to Stream<UsbEvent> to 
+  carry additional information about the device being added or removed. 
 * Added ACTION_USB_ATTACHED and ACTION_USB_DETACHED constants to dart interface.
 
 ## 0.0.2
 
-* Fixed crasher when connected or disconnecting a USB device without having
+* Fixed crasher when connected or disconnecting a USB device without having 
   a sink attached.
 
 ## 0.0.1

README.md

@@ -12,7 +12,7 @@ Add a dependency to your pubspec.yaml
 
 ```dart
 dependencies:
-	usb_serial: ^0.4.0
+	usb_serial: ^0.3.0
 ```
 
 include the usbserial package at the top of your dart file.

analysis_options.yaml

@@ -4,8 +4,6 @@
 linter:
   rules:
     - hash_and_equals
-    - iterable_contains_unrelated_type
-    - list_remove_unrelated_type
     - valid_regexps
     - always_declare_return_types
     - empty_constructor_bodies
@@ -16,9 +14,6 @@ linter:
     - unnecessary_brace_in_string_interps
 
 analyzer:
-  strong-mode:
-    implicit-casts: true
-    implicit-dynamic: true
   exclude:
     - test/test.dart
     - test/echo_port.dart

example/android/app/build.gradle

@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 33
+    compileSdkVersion 30
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'

example/android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip

example/lib/main.dart

@@ -134,7 +134,7 @@ class _MyAppState extends State<MyApp> {
       ),
       body: Center(
           child: Column(children: <Widget>[
-        Text(_ports.length > 0 ? "Available Serial Ports" : "No serial devices available", style: Theme.of(context).textTheme.headline6),
+        Text(_ports.length > 0 ? "Available Serial Ports" : "No serial devices available", style: Theme.of(context).textTheme.titleLarge),
         ..._ports,
         Text('Status: $_status\n'),
         Text('info: ${_port.toString()}\n'),
@@ -160,7 +160,7 @@ class _MyAppState extends State<MyApp> {
                   },
           ),
         ),
-        Text("Result Data", style: Theme.of(context).textTheme.headline6),
+        Text("Result Data", style: Theme.of(context).textTheme.titleLarge),
         ..._serialData,
       ])),
     ));

lib/transformers.dart

@@ -62,12 +62,7 @@ class TerminatedTransformer
   /// remain attached in the output.
   ///
   /// This constructor creates a single stream
-  TerminatedTransformer(
-      {bool sync = false,
-      this.cancelOnError,
-      this.terminator,
-      this.maxLen = 1024,
-      this.stripTerminator = true}) {
+  TerminatedTransformer({bool sync = false, this.cancelOnError, this.terminator, this.maxLen = 1024, this.stripTerminator = true}) {
     _partial = [];
     _controller = new StreamController<Uint8List>(
         onListen: _onListen,
@@ -90,12 +85,8 @@ class TerminatedTransformer
   /// remain attached in the output.
   ///
   /// This constructor creates a broadcast stream
-  TerminatedTransformer.broadcast(
-      {bool sync = false,
-      this.cancelOnError,
-      this.terminator,
-      this.maxLen = 1024,
-      this.stripTerminator = true}) {
+
+  TerminatedTransformer.broadcast({bool sync = false, this.cancelOnError, this.terminator, this.maxLen = 1024, this.stripTerminator = true}) {
     _partial = [];
     _controller = new StreamController<Uint8List>.broadcast(
         onListen: _onListen, onCancel: _onCancel, sync: sync);
@@ -180,12 +171,8 @@ class TerminatedStringTransformer
   /// remain attached in the output.
   ///
   /// This constructor creates a single string stream
-  TerminatedStringTransformer(
-      {bool sync = false,
-      this.cancelOnError,
-      this.terminator,
-      this.maxLen = 1024,
-      this.stripTerminator = true}) {
+
+  TerminatedStringTransformer({bool sync = false, this.cancelOnError, this.terminator, this.maxLen = 1024, this.stripTerminator = true}) {
     _partial = [];
     _controller = new StreamController<String>(
         onListen: _onListen,
@@ -210,12 +197,8 @@ class TerminatedStringTransformer
   /// remain attached in the output.
   ///
   /// This constructor creates a broadcast string stream
-  TerminatedStringTransformer.broadcast(
-      {bool sync = false,
-      this.cancelOnError,
-      this.terminator,
-      this.maxLen = 1024,
-      this.stripTerminator = true}) {
+
+  TerminatedStringTransformer.broadcast({bool sync = false, this.cancelOnError, this.terminator, this.maxLen = 1024, this.stripTerminator = true}) {
     _partial = [];
     _controller = new StreamController<String>.broadcast(
         onListen: _onListen, onCancel: _onCancel, sync: sync);
@@ -300,12 +283,7 @@ class MagicHeaderAndLengthByteTransformer
   StreamSubscription? _subscription;
   late Stream<Uint8List> _stream;
 
-  MagicHeaderAndLengthByteTransformer(
-      {bool sync = false,
-      this.cancelOnError,
-      this.header,
-      this.maxLen = 1024,
-      this.clearTimeout = const Duration(seconds: 1)}) {
+  MagicHeaderAndLengthByteTransformer({bool sync = false, this.cancelOnError, this.header, this.maxLen = 1024, this.clearTimeout = const Duration(seconds: 1)}) {
     _partial = [];
     _controller = new StreamController<Uint8List>(
         onListen: _onListen,
@@ -320,11 +298,7 @@ class MagicHeaderAndLengthByteTransformer
   }
 
   MagicHeaderAndLengthByteTransformer.broadcast(
-      {bool sync = false,
-      this.cancelOnError,
-      this.header,
-      this.maxLen = 1024,
-      this.clearTimeout = const Duration(seconds: 1)}) {
+      {bool sync = false, this.cancelOnError, this.header, this.maxLen = 1024, this.clearTimeout = const Duration(seconds: 1)}) {
     _partial = [];
     _controller = new StreamController<Uint8List>.broadcast(
         onListen: _onListen, onCancel: _onCancel, sync: sync);

lib/usb_serial.dart

@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'dart:typed_data';
 
 import 'package:collection/collection.dart';
 import 'package:flutter/services.dart';