Require Dart 2.19, use pkg:dart_flutter_team_lints (#35)
misc changelog cleanup
diff --git a/.github/workflows/test-package.yml b/.github/workflows/test-package.yml
index 6abae73..89e2dea 100644
--- a/.github/workflows/test-package.yml
+++ b/.github/workflows/test-package.yml
@@ -47,7 +47,7 @@
matrix:
# Add macos-latest and/or windows-latest if relevant for this package.
os: [ubuntu-latest]
- sdk: [2.12.0, dev]
+ sdk: [2.19.0, dev]
steps:
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
- uses: dart-lang/setup-dart@a57a6c04cf7d4840e88432aad6281d1e125f0d46
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a7202cd..74903a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,32 +1,15 @@
+## 2.1.2-dev
+
+* Require Dart 2.19
+
## 2.1.1
* Populate the pubspec `repository` field.
-* Switch to using `package:lints`.
## 2.1.0
* Stable release for null safety.
-
-## 2.1.0-nullsafety.4
-
-* Update SDK constraints to `>=2.12.0-0 <3.0.0` based on beta release
- guidelines.
-
-## 2.1.0-nullsafety.3
-
-* Allow prerelease versions of the 2.12 sdk.
-
-## 2.1.0-nullsafety.2
-
-* Allow 2.10 stable and 2.11.0 dev SDK versions.
-
-## 2.1.0-nullsafety.1
-
-* Update source_maps constraint.
-
-## 2.1.0-nullsafety
-
-* Migrate to null safety.
+* Require Dart 2.12
## 2.0.0
diff --git a/analysis_options.yaml b/analysis_options.yaml
index 08787b5..78932a5 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -1,4 +1,4 @@
-include: package:lints/recommended.yaml
+include: package:dart_flutter_team_lints/analysis_options.yaml
analyzer:
language:
diff --git a/lib/source_map_stack_trace.dart b/lib/source_map_stack_trace.dart
index 51b5ec0..a3925cd 100644
--- a/lib/source_map_stack_trace.dart
+++ b/lib/source_map_stack_trace.dart
@@ -50,14 +50,14 @@
var sourceUrl = span.sourceUrl.toString();
if (sdkLib != null && p.url.isWithin(sdkLib, sourceUrl)) {
- sourceUrl = 'dart:' + p.url.relative(sourceUrl, from: sdkLib);
+ sourceUrl = 'dart:${p.url.relative(sourceUrl, from: sdkLib)}';
} else if (packageMap != null) {
for (var package in packageMap.keys) {
var packageUrl = packageMap[package].toString();
if (!p.url.isWithin(packageUrl, sourceUrl)) continue;
sourceUrl =
- 'package:$package/' + p.url.relative(sourceUrl, from: packageUrl);
+ 'package:$package/${p.url.relative(sourceUrl, from: packageUrl)}';
break;
}
}
@@ -100,5 +100,5 @@
// Convert underscores after identifiers to dots. This runs the risk of
// incorrectly converting members that contain underscores, but those are
// contrary to the style guide anyway.
- .replaceAllMapped(RegExp(r'([a-zA-Z0-9]+)_'), (match) => match[1]! + '.');
+ .replaceAllMapped(RegExp(r'([a-zA-Z0-9]+)_'), (match) => '${match[1]!}.');
}
diff --git a/pubspec.yaml b/pubspec.yaml
index 3849230..03c0433 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,10 +1,10 @@
name: source_map_stack_trace
-version: 2.1.1
+version: 2.1.2-dev
description: A package for applying source maps to stack traces.
repository: https://github.com/dart-lang/source_map_stack_trace
environment:
- sdk: ">=2.12.0 <3.0.0"
+ sdk: ">=2.19.0 <3.0.0"
dependencies:
path: ^1.8.0
@@ -12,6 +12,6 @@
stack_trace: ^1.10.0
dev_dependencies:
- lints: ^1.0.0
+ dart_flutter_team_lints: ^1.0.0
source_span: ^1.8.0
test: ^1.16.0
diff --git a/test/source_map_stack_trace_test.dart b/test/source_map_stack_trace_test.dart
index ab92897..dd4d710 100644
--- a/test/source_map_stack_trace_test.dart
+++ b/test/source_map_stack_trace_test.dart
@@ -3,10 +3,10 @@
// BSD-style license that can be found in the LICENSE file.
import 'package:path/path.dart' as p;
+import 'package:source_map_stack_trace/source_map_stack_trace.dart';
import 'package:source_maps/source_maps.dart';
import 'package:source_span/source_span.dart';
import 'package:stack_trace/stack_trace.dart';
-import 'package:source_map_stack_trace/source_map_stack_trace.dart';
import 'package:test/test.dart';
/// A simple [Mapping] for tests that don't need anything special.
