Skip to content

Commit

Permalink
feat!: Dart 3 support (#194)
Browse files Browse the repository at this point in the history
  • Loading branch information
GregoryConrad authored May 29, 2023
1 parent 533362a commit b987dac
Show file tree
Hide file tree
Showing 16 changed files with 88 additions and 78 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ Here's what the recommended approach would look like:
final filter = Mimir.or([
Mimir.and([
Mimir.where('fruit', isEqualTo: 'apple'),
Mimir.where('year', isBetween: '2000', and: '2009'),
Mimir.where('year', isBetween: ('2000', '2009')),
]),
Mimir.where('colors', containsAtLeastOneOf: ['red', 'green']),
])
Expand Down
12 changes: 8 additions & 4 deletions analysis_options.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
# Modified from very_good_analysis@4.0.0
# Modified from very_good_analysis@5.0.0+1
analyzer:
language:
strict-casts: true
strict-inference: true
strict-raw-types: true

errors:
# close_sinks: ignore
missing_required_param: error
missing_return: error
record_literal_one_positional_no_trailing_comma: error

exclude:
- '**.freezed.dart'
- '**.g.dart'
Expand Down Expand Up @@ -73,14 +77,15 @@ linter:
- empty_catches
- empty_constructor_bodies
- empty_statements
- enable_null_safety
- eol_at_end_of_file
- exhaustive_cases
- file_names
- flutter_style_todos
- hash_and_equals
- implicit_call_tearoffs
- implementation_imports
- implicit_reopen
- invalid_case_patterns
- iterable_contains_unrelated_type
- join_return_with_assignment
- leading_newlines_in_multiline_strings
Expand Down Expand Up @@ -122,7 +127,6 @@ linter:
- prefer_const_literals_to_create_immutables
- prefer_constructors_over_static_methods
- prefer_contains
- prefer_equal_for_default_values
- prefer_final_fields
- prefer_final_in_for_each
- prefer_final_locals
Expand Down Expand Up @@ -164,6 +168,7 @@ linter:
- type_init_formals
- unawaited_futures
- unnecessary_await_in_return
- unnecessary_breaks
- unnecessary_brace_in_string_interps
- unnecessary_const
- unnecessary_constructor_name
Expand All @@ -187,7 +192,6 @@ linter:
- unrelated_type_equality_checks
- use_build_context_synchronously
- use_colored_box
- use_decorated_box
- use_enums
- use_full_hex_values_for_flutter_colors
- use_function_type_syntax_for_parameters
Expand Down
2 changes: 1 addition & 1 deletion packages/flutter_mimir/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version: 1.0.0
publish_to: none

environment:
sdk: '>=2.18.4 <3.0.0'
sdk: '>=3.0.0 <4.0.0'

dependencies:
flutter:
Expand Down
4 changes: 2 additions & 2 deletions packages/flutter_mimir/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ repository: https://github.com/GregoryConrad/mimir
issue_tracker: https://github.com/GregoryConrad/mimir/issues

environment:
sdk: ">=2.17.0 <3.0.0"
flutter: ">=3.0.0"
sdk: '>=3.0.0 <4.0.0'
flutter: '>=3.0.0'

dependencies:
flutter:
Expand Down
2 changes: 1 addition & 1 deletion packages/mimir/example/lib/mimir_example.dart
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ Future<void> run(String path, DynamicLibrary lib) async {
// The movie cast must include Bruce Willis
Mimir.where('cast', containsAtLeastOneOf: ['Bruce Willis']),
// The movie must have been released between 2015 & 2017
Mimir.where('year', isBetween: '2015', and: '2017'),
Mimir.where('year', isBetween: ('2015', '2017')),
]),
);

Expand Down
2 changes: 1 addition & 1 deletion packages/mimir/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version: 1.0.0
publish_to: none

environment:
sdk: '>=2.18.4 <3.0.0'
sdk: '>=3.0.0 <4.0.0'

dependencies:
# These two are needed for the example; they are not required by mimir
Expand Down
2 changes: 1 addition & 1 deletion packages/mimir/lib/src/bridge_generated.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// AUTO GENERATED FILE, DO NOT EDIT.
// Generated by `flutter_rust_bridge`@ 1.75.3.
// Generated by `flutter_rust_bridge`@ 1.77.0.
// ignore_for_file: non_constant_identifier_names, unused_element, duplicate_ignore, directives_ordering, curly_braces_in_flow_control_structures, unnecessary_lambdas, slash_for_doc_comments, prefer_const_literals_to_create_immutables, implicit_dynamic_list_literal, duplicate_import, unused_import, unnecessary_import, prefer_single_quotes, prefer_const_constructors, use_super_parameters, always_use_package_imports, annotate_overrides, invalid_use_of_protected_member, constant_identifier_names, invalid_use_of_internal_member, prefer_is_empty, unnecessary_const

import 'dart:convert';
Expand Down
54 changes: 27 additions & 27 deletions packages/mimir/lib/src/bridge_generated.io.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// AUTO GENERATED FILE, DO NOT EDIT.
// Generated by `flutter_rust_bridge`@ 1.75.3.
// Generated by `flutter_rust_bridge`@ 1.77.0.
// ignore_for_file: non_constant_identifier_names, unused_element, duplicate_ignore, directives_ordering, curly_braces_in_flow_control_structures, unnecessary_lambdas, slash_for_doc_comments, prefer_const_literals_to_create_immutables, implicit_dynamic_list_literal, duplicate_import, unused_import, unnecessary_import, prefer_single_quotes, prefer_const_constructors, use_super_parameters, always_use_package_imports, annotate_overrides, invalid_use_of_protected_member, constant_identifier_names, invalid_use_of_internal_member, prefer_is_empty, unnecessary_const

import 'dart:convert';
Expand Down Expand Up @@ -993,65 +993,65 @@ class EmbeddedMilliWire implements FlutterRustBridgeWireBase {
_free_WireSyncReturnPtr.asFunction<void Function(WireSyncReturn)>();
}

class _Dart_Handle extends ffi.Opaque {}
final class _Dart_Handle extends ffi.Opaque {}

class wire_uint_8_list extends ffi.Struct {
final class wire_uint_8_list extends ffi.Struct {
external ffi.Pointer<ffi.Uint8> ptr;

@ffi.Int32()
external int len;
}

class wire_StringList extends ffi.Struct {
final class wire_StringList extends ffi.Struct {
external ffi.Pointer<ffi.Pointer<wire_uint_8_list>> ptr;

@ffi.Int32()
external int len;
}

class wire_SortBy_Asc extends ffi.Struct {
final class wire_SortBy_Asc extends ffi.Struct {
external ffi.Pointer<wire_uint_8_list> field0;
}

class wire_SortBy_Desc extends ffi.Struct {
final class wire_SortBy_Desc extends ffi.Struct {
external ffi.Pointer<wire_uint_8_list> field0;
}

class SortByKind extends ffi.Union {
final class SortByKind extends ffi.Union {
external ffi.Pointer<wire_SortBy_Asc> Asc;

external ffi.Pointer<wire_SortBy_Desc> Desc;
}

class wire_SortBy extends ffi.Struct {
final class wire_SortBy extends ffi.Struct {
@ffi.Int32()
external int tag;

external ffi.Pointer<SortByKind> kind;
}

class wire_list_sort_by extends ffi.Struct {
final class wire_list_sort_by extends ffi.Struct {
external ffi.Pointer<wire_SortBy> ptr;

@ffi.Int32()
external int len;
}

class wire_list_filter extends ffi.Struct {
final class wire_list_filter extends ffi.Struct {
external ffi.Pointer<wire_Filter> ptr;

@ffi.Int32()
external int len;
}

class wire_Filter extends ffi.Struct {
final class wire_Filter extends ffi.Struct {
@ffi.Int32()
external int tag;

external ffi.Pointer<FilterKind> kind;
}

class FilterKind extends ffi.Union {
final class FilterKind extends ffi.Union {
external ffi.Pointer<wire_Filter_Or> Or;

external ffi.Pointer<wire_Filter_And> And;
Expand All @@ -1077,86 +1077,86 @@ class FilterKind extends ffi.Union {
external ffi.Pointer<wire_Filter_Between> Between;
}

class wire_Filter_Or extends ffi.Struct {
final class wire_Filter_Or extends ffi.Struct {
external ffi.Pointer<wire_list_filter> field0;
}

class wire_Filter_And extends ffi.Struct {
final class wire_Filter_And extends ffi.Struct {
external ffi.Pointer<wire_list_filter> field0;
}

class wire_Filter_Not extends ffi.Struct {
final class wire_Filter_Not extends ffi.Struct {
external ffi.Pointer<wire_Filter> field0;
}

class wire_Filter_Exists extends ffi.Struct {
final class wire_Filter_Exists extends ffi.Struct {
external ffi.Pointer<wire_uint_8_list> field;
}

class wire_Filter_InValues extends ffi.Struct {
final class wire_Filter_InValues extends ffi.Struct {
external ffi.Pointer<wire_uint_8_list> field;

external ffi.Pointer<wire_StringList> values;
}

class wire_Filter_GreaterThan extends ffi.Struct {
final class wire_Filter_GreaterThan extends ffi.Struct {
external ffi.Pointer<wire_uint_8_list> field;

external ffi.Pointer<wire_uint_8_list> value;
}

class wire_Filter_GreaterThanOrEqual extends ffi.Struct {
final class wire_Filter_GreaterThanOrEqual extends ffi.Struct {
external ffi.Pointer<wire_uint_8_list> field;

external ffi.Pointer<wire_uint_8_list> value;
}

class wire_Filter_Equal extends ffi.Struct {
final class wire_Filter_Equal extends ffi.Struct {
external ffi.Pointer<wire_uint_8_list> field;

external ffi.Pointer<wire_uint_8_list> value;
}

class wire_Filter_NotEqual extends ffi.Struct {
final class wire_Filter_NotEqual extends ffi.Struct {
external ffi.Pointer<wire_uint_8_list> field;

external ffi.Pointer<wire_uint_8_list> value;
}

class wire_Filter_LessThan extends ffi.Struct {
final class wire_Filter_LessThan extends ffi.Struct {
external ffi.Pointer<wire_uint_8_list> field;

external ffi.Pointer<wire_uint_8_list> value;
}

class wire_Filter_LessThanOrEqual extends ffi.Struct {
final class wire_Filter_LessThanOrEqual extends ffi.Struct {
external ffi.Pointer<wire_uint_8_list> field;

external ffi.Pointer<wire_uint_8_list> value;
}

class wire_Filter_Between extends ffi.Struct {
final class wire_Filter_Between extends ffi.Struct {
external ffi.Pointer<wire_uint_8_list> field;

external ffi.Pointer<wire_uint_8_list> from;

external ffi.Pointer<wire_uint_8_list> to;
}

class wire_Synonyms extends ffi.Struct {
final class wire_Synonyms extends ffi.Struct {
external ffi.Pointer<wire_uint_8_list> word;

external ffi.Pointer<wire_StringList> synonyms;
}

class wire_list_synonyms extends ffi.Struct {
final class wire_list_synonyms extends ffi.Struct {
external ffi.Pointer<wire_Synonyms> ptr;

@ffi.Int32()
external int len;
}

class wire_MimirIndexSettings extends ffi.Struct {
final class wire_MimirIndexSettings extends ffi.Struct {
external ffi.Pointer<wire_uint_8_list> primary_key;

external ffi.Pointer<wire_StringList> searchable_fields;
Expand Down
2 changes: 1 addition & 1 deletion packages/mimir/lib/src/bridge_generated.web.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// AUTO GENERATED FILE, DO NOT EDIT.
// Generated by `flutter_rust_bridge`@ 1.75.3.
// Generated by `flutter_rust_bridge`@ 1.77.0.
// ignore_for_file: non_constant_identifier_names, unused_element, duplicate_ignore, directives_ordering, curly_braces_in_flow_control_structures, unnecessary_lambdas, slash_for_doc_comments, prefer_const_literals_to_create_immutables, implicit_dynamic_list_literal, duplicate_import, unused_import, unnecessary_import, prefer_single_quotes, prefer_const_constructors, use_super_parameters, always_use_package_imports, annotate_overrides, invalid_use_of_protected_member, constant_identifier_names, invalid_use_of_internal_member, prefer_is_empty, unnecessary_const

import 'dart:convert';
Expand Down
Loading

0 comments on commit b987dac

Please sign in to comment.