0.1.68 (#1197)
# 0.1.68
* updated analyzer compatibility to `^0.33.0`
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c12050..6dbb50b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 0.1.68
+
+* updated analyzer compatibility to `^0.33.0`
+
# 0.1.67
* miscellaneous mixin support fixes
diff --git a/lib/src/util/unrelated_types_visitor.dart b/lib/src/util/unrelated_types_visitor.dart
index b7d4cb1..57d5d32 100644
--- a/lib/src/util/unrelated_types_visitor.dart
+++ b/lib/src/util/unrelated_types_visitor.dart
@@ -92,12 +92,9 @@
.elementDeclaredByClassDeclaration(classDeclaration)
?.type;
} else if (classDeclaration is MixinDeclaration) {
- type = null;
- // TODO(brianwilkerson) Replace the line above with the following, after
- // updating to a new analyzer release.
-// type = resolutionMap
-// .elementDeclaredByMixinDeclaration(classDeclaration)
-// ?.type;
+ type = resolutionMap
+ .elementDeclaredByMixinDeclaration(classDeclaration)
+ ?.type;
}
}
Expression argument = node.argumentList.arguments.first;
diff --git a/pubspec.yaml b/pubspec.yaml
index 9e1e472..114e007 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
name: linter
-version: 0.1.67
+version: 0.1.68
author: Dart Team <misc@dartlang.org>
@@ -10,7 +10,7 @@
sdk: '>=2.0.0 <3.0.0'
dependencies:
- analyzer: '>=0.33.0-alpha.0 < 0.33.0'
+ analyzer: ^0.33.0
args: '>=1.4.0 <2.0.0'
glob: ^1.0.3
meta: ^1.0.2
diff --git a/test/integration_test.dart b/test/integration_test.dart
index 7a3b79c..ae93ccd 100644
--- a/test/integration_test.dart
+++ b/test/integration_test.dart
@@ -69,7 +69,8 @@
await cli.run(['test/_data/p3', 'test/_data/p3/_pubpspec.yaml']);
expect(collectingOut.trim(),
startsWith('1 file analyzed, 0 issues found, in'));
- });
+ // TODO(pq): re-enable w/ analyzer >=0.33.1 https://github.com/dart-lang/linter/issues/1195
+ }, skip: true);
});
group('p4', () {
IOSink currentOut = outSink;
@@ -802,9 +803,8 @@
'pubspec.yaml 15:3 [lint] Sort pub dependencies.',
'1 file analyzed, 3 issues found',
]));
- },
- // TODO(a14n): remove skip once https://github.com/dart-lang/sdk/pull/34513 is merged
- skip: true);
+ // TODO(pq): re-enable w/ analyzer >=0.33.1 https://github.com/dart-lang/linter/issues/1195
+ }, skip: true);
});
group('examples', () {
diff --git a/test/mock_sdk.dart b/test/mock_sdk.dart
index 76efc9c..8bde430 100644
--- a/test/mock_sdk.dart
+++ b/test/mock_sdk.dart
@@ -279,7 +279,7 @@
if (library is _MockSdkLibrary) {
provider.newFile(provider.convertPath(library.path), library.content);
library.parts.forEach((file) {
- provider.newFile(file.path, file.content);
+ provider.newFile(provider.convertPath(file.path), file.content);
});
}
});
@@ -349,7 +349,7 @@
PackageBundle getLinkedBundle() {
if (_bundle == null) {
resource.File summaryFile =
- provider.getFile(provider.convertPath('/lib/_internal/spec.sum'));
+ provider.getFile(provider.convertPath('/lib/_internal/strong.sum'));
List<int> bytes;
if (summaryFile.exists) {
bytes = summaryFile.readAsBytesSync();
diff --git a/test/rule_test.dart b/test/rule_test.dart
index 681a7a4..fe36d30 100644
--- a/test/rule_test.dart
+++ b/test/rule_test.dart
@@ -323,12 +323,21 @@
return;
}
+ // TODO(pq): re-enable w/ analyzer >=0.33.1 https://github.com/dart-lang/linter/issues/1195
+ if (ruleName == 'package_names') {
+ print(
+ 'WARNING: Test skipped -- testing rule `$ruleName` requires an unpublished analyzer (>=0.33.1).');
+ return;
+ }
+
MemoryResourceProvider memoryResourceProvider = new MemoryResourceProvider(
context: PhysicalResourceProvider.INSTANCE.pathContext);
TestResourceProvider resourceProvider =
new TestResourceProvider(memoryResourceProvider);
- String packageConfigPath = p.join(p.dirname(file.path), '.mock_packages');
+ p.Context pathContext = memoryResourceProvider.pathContext;
+ String packageConfigPath = memoryResourceProvider.convertPath(pathContext
+ .join(pathContext.dirname(file.absolute.path), '.mock_packages'));
if (!resourceProvider.getFile(packageConfigPath).exists) {
packageConfigPath = null;
}
