From 74c850305e9df62c9d3cc809bf0afcfdbcffeb8f Mon Sep 17 00:00:00 2001 From: Plague Fox Date: Fri, 4 Aug 2023 08:46:18 +0400 Subject: [PATCH] Update codegeneration --- Makefile | 4 +-- lib/src/model/pubspec.yaml.g.dart | 32 +++++++++---------- .../protobuf/client.pb.dart | 0 .../protobuf/client.pbenum.dart | 0 .../protobuf/client.pbjson.dart | 0 .../protobuf/client.pbserver.dart | 0 .../protobuf/client.proto | 0 .../transport/transport_protobuf_codec.dart | 2 +- lib/src/transport/ws_protobuf_transport.dart | 2 +- 9 files changed, 20 insertions(+), 20 deletions(-) rename lib/src/{model => transport}/protobuf/client.pb.dart (100%) rename lib/src/{model => transport}/protobuf/client.pbenum.dart (100%) rename lib/src/{model => transport}/protobuf/client.pbjson.dart (100%) rename lib/src/{model => transport}/protobuf/client.pbserver.dart (100%) rename lib/src/{model => transport}/protobuf/client.proto (100%) diff --git a/Makefile b/Makefile index 8070650..8504dc8 100644 --- a/Makefile +++ b/Makefile @@ -44,6 +44,6 @@ pana: check generate: get @dart pub global activate protoc_plugin - @protoc --proto_path=lib/src/model/protobuf --dart_out=lib/src/model/protobuf lib/src/model/protobuf/client.proto + @protoc --proto_path=lib/src/transport/protobuf --dart_out=lib/src/transport/protobuf lib/src/transport/protobuf/client.proto @dart run build_runner build --delete-conflicting-outputs - @dart format -l 80 lib/src/model/pubspec.yaml.g.dart lib/src/model/protobuf/ \ No newline at end of file + @dart format -l 80 lib/src/model/pubspec.yaml.g.dart lib/src/transport/protobuf/ \ No newline at end of file diff --git a/lib/src/model/pubspec.yaml.g.dart b/lib/src/model/pubspec.yaml.g.dart index d5ddd88..dde0a2a 100644 --- a/lib/src/model/pubspec.yaml.g.dart +++ b/lib/src/model/pubspec.yaml.g.dart @@ -93,13 +93,13 @@ sealed class Pubspec { static const PubspecVersion version = ( /// Non-canonical string representation of the version as provided /// in the pubspec.yaml file. - representation: r'0.0.1-pre.1', + representation: r'0.0.1-pre.4', /// Returns a 'canonicalized' representation /// of the application version. /// This represents the version string in accordance with /// Semantic Versioning (SemVer) standards. - canonical: r'0.0.1-pre.1', + canonical: r'0.0.1-pre.4', /// MAJOR version when you make incompatible API changes. /// The major version number: 1 in "1.2.3". @@ -115,7 +115,7 @@ sealed class Pubspec { patch: 1, /// The pre-release identifier: "foo" in "1.2.3-foo". - preRelease: [r'pre', r'1'], + preRelease: [r'pre', r'4'], /// The build identifier: "foo" in "1.2.3+foo". build: [], @@ -124,13 +124,13 @@ sealed class Pubspec { /// Build date and time (UTC) static final DateTime timestamp = DateTime.utc( 2023, - 7, - 16, - 16, - 24, - 19, - 363, - 242, + 8, + 4, + 4, + 45, + 29, + 391, + 533, ); /// Name @@ -150,7 +150,7 @@ sealed class Pubspec { /// Try to pick a name that is clear, terse, and not already in use. /// A quick search of packages on the [pub.dev site](https://pub.dev/packages) /// to make sure that nothing else is using your name is recommended. - static const String name = r'centrifuge_dart'; + static const String name = r'spinify'; /// Description /// @@ -193,8 +193,7 @@ sealed class Pubspec { /// While providing a repository is optional, /// please provide it or homepage (or both). /// It helps users understand where your package is coming from. - static const String repository = - r'https://github.com/PlugFox/centrifuge-client'; + static const String repository = r'https://github.com/PlugFox/spinify'; /// Issue tracker /// @@ -208,7 +207,7 @@ sealed class Pubspec { /// then the pub.dev site uses the default issue tracker /// (https://github.com///issues). static const String issueTracker = - r'https://github.com/PlugFox/centrifuge-client/issues'; + r'https://github.com/PlugFox/spinify/issues'; /// Documentation /// @@ -350,11 +349,11 @@ sealed class Pubspec { /// When choosing topics, consider if existing topics are relevant. /// Tagging with existing topics helps users discover your package. static const List topics = [ + r'spinify', r'centrifugo', r'centrifuge', r'websocket', r'cross-platform', - r'client', ]; /// Environment @@ -427,10 +426,11 @@ sealed class Pubspec { /// see [Package dependencies](https://dart.dev/tools/pub/dependencies). static const Map dependencies = { 'meta': r'^1.9.1', - 'ws': r'^0.1.2', + 'ws': r'^1.0.0-pre.6', 'protobuf': r'^3.0.0', 'crypto': r'^3.0.3', 'fixnum': r'^1.1.0', + 'stack_trace': r'^1.11.1', }; /// Developer dependencies diff --git a/lib/src/model/protobuf/client.pb.dart b/lib/src/transport/protobuf/client.pb.dart similarity index 100% rename from lib/src/model/protobuf/client.pb.dart rename to lib/src/transport/protobuf/client.pb.dart diff --git a/lib/src/model/protobuf/client.pbenum.dart b/lib/src/transport/protobuf/client.pbenum.dart similarity index 100% rename from lib/src/model/protobuf/client.pbenum.dart rename to lib/src/transport/protobuf/client.pbenum.dart diff --git a/lib/src/model/protobuf/client.pbjson.dart b/lib/src/transport/protobuf/client.pbjson.dart similarity index 100% rename from lib/src/model/protobuf/client.pbjson.dart rename to lib/src/transport/protobuf/client.pbjson.dart diff --git a/lib/src/model/protobuf/client.pbserver.dart b/lib/src/transport/protobuf/client.pbserver.dart similarity index 100% rename from lib/src/model/protobuf/client.pbserver.dart rename to lib/src/transport/protobuf/client.pbserver.dart diff --git a/lib/src/model/protobuf/client.proto b/lib/src/transport/protobuf/client.proto similarity index 100% rename from lib/src/model/protobuf/client.proto rename to lib/src/transport/protobuf/client.proto diff --git a/lib/src/transport/transport_protobuf_codec.dart b/lib/src/transport/transport_protobuf_codec.dart index a1dfd5d..ec51f7c 100644 --- a/lib/src/transport/transport_protobuf_codec.dart +++ b/lib/src/transport/transport_protobuf_codec.dart @@ -2,7 +2,7 @@ import 'dart:convert'; import 'package:meta/meta.dart'; import 'package:protobuf/protobuf.dart' as pb; -import 'package:spinify/src/model/protobuf/client.pb.dart' as pb; +import 'package:spinify/src/transport/protobuf/client.pb.dart' as pb; import 'package:spinify/src/util/logger.dart' as logger; /// {@nodoc} diff --git a/lib/src/transport/ws_protobuf_transport.dart b/lib/src/transport/ws_protobuf_transport.dart index 264f67a..b329d8c 100644 --- a/lib/src/transport/ws_protobuf_transport.dart +++ b/lib/src/transport/ws_protobuf_transport.dart @@ -17,7 +17,6 @@ import 'package:spinify/src/model/history.dart'; import 'package:spinify/src/model/message.dart'; import 'package:spinify/src/model/presence.dart'; import 'package:spinify/src/model/presence_stats.dart'; -import 'package:spinify/src/model/protobuf/client.pb.dart' as pb; import 'package:spinify/src/model/publication.dart'; import 'package:spinify/src/model/refresh.dart'; import 'package:spinify/src/model/refresh_result.dart'; @@ -29,6 +28,7 @@ import 'package:spinify/src/subscription/subcibed_on_channel.dart'; import 'package:spinify/src/subscription/subscription.dart'; import 'package:spinify/src/subscription/subscription_config.dart'; import 'package:spinify/src/subscription/subscription_state.dart'; +import 'package:spinify/src/transport/protobuf/client.pb.dart' as pb; import 'package:spinify/src/transport/transport_interface.dart'; import 'package:spinify/src/transport/transport_protobuf_codec.dart'; import 'package:spinify/src/util/logger.dart' as logger;