Update minSDK and dependencies (#614)

Also update templates to Dart 2.4, except flutter_web_preview.
dart-archive · Jul 2, 2019 · 734f1e8 · 734f1e8
1 parent 7cdfa7b
commit 734f1e8
Show file tree

Hide file tree

Showing 22 changed files with 92 additions and 89 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,7 @@ language: dart
 sudo: required
 
 dart:
-  - 2.2.0
+  - 2.4.0
   - dev
 
 cache:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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 

diff --git a/README.md b/README.md
@@ -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
 

diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -1,4 +1,4 @@
-include: package:pedantic/analysis_options.yaml
+include: package:pedantic/analysis_options.1.7.0.yaml
 analyzer:
   exclude:
     - 'templates/**'

diff --git a/lib/src/generators/console_full.g.dart b/lib/src/generators/console_full.g.dart
diff --git a/lib/src/generators/flutter_web_preview.g.dart b/lib/src/generators/flutter_web_preview.g.dart
diff --git a/lib/src/generators/package_simple.g.dart b/lib/src/generators/package_simple.g.dart
diff --git a/lib/src/generators/server_shelf.g.dart b/lib/src/generators/server_shelf.g.dart
diff --git a/lib/src/generators/web_angular.g.dart b/lib/src/generators/web_angular.g.dart
diff --git a/lib/src/generators/web_simple.g.dart b/lib/src/generators/web_simple.g.dart
diff --git a/lib/src/generators/web_stagexl.g.dart b/lib/src/generators/web_stagexl.g.dart
diff --git a/lib/src/version.dart b/lib/src/version.dart
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -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
diff --git a/templates/console-full/pubspec.yaml b/templates/console-full/pubspec.yaml
@@ -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
diff --git a/templates/flutter-web-preview/pubspec.yaml b/templates/flutter-web-preview/pubspec.yaml
@@ -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:

diff --git a/templates/package-simple/pubspec.yaml b/templates/package-simple/pubspec.yaml
@@ -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
diff --git a/templates/server-shelf/bin/server.dart b/templates/server-shelf/bin/server.dart
@@ -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;

diff --git a/templates/server-shelf/pubspec.yaml b/templates/server-shelf/pubspec.yaml
@@ -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
diff --git a/templates/web-angular/pubspec.yaml b/templates/web-angular/pubspec.yaml
@@ -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
diff --git a/templates/web-simple/pubspec.yaml b/templates/web-simple/pubspec.yaml
@@ -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
diff --git a/templates/web-stagexl/pubspec.yaml b/templates/web-stagexl/pubspec.yaml
@@ -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
diff --git a/test/validate_templates.dart b/test/validate_templates.dart
@@ -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'];