Skip to content

Commit ec9f7a2

Browse files
committed
fix: merge conflicts
2 parents 68dced1 + 1d3c45b commit ec9f7a2

File tree

13 files changed

+75
-73
lines changed

13 files changed

+75
-73
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,21 @@ jobs:
1818
uses: ./.github/workflows/flutter_package.yml
1919
with:
2020
flutter_channel: stable
21-
flutter_version: 3.24.0
21+
flutter_version: 3.35.0
2222
setup: flutter doctor --verbose
2323
working_directory: examples/flutter_package
2424

2525
verify-pana-dart:
2626
uses: ./.github/workflows/pana.yml
2727
with:
28-
pana_version: 0.22.10
28+
pana_version: 0.22.24
2929
min_score: 95
3030
working_directory: examples/dart_package
3131

3232
verify-pana-flutter:
3333
uses: ./.github/workflows/pana.yml
3434
with:
35-
pana_version: 0.22.10
35+
pana_version: 0.22.24
3636
min_score: 95
3737
working_directory: examples/flutter_package
3838

CODE_OF_CONDUCT.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
5555
## Enforcement
5656

5757
Instances of abusive, harassing, or otherwise unacceptable behavior may be
58-
reported by contacting the project team at [email protected]. All
58+
reported by contacting the project team at <[email protected]>. All
5959
complaints will be reviewed and investigated and will result in a response that
6060
is deemed necessary and appropriate to the circumstances. The project team is
6161
obligated to maintain confidentiality with regard to the reporter of an incident.
@@ -68,9 +68,9 @@ members of the project's leadership.
6868
## Attribution
6969

7070
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
71-
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
71+
available at <https://www.contributor-covenant.org/version/1/4/code-of-conduct.html>
7272

7373
[homepage]: https://www.contributor-covenant.org
7474

7575
For answers to common questions about this code of conduct, see
76-
https://www.contributor-covenant.org/faqs
76+
<https://www.contributor-covenant.org/faqs>

CONTRIBUTING.md

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -31,73 +31,73 @@ accepted.
3131

3232
1. Go to the **main** branch and ensure it is up to date with the remote:
3333

34-
```bash
35-
git checkout main
36-
git pull
37-
```
34+
```bash
35+
git checkout main
36+
git pull
37+
```
3838

39-
2. Run the script that will generate the CHANGELOG for you:
39+
1. Run the script that will generate the CHANGELOG for you:
4040

41-
```bash
42-
sh tool/release_ready.sh <new-version>
43-
```
41+
```bash
42+
sh tool/release_ready.sh <new-version>
43+
```
4444

45-
**Note 💡** : You should follow semantic versioning and bump according to the changes the new version makes.
45+
**Note 💡** : You should follow semantic versioning and bump according to the changes the new version makes.
4646

47-
`<new-version>`: The version of this new extension release, for example: 0.2.1
47+
`<new-version>`: The version of this new extension release, for example: 0.2.1
4848

49-
The release_ready script will:
49+
The release_ready script will:
5050

51-
- Create a new branch just for this release and checkout to it.
52-
- Automatically update the CHANGELOG file with the associated changes.
51+
- Create a new branch just for this release and checkout to it.
52+
- Automatically update the CHANGELOG file with the associated changes.
5353

54-
3. Manually remove the *(deps-dev)* scope or other entries of the conventional commits entries in the CHANGELOG
55-
4. Add the changes and commit with the commit message that the *release_ready* script outputted.
56-
5. Raise a Pull Request, the title should be the same as the commit message outputted by the *release_ready* script.
57-
6. When the Pull Request is merged, tag a new release to the commit. When adding the tag ensure:
54+
1. Manually remove the *(deps-dev)* scope or other entries of the conventional commits entries in the CHANGELOG
55+
1. Add the changes and commit with the commit message that the *release_ready* script outputted.
56+
1. Raise a Pull Request, the title should be the same as the commit message outputted by the *release_ready* script.
57+
1. When the Pull Request is merged, tag a new release to the commit. When adding the tag ensure:
5858
- The tag is pointing to the commit that you recently merged.
5959
- The title of the tag should be v<new-version>
6060
- The title of the release should be v<new-version>
6161
- The description should be a raw copy of the CHANGELOG’s file version’s body you recently crafted (without the version header). If in doubt, see the other released tags as an example.
62-
7. After the release is tagged the new changes will be available by the the following syntax:
62+
1. After the release is tagged the new changes will be available by the the following syntax:
6363

64-
```yaml
65-
VeryGoodOpenSource/..@v<new-version>
66-
```
64+
```yaml
65+
VeryGoodOpenSource/..@v<new-version>
66+
```
6767

68-
Where:
68+
Where:
6969

70-
- `<new-version>`: The version of this new workflow or action, for example: 0.2.1
71-
8. Go to the **main** branch and ensure it is up to date with the remote:
70+
- `<new-version>`: The version of this new workflow or action, for example: 0.2.1
7271

73-
```yaml
74-
git checkout main
75-
git pull
76-
```
72+
1. Go to the **main** branch and ensure it is up to date with the remote:
7773

78-
9. Retag the major release.
74+
```yaml
75+
git checkout main
76+
git pull
77+
```
7978

80-
For the Workflow or Action to be updated for those users using the `@<major-version` syntax we will require to retag the major release.
79+
1. Retag the major release.
8180

82-
```yaml
83-
sh tool/retag_v<major-version>.sh <new-version>
84-
```
81+
For the Workflow or Action to be updated for those users using the `@<major-version` syntax we will require to retag the major release.
8582

86-
Where:
83+
```yaml
84+
sh tool/retag_v<major-version>.sh <new-version>
85+
```
8786

88-
- `<major-version>`: Is the major version of the release, for example in 2.16.3 the major version is 2. For more information see the [semantic versioning documentation](https://semver.org/).
89-
- `<new-version>`: The version of this new workflow or action, for example: 0.2.1.
87+
Where:
9088

89+
- `<major-version>`: Is the major version of the release, for example in 2.16.3 the major version is 2. For more information see the [semantic versioning documentation](https://semver.org/).
90+
- `<new-version>`: The version of this new workflow or action, for example: 0.2.1.
9191

92-
If your change is a breaking change and requires a new major release you should update the name of the retag script and its `v<major-version>` instances.
92+
If your change is a breaking change and requires a new major release you should update the name of the retag script and its `v<major-version>` instances.
9393

94-
10. After the retag the new changes will be available by the the following syntax:
94+
1. After the retag the new changes will be available by the the following syntax:
9595

96-
```yaml
97-
VeryGoodOpenSource/..@v<major-version>
98-
```
96+
```yaml
97+
VeryGoodOpenSource/..@v<major-version>
98+
```
9999

100-
Where: `<major-version>`: Is the major version of the release, for example in 2.16.3 the major version is 2. For more information see the [semantic versioning documentation](https://semver.org/).
100+
Where: `<major-version>`: Is the major version of the release, for example in 2.16.3 the major version is 2. For more information see the [semantic versioning documentation](https://semver.org/).
101101

102102
[conventional_commits_link]: https://www.conventionalcommits.org/en/v1.0.0
103103
[bug_report_link]: https://github.com/VeryGoodOpenSource/very_good_workflows/issues/new?assignees=&labels=bug&template=bug_report.md&title=fix%3A+

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Reusable [GitHub workflows][github_workflows_link] used internally at [Very Good
1414

1515
## Documentation 📝
1616

17-
For official documentation, please visit https://workflows.vgv.dev.
17+
For official documentation, please visit <https://workflows.vgv.dev>.
1818

1919
## Quick Start 🚀
2020

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
include: package:very_good_analysis/analysis_options.4.0.0.yaml
1+
include: package:very_good_analysis/analysis_options.yaml

examples/dart_package/pubspec.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ version: 1.0.0+1
44
publish_to: none
55

66
environment:
7-
sdk: ">=2.19.0 <3.0.0"
7+
sdk: ^3.8.0
88

99
dev_dependencies:
10-
test: ^1.19.2
11-
very_good_analysis: ^4.0.0
10+
test: ^1.26.3
11+
very_good_analysis: ^10.0.0

examples/dart_package/test/src/dart_package_test.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1+
// Can cause false positives.
12
// ignore_for_file: prefer_const_constructors
23
import 'package:dart_package/dart_package.dart';
34
import 'package:test/test.dart';
45

56
void main() {
6-
group('DartPackage', () {
7+
group(DartPackage, () {
78
test('can be instantiated', () {
89
expect(DartPackage(), isNotNull);
910
});
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
include: package:very_good_analysis/analysis_options.4.0.0.yaml
1+
include: package:very_good_analysis/analysis_options.yaml

examples/flutter_package/pubspec.lock

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@ packages:
55
dependency: transitive
66
description:
77
name: async
8-
sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
8+
sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb"
99
url: "https://pub.dev"
1010
source: hosted
11-
version: "2.11.0"
11+
version: "2.13.0"
1212
boolean_selector:
1313
dependency: transitive
1414
description:
1515
name: boolean_selector
16-
sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
16+
sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea"
1717
url: "https://pub.dev"
1818
source: hosted
19-
version: "2.1.1"
19+
version: "2.1.2"
2020
characters:
2121
dependency: transitive
2222
description:
@@ -124,10 +124,10 @@ packages:
124124
dependency: transitive
125125
description:
126126
name: source_span
127-
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
127+
sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c"
128128
url: "https://pub.dev"
129129
source: hosted
130-
version: "1.10.0"
130+
version: "1.10.1"
131131
stack_trace:
132132
dependency: transitive
133133
description:
@@ -148,18 +148,18 @@ packages:
148148
dependency: transitive
149149
description:
150150
name: string_scanner
151-
sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
151+
sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43"
152152
url: "https://pub.dev"
153153
source: hosted
154-
version: "1.2.0"
154+
version: "1.4.1"
155155
term_glyph:
156156
dependency: transitive
157157
description:
158158
name: term_glyph
159-
sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
159+
sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e"
160160
url: "https://pub.dev"
161161
source: hosted
162-
version: "1.2.1"
162+
version: "1.2.2"
163163
test_api:
164164
dependency: transitive
165165
description:
@@ -180,10 +180,10 @@ packages:
180180
dependency: "direct dev"
181181
description:
182182
name: very_good_analysis
183-
sha256: ebc48c51db35beeeec8c414e32f7bd78e612bd7f5992ccb0d46e19edaeb40b08
183+
sha256: "96245839dbcc45dfab1af5fa551603b5c7a282028a64746c19c547d21a7f1e3a"
184184
url: "https://pub.dev"
185185
source: hosted
186-
version: "4.0.0+1"
186+
version: "10.0.0"
187187
vm_service:
188188
dependency: transitive
189189
description:
@@ -193,5 +193,5 @@ packages:
193193
source: hosted
194194
version: "15.0.2"
195195
sdks:
196-
dart: ">=3.8.0-0 <4.0.0"
196+
dart: ">=3.9.0 <4.0.0"
197197
flutter: ">=3.18.0-18.0.pre.54"

examples/flutter_package/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version: 1.0.0+1
44
publish_to: none
55

66
environment:
7-
sdk: ">=2.19.0 <3.0.0"
7+
sdk: ^3.8.0
88

99
dependencies:
1010
flutter:
@@ -13,4 +13,4 @@ dependencies:
1313
dev_dependencies:
1414
flutter_test:
1515
sdk: flutter
16-
very_good_analysis: ^4.0.0
16+
very_good_analysis: ^10.0.0

0 commit comments

Comments
 (0)