From d2a337c846098361ac1e552ed7d750e04107c3cf Mon Sep 17 00:00:00 2001 From: Achilleas Anagnostopoulos Date: Fri, 17 May 2024 08:49:43 +0100 Subject: [PATCH 1/9] Update "part of" directives for protocol library --- lib/src/protocol/frame/decoded_message.dart | 2 +- lib/src/protocol/frame/impl/decoded_message_impl.dart | 2 +- lib/src/protocol/frame/impl/heartbeat_frame_impl.dart | 2 +- lib/src/protocol/frame/raw_frame.dart | 2 +- lib/src/protocol/headers/content_header.dart | 2 +- lib/src/protocol/headers/frame_header.dart | 2 +- lib/src/protocol/headers/header.dart | 2 +- lib/src/protocol/headers/protocol_header.dart | 2 +- lib/src/protocol/io/amqp_message_decoder.dart | 2 +- lib/src/protocol/io/frame_writer.dart | 2 +- lib/src/protocol/io/raw_frame_parser.dart | 2 +- lib/src/protocol/io/tuning_settings.dart | 2 +- lib/src/protocol/messages/bindings/basic.dart | 2 +- lib/src/protocol/messages/bindings/channel.dart | 2 +- lib/src/protocol/messages/bindings/confirm.dart | 2 +- lib/src/protocol/messages/bindings/connection.dart | 2 +- lib/src/protocol/messages/bindings/exchange.dart | 2 +- lib/src/protocol/messages/bindings/queue.dart | 2 +- lib/src/protocol/messages/bindings/tx.dart | 2 +- lib/src/protocol/messages/message.dart | 2 +- lib/src/protocol/messages/message_properties.dart | 2 +- lib/src/protocol/stream/chunked_input_reader.dart | 2 +- lib/src/protocol/stream/chunked_output_writer.dart | 2 +- lib/src/protocol/stream/type_decoder.dart | 2 +- lib/src/protocol/stream/type_encoder.dart | 2 +- tool/generate_bindings.dart | 4 ++-- 26 files changed, 27 insertions(+), 27 deletions(-) diff --git a/lib/src/protocol/frame/decoded_message.dart b/lib/src/protocol/frame/decoded_message.dart index 9cfb71d..26ebbc7 100644 --- a/lib/src/protocol/frame/decoded_message.dart +++ b/lib/src/protocol/frame/decoded_message.dart @@ -1,4 +1,4 @@ -part of dart_amqp.protocol; +part of "../../protocol.dart"; abstract class DecodedMessage { int get channel; diff --git a/lib/src/protocol/frame/impl/decoded_message_impl.dart b/lib/src/protocol/frame/impl/decoded_message_impl.dart index 3ea980b..3d1a20b 100644 --- a/lib/src/protocol/frame/impl/decoded_message_impl.dart +++ b/lib/src/protocol/frame/impl/decoded_message_impl.dart @@ -1,4 +1,4 @@ -part of dart_amqp.protocol; +part of "../../../protocol.dart"; class DecodedMessageImpl implements DecodedMessage { @override diff --git a/lib/src/protocol/frame/impl/heartbeat_frame_impl.dart b/lib/src/protocol/frame/impl/heartbeat_frame_impl.dart index b45ee54..754b604 100644 --- a/lib/src/protocol/frame/impl/heartbeat_frame_impl.dart +++ b/lib/src/protocol/frame/impl/heartbeat_frame_impl.dart @@ -1,4 +1,4 @@ -part of dart_amqp.protocol; +part of "../../../protocol.dart"; class HeartbeatFrameImpl implements DecodedMessage { @override diff --git a/lib/src/protocol/frame/raw_frame.dart b/lib/src/protocol/frame/raw_frame.dart index 9e2b991..c520f4c 100644 --- a/lib/src/protocol/frame/raw_frame.dart +++ b/lib/src/protocol/frame/raw_frame.dart @@ -1,4 +1,4 @@ -part of dart_amqp.protocol; +part of "../../protocol.dart"; class RawFrame { final FrameHeader header; diff --git a/lib/src/protocol/headers/content_header.dart b/lib/src/protocol/headers/content_header.dart index 5746d3f..83d90ad 100644 --- a/lib/src/protocol/headers/content_header.dart +++ b/lib/src/protocol/headers/content_header.dart @@ -1,4 +1,4 @@ -part of dart_amqp.protocol; +part of "../../protocol.dart"; class ContentHeader implements Header { int classId = 0; diff --git a/lib/src/protocol/headers/frame_header.dart b/lib/src/protocol/headers/frame_header.dart index da70cab..d6c3430 100644 --- a/lib/src/protocol/headers/frame_header.dart +++ b/lib/src/protocol/headers/frame_header.dart @@ -1,4 +1,4 @@ -part of dart_amqp.protocol; +part of "../../protocol.dart"; class FrameHeader implements Header { static const int LENGTH_IN_BYTES = 7; diff --git a/lib/src/protocol/headers/header.dart b/lib/src/protocol/headers/header.dart index 48ac2f8..3bb68ad 100644 --- a/lib/src/protocol/headers/header.dart +++ b/lib/src/protocol/headers/header.dart @@ -1,4 +1,4 @@ -part of dart_amqp.protocol; +part of "../../protocol.dart"; abstract class Header { void serialize(TypeEncoder encoder); diff --git a/lib/src/protocol/headers/protocol_header.dart b/lib/src/protocol/headers/protocol_header.dart index c256cd8..8cd0e3f 100644 --- a/lib/src/protocol/headers/protocol_header.dart +++ b/lib/src/protocol/headers/protocol_header.dart @@ -1,4 +1,4 @@ -part of dart_amqp.protocol; +part of "../../protocol.dart"; class ProtocolHeader implements Header { static const int LENGTH_IN_BYTES = 8; diff --git a/lib/src/protocol/io/amqp_message_decoder.dart b/lib/src/protocol/io/amqp_message_decoder.dart index 7127934..74af709 100644 --- a/lib/src/protocol/io/amqp_message_decoder.dart +++ b/lib/src/protocol/io/amqp_message_decoder.dart @@ -1,4 +1,4 @@ -part of dart_amqp.protocol; +part of "../../protocol.dart"; class AmqpMessageDecoder { Map incompleteMessages = {}; diff --git a/lib/src/protocol/io/frame_writer.dart b/lib/src/protocol/io/frame_writer.dart index 11901f9..74d3d52 100644 --- a/lib/src/protocol/io/frame_writer.dart +++ b/lib/src/protocol/io/frame_writer.dart @@ -1,4 +1,4 @@ -part of dart_amqp.protocol; +part of "../../protocol.dart"; final Uint8List frameTerminatorSequence = Uint8List.fromList([RawFrameParser.FRAME_TERMINATOR]); diff --git a/lib/src/protocol/io/raw_frame_parser.dart b/lib/src/protocol/io/raw_frame_parser.dart index e1eb4bf..a7aa9d7 100644 --- a/lib/src/protocol/io/raw_frame_parser.dart +++ b/lib/src/protocol/io/raw_frame_parser.dart @@ -1,4 +1,4 @@ -part of dart_amqp.protocol; +part of "../../protocol.dart"; class RawFrameParser { static const int FRAME_TERMINATOR = 0xCE; diff --git a/lib/src/protocol/io/tuning_settings.dart b/lib/src/protocol/io/tuning_settings.dart index 66405bd..f39314e 100644 --- a/lib/src/protocol/io/tuning_settings.dart +++ b/lib/src/protocol/io/tuning_settings.dart @@ -1,4 +1,4 @@ -part of dart_amqp.protocol; +part of "../../protocol.dart"; class TuningSettings { // The maximum number of channels to allow. A value of 0 indicates that there diff --git a/lib/src/protocol/messages/bindings/basic.dart b/lib/src/protocol/messages/bindings/basic.dart index 1991009..e475cc8 100644 --- a/lib/src/protocol/messages/bindings/basic.dart +++ b/lib/src/protocol/messages/bindings/basic.dart @@ -6,7 +6,7 @@ // ignore_for_file: empty_constructor_bodies -part of dart_amqp.protocol; +part of "../../../protocol.dart"; class BasicQos implements Message { @override diff --git a/lib/src/protocol/messages/bindings/channel.dart b/lib/src/protocol/messages/bindings/channel.dart index a40a851..b06c123 100644 --- a/lib/src/protocol/messages/bindings/channel.dart +++ b/lib/src/protocol/messages/bindings/channel.dart @@ -6,7 +6,7 @@ // ignore_for_file: empty_constructor_bodies -part of dart_amqp.protocol; +part of "../../../protocol.dart"; class ChannelOpen implements Message { @override diff --git a/lib/src/protocol/messages/bindings/confirm.dart b/lib/src/protocol/messages/bindings/confirm.dart index 7479f8a..0f149de 100644 --- a/lib/src/protocol/messages/bindings/confirm.dart +++ b/lib/src/protocol/messages/bindings/confirm.dart @@ -5,7 +5,7 @@ // ignore_for_file: empty_constructor_bodies -part of dart_amqp.protocol; +part of "../../../protocol.dart"; class ConfirmSelect implements Message { @override diff --git a/lib/src/protocol/messages/bindings/connection.dart b/lib/src/protocol/messages/bindings/connection.dart index 77ef13e..cc40d2b 100644 --- a/lib/src/protocol/messages/bindings/connection.dart +++ b/lib/src/protocol/messages/bindings/connection.dart @@ -6,7 +6,7 @@ // ignore_for_file: empty_constructor_bodies -part of dart_amqp.protocol; +part of "../../../protocol.dart"; class ConnectionStart implements Message { @override diff --git a/lib/src/protocol/messages/bindings/exchange.dart b/lib/src/protocol/messages/bindings/exchange.dart index 5c05545..d9d4489 100644 --- a/lib/src/protocol/messages/bindings/exchange.dart +++ b/lib/src/protocol/messages/bindings/exchange.dart @@ -6,7 +6,7 @@ // ignore_for_file: empty_constructor_bodies -part of dart_amqp.protocol; +part of "../../../protocol.dart"; class ExchangeDeclare implements Message { @override diff --git a/lib/src/protocol/messages/bindings/queue.dart b/lib/src/protocol/messages/bindings/queue.dart index 083601e..ba7a5d2 100644 --- a/lib/src/protocol/messages/bindings/queue.dart +++ b/lib/src/protocol/messages/bindings/queue.dart @@ -6,7 +6,7 @@ // ignore_for_file: empty_constructor_bodies -part of dart_amqp.protocol; +part of "../../../protocol.dart"; class QueueDeclare implements Message { @override diff --git a/lib/src/protocol/messages/bindings/tx.dart b/lib/src/protocol/messages/bindings/tx.dart index 7baf003..30f5e0a 100644 --- a/lib/src/protocol/messages/bindings/tx.dart +++ b/lib/src/protocol/messages/bindings/tx.dart @@ -6,7 +6,7 @@ // ignore_for_file: empty_constructor_bodies -part of dart_amqp.protocol; +part of "../../../protocol.dart"; class TxSelect implements Message { @override diff --git a/lib/src/protocol/messages/message.dart b/lib/src/protocol/messages/message.dart index 5ab2cc6..8419242 100644 --- a/lib/src/protocol/messages/message.dart +++ b/lib/src/protocol/messages/message.dart @@ -6,7 +6,7 @@ // // Do not modify -part of dart_amqp.protocol; +part of "../../protocol.dart"; abstract class Message { int get msgClassId; diff --git a/lib/src/protocol/messages/message_properties.dart b/lib/src/protocol/messages/message_properties.dart index 63b7e3c..ab7dead 100644 --- a/lib/src/protocol/messages/message_properties.dart +++ b/lib/src/protocol/messages/message_properties.dart @@ -1,4 +1,4 @@ -part of dart_amqp.protocol; +part of "../../protocol.dart"; class MessageProperties { String? contentType; diff --git a/lib/src/protocol/stream/chunked_input_reader.dart b/lib/src/protocol/stream/chunked_input_reader.dart index 2e50a8b..9cafe4c 100644 --- a/lib/src/protocol/stream/chunked_input_reader.dart +++ b/lib/src/protocol/stream/chunked_input_reader.dart @@ -1,4 +1,4 @@ -part of dart_amqp.protocol; +part of "../../protocol.dart"; class ChunkedInputReader { final _bufferedChunks = ListQueue>(); diff --git a/lib/src/protocol/stream/chunked_output_writer.dart b/lib/src/protocol/stream/chunked_output_writer.dart index 294745f..647b0f9 100644 --- a/lib/src/protocol/stream/chunked_output_writer.dart +++ b/lib/src/protocol/stream/chunked_output_writer.dart @@ -1,4 +1,4 @@ -part of dart_amqp.protocol; +part of "../../protocol.dart"; class ChunkedOutputWriter { final ListQueue _bufferedChunks = ListQueue(); diff --git a/lib/src/protocol/stream/type_decoder.dart b/lib/src/protocol/stream/type_decoder.dart index 8ba4ef0..83e1898 100644 --- a/lib/src/protocol/stream/type_decoder.dart +++ b/lib/src/protocol/stream/type_decoder.dart @@ -1,4 +1,4 @@ -part of dart_amqp.protocol; +part of "../../protocol.dart"; class TypeDecoder { int _offset = 0; diff --git a/lib/src/protocol/stream/type_encoder.dart b/lib/src/protocol/stream/type_encoder.dart index 45543c1..8126f77 100644 --- a/lib/src/protocol/stream/type_encoder.dart +++ b/lib/src/protocol/stream/type_encoder.dart @@ -1,4 +1,4 @@ -part of dart_amqp.protocol; +part of "../../protocol.dart"; class TypeEncoder { late ChunkedOutputWriter _writer; diff --git a/tool/generate_bindings.dart b/tool/generate_bindings.dart index 440ddb6..ccaad83 100644 --- a/tool/generate_bindings.dart +++ b/tool/generate_bindings.dart @@ -25,7 +25,7 @@ class AmqpBindingsBuilder { // // Do not modify -part of dart_amqp.protocol; +part of "../../protocol.dart"; abstract class Message { @@ -60,7 +60,7 @@ abstract class Message { // // Do not modify -library dart_amqp.protocol; +part of "../../../protocol.dart"; import "dart:async"; import "dart:convert"; From 26cbf947ec62b899e8a0ef2ecc516c43e829f202 Mon Sep 17 00:00:00 2001 From: Achilleas Anagnostopoulos Date: Fri, 17 May 2024 08:51:47 +0100 Subject: [PATCH 2/9] Update "part of" directives for logger library --- lib/src/logging/logger.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/logging/logger.dart b/lib/src/logging/logger.dart index fc2dfd8..8d73338 100644 --- a/lib/src/logging/logger.dart +++ b/lib/src/logging/logger.dart @@ -1,4 +1,4 @@ -part of dart_amqp.logger; +part of "../logging.dart"; // Define hierarchical loggers final Logger connectionLogger = Logger("dart_amqp.Connection"); From 7752224e21f6a3b7fbdd381056e35ea2bc0806cc Mon Sep 17 00:00:00 2001 From: Achilleas Anagnostopoulos Date: Fri, 17 May 2024 08:53:22 +0100 Subject: [PATCH 3/9] Update "part of" directives for exceptions library --- lib/src/exceptions/channel_exception.dart | 2 +- lib/src/exceptions/connection_exception.dart | 2 +- lib/src/exceptions/connection_failed_exception.dart | 2 +- lib/src/exceptions/exchange_not_found_exception.dart | 2 +- lib/src/exceptions/fatal_exception.dart | 2 +- lib/src/exceptions/heartbeat_failed_exception.dart | 2 +- lib/src/exceptions/queue_not_found_exception.dart | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/src/exceptions/channel_exception.dart b/lib/src/exceptions/channel_exception.dart index 041eb8c..9f07bf9 100644 --- a/lib/src/exceptions/channel_exception.dart +++ b/lib/src/exceptions/channel_exception.dart @@ -1,4 +1,4 @@ -part of dart_amqp.exceptions; +part of "../exceptions.dart"; class ChannelException implements Exception { final String message; diff --git a/lib/src/exceptions/connection_exception.dart b/lib/src/exceptions/connection_exception.dart index 42350ed..416e582 100644 --- a/lib/src/exceptions/connection_exception.dart +++ b/lib/src/exceptions/connection_exception.dart @@ -1,4 +1,4 @@ -part of dart_amqp.exceptions; +part of "../exceptions.dart"; class ConnectionException implements Exception { final String message; diff --git a/lib/src/exceptions/connection_failed_exception.dart b/lib/src/exceptions/connection_failed_exception.dart index cbdb0d5..c67296b 100644 --- a/lib/src/exceptions/connection_failed_exception.dart +++ b/lib/src/exceptions/connection_failed_exception.dart @@ -1,4 +1,4 @@ -part of dart_amqp.exceptions; +part of "../exceptions.dart"; class ConnectionFailedException implements Exception { final String message; diff --git a/lib/src/exceptions/exchange_not_found_exception.dart b/lib/src/exceptions/exchange_not_found_exception.dart index 0cbd1aa..d2001a0 100644 --- a/lib/src/exceptions/exchange_not_found_exception.dart +++ b/lib/src/exceptions/exchange_not_found_exception.dart @@ -1,4 +1,4 @@ -part of dart_amqp.exceptions; +part of "../exceptions.dart"; class ExchangeNotFoundException extends ChannelException { ExchangeNotFoundException(String message, int channel, ErrorType errorType) diff --git a/lib/src/exceptions/fatal_exception.dart b/lib/src/exceptions/fatal_exception.dart index 6ee21a2..ce25271 100644 --- a/lib/src/exceptions/fatal_exception.dart +++ b/lib/src/exceptions/fatal_exception.dart @@ -1,4 +1,4 @@ -part of dart_amqp.exceptions; +part of "../exceptions.dart"; class FatalException implements Exception { final String message; diff --git a/lib/src/exceptions/heartbeat_failed_exception.dart b/lib/src/exceptions/heartbeat_failed_exception.dart index 5c146f6..1661a1a 100644 --- a/lib/src/exceptions/heartbeat_failed_exception.dart +++ b/lib/src/exceptions/heartbeat_failed_exception.dart @@ -1,4 +1,4 @@ -part of dart_amqp.exceptions; +part of "../exceptions.dart"; class HeartbeatFailedException implements Exception { final String message; diff --git a/lib/src/exceptions/queue_not_found_exception.dart b/lib/src/exceptions/queue_not_found_exception.dart index 740b678..88ae500 100644 --- a/lib/src/exceptions/queue_not_found_exception.dart +++ b/lib/src/exceptions/queue_not_found_exception.dart @@ -1,4 +1,4 @@ -part of dart_amqp.exceptions; +part of "../exceptions.dart"; class QueueNotFoundException extends ChannelException { QueueNotFoundException(String message, int channel, ErrorType errorType) From db8ba613b64ba05d1fe0551971cb3a8e01d70416 Mon Sep 17 00:00:00 2001 From: Achilleas Anagnostopoulos Date: Fri, 17 May 2024 08:55:27 +0100 Subject: [PATCH 4/9] Update "part of" directives for enums library --- lib/src/enums/delivery_mode.dart | 2 +- lib/src/enums/enum.dart | 2 +- lib/src/enums/error_type.dart | 2 +- lib/src/enums/exchange_type.dart | 2 +- lib/src/enums/field_type.dart | 2 +- lib/src/enums/frame_type.dart | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/src/enums/delivery_mode.dart b/lib/src/enums/delivery_mode.dart index ca18f12..a9c268d 100644 --- a/lib/src/enums/delivery_mode.dart +++ b/lib/src/enums/delivery_mode.dart @@ -1,4 +1,4 @@ -part of dart_amqp.enums; +part of "../enums.dart"; class DeliveryMode extends Enum { static const DeliveryMode TRANSIENT = DeliveryMode._(1); diff --git a/lib/src/enums/enum.dart b/lib/src/enums/enum.dart index d66dc36..9638690 100644 --- a/lib/src/enums/enum.dart +++ b/lib/src/enums/enum.dart @@ -1,4 +1,4 @@ -part of dart_amqp.enums; +part of "../enums.dart"; /// An abstract class for modeling enums abstract class Enum { diff --git a/lib/src/enums/error_type.dart b/lib/src/enums/error_type.dart index b9fe2e0..2b96ca7 100644 --- a/lib/src/enums/error_type.dart +++ b/lib/src/enums/error_type.dart @@ -1,4 +1,4 @@ -part of dart_amqp.enums; +part of "../enums.dart"; class ErrorType extends Enum { static const ErrorType SUCCESS = ErrorType._(200, false); diff --git a/lib/src/enums/exchange_type.dart b/lib/src/enums/exchange_type.dart index 5f91750..82c25d0 100644 --- a/lib/src/enums/exchange_type.dart +++ b/lib/src/enums/exchange_type.dart @@ -1,4 +1,4 @@ -part of dart_amqp.enums; +part of "../enums.dart"; class ExchangeType extends BaseExchange { static const ExchangeType FANOUT = ExchangeType._("fanout"); diff --git a/lib/src/enums/field_type.dart b/lib/src/enums/field_type.dart index 089e115..a8a6f73 100644 --- a/lib/src/enums/field_type.dart +++ b/lib/src/enums/field_type.dart @@ -1,4 +1,4 @@ -part of dart_amqp.enums; +part of "../enums.dart"; class FieldType extends Enum { static const FieldType BOOLEAN = FieldType._(116); diff --git a/lib/src/enums/frame_type.dart b/lib/src/enums/frame_type.dart index 83984aa..ff1cc0c 100644 --- a/lib/src/enums/frame_type.dart +++ b/lib/src/enums/frame_type.dart @@ -1,4 +1,4 @@ -part of dart_amqp.enums; +part of "../enums.dart"; class FrameType extends Enum { static const FrameType METHOD = FrameType._(1); From c24be7920583fc73928903ccf65793c97734cb80 Mon Sep 17 00:00:00 2001 From: Achilleas Anagnostopoulos Date: Fri, 17 May 2024 09:03:13 +0100 Subject: [PATCH 5/9] Update "part of" directives for client library --- lib/src/client/amqp_message.dart | 2 +- lib/src/client/basicreturn_message.dart | 2 +- lib/src/client/channel.dart | 2 +- lib/src/client/client.dart | 2 +- lib/src/client/connection_settings.dart | 2 +- lib/src/client/consumer.dart | 2 +- lib/src/client/exchange.dart | 2 +- lib/src/client/impl/amqp_message_impl.dart | 2 +- lib/src/client/impl/basic_return_message_impl.dart | 2 +- lib/src/client/impl/channel_impl.dart | 2 +- lib/src/client/impl/client_impl.dart | 2 +- lib/src/client/impl/consumer_impl.dart | 2 +- lib/src/client/impl/exchange_impl.dart | 2 +- lib/src/client/impl/publish_notification_impl.dart | 2 +- lib/src/client/impl/queue_impl.dart | 2 +- lib/src/client/publish_notification.dart | 2 +- lib/src/client/queue.dart | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/lib/src/client/amqp_message.dart b/lib/src/client/amqp_message.dart index 6538794..8e2e850 100644 --- a/lib/src/client/amqp_message.dart +++ b/lib/src/client/amqp_message.dart @@ -1,4 +1,4 @@ -part of dart_amqp.client; +part of "../client.dart"; abstract class AmqpMessage { /// Get the payload as a [Uint8List] diff --git a/lib/src/client/basicreturn_message.dart b/lib/src/client/basicreturn_message.dart index ddad3b9..a8d2c3d 100644 --- a/lib/src/client/basicreturn_message.dart +++ b/lib/src/client/basicreturn_message.dart @@ -1,4 +1,4 @@ -part of dart_amqp.client; +part of "../client.dart"; abstract class BasicReturnMessage { /// Get the payload as a [Uint8List] diff --git a/lib/src/client/channel.dart b/lib/src/client/channel.dart index e6c335b..a5d7e8a 100644 --- a/lib/src/client/channel.dart +++ b/lib/src/client/channel.dart @@ -1,4 +1,4 @@ -part of dart_amqp.client; +part of "../client.dart"; abstract class Channel { /// Close the channel, abort any pending operations and return a [Future] to be completed diff --git a/lib/src/client/client.dart b/lib/src/client/client.dart index 62d8d0c..d54be24 100644 --- a/lib/src/client/client.dart +++ b/lib/src/client/client.dart @@ -1,4 +1,4 @@ -part of dart_amqp.client; +part of "../client.dart"; abstract class Client { factory Client({ConnectionSettings? settings}) => diff --git a/lib/src/client/connection_settings.dart b/lib/src/client/connection_settings.dart index 45c6ee1..791f069 100644 --- a/lib/src/client/connection_settings.dart +++ b/lib/src/client/connection_settings.dart @@ -1,4 +1,4 @@ -part of dart_amqp.client; +part of "../client.dart"; class ConnectionSettings { // The host to connect to diff --git a/lib/src/client/consumer.dart b/lib/src/client/consumer.dart index 286f2df..986a262 100644 --- a/lib/src/client/consumer.dart +++ b/lib/src/client/consumer.dart @@ -1,4 +1,4 @@ -part of dart_amqp.client; +part of "../client.dart"; abstract class Consumer { /// Get the consumer tag. diff --git a/lib/src/client/exchange.dart b/lib/src/client/exchange.dart index 3a72abe..91e8f46 100644 --- a/lib/src/client/exchange.dart +++ b/lib/src/client/exchange.dart @@ -1,4 +1,4 @@ -part of dart_amqp.client; +part of "../client.dart"; abstract class Exchange { /// Get the name of the exchange diff --git a/lib/src/client/impl/amqp_message_impl.dart b/lib/src/client/impl/amqp_message_impl.dart index 54088fe..5c1fa21 100644 --- a/lib/src/client/impl/amqp_message_impl.dart +++ b/lib/src/client/impl/amqp_message_impl.dart @@ -1,4 +1,4 @@ -part of dart_amqp.client; +part of "../../client.dart"; class _AmqpMessageImpl implements AmqpMessage { final _ConsumerImpl consumer; diff --git a/lib/src/client/impl/basic_return_message_impl.dart b/lib/src/client/impl/basic_return_message_impl.dart index e33dfa7..26b760d 100644 --- a/lib/src/client/impl/basic_return_message_impl.dart +++ b/lib/src/client/impl/basic_return_message_impl.dart @@ -1,4 +1,4 @@ -part of dart_amqp.client; +part of "../../client.dart"; class _BasicReturnMessageImpl implements BasicReturnMessage { final DecodedMessage message; diff --git a/lib/src/client/impl/channel_impl.dart b/lib/src/client/impl/channel_impl.dart index f82b69f..8175ac5 100644 --- a/lib/src/client/impl/channel_impl.dart +++ b/lib/src/client/impl/channel_impl.dart @@ -1,4 +1,4 @@ -part of dart_amqp.client; +part of "../../client.dart"; class _ChannelImpl implements Channel { // The allocated channel id diff --git a/lib/src/client/impl/client_impl.dart b/lib/src/client/impl/client_impl.dart index ccb34e7..95efd91 100644 --- a/lib/src/client/impl/client_impl.dart +++ b/lib/src/client/impl/client_impl.dart @@ -1,4 +1,4 @@ -part of dart_amqp.client; +part of "../../client.dart"; class _ClientImpl implements Client { // Configuration options diff --git a/lib/src/client/impl/consumer_impl.dart b/lib/src/client/impl/consumer_impl.dart index ce22dc9..0802449 100644 --- a/lib/src/client/impl/consumer_impl.dart +++ b/lib/src/client/impl/consumer_impl.dart @@ -1,4 +1,4 @@ -part of dart_amqp.client; +part of "../../client.dart"; class _ConsumerImpl implements Consumer { // https://github.com/dart-lang/linter/issues/2697 diff --git a/lib/src/client/impl/exchange_impl.dart b/lib/src/client/impl/exchange_impl.dart index a218d4b..4e3f796 100644 --- a/lib/src/client/impl/exchange_impl.dart +++ b/lib/src/client/impl/exchange_impl.dart @@ -1,4 +1,4 @@ -part of dart_amqp.client; +part of "../../client.dart"; class _ExchangeImpl implements Exchange { final String _name; diff --git a/lib/src/client/impl/publish_notification_impl.dart b/lib/src/client/impl/publish_notification_impl.dart index c1ee712..406810d 100644 --- a/lib/src/client/impl/publish_notification_impl.dart +++ b/lib/src/client/impl/publish_notification_impl.dart @@ -1,4 +1,4 @@ -part of dart_amqp.client; +part of "../../client.dart"; class _PublishNotificationImpl implements PublishNotification { @override diff --git a/lib/src/client/impl/queue_impl.dart b/lib/src/client/impl/queue_impl.dart index 738ec2f..e11f624 100644 --- a/lib/src/client/impl/queue_impl.dart +++ b/lib/src/client/impl/queue_impl.dart @@ -1,4 +1,4 @@ -part of dart_amqp.client; +part of "../../client.dart"; class _QueueImpl implements Queue { // https://github.com/dart-lang/linter/issues/2697 diff --git a/lib/src/client/publish_notification.dart b/lib/src/client/publish_notification.dart index b480470..1913da7 100644 --- a/lib/src/client/publish_notification.dart +++ b/lib/src/client/publish_notification.dart @@ -1,4 +1,4 @@ -part of dart_amqp.client; +part of "../client.dart"; abstract class PublishNotification { Object? get message; diff --git a/lib/src/client/queue.dart b/lib/src/client/queue.dart index 5896301..993e152 100644 --- a/lib/src/client/queue.dart +++ b/lib/src/client/queue.dart @@ -1,4 +1,4 @@ -part of dart_amqp.client; +part of "../client.dart"; abstract class Queue { /// Get the queue name From 161cea071bed2bfcd1e535de35493f1bbac12c13 Mon Sep 17 00:00:00 2001 From: Achilleas Anagnostopoulos Date: Fri, 17 May 2024 09:08:52 +0100 Subject: [PATCH 6/9] Update "part of" directives for authentication library --- lib/src/authentication/amq_plain_authenticator.dart | 2 +- lib/src/authentication/authenticator.dart | 2 +- lib/src/authentication/plain_authenticator.dart | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/src/authentication/amq_plain_authenticator.dart b/lib/src/authentication/amq_plain_authenticator.dart index 4a7dc8e..bebdf0f 100644 --- a/lib/src/authentication/amq_plain_authenticator.dart +++ b/lib/src/authentication/amq_plain_authenticator.dart @@ -1,4 +1,4 @@ -part of dart_amqp.authentication; +part of "../authentication.dart"; class AmqPlainAuthenticator implements Authenticator { final String userName; diff --git a/lib/src/authentication/authenticator.dart b/lib/src/authentication/authenticator.dart index 968d44b..d065341 100644 --- a/lib/src/authentication/authenticator.dart +++ b/lib/src/authentication/authenticator.dart @@ -1,4 +1,4 @@ -part of dart_amqp.authentication; +part of "../authentication.dart"; abstract class Authenticator { /// Get the SASL type of this authenticator diff --git a/lib/src/authentication/plain_authenticator.dart b/lib/src/authentication/plain_authenticator.dart index 08a4556..0fa7e73 100644 --- a/lib/src/authentication/plain_authenticator.dart +++ b/lib/src/authentication/plain_authenticator.dart @@ -1,4 +1,4 @@ -part of dart_amqp.authentication; +part of "../authentication.dart"; class PlainAuthenticator implements Authenticator { final String userName; From 374c3ccdc0621a20f5117f66c36901aab1903286 Mon Sep 17 00:00:00 2001 From: Achilleas Anagnostopoulos Date: Sun, 19 May 2024 08:07:35 +0100 Subject: [PATCH 7/9] Update "part of" directives for mocks library --- test/lib/mocks/message_mocks.dart | 2 +- test/lib/mocks/server_mocks.dart | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/lib/mocks/message_mocks.dart b/test/lib/mocks/message_mocks.dart index 9736f52..fe545d5 100644 --- a/test/lib/mocks/message_mocks.dart +++ b/test/lib/mocks/message_mocks.dart @@ -1,4 +1,4 @@ -part of dart_amqp.tests.mocks; +part of "mocks.dart"; class ConnectionStartMock extends Mock implements ConnectionStart { @override diff --git a/test/lib/mocks/server_mocks.dart b/test/lib/mocks/server_mocks.dart index 4fe845b..dc9277e 100644 --- a/test/lib/mocks/server_mocks.dart +++ b/test/lib/mocks/server_mocks.dart @@ -1,4 +1,4 @@ -part of dart_amqp.tests.mocks; +part of "mocks.dart"; class MockServer { ServerSocket? _server; From c4c124eefa84f597149e2c419f434f3781526f81 Mon Sep 17 00:00:00 2001 From: Achilleas Anagnostopoulos Date: Sun, 19 May 2024 08:07:47 +0100 Subject: [PATCH 8/9] Update dependency versions --- pubspec.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pubspec.yaml b/pubspec.yaml index 8454103..4c75776 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -4,15 +4,15 @@ description: > version: 0.3.0 homepage: https://github.com/achilleasa/dart_amqp environment: - sdk: ">=2.12.0 <3.0.0" + sdk: ">=2.12.0 <4.0.0" dependencies: async: ^2.10.0 logging: ^1.0.1 dev_dependencies: test: ^1.17.5 mockito: ^5.0.9 - http: ^0.13.3 - xml: ^5.1.1 - lints: ^2.0.1 + http: ^1.2.0 + xml: ^6.2.2 + lints: ^4.0.0 false_secrets: - test/lib/mocks/certs/*.pem From 841888c20f89bc750787786ce5671c709c415091 Mon Sep 17 00:00:00 2001 From: Achilleas Anagnostopoulos Date: Sun, 19 May 2024 08:12:50 +0100 Subject: [PATCH 9/9] Always use stable sdk for CI runs Some of the newer linter features require a more recent SDK. Forcing the use of the "stable" SDK for CI runs should ensure that we don't accidentally miss a lint warning that pub catches after a new version is published. --- .github/workflows/ci.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 52548f8..4f387ca 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -12,6 +12,8 @@ jobs: - name: Setup Dart SDK uses: dart-lang/setup-dart@v1 + with: + sdk: stable - name: Prepare RabbitMQ configuration run: |