diff --git a/.idea/modules.xml b/.idea/modules.xml index dd9bc39..72fea45 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,9 +2,9 @@ - + - + diff --git a/example/lib/main.dart b/example/lib/main.dart index 9feab20..0591fba 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:logging/logging.dart'; import 'package:moxdns/moxdns.dart'; import 'package:moxxmpp/moxxmpp.dart'; -import 'package:moxxmpp_socket/moxxmpp_socket.dart'; +import 'package:moxxmpp_socket_tcp/moxxmpp_socket_tcp.dart'; class ExampleTcpSocketWrapper extends TCPSocketWrapper { ExampleTcpSocketWrapper() : super(false); diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 8aad32a..779eb35 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -17,7 +17,7 @@ dependencies: moxxmpp: hosted: https://git.polynom.me/api/packages/Moxxy/pub version: 0.1.0 - moxxmpp_socket: + moxxmpp_socket_tcp: hosted: https://git.polynom.me/api/packages/Moxxy/pub version: 0.1.0 diff --git a/example/pubspec_overrides.yaml b/example/pubspec_overrides.yaml index 3d4fbb1..d2e8e37 100644 --- a/example/pubspec_overrides.yaml +++ b/example/pubspec_overrides.yaml @@ -1,6 +1,6 @@ -# melos_managed_dependency_overrides: moxxmpp,moxxmpp_socket +# melos_managed_dependency_overrides: moxxmpp,moxxmpp_socket_tcp dependency_overrides: - moxxmpp: - path: ../moxxmpp - moxxmpp_socket: - path: ../moxxmpp_socket + moxxmpp: + path: ../packages/moxxmpp + moxxmpp_socket_tcp: + path: ../packages/moxxmpp_socket_tcp diff --git a/melos.yaml b/melos.yaml index 7fea571..0fe9ab3 100644 --- a/melos.yaml +++ b/melos.yaml @@ -1,8 +1,7 @@ name: moxxmpp packages: - - moxxmpp - - moxxmpp_socket + - packages/* - example command: diff --git a/moxxmpp/CHANGELOG.md b/packages/moxxmpp/CHANGELOG.md similarity index 100% rename from moxxmpp/CHANGELOG.md rename to packages/moxxmpp/CHANGELOG.md diff --git a/moxxmpp/LICENSE b/packages/moxxmpp/LICENSE similarity index 100% rename from moxxmpp/LICENSE rename to packages/moxxmpp/LICENSE diff --git a/moxxmpp/README.md b/packages/moxxmpp/README.md similarity index 100% rename from moxxmpp/README.md rename to packages/moxxmpp/README.md diff --git a/moxxmpp/analysis_options.yaml b/packages/moxxmpp/analysis_options.yaml similarity index 100% rename from moxxmpp/analysis_options.yaml rename to packages/moxxmpp/analysis_options.yaml diff --git a/moxxmpp/lib/moxxmpp.dart b/packages/moxxmpp/lib/moxxmpp.dart similarity index 100% rename from moxxmpp/lib/moxxmpp.dart rename to packages/moxxmpp/lib/moxxmpp.dart diff --git a/moxxmpp/lib/src/buffer.dart b/packages/moxxmpp/lib/src/buffer.dart similarity index 100% rename from moxxmpp/lib/src/buffer.dart rename to packages/moxxmpp/lib/src/buffer.dart diff --git a/moxxmpp/lib/src/connection.dart b/packages/moxxmpp/lib/src/connection.dart similarity index 100% rename from moxxmpp/lib/src/connection.dart rename to packages/moxxmpp/lib/src/connection.dart diff --git a/moxxmpp/lib/src/events.dart b/packages/moxxmpp/lib/src/events.dart similarity index 100% rename from moxxmpp/lib/src/events.dart rename to packages/moxxmpp/lib/src/events.dart diff --git a/moxxmpp/lib/src/iq.dart b/packages/moxxmpp/lib/src/iq.dart similarity index 100% rename from moxxmpp/lib/src/iq.dart rename to packages/moxxmpp/lib/src/iq.dart diff --git a/moxxmpp/lib/src/jid.dart b/packages/moxxmpp/lib/src/jid.dart similarity index 100% rename from moxxmpp/lib/src/jid.dart rename to packages/moxxmpp/lib/src/jid.dart diff --git a/moxxmpp/lib/src/managers/attributes.dart b/packages/moxxmpp/lib/src/managers/attributes.dart similarity index 100% rename from moxxmpp/lib/src/managers/attributes.dart rename to packages/moxxmpp/lib/src/managers/attributes.dart diff --git a/moxxmpp/lib/src/managers/base.dart b/packages/moxxmpp/lib/src/managers/base.dart similarity index 100% rename from moxxmpp/lib/src/managers/base.dart rename to packages/moxxmpp/lib/src/managers/base.dart diff --git a/moxxmpp/lib/src/managers/data.dart b/packages/moxxmpp/lib/src/managers/data.dart similarity index 100% rename from moxxmpp/lib/src/managers/data.dart rename to packages/moxxmpp/lib/src/managers/data.dart diff --git a/moxxmpp/lib/src/managers/data.freezed.dart b/packages/moxxmpp/lib/src/managers/data.freezed.dart similarity index 100% rename from moxxmpp/lib/src/managers/data.freezed.dart rename to packages/moxxmpp/lib/src/managers/data.freezed.dart diff --git a/moxxmpp/lib/src/managers/handlers.dart b/packages/moxxmpp/lib/src/managers/handlers.dart similarity index 100% rename from moxxmpp/lib/src/managers/handlers.dart rename to packages/moxxmpp/lib/src/managers/handlers.dart diff --git a/moxxmpp/lib/src/managers/namespaces.dart b/packages/moxxmpp/lib/src/managers/namespaces.dart similarity index 100% rename from moxxmpp/lib/src/managers/namespaces.dart rename to packages/moxxmpp/lib/src/managers/namespaces.dart diff --git a/moxxmpp/lib/src/managers/priorities.dart b/packages/moxxmpp/lib/src/managers/priorities.dart similarity index 100% rename from moxxmpp/lib/src/managers/priorities.dart rename to packages/moxxmpp/lib/src/managers/priorities.dart diff --git a/moxxmpp/lib/src/message.dart b/packages/moxxmpp/lib/src/message.dart similarity index 100% rename from moxxmpp/lib/src/message.dart rename to packages/moxxmpp/lib/src/message.dart diff --git a/moxxmpp/lib/src/namespaces.dart b/packages/moxxmpp/lib/src/namespaces.dart similarity index 100% rename from moxxmpp/lib/src/namespaces.dart rename to packages/moxxmpp/lib/src/namespaces.dart diff --git a/moxxmpp/lib/src/negotiators/manager.dart b/packages/moxxmpp/lib/src/negotiators/manager.dart similarity index 100% rename from moxxmpp/lib/src/negotiators/manager.dart rename to packages/moxxmpp/lib/src/negotiators/manager.dart diff --git a/moxxmpp/lib/src/negotiators/namespaces.dart b/packages/moxxmpp/lib/src/negotiators/namespaces.dart similarity index 100% rename from moxxmpp/lib/src/negotiators/namespaces.dart rename to packages/moxxmpp/lib/src/negotiators/namespaces.dart diff --git a/moxxmpp/lib/src/negotiators/negotiator.dart b/packages/moxxmpp/lib/src/negotiators/negotiator.dart similarity index 100% rename from moxxmpp/lib/src/negotiators/negotiator.dart rename to packages/moxxmpp/lib/src/negotiators/negotiator.dart diff --git a/moxxmpp/lib/src/negotiators/resource_binding.dart b/packages/moxxmpp/lib/src/negotiators/resource_binding.dart similarity index 100% rename from moxxmpp/lib/src/negotiators/resource_binding.dart rename to packages/moxxmpp/lib/src/negotiators/resource_binding.dart diff --git a/moxxmpp/lib/src/negotiators/sasl/kv.dart b/packages/moxxmpp/lib/src/negotiators/sasl/kv.dart similarity index 100% rename from moxxmpp/lib/src/negotiators/sasl/kv.dart rename to packages/moxxmpp/lib/src/negotiators/sasl/kv.dart diff --git a/moxxmpp/lib/src/negotiators/sasl/negotiator.dart b/packages/moxxmpp/lib/src/negotiators/sasl/negotiator.dart similarity index 100% rename from moxxmpp/lib/src/negotiators/sasl/negotiator.dart rename to packages/moxxmpp/lib/src/negotiators/sasl/negotiator.dart diff --git a/moxxmpp/lib/src/negotiators/sasl/nonza.dart b/packages/moxxmpp/lib/src/negotiators/sasl/nonza.dart similarity index 100% rename from moxxmpp/lib/src/negotiators/sasl/nonza.dart rename to packages/moxxmpp/lib/src/negotiators/sasl/nonza.dart diff --git a/moxxmpp/lib/src/negotiators/sasl/plain.dart b/packages/moxxmpp/lib/src/negotiators/sasl/plain.dart similarity index 100% rename from moxxmpp/lib/src/negotiators/sasl/plain.dart rename to packages/moxxmpp/lib/src/negotiators/sasl/plain.dart diff --git a/moxxmpp/lib/src/negotiators/sasl/scram.dart b/packages/moxxmpp/lib/src/negotiators/sasl/scram.dart similarity index 100% rename from moxxmpp/lib/src/negotiators/sasl/scram.dart rename to packages/moxxmpp/lib/src/negotiators/sasl/scram.dart diff --git a/moxxmpp/lib/src/negotiators/starttls.dart b/packages/moxxmpp/lib/src/negotiators/starttls.dart similarity index 100% rename from moxxmpp/lib/src/negotiators/starttls.dart rename to packages/moxxmpp/lib/src/negotiators/starttls.dart diff --git a/moxxmpp/lib/src/ping.dart b/packages/moxxmpp/lib/src/ping.dart similarity index 100% rename from moxxmpp/lib/src/ping.dart rename to packages/moxxmpp/lib/src/ping.dart diff --git a/moxxmpp/lib/src/presence.dart b/packages/moxxmpp/lib/src/presence.dart similarity index 100% rename from moxxmpp/lib/src/presence.dart rename to packages/moxxmpp/lib/src/presence.dart diff --git a/moxxmpp/lib/src/reconnect.dart b/packages/moxxmpp/lib/src/reconnect.dart similarity index 100% rename from moxxmpp/lib/src/reconnect.dart rename to packages/moxxmpp/lib/src/reconnect.dart diff --git a/moxxmpp/lib/src/rfcs/rfc_2782.dart b/packages/moxxmpp/lib/src/rfcs/rfc_2782.dart similarity index 100% rename from moxxmpp/lib/src/rfcs/rfc_2782.dart rename to packages/moxxmpp/lib/src/rfcs/rfc_2782.dart diff --git a/moxxmpp/lib/src/rfcs/rfc_4790.dart b/packages/moxxmpp/lib/src/rfcs/rfc_4790.dart similarity index 100% rename from moxxmpp/lib/src/rfcs/rfc_4790.dart rename to packages/moxxmpp/lib/src/rfcs/rfc_4790.dart diff --git a/moxxmpp/lib/src/roster.dart b/packages/moxxmpp/lib/src/roster.dart similarity index 100% rename from moxxmpp/lib/src/roster.dart rename to packages/moxxmpp/lib/src/roster.dart diff --git a/moxxmpp/lib/src/routing.dart b/packages/moxxmpp/lib/src/routing.dart similarity index 100% rename from moxxmpp/lib/src/routing.dart rename to packages/moxxmpp/lib/src/routing.dart diff --git a/moxxmpp/lib/src/settings.dart b/packages/moxxmpp/lib/src/settings.dart similarity index 100% rename from moxxmpp/lib/src/settings.dart rename to packages/moxxmpp/lib/src/settings.dart diff --git a/moxxmpp/lib/src/socket.dart b/packages/moxxmpp/lib/src/socket.dart similarity index 100% rename from moxxmpp/lib/src/socket.dart rename to packages/moxxmpp/lib/src/socket.dart diff --git a/moxxmpp/lib/src/stanza.dart b/packages/moxxmpp/lib/src/stanza.dart similarity index 100% rename from moxxmpp/lib/src/stanza.dart rename to packages/moxxmpp/lib/src/stanza.dart diff --git a/moxxmpp/lib/src/stringxml.dart b/packages/moxxmpp/lib/src/stringxml.dart similarity index 100% rename from moxxmpp/lib/src/stringxml.dart rename to packages/moxxmpp/lib/src/stringxml.dart diff --git a/moxxmpp/lib/src/types/error.dart b/packages/moxxmpp/lib/src/types/error.dart similarity index 100% rename from moxxmpp/lib/src/types/error.dart rename to packages/moxxmpp/lib/src/types/error.dart diff --git a/moxxmpp/lib/src/types/result.dart b/packages/moxxmpp/lib/src/types/result.dart similarity index 100% rename from moxxmpp/lib/src/types/result.dart rename to packages/moxxmpp/lib/src/types/result.dart diff --git a/moxxmpp/lib/src/types/resultv2.dart b/packages/moxxmpp/lib/src/types/resultv2.dart similarity index 100% rename from moxxmpp/lib/src/types/resultv2.dart rename to packages/moxxmpp/lib/src/types/resultv2.dart diff --git a/moxxmpp/lib/src/xeps/staging/extensible_file_thumbnails.dart b/packages/moxxmpp/lib/src/xeps/staging/extensible_file_thumbnails.dart similarity index 100% rename from moxxmpp/lib/src/xeps/staging/extensible_file_thumbnails.dart rename to packages/moxxmpp/lib/src/xeps/staging/extensible_file_thumbnails.dart diff --git a/moxxmpp/lib/src/xeps/staging/file_upload_notification.dart b/packages/moxxmpp/lib/src/xeps/staging/file_upload_notification.dart similarity index 100% rename from moxxmpp/lib/src/xeps/staging/file_upload_notification.dart rename to packages/moxxmpp/lib/src/xeps/staging/file_upload_notification.dart diff --git a/moxxmpp/lib/src/xeps/xep_0004.dart b/packages/moxxmpp/lib/src/xeps/xep_0004.dart similarity index 100% rename from moxxmpp/lib/src/xeps/xep_0004.dart rename to packages/moxxmpp/lib/src/xeps/xep_0004.dart diff --git a/moxxmpp/lib/src/xeps/xep_0030/errors.dart b/packages/moxxmpp/lib/src/xeps/xep_0030/errors.dart similarity index 100% rename from moxxmpp/lib/src/xeps/xep_0030/errors.dart rename to packages/moxxmpp/lib/src/xeps/xep_0030/errors.dart diff --git a/moxxmpp/lib/src/xeps/xep_0030/helpers.dart b/packages/moxxmpp/lib/src/xeps/xep_0030/helpers.dart similarity index 100% rename from moxxmpp/lib/src/xeps/xep_0030/helpers.dart rename to packages/moxxmpp/lib/src/xeps/xep_0030/helpers.dart diff --git a/moxxmpp/lib/src/xeps/xep_0030/types.dart b/packages/moxxmpp/lib/src/xeps/xep_0030/types.dart similarity index 100% rename from moxxmpp/lib/src/xeps/xep_0030/types.dart rename to packages/moxxmpp/lib/src/xeps/xep_0030/types.dart diff --git a/moxxmpp/lib/src/xeps/xep_0030/xep_0030.dart b/packages/moxxmpp/lib/src/xeps/xep_0030/xep_0030.dart similarity index 100% rename from moxxmpp/lib/src/xeps/xep_0030/xep_0030.dart rename to packages/moxxmpp/lib/src/xeps/xep_0030/xep_0030.dart diff --git a/moxxmpp/lib/src/xeps/xep_0054.dart b/packages/moxxmpp/lib/src/xeps/xep_0054.dart similarity index 100% rename from moxxmpp/lib/src/xeps/xep_0054.dart rename to packages/moxxmpp/lib/src/xeps/xep_0054.dart diff --git a/moxxmpp/lib/src/xeps/xep_0060/errors.dart b/packages/moxxmpp/lib/src/xeps/xep_0060/errors.dart similarity index 100% rename from moxxmpp/lib/src/xeps/xep_0060/errors.dart rename to packages/moxxmpp/lib/src/xeps/xep_0060/errors.dart diff --git a/moxxmpp/lib/src/xeps/xep_0060/helpers.dart b/packages/moxxmpp/lib/src/xeps/xep_0060/helpers.dart similarity index 100% rename from moxxmpp/lib/src/xeps/xep_0060/helpers.dart rename to packages/moxxmpp/lib/src/xeps/xep_0060/helpers.dart diff --git a/moxxmpp/lib/src/xeps/xep_0060/xep_0060.dart b/packages/moxxmpp/lib/src/xeps/xep_0060/xep_0060.dart similarity index 100% rename from moxxmpp/lib/src/xeps/xep_0060/xep_0060.dart rename to packages/moxxmpp/lib/src/xeps/xep_0060/xep_0060.dart diff --git a/moxxmpp/lib/src/xeps/xep_0066.dart b/packages/moxxmpp/lib/src/xeps/xep_0066.dart similarity index 100% rename from moxxmpp/lib/src/xeps/xep_0066.dart rename to packages/moxxmpp/lib/src/xeps/xep_0066.dart diff --git a/moxxmpp/lib/src/xeps/xep_0084.dart b/packages/moxxmpp/lib/src/xeps/xep_0084.dart similarity index 100% rename from moxxmpp/lib/src/xeps/xep_0084.dart rename to packages/moxxmpp/lib/src/xeps/xep_0084.dart diff --git a/moxxmpp/lib/src/xeps/xep_0085.dart b/packages/moxxmpp/lib/src/xeps/xep_0085.dart similarity index 100% rename from moxxmpp/lib/src/xeps/xep_0085.dart rename to packages/moxxmpp/lib/src/xeps/xep_0085.dart diff --git a/moxxmpp/lib/src/xeps/xep_0115.dart b/packages/moxxmpp/lib/src/xeps/xep_0115.dart similarity index 100% rename from moxxmpp/lib/src/xeps/xep_0115.dart rename to packages/moxxmpp/lib/src/xeps/xep_0115.dart diff --git a/moxxmpp/lib/src/xeps/xep_0184.dart b/packages/moxxmpp/lib/src/xeps/xep_0184.dart similarity index 100% rename from moxxmpp/lib/src/xeps/xep_0184.dart rename to packages/moxxmpp/lib/src/xeps/xep_0184.dart diff --git a/moxxmpp/lib/src/xeps/xep_0191.dart b/packages/moxxmpp/lib/src/xeps/xep_0191.dart similarity index 100% rename from moxxmpp/lib/src/xeps/xep_0191.dart rename to packages/moxxmpp/lib/src/xeps/xep_0191.dart diff --git a/moxxmpp/lib/src/xeps/xep_0198/negotiator.dart b/packages/moxxmpp/lib/src/xeps/xep_0198/negotiator.dart similarity index 100% rename from moxxmpp/lib/src/xeps/xep_0198/negotiator.dart rename to packages/moxxmpp/lib/src/xeps/xep_0198/negotiator.dart diff --git a/moxxmpp/lib/src/xeps/xep_0198/nonzas.dart b/packages/moxxmpp/lib/src/xeps/xep_0198/nonzas.dart similarity index 100% rename from moxxmpp/lib/src/xeps/xep_0198/nonzas.dart rename to packages/moxxmpp/lib/src/xeps/xep_0198/nonzas.dart diff --git a/moxxmpp/lib/src/xeps/xep_0198/state.dart b/packages/moxxmpp/lib/src/xeps/xep_0198/state.dart similarity index 100% rename from moxxmpp/lib/src/xeps/xep_0198/state.dart rename to packages/moxxmpp/lib/src/xeps/xep_0198/state.dart diff --git a/moxxmpp/lib/src/xeps/xep_0198/state.freezed.dart b/packages/moxxmpp/lib/src/xeps/xep_0198/state.freezed.dart similarity index 100% rename from moxxmpp/lib/src/xeps/xep_0198/state.freezed.dart rename to packages/moxxmpp/lib/src/xeps/xep_0198/state.freezed.dart diff --git a/moxxmpp/lib/src/xeps/xep_0198/state.g.dart b/packages/moxxmpp/lib/src/xeps/xep_0198/state.g.dart similarity index 100% rename from moxxmpp/lib/src/xeps/xep_0198/state.g.dart rename to packages/moxxmpp/lib/src/xeps/xep_0198/state.g.dart diff --git a/moxxmpp/lib/src/xeps/xep_0198/xep_0198.dart b/packages/moxxmpp/lib/src/xeps/xep_0198/xep_0198.dart similarity index 100% rename from moxxmpp/lib/src/xeps/xep_0198/xep_0198.dart rename to packages/moxxmpp/lib/src/xeps/xep_0198/xep_0198.dart diff --git a/moxxmpp/lib/src/xeps/xep_0203.dart b/packages/moxxmpp/lib/src/xeps/xep_0203.dart similarity index 100% rename from moxxmpp/lib/src/xeps/xep_0203.dart rename to packages/moxxmpp/lib/src/xeps/xep_0203.dart diff --git a/moxxmpp/lib/src/xeps/xep_0280.dart b/packages/moxxmpp/lib/src/xeps/xep_0280.dart similarity index 100% rename from moxxmpp/lib/src/xeps/xep_0280.dart rename to packages/moxxmpp/lib/src/xeps/xep_0280.dart diff --git a/moxxmpp/lib/src/xeps/xep_0297.dart b/packages/moxxmpp/lib/src/xeps/xep_0297.dart similarity index 100% rename from moxxmpp/lib/src/xeps/xep_0297.dart rename to packages/moxxmpp/lib/src/xeps/xep_0297.dart diff --git a/moxxmpp/lib/src/xeps/xep_0300.dart b/packages/moxxmpp/lib/src/xeps/xep_0300.dart similarity index 100% rename from moxxmpp/lib/src/xeps/xep_0300.dart rename to packages/moxxmpp/lib/src/xeps/xep_0300.dart diff --git a/moxxmpp/lib/src/xeps/xep_0333.dart b/packages/moxxmpp/lib/src/xeps/xep_0333.dart similarity index 100% rename from moxxmpp/lib/src/xeps/xep_0333.dart rename to packages/moxxmpp/lib/src/xeps/xep_0333.dart diff --git a/moxxmpp/lib/src/xeps/xep_0334.dart b/packages/moxxmpp/lib/src/xeps/xep_0334.dart similarity index 100% rename from moxxmpp/lib/src/xeps/xep_0334.dart rename to packages/moxxmpp/lib/src/xeps/xep_0334.dart diff --git a/moxxmpp/lib/src/xeps/xep_0352.dart b/packages/moxxmpp/lib/src/xeps/xep_0352.dart similarity index 100% rename from moxxmpp/lib/src/xeps/xep_0352.dart rename to packages/moxxmpp/lib/src/xeps/xep_0352.dart diff --git a/moxxmpp/lib/src/xeps/xep_0359.dart b/packages/moxxmpp/lib/src/xeps/xep_0359.dart similarity index 100% rename from moxxmpp/lib/src/xeps/xep_0359.dart rename to packages/moxxmpp/lib/src/xeps/xep_0359.dart diff --git a/moxxmpp/lib/src/xeps/xep_0363.dart b/packages/moxxmpp/lib/src/xeps/xep_0363.dart similarity index 100% rename from moxxmpp/lib/src/xeps/xep_0363.dart rename to packages/moxxmpp/lib/src/xeps/xep_0363.dart diff --git a/moxxmpp/lib/src/xeps/xep_0380.dart b/packages/moxxmpp/lib/src/xeps/xep_0380.dart similarity index 100% rename from moxxmpp/lib/src/xeps/xep_0380.dart rename to packages/moxxmpp/lib/src/xeps/xep_0380.dart diff --git a/moxxmpp/lib/src/xeps/xep_0384/crypto.dart b/packages/moxxmpp/lib/src/xeps/xep_0384/crypto.dart similarity index 100% rename from moxxmpp/lib/src/xeps/xep_0384/crypto.dart rename to packages/moxxmpp/lib/src/xeps/xep_0384/crypto.dart diff --git a/moxxmpp/lib/src/xeps/xep_0384/errors.dart b/packages/moxxmpp/lib/src/xeps/xep_0384/errors.dart similarity index 100% rename from moxxmpp/lib/src/xeps/xep_0384/errors.dart rename to packages/moxxmpp/lib/src/xeps/xep_0384/errors.dart diff --git a/moxxmpp/lib/src/xeps/xep_0384/helpers.dart b/packages/moxxmpp/lib/src/xeps/xep_0384/helpers.dart similarity index 100% rename from moxxmpp/lib/src/xeps/xep_0384/helpers.dart rename to packages/moxxmpp/lib/src/xeps/xep_0384/helpers.dart diff --git a/moxxmpp/lib/src/xeps/xep_0384/types.dart b/packages/moxxmpp/lib/src/xeps/xep_0384/types.dart similarity index 100% rename from moxxmpp/lib/src/xeps/xep_0384/types.dart rename to packages/moxxmpp/lib/src/xeps/xep_0384/types.dart diff --git a/moxxmpp/lib/src/xeps/xep_0384/xep_0384.dart b/packages/moxxmpp/lib/src/xeps/xep_0384/xep_0384.dart similarity index 100% rename from moxxmpp/lib/src/xeps/xep_0384/xep_0384.dart rename to packages/moxxmpp/lib/src/xeps/xep_0384/xep_0384.dart diff --git a/moxxmpp/lib/src/xeps/xep_0385.dart b/packages/moxxmpp/lib/src/xeps/xep_0385.dart similarity index 100% rename from moxxmpp/lib/src/xeps/xep_0385.dart rename to packages/moxxmpp/lib/src/xeps/xep_0385.dart diff --git a/moxxmpp/lib/src/xeps/xep_0414.dart b/packages/moxxmpp/lib/src/xeps/xep_0414.dart similarity index 100% rename from moxxmpp/lib/src/xeps/xep_0414.dart rename to packages/moxxmpp/lib/src/xeps/xep_0414.dart diff --git a/moxxmpp/lib/src/xeps/xep_0446.dart b/packages/moxxmpp/lib/src/xeps/xep_0446.dart similarity index 100% rename from moxxmpp/lib/src/xeps/xep_0446.dart rename to packages/moxxmpp/lib/src/xeps/xep_0446.dart diff --git a/moxxmpp/lib/src/xeps/xep_0447.dart b/packages/moxxmpp/lib/src/xeps/xep_0447.dart similarity index 100% rename from moxxmpp/lib/src/xeps/xep_0447.dart rename to packages/moxxmpp/lib/src/xeps/xep_0447.dart diff --git a/moxxmpp/lib/src/xeps/xep_0448.dart b/packages/moxxmpp/lib/src/xeps/xep_0448.dart similarity index 100% rename from moxxmpp/lib/src/xeps/xep_0448.dart rename to packages/moxxmpp/lib/src/xeps/xep_0448.dart diff --git a/moxxmpp/lib/src/xeps/xep_0461.dart b/packages/moxxmpp/lib/src/xeps/xep_0461.dart similarity index 100% rename from moxxmpp/lib/src/xeps/xep_0461.dart rename to packages/moxxmpp/lib/src/xeps/xep_0461.dart diff --git a/moxxmpp/melos_moxxmpp.iml b/packages/moxxmpp/melos_moxxmpp.iml similarity index 100% rename from moxxmpp/melos_moxxmpp.iml rename to packages/moxxmpp/melos_moxxmpp.iml diff --git a/moxxmpp/pubspec.yaml b/packages/moxxmpp/pubspec.yaml similarity index 100% rename from moxxmpp/pubspec.yaml rename to packages/moxxmpp/pubspec.yaml diff --git a/moxxmpp/test/moxxmpp_test.dart b/packages/moxxmpp/test/moxxmpp_test.dart similarity index 100% rename from moxxmpp/test/moxxmpp_test.dart rename to packages/moxxmpp/test/moxxmpp_test.dart diff --git a/moxxmpp_socket/.gitignore b/packages/moxxmpp_socket_tcp/.gitignore similarity index 100% rename from moxxmpp_socket/.gitignore rename to packages/moxxmpp_socket_tcp/.gitignore diff --git a/moxxmpp_socket/.metadata b/packages/moxxmpp_socket_tcp/.metadata similarity index 100% rename from moxxmpp_socket/.metadata rename to packages/moxxmpp_socket_tcp/.metadata diff --git a/moxxmpp_socket/CHANGELOG.md b/packages/moxxmpp_socket_tcp/CHANGELOG.md similarity index 100% rename from moxxmpp_socket/CHANGELOG.md rename to packages/moxxmpp_socket_tcp/CHANGELOG.md diff --git a/moxxmpp_socket/LICENSE b/packages/moxxmpp_socket_tcp/LICENSE similarity index 100% rename from moxxmpp_socket/LICENSE rename to packages/moxxmpp_socket_tcp/LICENSE diff --git a/moxxmpp_socket/README.md b/packages/moxxmpp_socket_tcp/README.md similarity index 100% rename from moxxmpp_socket/README.md rename to packages/moxxmpp_socket_tcp/README.md diff --git a/moxxmpp_socket/analysis_options.yaml b/packages/moxxmpp_socket_tcp/analysis_options.yaml similarity index 100% rename from moxxmpp_socket/analysis_options.yaml rename to packages/moxxmpp_socket_tcp/analysis_options.yaml diff --git a/moxxmpp_socket/lib/moxxmpp_socket.dart b/packages/moxxmpp_socket_tcp/lib/moxxmpp_socket_tcp.dart similarity index 65% rename from moxxmpp_socket/lib/moxxmpp_socket.dart rename to packages/moxxmpp_socket_tcp/lib/moxxmpp_socket_tcp.dart index c915525..94c8361 100644 --- a/moxxmpp_socket/lib/moxxmpp_socket.dart +++ b/packages/moxxmpp_socket_tcp/lib/moxxmpp_socket_tcp.dart @@ -1,4 +1,4 @@ -library moxxmpp_socket; +library moxxmpp_socket_tcp; export 'src/record.dart'; export 'src/socket.dart'; diff --git a/moxxmpp_socket/lib/src/record.dart b/packages/moxxmpp_socket_tcp/lib/src/record.dart similarity index 100% rename from moxxmpp_socket/lib/src/record.dart rename to packages/moxxmpp_socket_tcp/lib/src/record.dart diff --git a/moxxmpp_socket/lib/src/rfc_2782.dart b/packages/moxxmpp_socket_tcp/lib/src/rfc_2782.dart similarity index 88% rename from moxxmpp_socket/lib/src/rfc_2782.dart rename to packages/moxxmpp_socket_tcp/lib/src/rfc_2782.dart index 7ea6777..5804453 100644 --- a/moxxmpp_socket/lib/src/rfc_2782.dart +++ b/packages/moxxmpp_socket_tcp/lib/src/rfc_2782.dart @@ -1,4 +1,4 @@ -import 'package:moxxmpp_socket/src/record.dart'; +import 'package:moxxmpp_socket_tcp/src/record.dart'; /// Sorts the SRV records according to priority and weight. int srvRecordSortComparator(MoxSrvRecord a, MoxSrvRecord b) { diff --git a/moxxmpp_socket/lib/src/socket.dart b/packages/moxxmpp_socket_tcp/lib/src/socket.dart similarity index 98% rename from moxxmpp_socket/lib/src/socket.dart rename to packages/moxxmpp_socket_tcp/lib/src/socket.dart index c71dcb7..1975fc4 100644 --- a/moxxmpp_socket/lib/src/socket.dart +++ b/packages/moxxmpp_socket_tcp/lib/src/socket.dart @@ -4,8 +4,8 @@ import 'dart:io'; import 'package:logging/logging.dart'; import 'package:meta/meta.dart'; import 'package:moxxmpp/moxxmpp.dart'; -import 'package:moxxmpp_socket/src/record.dart'; -import 'package:moxxmpp_socket/src/rfc_2782.dart'; +import 'package:moxxmpp_socket_tcp/src/record.dart'; +import 'package:moxxmpp_socket_tcp/src/rfc_2782.dart'; /// TCP socket implementation for XmppConnection class TCPSocketWrapper extends BaseSocketWrapper { diff --git a/moxxmpp_socket/pubspec.yaml b/packages/moxxmpp_socket_tcp/pubspec.yaml similarity index 70% rename from moxxmpp_socket/pubspec.yaml rename to packages/moxxmpp_socket_tcp/pubspec.yaml index 0e3ddef..7fc3e1a 100644 --- a/moxxmpp_socket/pubspec.yaml +++ b/packages/moxxmpp_socket_tcp/pubspec.yaml @@ -1,5 +1,5 @@ -name: moxxmpp_socket -description: A socket for moxxmpp that implements the RFC6120 connection algorithm +name: moxxmpp_socket_tcp +description: A socket for moxxmpp using TCP that implements the RFC6120 connection algorithm and XEP-0368 version: 0.1.0 homepage: https://codeberg.org/moxxy/moxxmpp publish_to: https://git.polynom.me/api/packages/Moxxy/pub @@ -8,7 +8,7 @@ environment: sdk: '>=2.18.0 <3.0.0' dependencies: - logging: 1.0.2 + logging: ^1.0.2 meta: ^1.6.0 moxxmpp: hosted: https://git.polynom.me/api/packages/Moxxy/pub diff --git a/moxxmpp_socket/pubspec_overrides.yaml b/packages/moxxmpp_socket_tcp/pubspec_overrides.yaml similarity index 100% rename from moxxmpp_socket/pubspec_overrides.yaml rename to packages/moxxmpp_socket_tcp/pubspec_overrides.yaml diff --git a/moxxmpp_socket/test/widget_test.dart b/packages/moxxmpp_socket_tcp/test/widget_test.dart similarity index 100% rename from moxxmpp_socket/test/widget_test.dart rename to packages/moxxmpp_socket_tcp/test/widget_test.dart