From a7f03153e2c2c87d25c8dd0a32ef687d0ad8b328 Mon Sep 17 00:00:00 2001 From: Sourcegraph Date: Thu, 16 Sep 2021 02:52:37 +0000 Subject: [PATCH 1/2] Raise the Dart SDK minimum to at least 2.11.0 --- app/over_react_redux/todo_client/pubspec.yaml | 2 +- pubspec.yaml | 2 +- tools/analyzer_plugin/playground/pubspec.yaml | 2 +- tools/analyzer_plugin/pubspec.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/over_react_redux/todo_client/pubspec.yaml b/app/over_react_redux/todo_client/pubspec.yaml index f7b0ab039..fa21a5350 100644 --- a/app/over_react_redux/todo_client/pubspec.yaml +++ b/app/over_react_redux/todo_client/pubspec.yaml @@ -2,7 +2,7 @@ name: todo_client version: 1.0.0 environment: - sdk: ">=2.7.0 <3.0.0" + sdk: ">=2.11.0 <3.0.0" dependencies: color: any diff --git a/pubspec.yaml b/pubspec.yaml index d58dbf3e8..3aaffc767 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -3,7 +3,7 @@ version: 4.2.2 description: A library for building statically-typed React UI components using Dart. homepage: https://github.com/Workiva/over_react/ environment: - sdk: '>=2.7.0 <3.0.0' + sdk: ">=2.11.0 <3.0.0" dependencies: collection: ^1.14.11 diff --git a/tools/analyzer_plugin/playground/pubspec.yaml b/tools/analyzer_plugin/playground/pubspec.yaml index 7e563fd2e..a923eef72 100644 --- a/tools/analyzer_plugin/playground/pubspec.yaml +++ b/tools/analyzer_plugin/playground/pubspec.yaml @@ -1,7 +1,7 @@ name: plugin_playground version: 0.0.0 environment: - sdk: '>=2.7.0 <3.0.0' + sdk: ">=2.11.0 <3.0.0" dependencies: over_react: ^3.5.3 dev_dependencies: diff --git a/tools/analyzer_plugin/pubspec.yaml b/tools/analyzer_plugin/pubspec.yaml index 14b0df7fc..9893b774c 100644 --- a/tools/analyzer_plugin/pubspec.yaml +++ b/tools/analyzer_plugin/pubspec.yaml @@ -4,7 +4,7 @@ publish_to: none description: Dart analyzer plugin for OverReact repository: https://github.com/Workiva/over_react/tree/master/tools/analyzer_plugin environment: - sdk: '>=2.7.0 <3.0.0' + sdk: ">=2.11.0 <3.0.0" dependencies: analyzer: ">=0.39.10 <0.42.0" analyzer_plugin: '^0.2.4' From 0f8c72ade785d47272f1672c1969b37cc8e9a9b9 Mon Sep 17 00:00:00 2001 From: Aaron Lademann Date: Fri, 17 Sep 2021 13:15:08 -0700 Subject: [PATCH 2/2] Don't test on 2.7.2 --- .github/workflows/dart_ci.yml | 6 +++--- Dockerfile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dart_ci.yml b/.github/workflows/dart_ci.yml index 59b88a698..9bf177319 100644 --- a/.github/workflows/dart_ci.yml +++ b/.github/workflows/dart_ci.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - sdk: [ 2.7.2, 2.13.4, stable, dev ] + sdk: [ 2.13.4, stable, dev ] steps: - uses: actions/checkout@v2 - uses: dart-lang/setup-dart@v0.2 @@ -40,7 +40,7 @@ jobs: # Analyze before generated files are created to verify that component boilerplate analysis is "clean" without the need for building - name: Analyze example source (pre-build) run: | - # Analyze lib to ensure public APIs don't depend on build-to-cache files, + # Analyze lib to ensure public APIs don't depend on build-to-cache files, # which could cause analysis issues for consumers who haven't run a build yet. dartanalyzer lib cd example/boilerplate_versions @@ -82,7 +82,7 @@ jobs: strategy: fail-fast: false matrix: - sdk: [ 2.7.2, 2.13.4, stable, dev ] + sdk: [ 2.13.4, stable, dev ] steps: - uses: actions/checkout@v2 - uses: dart-lang/setup-dart@v0.2 diff --git a/Dockerfile b/Dockerfile index 418c3c3e4..f832c6349 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM google/dart:2.7 +FROM google/dart:2.13 # Expose env vars for git ssh access ARG GIT_SSH_KEY