diff --git a/.travis.yml b/.travis.yml index 641a58fa..717c5797 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ dart: # SDK version to prevent errors when using Stagehand from inside VSCode's # Dart and Flutter plugins. For more detail, please see: # https://github.com/dart-lang/stagehand/issues/617 - - "2.9.3" + - "2.10.0" - beta - dev diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e21c03a..976f59f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 3.3.11 + +- Updated minimum Dart SDK to 2.10.0 in stagehand tool and templates. + ## 3.3.10 - Updated dependency versions for `web-angular`. diff --git a/lib/src/generators/console_full.g.dart b/lib/src/generators/console_full.g.dart index a0a8742f..ce4f9a11 100644 --- a/lib/src/generators/console_full.g.dart +++ b/lib/src/generators/console_full.g.dart @@ -49,9 +49,9 @@ cmludCgnSGVsbG8gd29ybGQ6ICR7X19wcm9qZWN0TmFtZV9fLmNhbGN1bGF0ZSgpfSEnKTsKfQo=''', ''' bmFtZTogX19wcm9qZWN0TmFtZV9fCmRlc2NyaXB0aW9uOiBBIHNhbXBsZSBjb21tYW5kLWxpbmUg YXBwbGljYXRpb24uCiMgdmVyc2lvbjogMS4wLjAKIyBob21lcGFnZTogaHR0cHM6Ly93d3cuZXhh -bXBsZS5jb20KCmVudmlyb25tZW50OgogIHNkazogJz49Mi45LjMgPDMuMC4wJwoKI2RlcGVuZGVu -Y2llczoKIyAgcGF0aDogXjEuNy4wCgpkZXZfZGVwZW5kZW5jaWVzOgogIHBlZGFudGljOiBeMS45 -LjAKICB0ZXN0OiBeMS4xNC40Cg==''', +bXBsZS5jb20KCmVudmlyb25tZW50OgogIHNkazogJz49Mi4xMC4wIDwzLjAuMCcKCiNkZXBlbmRl +bmNpZXM6CiMgIHBhdGg6IF4xLjcuMAoKZGV2X2RlcGVuZGVuY2llczoKICBwZWRhbnRpYzogXjEu +OS4wCiAgdGVzdDogXjEuMTQuNAo=''', 'test/__projectName___test.dart', 'text', ''' diff --git a/lib/src/generators/console_simple.g.dart b/lib/src/generators/console_simple.g.dart index df3b3c1e..d8aa58a8 100644 --- a/lib/src/generators/console_simple.g.dart +++ b/lib/src/generators/console_simple.g.dart @@ -44,7 +44,7 @@ Jyk7Cn0K''', ''' bmFtZTogX19wcm9qZWN0TmFtZV9fCmRlc2NyaXB0aW9uOiBBIHNpbXBsZSBjb21tYW5kLWxpbmUg YXBwbGljYXRpb24uCiMgdmVyc2lvbjogMS4wLjAKIyBob21lcGFnZTogaHR0cHM6Ly93d3cuZXhh -bXBsZS5jb20KCmVudmlyb25tZW50OgogIHNkazogJz49Mi45LjMgPDMuMC4wJwoKI2RlcGVuZGVu -Y2llczoKIyAgcGF0aDogXjEuNy4wCgpkZXZfZGVwZW5kZW5jaWVzOgogIHBlZGFudGljOiBeMS45 -LjAK''' +bXBsZS5jb20KCmVudmlyb25tZW50OgogIHNkazogJz49Mi4xMC4wIDwzLjAuMCcKCiNkZXBlbmRl +bmNpZXM6CiMgIHBhdGg6IF4xLjcuMAoKZGV2X2RlcGVuZGVuY2llczoKICBwZWRhbnRpYzogXjEu +OS4wCg==''' ]; diff --git a/lib/src/generators/package_simple.g.dart b/lib/src/generators/package_simple.g.dart index e10acaf8..55fc3843 100644 --- a/lib/src/generators/package_simple.g.dart +++ b/lib/src/generators/package_simple.g.dart @@ -65,9 +65,9 @@ IGJvb2wgZ2V0IGlzQXdlc29tZSA9PiB0cnVlOwp9Cg==''', ''' bmFtZTogX19wcm9qZWN0TmFtZV9fCmRlc2NyaXB0aW9uOiBBIHN0YXJ0aW5nIHBvaW50IGZvciBE YXJ0IGxpYnJhcmllcyBvciBhcHBsaWNhdGlvbnMuCiMgdmVyc2lvbjogMS4wLjAKIyBob21lcGFn -ZTogaHR0cHM6Ly93d3cuZXhhbXBsZS5jb20KCmVudmlyb25tZW50OgogIHNkazogJz49Mi45LjMg -PDMuMC4wJwoKI2RlcGVuZGVuY2llczoKIyAgcGF0aDogXjEuNy4wCgpkZXZfZGVwZW5kZW5jaWVz -OgogIHBlZGFudGljOiBeMS45LjAKICB0ZXN0OiBeMS4xNC40Cg==''', +ZTogaHR0cHM6Ly93d3cuZXhhbXBsZS5jb20KCmVudmlyb25tZW50OgogIHNkazogJz49Mi4xMC4w +IDwzLjAuMCcKCiNkZXBlbmRlbmNpZXM6CiMgIHBhdGg6IF4xLjcuMAoKZGV2X2RlcGVuZGVuY2ll +czoKICBwZWRhbnRpYzogXjEuOS4wCiAgdGVzdDogXjEuMTQuNAo=''', 'test/__projectName___test.dart', 'text', ''' diff --git a/lib/src/generators/server_shelf.g.dart b/lib/src/generators/server_shelf.g.dart index caf9dd4f..ed5072c6 100644 --- a/lib/src/generators/server_shelf.g.dart +++ b/lib/src/generators/server_shelf.g.dart @@ -61,7 +61,7 @@ UmVxdWVzdCBmb3IgIiR7cmVxdWVzdC51cmx9IicpOwo=''', ''' bmFtZTogX19wcm9qZWN0TmFtZV9fCmRlc2NyaXB0aW9uOiBBIHdlYiBzZXJ2ZXIgYnVpbHQgdXNp bmcgdGhlIHNoZWxmIHBhY2thZ2UuCiMgdmVyc2lvbjogMS4wLjAKIyBob21lcGFnZTogaHR0cHM6 -Ly93d3cuZXhhbXBsZS5jb20KCmVudmlyb25tZW50OgogIHNkazogJz49Mi45LjMgPDMuMC4wJwoK -ZGVwZW5kZW5jaWVzOgogIGFyZ3M6IF4xLjYuMAogIHNoZWxmOiBeMC43LjUKCmRldl9kZXBlbmRl -bmNpZXM6CiAgcGVkYW50aWM6IF4xLjkuMAo=''' +Ly93d3cuZXhhbXBsZS5jb20KCmVudmlyb25tZW50OgogIHNkazogJz49Mi4xMC4wIDwzLjAuMCcK +CmRlcGVuZGVuY2llczoKICBhcmdzOiBeMS42LjAKICBzaGVsZjogXjAuNy41CgpkZXZfZGVwZW5k +ZW5jaWVzOgogIHBlZGFudGljOiBeMS45LjAK''' ]; diff --git a/lib/src/generators/web_angular.g.dart b/lib/src/generators/web_angular.g.dart index 6543e801..923014bc 100644 --- a/lib/src/generators/web_angular.g.dart +++ b/lib/src/generators/web_angular.g.dart @@ -120,11 +120,11 @@ bmc+PiBnZXRUb2RvTGlzdCgpIGFzeW5jID0+IG1vY2tUb2RvTGlzdDsKfQo=''', ''' bmFtZTogX19wcm9qZWN0TmFtZV9fCmRlc2NyaXB0aW9uOiBBIHdlYiBhcHAgdGhhdCB1c2VzIEFu Z3VsYXJEYXJ0IENvbXBvbmVudHMKIyB2ZXJzaW9uOiAxLjAuMAojIGhvbWVwYWdlOiBodHRwczov -L3d3dy5leGFtcGxlLmNvbQoKZW52aXJvbm1lbnQ6CiAgc2RrOiAnPj0yLjkuMyA8My4wLjAnCgpk -ZXBlbmRlbmNpZXM6CiAgYW5ndWxhcjogXjYuMC4wCiAgYW5ndWxhcl9jb21wb25lbnRzOiBeMS4w -LjIKCmRldl9kZXBlbmRlbmNpZXM6CiAgYW5ndWxhcl90ZXN0OiBeMi4zLjAKICBidWlsZF9ydW5u -ZXI6IF4xLjkuMAogIGJ1aWxkX3Rlc3Q6IF4xLjAuMAogIGJ1aWxkX3dlYl9jb21waWxlcnM6IF4y -LjEwLjAKICBwZWRhbnRpYzogXjEuOS4wCiAgdGVzdDogXjEuNi4zCg==''', +L3d3dy5leGFtcGxlLmNvbQoKZW52aXJvbm1lbnQ6CiAgc2RrOiAnPj0yLjEwLjAgPDMuMC4wJwoK +ZGVwZW5kZW5jaWVzOgogIGFuZ3VsYXI6IF42LjAuMAogIGFuZ3VsYXJfY29tcG9uZW50czogXjEu +MC4yCgpkZXZfZGVwZW5kZW5jaWVzOgogIGFuZ3VsYXJfdGVzdDogXjIuMy4wCiAgYnVpbGRfcnVu +bmVyOiBeMS45LjAKICBidWlsZF90ZXN0OiBeMS4wLjAKICBidWlsZF93ZWJfY29tcGlsZXJzOiBe +Mi4xMC4wCiAgcGVkYW50aWM6IF4xLjkuMAogIHRlc3Q6IF4xLjYuMwo=''', 'test/app_test.dart', 'text', ''' diff --git a/lib/src/generators/web_simple.g.dart b/lib/src/generators/web_simple.g.dart index 0b2219a6..740f5a56 100644 --- a/lib/src/generators/web_simple.g.dart +++ b/lib/src/generators/web_simple.g.dart @@ -39,9 +39,9 @@ CiMgICAgIC0gcGF0aC90by9leGNsdWRlZC9maWxlcy8qKgo=''', ''' bmFtZTogX19wcm9qZWN0TmFtZV9fCmRlc2NyaXB0aW9uOiBBbiBhYnNvbHV0ZSBiYXJlLWJvbmVz IHdlYiBhcHAuCiMgdmVyc2lvbjogMS4wLjAKI2hvbWVwYWdlOiBodHRwczovL3d3dy5leGFtcGxl -LmNvbQoKZW52aXJvbm1lbnQ6CiAgc2RrOiAnPj0yLjkuMyA8My4wLjAnCgojZGVwZW5kZW5jaWVz -OgojICBwYXRoOiBeMS43LjAKCmRldl9kZXBlbmRlbmNpZXM6CiAgYnVpbGRfcnVubmVyOiBeMS4x -MC4wCiAgYnVpbGRfd2ViX2NvbXBpbGVyczogXjIuMTEuMAogIHBlZGFudGljOiBeMS45LjAK''', +LmNvbQoKZW52aXJvbm1lbnQ6CiAgc2RrOiAnPj0yLjEwLjAgPDMuMC4wJwoKI2RlcGVuZGVuY2ll +czoKIyAgcGF0aDogXjEuNy4wCgpkZXZfZGVwZW5kZW5jaWVzOgogIGJ1aWxkX3J1bm5lcjogXjEu +MTAuMAogIGJ1aWxkX3dlYl9jb21waWxlcnM6IF4yLjExLjAKICBwZWRhbnRpYzogXjEuOS4wCg==''', 'web/favicon.ico', 'binary', ''' diff --git a/lib/src/generators/web_stagexl.g.dart b/lib/src/generators/web_stagexl.g.dart index c8f88645..1fa40fc6 100644 --- a/lib/src/generators/web_stagexl.g.dart +++ b/lib/src/generators/web_stagexl.g.dart @@ -39,9 +39,9 @@ CiMgICAgIC0gcGF0aC90by9leGNsdWRlZC9maWxlcy8qKgo=''', ''' bmFtZTogX19wcm9qZWN0TmFtZV9fCmRlc2NyaXB0aW9uOiBBIHNpbXBsZSBTdGFnZVhMIHdlYiBh cHAuCiMgdmVyc2lvbjogMS4wLjAKI2hvbWVwYWdlOiBodHRwczovL3d3dy5leGFtcGxlLmNvbQoK -ZW52aXJvbm1lbnQ6CiAgc2RrOiAnPj0yLjkuMyA8My4wLjAnCgpkZXBlbmRlbmNpZXM6CiAgc3Rh -Z2V4bDogXjEuNC40CgpkZXZfZGVwZW5kZW5jaWVzOgogIGJ1aWxkX3J1bm5lcjogXjEuMTAuMAog -IGJ1aWxkX3dlYl9jb21waWxlcnM6IF4yLjExLjAKICBwZWRhbnRpYzogXjEuOS4wCg==''', +ZW52aXJvbm1lbnQ6CiAgc2RrOiAnPj0yLjEwLjAgPDMuMC4wJwoKZGVwZW5kZW5jaWVzOgogIHN0 +YWdleGw6IF4xLjQuNAoKZGV2X2RlcGVuZGVuY2llczoKICBidWlsZF9ydW5uZXI6IF4xLjEwLjAK +ICBidWlsZF93ZWJfY29tcGlsZXJzOiBeMi4xMS4wCiAgcGVkYW50aWM6IF4xLjkuMAo=''', 'web/images/dart@1x.png', 'binary', ''' diff --git a/lib/src/version.dart b/lib/src/version.dart index 9ee28375..b5ed5f3d 100644 --- a/lib/src/version.dart +++ b/lib/src/version.dart @@ -1,2 +1,2 @@ // Generated code. Do not modify. -const packageVersion = '3.3.10'; +const packageVersion = '3.3.11'; diff --git a/pubspec.yaml b/pubspec.yaml index d4d6ccd4..df3e9908 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -7,7 +7,7 @@ description: > A scaffolding generator for your Dart projects. Stagehand helps you get set up! # After changing the version, run `pub run build_runner build`. -version: 3.3.10 +version: 3.3.11 homepage: https://github.com/dart-lang/stagehand environment: @@ -17,7 +17,7 @@ environment: # https://github.com/dart-lang/stagehand/issues/617 # # Also make sure this minimum sdk version is reflected in `.travis.yml`. - sdk: '>=2.9.3 <3.0.0' + sdk: '>=2.10.0 <3.0.0' # Add the bin/stagehand.dart script to the scripts pub installs. executables: diff --git a/templates/console-full/pubspec.yaml b/templates/console-full/pubspec.yaml index 58c6afe9..2c991811 100644 --- a/templates/console-full/pubspec.yaml +++ b/templates/console-full/pubspec.yaml @@ -4,7 +4,7 @@ description: A sample command-line application. # homepage: https://www.example.com environment: - sdk: '>=2.9.3 <3.0.0' + sdk: '>=2.10.0 <3.0.0' #dependencies: # path: ^1.7.0 diff --git a/templates/console-simple/pubspec.yaml b/templates/console-simple/pubspec.yaml index feff25f1..5ecc3675 100644 --- a/templates/console-simple/pubspec.yaml +++ b/templates/console-simple/pubspec.yaml @@ -4,7 +4,7 @@ description: A simple command-line application. # homepage: https://www.example.com environment: - sdk: '>=2.9.3 <3.0.0' + sdk: '>=2.10.0 <3.0.0' #dependencies: # path: ^1.7.0 diff --git a/templates/package-simple/pubspec.yaml b/templates/package-simple/pubspec.yaml index f43e2fdd..66315e80 100644 --- a/templates/package-simple/pubspec.yaml +++ b/templates/package-simple/pubspec.yaml @@ -4,7 +4,7 @@ description: A starting point for Dart libraries or applications. # homepage: https://www.example.com environment: - sdk: '>=2.9.3 <3.0.0' + sdk: '>=2.10.0 <3.0.0' #dependencies: # path: ^1.7.0 diff --git a/templates/server-shelf/pubspec.yaml b/templates/server-shelf/pubspec.yaml index f7ae32ec..ce8a30a7 100644 --- a/templates/server-shelf/pubspec.yaml +++ b/templates/server-shelf/pubspec.yaml @@ -4,7 +4,7 @@ description: A web server built using the shelf package. # homepage: https://www.example.com environment: - sdk: '>=2.9.3 <3.0.0' + sdk: '>=2.10.0 <3.0.0' dependencies: args: ^1.6.0 diff --git a/templates/web-angular/pubspec.yaml b/templates/web-angular/pubspec.yaml index 19645278..e9b31b2e 100644 --- a/templates/web-angular/pubspec.yaml +++ b/templates/web-angular/pubspec.yaml @@ -4,7 +4,7 @@ description: A web app that uses AngularDart Components # homepage: https://www.example.com environment: - sdk: '>=2.9.3 <3.0.0' + sdk: '>=2.10.0 <3.0.0' dependencies: angular: ^6.0.0 diff --git a/templates/web-simple/pubspec.yaml b/templates/web-simple/pubspec.yaml index 5b952677..e45db991 100644 --- a/templates/web-simple/pubspec.yaml +++ b/templates/web-simple/pubspec.yaml @@ -4,7 +4,7 @@ description: An absolute bare-bones web app. #homepage: https://www.example.com environment: - sdk: '>=2.9.3 <3.0.0' + sdk: '>=2.10.0 <3.0.0' #dependencies: # path: ^1.7.0 diff --git a/templates/web-stagexl/pubspec.yaml b/templates/web-stagexl/pubspec.yaml index 5de617b4..00126ebb 100644 --- a/templates/web-stagexl/pubspec.yaml +++ b/templates/web-stagexl/pubspec.yaml @@ -4,7 +4,7 @@ description: A simple StageXL web app. #homepage: https://www.example.com environment: - sdk: '>=2.9.3 <3.0.0' + sdk: '>=2.10.0 <3.0.0' dependencies: stagexl: ^1.4.4 diff --git a/test/validate_templates.dart b/test/validate_templates.dart index a239e267..27163d02 100644 --- a/test/validate_templates.dart +++ b/test/validate_templates.dart @@ -139,7 +139,7 @@ void _testGenerator(stagehand.Generator generator, Directory tempDir) { expect( pubspecContent, - containsPair('environment', {'sdk': '>=2.9.3 <3.0.0'}), + containsPair('environment', {'sdk': '>=2.10.0 <3.0.0'}), ); // Run package tests, if `test` is included. diff --git a/tool/travis.sh b/tool/travis.sh index 2e2d75f8..a2d2da29 100755 --- a/tool/travis.sh +++ b/tool/travis.sh @@ -10,7 +10,7 @@ set -e source ./tool/env-set.sh # Verify that the libraries are error free. -dartanalyzer --fatal-warnings . +dart analyze travis_fold start check_templates for d in templates/*; do @@ -20,7 +20,7 @@ for d in templates/*; do pushd $d >> /dev/null PUB_ALLOW_PRERELEASE_SDK=quiet pub get dartfmt --set-exit-if-changed -w . | grep -Ev "Formatting directory|Skipping|Unchanged" | cat - - dartanalyzer --fatal-warnings . + dart analyze popd >> /dev/null done travis_fold start check_templates