Skip to content

Commit

Permalink
Fix changelog, bump min SDK (#488)
Browse files Browse the repository at this point in the history
  • Loading branch information
kevmoo authored Jul 19, 2024
1 parent 2dcb6b0 commit 62562fe
Show file tree
Hide file tree
Showing 15 changed files with 132 additions and 100 deletions.
26 changes: 13 additions & 13 deletions .github/workflows/dart.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions analysis_options.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,19 +34,25 @@ linter:
- cancel_subscriptions
- cascade_invocations
- collection_methods_unrelated_type
- combinators_ordering
- comment_references
- conditional_uri_does_not_exist
- constant_identifier_names
- control_flow_in_finally
- curly_braces_in_flow_control_structures
- dangling_library_doc_comments
- depend_on_referenced_packages
- directives_ordering
- empty_catches
- empty_constructor_bodies
- empty_statements
- exhaustive_cases
- file_names
- hash_and_equals
- implementation_imports
- implicit_call_tearoffs
- join_return_with_assignment
- library_annotations
- library_names
- library_prefixes
- library_private_types_in_public_api
Expand All @@ -57,6 +63,7 @@ linter:
- no_leading_underscores_for_library_prefixes
- no_leading_underscores_for_local_identifiers
- no_runtimeType_toString
- no_wildcard_variable_uses
- non_constant_identifier_names
- null_check_on_nullable_type_parameter
- null_closures
Expand Down Expand Up @@ -97,34 +104,42 @@ linter:
- provide_deprecation_message
- recursive_getters
- require_trailing_commas
- secure_pubspec_urls
- slash_for_doc_comments
- sort_pub_dependencies
- sort_unnamed_constructors_first
- test_types_in_equals
- throw_in_finally
- type_annotate_public_apis
- type_init_formals
- type_literal_in_constant_pattern
- unawaited_futures
- unnecessary_brace_in_string_interps
- unnecessary_const
- unnecessary_constructor_name
- unnecessary_getters_setters
- unnecessary_lambdas
- unnecessary_late
- unnecessary_library_directive
- unnecessary_library_name
- unnecessary_new
- unnecessary_null_aware_assignments
- unnecessary_null_in_if_null_operators
- unnecessary_nullable_for_final_variable_declarations
- unnecessary_overrides
- unnecessary_parenthesis
- unnecessary_statements
- unnecessary_string_escapes
- unnecessary_string_interpolations
- unnecessary_this
- unnecessary_to_list_in_spreads
- unreachable_from_main
- unrelated_type_equality_checks
- use_function_type_syntax_for_parameters
- use_is_even_rather_than_modulo
- use_rethrow_when_possible
- use_string_buffers
- use_string_in_part_of_directives
- use_super_parameters
- valid_regexps
- void_checks
7 changes: 7 additions & 0 deletions mono_repo/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## 6.6.2

- Require Dart `sdk: ^3.4.0`.
- Populate `token` for `codecov` action.
(Requires the user to provide `CODECOV_TOKEN` in their secrets.)
- Update to latest action versions.

## 6.6.1

- Update to latest action versions.
Expand Down
6 changes: 3 additions & 3 deletions mono_repo/lib/src/commands/github/action_versions.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.

/// This file is generated, and should not be modified by hand.
///
/// To regenerate it, run the `tool/generate_action_versions.dart` script.
// This file is generated, and should not be modified by hand.
//
// To regenerate it, run the `tool/generate_action_versions.dart` script.

const actionsCacheVersion = '0c45773b623bea8c8e75f6c82b208c3cf94ea4f9';
const dartLangSetupDartVersion = '0a8a0fc875eb934c15d08629302413c671d3f672';
Expand Down
2 changes: 1 addition & 1 deletion mono_repo/lib/src/mono_config.dart
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class MonoConfig implements BasicConfiguration {

Map parseCI(CI targetCI) {
final key = targetCI.toString().split('.').last;
final value = json[key] ?? {};
final value = json[key] ?? <String, dynamic>{};

if (value is bool) {
if (!value) {
Expand Down
2 changes: 1 addition & 1 deletion mono_repo/lib/src/version.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions mono_repo/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@ name: mono_repo
description: >-
CLI tools to make it easier to manage a single source repository containing
multiple Dart packages.
version: 6.6.1
version: 6.6.2
repository: https://github.com/google/mono_repo.dart

topics:
- tool
- repository-management

environment:
sdk: ^3.0.0
sdk: ^3.4.0

dependencies:
args: ^2.0.0
checked_yaml: ^2.0.0
collection: ^1.14.3
graphs: ^2.2.0
io: ^1.0.0
json_annotation: ^4.8.0
json_annotation: ^4.9.0
meta: ^1.0.0
path: ^1.4.1
pub_semver: ^2.0.0
Expand Down
2 changes: 2 additions & 0 deletions mono_repo/test/action_versions_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
// On windows this test fails for unknown reasons, possibly there are carriage
// returns being introduced during formatting.
@OnPlatform({'windows': Skip('Broken on windows')})
library;

import 'dart:io';

import 'package:test/test.dart';
Expand Down
2 changes: 2 additions & 0 deletions mono_repo/test/ensure_build_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
@Tags(['presubmit-only'])
@OnPlatform({'windows': Skip('newlines are different')})
@Timeout.factor(4)
library;

import 'package:build_verify/build_verify.dart';
import 'package:test/test.dart';

Expand Down
2 changes: 2 additions & 0 deletions mono_repo/test/github_command_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.

// ignore_for_file: inference_failure_on_collection_literal

import 'package:mono_repo/src/github_config.dart';
import 'package:mono_repo/src/yaml.dart';
import 'package:term_glyph/term_glyph.dart' as glyph;
Expand Down
8 changes: 4 additions & 4 deletions mono_repo/test/mono_config_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ final _dummyPubspec = Pubspec('_example');
String _encodeJson(Object? input) =>
const JsonEncoder.withIndent(' ').convert(input);

PackageConfig _parse(map) => PackageConfig.parse(
PackageConfig _parse(Object map) => PackageConfig.parse(
'a',
_dummyPubspec,
map is YamlMap
Expand Down Expand Up @@ -122,7 +122,7 @@ line 2, column 9: Unsupported value for "sdk". The value for "sdk" must be an ar

test('sdk value cannot be empty', () {
_expectParseThrows(
{'sdk': []},
{'sdk': <Never>[]},
r'''
line 2, column 9: Unsupported value for "sdk". The value for "sdk" must be an array with at least one value.
Expand Down Expand Up @@ -246,7 +246,7 @@ line 10, column 6: Must have one and only one key of `format`, `analyze`, `test`
final monoYaml = {
'sdk': ['stable'],
'stages': [
{'a': []},
{'a': <Never>[]},
],
};
_expectParseThrows(
Expand Down Expand Up @@ -281,7 +281,7 @@ line 8, column 4: Stages must be a list of maps with exactly one key (the name o
test('no keys under a stage', () {
final monoYaml = {
'sdk': ['stable'],
'stages': [{}],
'stages': [<String, dynamic>{}],
};
_expectParseThrows(
monoYaml,
Expand Down
2 changes: 2 additions & 0 deletions mono_repo/test/presubmit_command_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

@Tags(['presubmit-only'])
@OnPlatform({'windows': Skip('Cant run shell scripts on windows')})
library;

import 'dart:io';

import 'package:io/ansi.dart';
Expand Down
Loading

0 comments on commit 62562fe

Please sign in to comment.