Skip to content
This repository has been archived by the owner on May 31, 2021. It is now read-only.

Commit

Permalink
Prepare for v2 release (#500)
Browse files Browse the repository at this point in the history
Closes #470

* Remove gh-page task – not used any more
* update min SDK for all templates
  • Loading branch information
kevmoo committed Apr 30, 2018
1 parent 3d84b0a commit e03c1df
Show file tree
Hide file tree
Showing 17 changed files with 35 additions and 44 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
## 2.0.0-alpha-dev
## 2.0.0

Project and template file changes:
- In `pubspec.yaml` files:
- Set minimal SDK to 2.0.0-dev.48.0.
- Set minimal SDK to 2.0.0-dev.51.0.
- Dropped the <del>`browser`</del> package dependency.
- Upgraded to `test` 0.12.30, which supports running tests under headless chrome.
- Set initial `version` to 1.0.0 for all templates, and commented it out.
Expand Down
2 changes: 1 addition & 1 deletion lib/generators/console_full_data.dart
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ J0hlbGxvIHdvcmxkOiAke19fcHJvamVjdE5hbWVfXy5jYWxjdWxhdGUoKX0hJyk7Cn0K''',
'''bmFtZTogX19wcm9qZWN0TmFtZV9fCmRlc2NyaXB0aW9uOiBBIHNhbXBsZSBjb21tYW5kLWxpbmUg
YXBwbGljYXRpb24uCiMgdmVyc2lvbjogMS4wLjAKIyBob21lcGFnZTogaHR0cHM6Ly93d3cuZXhh
bXBsZS5jb20KIyBhdXRob3I6IF9fYXV0aG9yX18gPGVtYWlsQGV4YW1wbGUuY29tPgoKZW52aXJv
bm1lbnQ6CiAgc2RrOiAnPj0yLjAuMC1kZXYuNDguMCA8Mi4wLjAnCgojZGVwZW5kZW5jaWVzOgoj
bm1lbnQ6CiAgc2RrOiAnPj0yLjAuMC1kZXYuNTEuMCA8Mi4wLjAnCgojZGVwZW5kZW5jaWVzOgoj
ICBwYXRoOiBeMS40LjEKCmRldl9kZXBlbmRlbmNpZXM6CiAgdGVzdDogXjAuMTIuMzAK''',
'test/__projectName___test.dart',
'text',
Expand Down
2 changes: 1 addition & 1 deletion lib/generators/package_simple_data.dart
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ IGJvb2wgZ2V0IGlzQXdlc29tZSA9PiB0cnVlOwp9Cg==''',
'''bmFtZTogX19wcm9qZWN0TmFtZV9fCmRlc2NyaXB0aW9uOiBBIHN0YXJ0aW5nIHBvaW50IGZvciBE
YXJ0IGxpYnJhcmllcyBvciBhcHBsaWNhdGlvbnMuCiMgdmVyc2lvbjogMS4wLjAKIyBob21lcGFn
ZTogaHR0cHM6Ly93d3cuZXhhbXBsZS5jb20KIyBhdXRob3I6IF9fYXV0aG9yX18gPGVtYWlsQGV4
YW1wbGUuY29tPgoKZW52aXJvbm1lbnQ6CiAgc2RrOiAnPj0yLjAuMC1kZXYuNDguMCA8Mi4wLjAn
YW1wbGUuY29tPgoKZW52aXJvbm1lbnQ6CiAgc2RrOiAnPj0yLjAuMC1kZXYuNTEuMCA8Mi4wLjAn
CgojZGVwZW5kZW5jaWVzOgojICBwYXRoOiBeMS40LjEKCmRldl9kZXBlbmRlbmNpZXM6CiAgdGVz
dDogXjAuMTIuMzAK''',
'test/__projectName___test.dart',
Expand Down
2 changes: 1 addition & 1 deletion lib/generators/server_shelf_data.dart
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ UmVxdWVzdCBmb3IgIiR7cmVxdWVzdC51cmx9IicpOwo=''',
'''bmFtZTogX19wcm9qZWN0TmFtZV9fCmRlc2NyaXB0aW9uOiBBIHdlYiBzZXJ2ZXIgYnVpbHQgdXNp
bmcgdGhlIHNoZWxmIHBhY2thZ2UuCiMgdmVyc2lvbjogMS4wLjAKIyBob21lcGFnZTogaHR0cHM6
Ly93d3cuZXhhbXBsZS5jb20KIyBhdXRob3I6IF9fYXV0aG9yX18gPGVtYWlsQGV4YW1wbGUuY29t
PgoKZW52aXJvbm1lbnQ6CiAgc2RrOiAnPj0yLjAuMC1kZXYuNDguMCA8Mi4wLjAnCgpkZXBlbmRl
PgoKZW52aXJvbm1lbnQ6CiAgc2RrOiAnPj0yLjAuMC1kZXYuNTEuMCA8Mi4wLjAnCgpkZXBlbmRl
bmNpZXM6CiAgYXJnczogXjEuNC4yCiAgc2hlbGY6IF4wLjcuMgoKI2Rldl9kZXBlbmRlbmNpZXM6
CiMgIHRlc3Q6IF4wLjEyLjMwCg=='''
];
10 changes: 5 additions & 5 deletions lib/generators/web_angular_data.dart
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,11 @@ bmc+PiBnZXRUb2RvTGlzdCgpIGFzeW5jID0+IG1vY2tUb2RvTGlzdDsKfQo=''',
'''bmFtZTogX19wcm9qZWN0TmFtZV9fCmRlc2NyaXB0aW9uOiBBIHdlYiBhcHAgdGhhdCB1c2VzIEFu
Z3VsYXJEYXJ0IENvbXBvbmVudHMKIyB2ZXJzaW9uOiAxLjAuMAojIGhvbWVwYWdlOiBodHRwczov
L3d3dy5leGFtcGxlLmNvbQojIGF1dGhvcjogX19hdXRob3JfXyA8ZW1haWxAZXhhbXBsZS5jb20+
CgplbnZpcm9ubWVudDoKICBzZGs6ICc+PTIuMC4wLWRldi40OC4wIDwyLjAuMCcKCmRlcGVuZGVu
Y2llczoKICBhbmd1bGFyOiBeNS4wLjAtYWxwaGErMTAKICBhbmd1bGFyX2NvbXBvbmVudHM6IF4w
LjkuMC1hbHBoYQoKZGV2X2RlcGVuZGVuY2llczoKICBhbmd1bGFyX3Rlc3Q6IF4yLjAuMC1hbHBo
YQogIGJ1aWxkX3J1bm5lcjogXjAuOC41CiAgYnVpbGRfdGVzdDogXjAuMTAuMAogIGJ1aWxkX3dl
Yl9jb21waWxlcnM6IF4wLjMuNgogIHRlc3Q6IF4wLjEyLjMwCg==''',
CgplbnZpcm9ubWVudDoKICBzZGs6ICc+PTIuMC4wLWRldi41MS4wIDwyLjAuMCcKCmRlcGVuZGVu
Y2llczoKICBhbmd1bGFyOiBeNS4wLjAtYWxwaGErMTEKICBhbmd1bGFyX2NvbXBvbmVudHM6IF4w
LjkuMC1hbHBoYSsxMQoKZGV2X2RlcGVuZGVuY2llczoKICBhbmd1bGFyX3Rlc3Q6IF4yLjAuMC1h
bHBoYSs5CiAgYnVpbGRfcnVubmVyOiBeMC44LjcKICBidWlsZF90ZXN0OiBeMC4xMC4wCiAgYnVp
bGRfd2ViX2NvbXBpbGVyczogXjAuMy43CiAgdGVzdDogXjAuMTIuMzAK''',
'test/app_test.dart',
'text',
'''QFRlc3RPbignYnJvd3NlcicpCmltcG9ydCAncGFja2FnZTphbmd1bGFyX3Rlc3QvYW5ndWxhcl90
Expand Down
6 changes: 3 additions & 3 deletions lib/generators/web_simple_data.dart
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ dWFsaXR5X2NoZWNrcwogICAgLSB2YWxpZF9yZWdleHBzCg==''',
'''bmFtZTogX19wcm9qZWN0TmFtZV9fCmRlc2NyaXB0aW9uOiBBbiBhYnNvbHV0ZSBiYXJlLWJvbmVz
IHdlYiBhcHAuCiMgdmVyc2lvbjogMS4wLjAKI2hvbWVwYWdlOiBodHRwczovL3d3dy5leGFtcGxl
LmNvbQojYXV0aG9yOiBfX2F1dGhvcl9fIDxlbWFpbEBleGFtcGxlLmNvbT4KCmVudmlyb25tZW50
OgogIHNkazogJz49Mi4wLjAtZGV2LjQ4LjAgPDIuMC4wJwoKI2RlcGVuZGVuY2llczoKIyAgcGF0
aDogXjEuNC4xCgpkZXZfZGVwZW5kZW5jaWVzOgogIGJ1aWxkX3J1bm5lcjogXjAuOC4yCiAgYnVp
bGRfd2ViX2NvbXBpbGVyczogXjAuMy42Cg==''',
OgogIHNkazogJz49Mi4wLjAtZGV2LjUxLjAgPDIuMC4wJwoKI2RlcGVuZGVuY2llczoKIyAgcGF0
aDogXjEuNC4xCgpkZXZfZGVwZW5kZW5jaWVzOgogIGJ1aWxkX3J1bm5lcjogXjAuOC43CiAgYnVp
bGRfd2ViX2NvbXBpbGVyczogXjAuMy43Cg==''',
'web/favicon.ico',
'binary',
'''iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAACXBIWXMAAAsTAAALEwEAmpwYAAAN
Expand Down
6 changes: 3 additions & 3 deletions lib/generators/web_stagexl_data.dart
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ dWFsaXR5X2NoZWNrcwogICAgLSB2YWxpZF9yZWdleHBzCg==''',
'''bmFtZTogX19wcm9qZWN0TmFtZV9fCmRlc2NyaXB0aW9uOiBBIHNpbXBsZSBTdGFnZVhMIHdlYiBh
cHAuCiMgdmVyc2lvbjogMS4wLjAKI2hvbWVwYWdlOiBodHRwczovL3d3dy5leGFtcGxlLmNvbQoj
YXV0aG9yOiBfX2F1dGhvcl9fIDxlbWFpbEBleGFtcGxlLmNvbT4KCmVudmlyb25tZW50OgogIHNk
azogJz49Mi4wLjAtZGV2LjQ4LjAgPDIuMC4wJwoKZGVwZW5kZW5jaWVzOgogIHN0YWdleGw6IF4x
LjEuMAoKZGV2X2RlcGVuZGVuY2llczoKICBidWlsZF9ydW5uZXI6IF4wLjguMgogIGJ1aWxkX3dl
Yl9jb21waWxlcnM6IF4wLjMuNgo=''',
azogJz49Mi4wLjAtZGV2LjUxLjAgPDIuMC4wJwoKZGVwZW5kZW5jaWVzOgogIHN0YWdleGw6IF4x
LjEuMAoKZGV2X2RlcGVuZGVuY2llczoKICBidWlsZF9ydW5uZXI6IF4wLjguNwogIGJ1aWxkX3dl
Yl9jb21waWxlcnM6IF4wLjMuNwo=''',
'web/images/dart@1x.png',
'binary',
'''iVBORw0KGgoAAAANSUhEUgAAASwAAABQCAYAAACj6kh7AAAgkElEQVR4AeyaBWzrVhSG/8KYGdvY
Expand Down
2 changes: 1 addition & 1 deletion lib/src/cli_app.dart
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import 'package:usage/usage_io.dart';
const String appName = 'stagehand';

// This version must be updated in tandem with the pubspec version.
const String appVersion = '2.0.0-alpha-dev';
const String appVersion = '2.0.0';

const String appPubInfo = 'https://pub.dartlang.org/packages/$appName.json';

Expand Down
4 changes: 2 additions & 2 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ name: stagehand
description: >
A scaffolding generator for your Dart projects. Stagehand helps you get set
up!
version: 2.0.0-alpha-dev
version: 2.0.0
homepage: https://github.com/dart-lang/stagehand
author: Dart Team <misc@dartlang.org>

environment:
sdk: '>=2.0.0-dev.48.0 <2.0.0'
sdk: '>=2.0.0-dev.51.0 <2.0.0'

# Add the bin/stagehand.dart script to the scripts pub installs.
executables:
Expand Down
2 changes: 1 addition & 1 deletion templates/console-full/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ description: A sample command-line application.
# author: __author__ <email@example.com>

environment:
sdk: '>=2.0.0-dev.48.0 <2.0.0'
sdk: '>=2.0.0-dev.51.0 <2.0.0'

#dependencies:
# path: ^1.4.1
Expand Down
2 changes: 1 addition & 1 deletion templates/package-simple/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ description: A starting point for Dart libraries or applications.
# author: __author__ <email@example.com>

environment:
sdk: '>=2.0.0-dev.48.0 <2.0.0'
sdk: '>=2.0.0-dev.51.0 <2.0.0'

#dependencies:
# path: ^1.4.1
Expand Down
2 changes: 1 addition & 1 deletion templates/server-shelf/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ description: A web server built using the shelf package.
# author: __author__ <email@example.com>

environment:
sdk: '>=2.0.0-dev.48.0 <2.0.0'
sdk: '>=2.0.0-dev.51.0 <2.0.0'

dependencies:
args: ^1.4.2
Expand Down
12 changes: 6 additions & 6 deletions templates/web-angular/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ description: A web app that uses AngularDart Components
# author: __author__ <email@example.com>

environment:
sdk: '>=2.0.0-dev.48.0 <2.0.0'
sdk: '>=2.0.0-dev.51.0 <2.0.0'

dependencies:
angular: ^5.0.0-alpha+10
angular_components: ^0.9.0-alpha
angular: ^5.0.0-alpha+11
angular_components: ^0.9.0-alpha+11

dev_dependencies:
angular_test: ^2.0.0-alpha
build_runner: ^0.8.5
angular_test: ^2.0.0-alpha+9
build_runner: ^0.8.7
build_test: ^0.10.0
build_web_compilers: ^0.3.6
build_web_compilers: ^0.3.7
test: ^0.12.30
6 changes: 3 additions & 3 deletions templates/web-simple/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ description: An absolute bare-bones web app.
#author: __author__ <email@example.com>

environment:
sdk: '>=2.0.0-dev.48.0 <2.0.0'
sdk: '>=2.0.0-dev.51.0 <2.0.0'

#dependencies:
# path: ^1.4.1

dev_dependencies:
build_runner: ^0.8.2
build_web_compilers: ^0.3.6
build_runner: ^0.8.7
build_web_compilers: ^0.3.7
6 changes: 3 additions & 3 deletions templates/web-stagexl/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ description: A simple StageXL web app.
#author: __author__ <email@example.com>

environment:
sdk: '>=2.0.0-dev.48.0 <2.0.0'
sdk: '>=2.0.0-dev.51.0 <2.0.0'

dependencies:
stagexl: ^1.1.0

dev_dependencies:
build_runner: ^0.8.2
build_web_compilers: ^0.3.6
build_runner: ^0.8.7
build_web_compilers: ^0.3.7
2 changes: 1 addition & 1 deletion test/validate_templates.dart
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ void _testGenerator(stagehand.Generator generator, Directory tempDir) {
expect(pubspecContent, containsPair('name', 'stagehand'));
expect(pubspecContent, containsPair('description', isNotEmpty));

final minSDK = '2.0.0-dev.48.0';
final minSDK = '2.0.0-dev.51.0';
final env = {'sdk': '>=$minSDK <2.0.0'};
expect(pubspecContent, containsPair('environment', env));

Expand Down
9 changes: 0 additions & 9 deletions tool/grind.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import 'dart:convert';
import 'dart:io';
import 'dart:math' as math;

import 'package:ghpages_generator/ghpages_generator.dart' as ghpages;
import 'package:grinder/grinder.dart';
import 'package:path/path.dart' as path;
import 'package:stagehand/stagehand.dart' as stagehand;
Expand Down Expand Up @@ -49,14 +48,6 @@ void build() {
f.writeAsStringSync(newSource);
}

@Task('Generate a new version of gh-pages')
void updateGhPages() {
log('Updating gh-pages branch of the project');
new ghpages.Generator(rootDir: getDir('.').absolute.path)
..templateDir = getDir('site').absolute.path
..generate();
}

@Task('Run each generator and analyze the output')
test() => new TestRunner().testAsync(files: 'test/validate_templates.dart');

Expand Down

0 comments on commit e03c1df

Please sign in to comment.