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

Update minSDK and dependencies #614

Merged
merged 6 commits into from
Jul 2, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ language: dart
sudo: required

dart:
- 2.2.0
- 2.4.0
- dev

cache:
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## 3.3.2

- Updated minimum Dart SDK to 2.4, except `flutter_web_preview`.

- Updated dependency versions across all templates.

## 3.3.1

- `server-shelf` template updated to make it easy to use with
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ Please file reports on the
## Contributing

Contributions welcome! Please read this short
[guide](https://github.com/dart-lang/stagehand/wiki/Contributing) first.
[guide](https://github.com/dart-lang/stagehand/blob/master/CONTRIBUTING.md) first.

## Analytics and crash reports

Expand Down
2 changes: 1 addition & 1 deletion analysis_options.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
include: package:pedantic/analysis_options.yaml
include: package:pedantic/analysis_options.1.7.0.yaml
analyzer:
exclude:
- 'templates/**'
Expand Down
4 changes: 2 additions & 2 deletions lib/src/generators/console_full.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions lib/src/generators/flutter_web_preview.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions lib/src/generators/package_simple.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 11 additions & 11 deletions lib/src/generators/server_shelf.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions lib/src/generators/web_angular.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions lib/src/generators/web_simple.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions lib/src/generators/web_stagexl.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/src/version.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,31 +7,31 @@ 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.1
version: 3.3.2
homepage: https://github.com/dart-lang/stagehand
author: Dart Team <misc@dartlang.org>

environment:
sdk: '>=2.2.0 <3.0.0'
sdk: '>=2.4.0 <3.0.0'

# Add the bin/stagehand.dart script to the scripts pub installs.
executables:
stagehand:

dependencies:
args: ^1.0.0
args: ^1.5.0
http: ^0.12.0
path: ^1.3.0
usage: ^3.0.0
path: ^1.6.0
usage: ^3.4.0

dev_dependencies:
build: ^1.0.0
build_config: '>=0.3.0 <0.5.0'
build_runner: ^1.0.0
build: ^1.1.0
build_config: ^0.4.0
build_runner: ^1.5.0
build_version: ^2.0.0
glob: ^1.1.5
grinder: ^0.8.0
pedantic: ^1.1.0
pedantic: ^1.7.0
source_gen: ^0.9.0
test: ^1.0.0
test: ^1.6.0
yaml: ^2.1.2
8 changes: 4 additions & 4 deletions templates/console-full/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ description: A sample command-line application.
# author: __author__ <__email__>

environment:
sdk: '>=2.2.0 <3.0.0'
sdk: '>=2.4.0 <3.0.0'

#dependencies:
# path: ^1.4.1
# path: ^1.6.0

dev_dependencies:
pedantic: ^1.0.0
test: ^1.0.0
pedantic: ^1.7.0
test: ^1.5.0
8 changes: 4 additions & 4 deletions templates/flutter-web-preview/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ description: An app built using Flutter for web

environment:
# You must be using Flutter >=1.5.0 or Dart >=2.3.0
sdk: '>=2.3.0-dev.0.1 <3.0.0'
sdk: '>=2.3.0 <3.0.0'

dependencies:
flutter_web: any
flutter_web_ui: any

dev_dependencies:
build_runner: ^1.4.0
build_web_compilers: ^2.0.0
pedantic: ^1.0.0
build_runner: ^1.5.0
build_web_compilers: ^2.1.0
pedantic: ^1.7.0

dependency_overrides:
flutter_web:
Expand Down
8 changes: 4 additions & 4 deletions templates/package-simple/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ description: A starting point for Dart libraries or applications.
# author: __author__ <__email__>

environment:
sdk: '>=2.2.0 <3.0.0'
sdk: '>=2.4.0 <3.0.0'

#dependencies:
# path: ^1.4.1
# path: ^1.6.0

dev_dependencies:
pedantic: ^1.0.0
test: ^1.0.0
pedantic: ^1.7.0
test: ^1.6.0
3 changes: 1 addition & 2 deletions templates/server-shelf/bin/server.dart
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ main(List<String> args) async {
var port = int.tryParse(portStr);

if (port == null) {
stdout.writeln(
'Could not parse port value "$portStr" into a number.');
stdout.writeln('Could not parse port value "$portStr" into a number.');
// 64: command line usage error
exitCode = 64;
return;
Expand Down
6 changes: 3 additions & 3 deletions templates/server-shelf/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ description: A web server built using the shelf package.
# author: __author__ <__email__>

environment:
sdk: '>=2.2.0 <3.0.0'
sdk: '>=2.4.0 <3.0.0'

dependencies:
args: ^1.4.2
args: ^1.5.0
shelf: ^0.7.2

dev_dependencies:
pedantic: ^1.0.0
pedantic: ^1.7.0
16 changes: 8 additions & 8 deletions templates/web-angular/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ description: A web app that uses AngularDart Components
# author: __author__ <__email__>

environment:
sdk: '>=2.2.0 <3.0.0'
sdk: '>=2.4.0 <3.0.0'

dependencies:
angular: ^5.2.0
angular_components: ^0.11.0
angular: ^5.3.0
angular_components: ^0.13.0

dev_dependencies:
angular_test: ^2.2.0
build_runner: ^1.1.2
angular_test: ^2.3.0
build_runner: ^1.5.0
build_test: ^0.10.3
build_web_compilers: ^1.0.0
pedantic: ^1.0.0
test: ^1.5.1
build_web_compilers: ^2.1.0
pedantic: ^1.7.0
test: ^1.6.0
10 changes: 5 additions & 5 deletions templates/web-simple/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ description: An absolute bare-bones web app.
#author: __author__ <__email__>

environment:
sdk: '>=2.2.0 <3.0.0'
sdk: '>=2.4.0 <3.0.0'

#dependencies:
# path: ^1.4.1
# path: ^1.6.0

dev_dependencies:
build_runner: ^1.1.2
build_web_compilers: ^1.0.0
pedantic: ^1.0.0
build_runner: ^1.5.0
build_web_compilers: ^2.1.0
pedantic: ^1.7.0
10 changes: 5 additions & 5 deletions templates/web-stagexl/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ description: A simple StageXL web app.
#author: __author__ <__email__>

environment:
sdk: '>=2.2.0 <3.0.0'
sdk: '>=2.4.0 <3.0.0'

dependencies:
stagexl: ^1.1.0
stagexl: ^1.4.0

dev_dependencies:
build_runner: ^1.1.2
build_web_compilers: ^1.0.0
pedantic: ^1.0.0
build_runner: ^1.5.0
build_web_compilers: ^2.1.0
pedantic: ^1.7.0
8 changes: 3 additions & 5 deletions test/validate_templates.dart
Original file line number Diff line number Diff line change
Expand Up @@ -156,11 +156,9 @@ void _testGenerator(stagehand.Generator generator, Directory tempDir) {
expect(pubspecContent, containsPair('name', 'stagehand'));
expect(pubspecContent, containsPair('description', isNotEmpty));

if (!usesFlutter) {
final minSDK = '2.2.0';
expect(pubspecContent,
containsPair('environment', {'sdk': '>=$minSDK <3.0.0'}));
}
final minSDK = (!usesFlutter) ? '2.4.0' : '2.3.0';
expect(
pubspecContent, containsPair('environment', {'sdk': '>=$minSDK <3.0.0'}));

// Run package tests, if `test` is included.
var devDeps = pubspecContent['dev_dependencies'];
Expand Down