From b2ef5641f47ce8f3c723e745c7f38da597b21b8b Mon Sep 17 00:00:00 2001 From: Patrice Chalin Date: Fri, 13 Jul 2018 20:41:44 -0400 Subject: [PATCH 1/2] chore: set max SDK version to <3.0.0 --- .travis.yml | 2 +- CHANGELOG.md | 4 ++++ analysis_options.yaml | 1 - lib/linkcheck.dart | 2 +- lib/src/crawl.dart | 4 +--- lib/src/writer_report.dart | 8 ++------ pubspec.lock | 32 ++++++++++++++++---------------- pubspec.yaml | 4 ++-- 8 files changed, 27 insertions(+), 30 deletions(-) diff --git a/.travis.yml b/.travis.yml index f888c28..b26f582 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: dart -dart: 2.0.0-dev.61.0 +dart: dev env: global: diff --git a/CHANGELOG.md b/CHANGELOG.md index caf17ba..b36eace 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.0.1 + +- Set max SDK version to <3.0.0 + ## 2.0.0, 2.0.0+1 - First Dart-2-only version. diff --git a/analysis_options.yaml b/analysis_options.yaml index 721b48f..91feea1 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -1,5 +1,4 @@ analyzer: - strong-mode: true linter: rules: - always_declare_return_types diff --git a/lib/linkcheck.dart b/lib/linkcheck.dart index c79ca06..212047c 100644 --- a/lib/linkcheck.dart +++ b/lib/linkcheck.dart @@ -25,7 +25,7 @@ const helpFlag = "help"; const hostsFlag = "hosts"; const inputFlag = "input-file"; const skipFlag = "skip-file"; -const version = "2.0.0+1"; +const version = "2.0.1"; const versionFlag = "version"; final _portOnlyRegExp = new RegExp(r"^:\d+$"); diff --git a/lib/src/crawl.dart b/lib/src/crawl.dart index 0451dd4..a58c730 100644 --- a/lib/src/crawl.dart +++ b/lib/src/crawl.dart @@ -234,9 +234,7 @@ Future crawl( count += 1; print("Server check for ${result.host} complete: " "${result.didNotConnect ? 'didn\'t connect' : 'connected'}, " - "${result.robotsTxtContents.isEmpty - ? 'no robots.txt' - : 'robots.txt found'}."); + "${result.robotsTxtContents.isEmpty ? 'no robots.txt' : 'robots.txt found'}."); } else { if (ansiTerm) { cursor.moveLeft(count.toString().length); diff --git a/lib/src/writer_report.dart b/lib/src/writer_report.dart index cf99929..f55336c 100644 --- a/lib/src/writer_report.dart +++ b/lib/src/writer_report.dart @@ -167,13 +167,9 @@ void printWithoutAnsi(Uri uri, List broken, Stdout stdout) { ":${link.origin.span.start.column}) " "$tag" "=> ${link.destination.url}" - "${link.fragment == null - ? '' - : '#' + link.fragment} " + "${link.fragment == null ? '' : '#' + link.fragment} " "(${link.destination.statusDescription}" - "${!link.destination.isBroken && link.breaksAnchor - ? ' but missing anchor' - : ''}" + "${!link.destination.isBroken && link.breaksAnchor ? ' but missing anchor' : ''}" ")"); if (link.destination.isRedirected) { print(" - redirect path:"); diff --git a/pubspec.lock b/pubspec.lock index 7130c22..044e4ce 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,7 +7,7 @@ packages: name: analyzer url: "https://pub.dartlang.org" source: hosted - version: "0.32.1" + version: "0.32.3" args: dependency: "direct main" description: @@ -28,14 +28,14 @@ packages: name: boolean_selector url: "https://pub.dartlang.org" source: hosted - version: "1.0.3" + version: "1.0.4" charcode: dependency: transitive description: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.1.1" + version: "1.1.2" collection: dependency: transitive description: @@ -63,7 +63,7 @@ packages: name: crypto url: "https://pub.dartlang.org" source: hosted - version: "2.0.5" + version: "2.0.6" csslib: dependency: "direct main" description: @@ -84,7 +84,7 @@ packages: name: front_end url: "https://pub.dartlang.org" source: hosted - version: "0.1.1" + version: "0.1.3" glob: dependency: "direct main" description: @@ -105,7 +105,7 @@ packages: name: http url: "https://pub.dartlang.org" source: hosted - version: "0.11.3+16" + version: "0.11.3+17" http_multi_server: dependency: transitive description: @@ -126,7 +126,7 @@ packages: name: io url: "https://pub.dartlang.org" source: hosted - version: "0.3.2+1" + version: "0.3.3" js: dependency: transitive description: @@ -147,7 +147,7 @@ packages: name: kernel url: "https://pub.dartlang.org" source: hosted - version: "0.3.1" + version: "0.3.3" logging: dependency: "direct main" description: @@ -189,7 +189,7 @@ packages: name: node_preamble url: "https://pub.dartlang.org" source: hosted - version: "1.4.2" + version: "1.4.3" package_config: dependency: transitive description: @@ -238,7 +238,7 @@ packages: name: shelf url: "https://pub.dartlang.org" source: hosted - version: "0.7.3+1" + version: "0.7.3+2" shelf_packages_handler: dependency: transitive description: @@ -252,7 +252,7 @@ packages: name: shelf_static url: "https://pub.dartlang.org" source: hosted - version: "0.2.7+1" + version: "0.2.8" shelf_web_socket: dependency: transitive description: @@ -273,7 +273,7 @@ packages: name: source_maps url: "https://pub.dartlang.org" source: hosted - version: "0.10.5" + version: "0.10.6" source_span: dependency: "direct main" description: @@ -315,7 +315,7 @@ packages: name: test url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.2.0" typed_data: dependency: transitive description: @@ -343,14 +343,14 @@ packages: name: vm_service_client url: "https://pub.dartlang.org" source: hosted - version: "0.2.4+3" + version: "0.2.5" watcher: dependency: transitive description: name: watcher url: "https://pub.dartlang.org" source: hosted - version: "0.9.7+8" + version: "0.9.7+9" web_socket_channel: dependency: transitive description: @@ -366,4 +366,4 @@ packages: source: hosted version: "2.1.14" sdks: - dart: ">=2.0.0-dev.62.0 <=2.0.0-dev.64.1" + dart: ">=2.0.0-dev.62.0 <=2.0.0-dev.68.0" diff --git a/pubspec.yaml b/pubspec.yaml index 73f3488..5e234ed 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,5 +1,5 @@ name: linkcheck -version: 2.0.0+1 # Don't forget to update in lib/linkcheck.dart, too. +version: 2.0.1 # Don't forget to update in lib/linkcheck.dart, too. description: A very fast link-checker. @@ -7,7 +7,7 @@ homepage: https://github.com/filiph/linkcheck author: 'Filip Hracek ' environment: - sdk: '>=2.0.0-dev <2.0.0' + sdk: '>=2.0.0-dev <3.0.0' dependencies: args: ^1.4.3 From 864605c2075b0560a413778ab74931fa435539ed Mon Sep 17 00:00:00 2001 From: Patrice Chalin Date: Wed, 18 Jul 2018 10:16:02 -0400 Subject: [PATCH 2/2] Final pub upgrade --- analysis_options.yaml | 1 - pubspec.lock | 24 ++++++++++++------------ 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/analysis_options.yaml b/analysis_options.yaml index 91feea1..14b33eb 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -1,4 +1,3 @@ -analyzer: linter: rules: - always_declare_return_types diff --git a/pubspec.lock b/pubspec.lock index 044e4ce..b7216ee 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -70,7 +70,7 @@ packages: name: csslib url: "https://pub.dartlang.org" source: hosted - version: "0.14.4" + version: "0.14.4+1" dhttpd: dependency: "direct dev" description: @@ -161,7 +161,7 @@ packages: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.3" + version: "0.12.3+1" meta: dependency: transitive description: @@ -196,7 +196,7 @@ packages: name: package_config url: "https://pub.dartlang.org" source: hosted - version: "1.0.3" + version: "1.0.4" package_resolver: dependency: transitive description: @@ -217,7 +217,7 @@ packages: name: plugin url: "https://pub.dartlang.org" source: hosted - version: "0.2.0+2" + version: "0.2.0+3" pool: dependency: transitive description: @@ -238,7 +238,7 @@ packages: name: shelf url: "https://pub.dartlang.org" source: hosted - version: "0.7.3+2" + version: "0.7.3+3" shelf_packages_handler: dependency: transitive description: @@ -273,7 +273,7 @@ packages: name: source_maps url: "https://pub.dartlang.org" source: hosted - version: "0.10.6" + version: "0.10.7" source_span: dependency: "direct main" description: @@ -308,14 +308,14 @@ packages: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.0.1" test: dependency: "direct dev" description: name: test url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.0" typed_data: dependency: transitive description: @@ -329,7 +329,7 @@ packages: name: utf url: "https://pub.dartlang.org" source: hosted - version: "0.9.0+4" + version: "0.9.0+5" vector_math: dependency: transitive description: @@ -357,13 +357,13 @@ packages: name: web_socket_channel url: "https://pub.dartlang.org" source: hosted - version: "1.0.8" + version: "1.0.9" yaml: dependency: transitive description: name: yaml url: "https://pub.dartlang.org" source: hosted - version: "2.1.14" + version: "2.1.15" sdks: - dart: ">=2.0.0-dev.62.0 <=2.0.0-dev.68.0" + dart: ">=2.0.0-dev.62.0 <=2.0.0-dev.69.0"