Build fixes

Author: Mikael Wills

.github/workflows/dart.yml

@@ -22,7 +22,7 @@ jobs:
           java-version: '12.x'
       - uses: subosito/flutter-action@v1
         with:
-          channel: 'stable'
+          flutter-version: '3.27.1'
       - name: Install project dependencies
         run: flutter pub get
       - name: Dart Format Check

.github/workflows/pushMaster.yaml

@@ -14,13 +14,13 @@ jobs:
       - name: Install Flutter
         uses: subosito/flutter-action@v2
         with:
-          channel: "stable"
+          flutter-version: "3.27.1"
       - name: Install project dependencies
         run: flutter pub get
       - name: Dart Format Check
         run: dart format lib/ test/ --set-exit-if-changed
       - name: Import Sorter Check
-        run: dart run import_sorter:main
+        run: dart run import_sorter:main --exit-if-changed
       - name: Dart Analyze Check
         run: flutter analyze
       - name: Dart Test Check

lib/src/config.dart

@@ -1,4 +1,3 @@
-// Project imports:
 import '../sip_ua.dart';
 import 'constants.dart' as DartSIP_C;
 import 'constants.dart';

lib/src/data.dart

@@ -1,7 +1,5 @@
-// Dart imports:
 import 'dart:core';
 
-// Project imports:
 import 'constants.dart';
 import 'uri.dart';
 

lib/src/dialog.dart

@@ -1,4 +1,3 @@
-// Project imports:
 import 'constants.dart';
 import 'dialog/request_sender.dart';
 import 'event_manager/event_manager.dart';

lib/src/dialog/request_sender.dart

@@ -1,7 +1,5 @@
-// Dart imports:
 import 'dart:async';
 
-// Project imports:
 import '../constants.dart';
 import '../dialog.dart';
 import '../event_manager/event_manager.dart';

lib/src/digest_authentication.dart

@@ -1,4 +1,3 @@
-// Project imports:
 import 'constants.dart';
 import 'logger.dart';
 import 'utils.dart' as utils;

lib/src/event_manager/call_events.dart

@@ -1,7 +1,5 @@
-// Package imports:
 import 'package:flutter_webrtc/flutter_webrtc.dart';
 
-// Project imports:
 import '../enums.dart';
 import '../rtc_session.dart';
 import '../sip_message.dart';

lib/src/event_manager/event_manager.dart

@@ -1,4 +1,3 @@
-// Project imports:
 import '../logger.dart';
 import 'events.dart';
 

lib/src/event_manager/internal_events.dart

@@ -1,7 +1,5 @@
-// Package imports:
 import 'package:flutter_webrtc/flutter_webrtc.dart';
 
-// Project imports:
 import '../enums.dart';
 import '../rtc_session.dart' show RTCSession;
 import '../rtc_session/dtmf.dart';

lib/src/event_manager/message_events.dart

@@ -1,4 +1,3 @@
-// Project imports:
 import '../enums.dart';
 import '../message.dart';
 import 'events.dart';

lib/src/event_manager/notifier_events.dart

@@ -1,4 +1,3 @@
-// Project imports:
 import '../sip_message.dart';
 import 'events.dart';
 

lib/src/event_manager/options_events.dart

@@ -1,4 +1,3 @@
-// Project imports:
 import '../enums.dart';
 import '../options.dart';
 import 'events.dart';

lib/src/event_manager/refer_events.dart

@@ -1,4 +1,3 @@
-// Project imports:
 import 'events.dart';
 
 class EventReferTrying extends EventType {

lib/src/event_manager/register_events.dart

@@ -1,4 +1,3 @@
-// Project imports:
 import 'events.dart';
 
 class EventRegistrationExpiring extends EventType {

lib/src/event_manager/subscriber_events.dart

@@ -1,4 +1,3 @@
-// Project imports:
 import '../sip_message.dart';
 import 'events.dart';
 

lib/src/event_manager/transport_events.dart

@@ -1,4 +1,3 @@
-// Project imports:
 import '../transports/socket_interface.dart';
 import '../transports/web_socket.dart';
 import 'events.dart';

lib/src/exceptions.dart

@@ -1,4 +1,3 @@
-// Project imports:
 import 'utils.dart';
 
 class ErrorImpl extends Error {

lib/src/grammar.dart

@@ -1,4 +1,3 @@
-// Project imports:
 import 'grammar_parser.dart';
 import 'parser_error.dart';
 

lib/src/grammar_parser.dart

@@ -1,11 +1,9 @@
 // This code was generated by a tool.
 // Processing tool available at https://github.com/mezoni/peg
 
-// Dart imports:
 import 'dart:convert';
 import 'dart:core';
 
-// Project imports:
 import 'data.dart';
 import 'name_addr_header.dart';
 import 'uri.dart';

lib/src/logger.dart

@@ -1,8 +1,6 @@
-// Package imports:
 import 'package:intl/intl.dart';
 import 'package:logger/logger.dart';
 
-// Project imports:
 import 'stack_trace_nj.dart';
 
 Logger logger = Log();

lib/src/message.dart

@@ -1,4 +1,3 @@
-// Project imports:
 import 'constants.dart' as DartSIP_C;
 import 'constants.dart';
 import 'enums.dart';

lib/src/name_addr_header.dart

@@ -1,4 +1,3 @@
-// Project imports:
 import 'grammar.dart';
 import 'uri.dart';
 import 'utils.dart';

lib/src/options.dart

@@ -1,4 +1,3 @@
-// Project imports:
 import 'package:sip_ua/src/enums.dart';
 import 'package:sip_ua/src/name_addr_header.dart';
 import 'constants.dart' as DartSIP_C;

lib/src/parser.dart

@@ -1,7 +1,5 @@
-// Dart imports:
 import 'dart:convert' show utf8;
 
-// Project imports:
 import 'grammar.dart';
 import 'logger.dart';
 import 'sip_message.dart';

lib/src/parser_error.dart

@@ -1,4 +1,3 @@
-// Package imports:
 import 'package:text/text.dart';
 
 class ParserErrorMessage {

lib/src/registrator.dart

@@ -1,7 +1,5 @@
-// Dart imports:
 import 'dart:async';
 
-// Project imports:
 import 'constants.dart' as DartSIP_C;
 import 'constants.dart';
 import 'event_manager/event_manager.dart';

lib/src/request_sender.dart

@@ -1,4 +1,3 @@
-// Project imports:
 import 'constants.dart';
 import 'data.dart';
 import 'digest_authentication.dart';

lib/src/rtc_session.dart

@@ -1,11 +1,8 @@
-// Dart imports:
 import 'dart:async';
 
-// Package imports:
 import 'package:flutter_webrtc/flutter_webrtc.dart';
 import 'package:sdp_transform/sdp_transform.dart' as sdp_transform;
 
-// Project imports:
 import '../sip_ua.dart';
 import 'constants.dart' as DartSIP_C;
 import 'constants.dart';

lib/src/rtc_session/dtmf.dart

@@ -1,7 +1,5 @@
-// Package imports:
 import 'package:flutter_webrtc/flutter_webrtc.dart';
 
-// Project imports:
 import '../../sip_ua.dart';
 import '../constants.dart';
 import '../event_manager/event_manager.dart';

lib/src/rtc_session/info.dart

@@ -1,4 +1,3 @@
-// Project imports:
 import '../constants.dart';
 import '../enums.dart';
 import '../event_manager/event_manager.dart';

lib/src/rtc_session/refer_notifier.dart

@@ -1,4 +1,3 @@
-// Project imports:
 import '../constants.dart' as DartSIP_C;
 import '../constants.dart';
 import '../event_manager/event_manager.dart';

lib/src/rtc_session/refer_subscriber.dart

@@ -1,4 +1,3 @@
-// Project imports:
 import '../constants.dart' as DartSIP_C;
 import '../constants.dart';
 import '../event_manager/event_manager.dart';

lib/src/sanity_check.dart

@@ -1,4 +1,3 @@
-// Project imports:
 import 'constants.dart' as DartSIP_C;
 import 'constants.dart';
 import 'logger.dart';

lib/src/sip_message.dart

@@ -1,10 +1,7 @@
-// Dart imports:
 import 'dart:convert' show utf8;
 
-// Package imports:
 import 'package:sdp_transform/sdp_transform.dart' as sdp_transform;
 
-// Project imports:
 import 'constants.dart' as DartSIP_C;
 import 'constants.dart';
 import 'data.dart';

lib/src/sip_ua_helper.dart

@@ -1,12 +1,9 @@
-// Dart imports:
 import 'dart:async';
 
-// Package imports:
 import 'package:flutter_webrtc/flutter_webrtc.dart';
 import 'package:logger/logger.dart';
 import 'package:sdp_transform/sdp_transform.dart' as sdp_transform;
 
-// Project imports:
 import 'package:sip_ua/src/uri.dart';
 import 'config.dart';
 import 'constants.dart' as DartSIP_C;

lib/src/socket_transport.dart

@@ -1,8 +1,6 @@
-// Dart imports:
 import 'dart:async';
 import 'dart:math';
 
-// Project imports:
 import './event_manager/events.dart';
 import './transports/socket_interface.dart';
 import 'exceptions.dart' as Exceptions;

lib/src/stack_trace_nj.dart

@@ -1,9 +1,7 @@
-// Dart imports:
 import 'dart:core' as core show StackTrace;
 import 'dart:core';
 import 'dart:io';
 
-// Package imports:
 import 'package:path/path.dart';
 
 class StackTraceNJ implements core.StackTrace {

lib/src/subscriber.dart

@@ -1,10 +1,7 @@
-// Dart imports:
 import 'dart:async';
 
-// Package imports:
 import 'package:collection/collection.dart';
 
-// Project imports:
 import './exceptions.dart' as exceptions;
 import 'constants.dart';
 import 'dialog.dart';

lib/src/timers.dart

@@ -1,4 +1,3 @@
-// Dart imports:
 import 'dart:async';
 
 class Timers {

lib/src/transactions/ack_client.dart

@@ -1,4 +1,3 @@
-// Project imports:
 import '../event_manager/event_manager.dart';
 import '../event_manager/internal_events.dart';
 import '../logger.dart';

lib/src/transactions/invite_client.dart

@@ -1,7 +1,5 @@
-// Dart imports:
 import 'dart:async';
 
-// Project imports:
 import '../constants.dart';
 import '../event_manager/event_manager.dart';
 import '../event_manager/internal_events.dart';

lib/src/transactions/invite_server.dart

@@ -1,7 +1,5 @@
-// Dart imports:
 import 'dart:async';
 
-// Project imports:
 import '../event_manager/internal_events.dart';
 import '../logger.dart';
 import '../sip_message.dart';

lib/src/transactions/non_invite_client.dart

@@ -1,7 +1,5 @@
-// Dart imports:
 import 'dart:async';
 
-// Project imports:
 import '../event_manager/event_manager.dart';
 import '../event_manager/internal_events.dart';
 import '../logger.dart';

lib/src/transactions/non_invite_server.dart

@@ -1,7 +1,5 @@
-// Dart imports:
 import 'dart:async';
 
-// Project imports:
 import 'package:sip_ua/src/sip_message.dart';
 import '../event_manager/internal_events.dart';
 import '../logger.dart';

lib/src/transactions/transaction_base.dart

@@ -1,4 +1,3 @@
-// Project imports:
 import '../event_manager/event_manager.dart';
 import '../sip_message.dart';
 import '../socket_transport.dart';

lib/src/transactions/transactions.dart

@@ -1,4 +1,3 @@
-// Project imports:
 import '../constants.dart';
 import '../sip_message.dart';
 import '../timers.dart';

lib/src/transports/tcp_socket.dart

@@ -1,4 +1,3 @@
-// Project imports:
 import '../../sip_ua.dart';
 import '../logger.dart';
 import 'socket_interface.dart';

lib/src/transports/tcp_socket_impl.dart

@@ -1,10 +1,8 @@
-// Dart imports:
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 import 'dart:math';
 
-// Project imports:
 import '../logger.dart';
 import '../sip_ua_helper.dart';
 

lib/src/transports/web_socket.dart

@@ -1,4 +1,3 @@
-// Project imports:
 import '../../sip_ua.dart';
 import '../grammar.dart';
 import '../logger.dart';

lib/src/transports/websocket_dart_impl.dart

@@ -1,10 +1,8 @@
-// Dart imports:
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 import 'dart:math';
 
-// Project imports:
 import 'package:sip_ua/src/sip_ua_helper.dart';
 import '../logger.dart';
 

lib/src/transports/websocket_web_impl.dart

@@ -1,8 +1,6 @@
-// Dart imports:
 import 'dart:html';
 import 'dart:js_util' as JSUtils;
 
-// Project imports:
 import 'package:sip_ua/src/sip_ua_helper.dart';
 import '../logger.dart';
 

lib/src/ua.dart

@@ -1,7 +1,5 @@
-// Dart imports:
 import 'dart:async';
 
-// Project imports:
 import 'config.dart' as config;
 import 'config.dart';
 import 'constants.dart' as DartSIP_C;
@@ -319,7 +317,7 @@ class UA extends EventManager {
     int num_sessions = _sessions.length;
 
     // Run  _terminate_ on every Session.
-    _sessions.keys.toList().forEach((String? key, _) {
+    _sessions.keys.toList().forEach((String? key) {
       if (_sessions.containsKey(key)) {
         logger.d('closing session $key');
         try {

lib/src/uri.dart

@@ -1,4 +1,3 @@
-// Project imports:
 import 'constants.dart' as DartSIP_C;
 import 'grammar.dart';
 import 'utils.dart' as utils;