diff --git a/CHANGELOG.md b/CHANGELOG.md index 3293d994..c6f6bd62 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 3.1.0 + +- Set max SDK version to <3.0.0 everywhere. + ## 3.0.2 - Set min SDK version to 2.0.0-dev.68.0 everywhere. diff --git a/lib/src/cli_app.g.dart b/lib/src/cli_app.g.dart index 9291d59c..b3180552 100644 --- a/lib/src/cli_app.g.dart +++ b/lib/src/cli_app.g.dart @@ -10,4 +10,4 @@ part of 'cli_app.dart'; // VersionGenerator // ************************************************************************** -const appVersion = '3.0.2'; +const appVersion = '3.1.0'; diff --git a/lib/src/generators/console_full.g.dart b/lib/src/generators/console_full.g.dart index 4ea3e819..7484e431 100644 --- a/lib/src/generators/console_full.g.dart +++ b/lib/src/generators/console_full.g.dart @@ -54,7 +54,7 @@ J0hlbGxvIHdvcmxkOiAke19fcHJvamVjdE5hbWVfXy5jYWxjdWxhdGUoKX0hJyk7Cn0K''', bmFtZTogX19wcm9qZWN0TmFtZV9fCmRlc2NyaXB0aW9uOiBBIHNhbXBsZSBjb21tYW5kLWxpbmUg YXBwbGljYXRpb24uCiMgdmVyc2lvbjogMS4wLjAKIyBob21lcGFnZTogaHR0cHM6Ly93d3cuZXhh bXBsZS5jb20KIyBhdXRob3I6IF9fYXV0aG9yX18gPGVtYWlsQGV4YW1wbGUuY29tPgoKZW52aXJv -bm1lbnQ6CiAgc2RrOiAnPj0yLjAuMC1kZXYuNjguMCA8Mi4wLjAnCgojZGVwZW5kZW5jaWVzOgoj +bm1lbnQ6CiAgc2RrOiAnPj0yLjAuMC1kZXYuNjguMCA8My4wLjAnCgojZGVwZW5kZW5jaWVzOgoj ICBwYXRoOiBeMS40LjEKCmRldl9kZXBlbmRlbmNpZXM6CiAgdGVzdDogXjEuMC4wCg==''', 'test/__projectName___test.dart', 'text', diff --git a/lib/src/generators/package_simple.g.dart b/lib/src/generators/package_simple.g.dart index d44e1f0e..d37c7bb5 100644 --- a/lib/src/generators/package_simple.g.dart +++ b/lib/src/generators/package_simple.g.dart @@ -69,7 +69,7 @@ IGJvb2wgZ2V0IGlzQXdlc29tZSA9PiB0cnVlOwp9Cg==''', bmFtZTogX19wcm9qZWN0TmFtZV9fCmRlc2NyaXB0aW9uOiBBIHN0YXJ0aW5nIHBvaW50IGZvciBE YXJ0IGxpYnJhcmllcyBvciBhcHBsaWNhdGlvbnMuCiMgdmVyc2lvbjogMS4wLjAKIyBob21lcGFn ZTogaHR0cHM6Ly93d3cuZXhhbXBsZS5jb20KIyBhdXRob3I6IF9fYXV0aG9yX18gPGVtYWlsQGV4 -YW1wbGUuY29tPgoKZW52aXJvbm1lbnQ6CiAgc2RrOiAnPj0yLjAuMC1kZXYuNjguMCA8Mi4wLjAn +YW1wbGUuY29tPgoKZW52aXJvbm1lbnQ6CiAgc2RrOiAnPj0yLjAuMC1kZXYuNjguMCA8My4wLjAn CgojZGVwZW5kZW5jaWVzOgojICBwYXRoOiBeMS40LjEKCmRldl9kZXBlbmRlbmNpZXM6CiAgdGVz dDogXjEuMC4wCg==''', 'test/__projectName___test.dart', diff --git a/lib/src/generators/server_shelf.g.dart b/lib/src/generators/server_shelf.g.dart index 15388f04..7d190335 100644 --- a/lib/src/generators/server_shelf.g.dart +++ b/lib/src/generators/server_shelf.g.dart @@ -65,7 +65,7 @@ UmVxdWVzdCBmb3IgIiR7cmVxdWVzdC51cmx9IicpOwo=''', bmFtZTogX19wcm9qZWN0TmFtZV9fCmRlc2NyaXB0aW9uOiBBIHdlYiBzZXJ2ZXIgYnVpbHQgdXNp bmcgdGhlIHNoZWxmIHBhY2thZ2UuCiMgdmVyc2lvbjogMS4wLjAKIyBob21lcGFnZTogaHR0cHM6 Ly93d3cuZXhhbXBsZS5jb20KIyBhdXRob3I6IF9fYXV0aG9yX18gPGVtYWlsQGV4YW1wbGUuY29t -PgoKZW52aXJvbm1lbnQ6CiAgc2RrOiAnPj0yLjAuMC1kZXYuNjguMCA8Mi4wLjAnCgpkZXBlbmRl +PgoKZW52aXJvbm1lbnQ6CiAgc2RrOiAnPj0yLjAuMC1kZXYuNjguMCA8My4wLjAnCgpkZXBlbmRl bmNpZXM6CiAgYXJnczogXjEuNC4yCiAgc2hlbGY6IF4wLjcuMgoKI2Rldl9kZXBlbmRlbmNpZXM6 CiMgIHRlc3Q6IF4xLjAuMAo=''' ]; diff --git a/lib/src/generators/web_angular.g.dart b/lib/src/generators/web_angular.g.dart index 29103ccb..e8dd11e4 100644 --- a/lib/src/generators/web_angular.g.dart +++ b/lib/src/generators/web_angular.g.dart @@ -124,7 +124,7 @@ bmc+PiBnZXRUb2RvTGlzdCgpIGFzeW5jID0+IG1vY2tUb2RvTGlzdDsKfQo=''', bmFtZTogX19wcm9qZWN0TmFtZV9fCmRlc2NyaXB0aW9uOiBBIHdlYiBhcHAgdGhhdCB1c2VzIEFu Z3VsYXJEYXJ0IENvbXBvbmVudHMKIyB2ZXJzaW9uOiAxLjAuMAojIGhvbWVwYWdlOiBodHRwczov L3d3dy5leGFtcGxlLmNvbQojIGF1dGhvcjogX19hdXRob3JfXyA8ZW1haWxAZXhhbXBsZS5jb20+ -CgplbnZpcm9ubWVudDoKICBzZGs6ICc+PTIuMC4wLWRldi42OC4wIDwyLjAuMCcKCmRlcGVuZGVu +CgplbnZpcm9ubWVudDoKICBzZGs6ICc+PTIuMC4wLWRldi42OC4wIDwzLjAuMCcKCmRlcGVuZGVu Y2llczoKICBhbmd1bGFyOiBeNS4wLjAtYmV0YQogIGFuZ3VsYXJfY29tcG9uZW50czogXjAuOS4w LWJldGEKCmRldl9kZXBlbmRlbmNpZXM6CiAgYW5ndWxhcl90ZXN0OiBeMi4wLjAtYmV0YQogIGJ1 aWxkX3J1bm5lcjogXjAuOS4wCiAgYnVpbGRfdGVzdDogXjAuMTAuMgogIGJ1aWxkX3dlYl9jb21w diff --git a/lib/src/generators/web_simple.g.dart b/lib/src/generators/web_simple.g.dart index 30d93ef7..49860359 100644 --- a/lib/src/generators/web_simple.g.dart +++ b/lib/src/generators/web_simple.g.dart @@ -45,7 +45,7 @@ dmFsaWRfcmVnZXhwcwo=''', bmFtZTogX19wcm9qZWN0TmFtZV9fCmRlc2NyaXB0aW9uOiBBbiBhYnNvbHV0ZSBiYXJlLWJvbmVz IHdlYiBhcHAuCiMgdmVyc2lvbjogMS4wLjAKI2hvbWVwYWdlOiBodHRwczovL3d3dy5leGFtcGxl LmNvbQojYXV0aG9yOiBfX2F1dGhvcl9fIDxlbWFpbEBleGFtcGxlLmNvbT4KCmVudmlyb25tZW50 -OgogIHNkazogJz49Mi4wLjAtZGV2LjY4LjAgPDIuMC4wJwoKI2RlcGVuZGVuY2llczoKIyAgcGF0 +OgogIHNkazogJz49Mi4wLjAtZGV2LjY4LjAgPDMuMC4wJwoKI2RlcGVuZGVuY2llczoKIyAgcGF0 aDogXjEuNC4xCgpkZXZfZGVwZW5kZW5jaWVzOgogIGJ1aWxkX3J1bm5lcjogXjAuOS4wCiAgYnVp bGRfd2ViX2NvbXBpbGVyczogXjAuNC4wCg==''', 'web/favicon.ico', diff --git a/lib/src/generators/web_stagexl.g.dart b/lib/src/generators/web_stagexl.g.dart index 3bbd5610..c2a7765e 100644 --- a/lib/src/generators/web_stagexl.g.dart +++ b/lib/src/generators/web_stagexl.g.dart @@ -45,7 +45,7 @@ dmFsaWRfcmVnZXhwcwo=''', bmFtZTogX19wcm9qZWN0TmFtZV9fCmRlc2NyaXB0aW9uOiBBIHNpbXBsZSBTdGFnZVhMIHdlYiBh cHAuCiMgdmVyc2lvbjogMS4wLjAKI2hvbWVwYWdlOiBodHRwczovL3d3dy5leGFtcGxlLmNvbQoj YXV0aG9yOiBfX2F1dGhvcl9fIDxlbWFpbEBleGFtcGxlLmNvbT4KCmVudmlyb25tZW50OgogIHNk -azogJz49Mi4wLjAtZGV2LjY4LjAgPDIuMC4wJwoKZGVwZW5kZW5jaWVzOgogIHN0YWdleGw6IF4x +azogJz49Mi4wLjAtZGV2LjY4LjAgPDMuMC4wJwoKZGVwZW5kZW5jaWVzOgogIHN0YWdleGw6IF4x LjEuMAoKZGV2X2RlcGVuZGVuY2llczoKICBidWlsZF9ydW5uZXI6IF4wLjkuMAogIGJ1aWxkX3dl Yl9jb21waWxlcnM6IF4wLjQuMAo=''', 'web/images/dart@1x.png', diff --git a/pubspec.yaml b/pubspec.yaml index f59c48e3..e44f65de 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -7,12 +7,12 @@ name: stagehand description: > A scaffolding generator for your Dart projects. Stagehand helps you get set up! -version: 3.0.2 +version: 3.1.0 homepage: https://github.com/dart-lang/stagehand author: Dart Team environment: - sdk: '>=2.0.0-dev.68.0 <2.0.0' + sdk: '>=2.0.0-dev.68.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 fc736181..755d6a42 100644 --- a/templates/console-full/pubspec.yaml +++ b/templates/console-full/pubspec.yaml @@ -5,7 +5,7 @@ description: A sample command-line application. # author: __author__ environment: - sdk: '>=2.0.0-dev.68.0 <2.0.0' + sdk: '>=2.0.0-dev.68.0 <3.0.0' #dependencies: # path: ^1.4.1 diff --git a/templates/package-simple/pubspec.yaml b/templates/package-simple/pubspec.yaml index 91921998..6cc3edf2 100644 --- a/templates/package-simple/pubspec.yaml +++ b/templates/package-simple/pubspec.yaml @@ -5,7 +5,7 @@ description: A starting point for Dart libraries or applications. # author: __author__ environment: - sdk: '>=2.0.0-dev.68.0 <2.0.0' + sdk: '>=2.0.0-dev.68.0 <3.0.0' #dependencies: # path: ^1.4.1 diff --git a/templates/server-shelf/pubspec.yaml b/templates/server-shelf/pubspec.yaml index 001bfd01..b6406cc1 100644 --- a/templates/server-shelf/pubspec.yaml +++ b/templates/server-shelf/pubspec.yaml @@ -5,7 +5,7 @@ description: A web server built using the shelf package. # author: __author__ environment: - sdk: '>=2.0.0-dev.68.0 <2.0.0' + sdk: '>=2.0.0-dev.68.0 <3.0.0' dependencies: args: ^1.4.2 diff --git a/templates/web-angular/pubspec.yaml b/templates/web-angular/pubspec.yaml index b89c69de..bd2be9b7 100644 --- a/templates/web-angular/pubspec.yaml +++ b/templates/web-angular/pubspec.yaml @@ -5,7 +5,7 @@ description: A web app that uses AngularDart Components # author: __author__ environment: - sdk: '>=2.0.0-dev.68.0 <2.0.0' + sdk: '>=2.0.0-dev.68.0 <3.0.0' dependencies: angular: ^5.0.0-beta diff --git a/templates/web-simple/pubspec.yaml b/templates/web-simple/pubspec.yaml index b822cb0e..b00cb05e 100644 --- a/templates/web-simple/pubspec.yaml +++ b/templates/web-simple/pubspec.yaml @@ -5,7 +5,7 @@ description: An absolute bare-bones web app. #author: __author__ environment: - sdk: '>=2.0.0-dev.68.0 <2.0.0' + sdk: '>=2.0.0-dev.68.0 <3.0.0' #dependencies: # path: ^1.4.1 diff --git a/templates/web-stagexl/pubspec.yaml b/templates/web-stagexl/pubspec.yaml index 8f354434..baf1719b 100644 --- a/templates/web-stagexl/pubspec.yaml +++ b/templates/web-stagexl/pubspec.yaml @@ -5,7 +5,7 @@ description: A simple StageXL web app. #author: __author__ environment: - sdk: '>=2.0.0-dev.68.0 <2.0.0' + sdk: '>=2.0.0-dev.68.0 <3.0.0' dependencies: stagexl: ^1.1.0 diff --git a/test/validate_templates.dart b/test/validate_templates.dart index 22c68bc2..83798175 100644 --- a/test/validate_templates.dart +++ b/test/validate_templates.dart @@ -140,7 +140,7 @@ void _testGenerator(stagehand.Generator generator, Directory tempDir) { expect(pubspecContent, containsPair('description', isNotEmpty)); final minSDK = '2.0.0-dev.68.0'; - final env = {'sdk': '>=$minSDK <2.0.0'}; + final env = {'sdk': '>=$minSDK <3.0.0'}; expect(pubspecContent, containsPair('environment', env)); // Run package tests, if `test` is included.