Upgrade runtime SDK to 2.1-dev (#1541)

* Upgrade pub_dartdoc to 2.1-dev SDK

* Upgrade _popularity to 2.1-dev SDK

* Upgrade app to 2.1-dev SDK

* Restore default timeout for tests.

* Update upper SDK limit to 3.0.0

Author: isoos

.travis.yml

@@ -6,27 +6,27 @@ jobs:
     - stage: smoke_test
       script: ./tool/travis.sh dartfmt dartanalyzer
       env: PKG="app"
-      dart: 2.0.0-dev.63.0
+      dart: 2.1.0-dev.1.0
     - stage: unit_test
       script: ./tool/travis.sh test
       env: PKG="app"
-      dart: 2.0.0-dev.63.0
+      dart: 2.1.0-dev.1.0
     - stage: smoke_test
       script: ./tool/travis.sh dartfmt dartanalyzer
       env: PKG="pkg/_popularity"
-      dart: 2.0.0-dev.63.0
+      dart: 2.1.0-dev.1.0
     - stage: unit_test
       script: ./tool/travis.sh test
       env: PKG="pkg/_popularity"
-      dart: 2.0.0-dev.63.0
+      dart: 2.1.0-dev.1.0
     - stage: smoke_test
       script: ./tool/travis.sh dartfmt dartanalyzer
       env: PKG="pkg/pub_dartdoc"
-      dart: 2.0.0-dev.63.0
+      dart: 2.1.0-dev.1.0
     - stage: unit_test
       script: ./tool/travis.sh test
       env: PKG="pkg/pub_dartdoc"
-      dart: 2.0.0-dev.63.0
+      dart: 2.1.0-dev.1.0
 
 stages:
   - smoke_test

Dockerfile

@@ -1,5 +1,5 @@
 # Keep version in-sync with .travis.yml, .mono_repo.yml and app/lib/shared/versions.dart
-FROM google/dart-runtime-base:2.0.0-dev.63.0
+FROM google/dart-runtime-base:2.1.0-dev.1.0
 
 # `apt-mark hold dart` ensures that Dart is not upgraded with the other packages
 #   We want to make sure SDK upgrades are explicit.

app/.mono_repo.yml

@@ -1,6 +1,6 @@
 # See https://github.com/dart-lang/mono_repo for details
 dart:
-  - 2.0.0-dev.63.0
+  - 2.1.0-dev.1.0
 
 stages:
   - smoke_test:

app/analysis_options.yaml

@@ -1,7 +1,5 @@
 # https://www.dartlang.org/guides/language/analysis-options
 analyzer:
-  language:
-    enablePreviewDart2: true
   strong-mode:
     implicit-casts: false
 
@@ -43,7 +41,8 @@ linter:
     - package_prefixed_library_names
 #    - parameter_assignments
     - prefer_final_fields
-    - prefer_final_locals
+# TODO: enable after generated code passes
+#    - prefer_final_locals
     - prefer_is_not_empty
     - prefer_typing_uninitialized_variables
 #    - public_member_api_docs

app/bin/service/frontend.dart

@@ -146,7 +146,7 @@ Future<shelf.Handler> setupServices(Configuration configuration) async {
     uploadSigner = new ServiceAccountBasedUploadSigner(credentials);
   } else {
     final authClient = await auth.clientViaMetadataServer();
-    registerScopeExitCallback(authClient.close);
+    registerScopeExitCallback(() async => authClient.close());
     final email = await obtainServiceAccountEmail();
     uploadSigner =
         new IamBasedUploadSigner(configuration.projectId, email, authClient);

app/bin/tools/backfill_examples.dart

@@ -25,7 +25,7 @@ Future main(List<String> args) async {
   int updated = 0;
   _httpClient = new http.Client();
   await withProdServices(() async {
-    final query = dbService.query(PackageVersion)..order('-created');
+    final query = dbService.query<PackageVersion>()..order('-created');
     if (pkg != null) {
       query.filter(
           "package =", new ds.Key([new ds.KeyElement('Package', pkg)]));

app/bin/tools/backfill_history.dart

@@ -27,7 +27,7 @@ Future main(List<String> args) async {
     if (package != null) {
       await _backfillPackage(package);
     } else {
-      await for (Package p in dbService.query(Package).run()) {
+      await for (Package p in dbService.query<Package>().run()) {
         await _backfillPackage(p.name);
       }
     }
@@ -37,7 +37,7 @@ Future main(List<String> args) async {
 Future _backfillPackage(String package) async {
   print('Backfill history in: $package');
   final packageKey = dbService.emptyKey.append(Package, id: package);
-  final query = dbService.query(PackageVersion, ancestorKey: packageKey);
+  final query = dbService.query<PackageVersion>(ancestorKey: packageKey);
   await for (PackageVersion pv in query.run()) {
     bool hasUploaded = false;
     await for (History history in historyBackend.getAll(

app/bin/tools/backfill_packages.dart

@@ -12,7 +12,7 @@ import 'package:pub_dartlang_org/frontend/service_utils.dart';
 Future main(List<String> args) async {
   int updatedPackages = 0;
   await withProdServices(() async {
-    await for (Package p in dbService.query(Package).run().cast<Package>()) {
+    await for (Package p in dbService.query<Package>().run()) {
       if (p.latestDevVersionKey == null) {
         try {
           await _updateDevVersionKey(p.key);
@@ -29,11 +29,7 @@ Future main(List<String> args) async {
 Future _updateDevVersionKey(Key packageKey) async {
   await dbService.withTransaction((Transaction t) async {
     final Package package = (await t.lookup([packageKey])).first;
-    final versions = await t
-        .query(PackageVersion, packageKey)
-        .run()
-        .cast<PackageVersion>()
-        .toList();
+    final versions = await t.query<PackageVersion>(packageKey).run().toList();
     for (PackageVersion pv in versions) {
       package.updateVersion(pv);
     }

app/bin/tools/check_package_names.dart

@@ -14,7 +14,7 @@ Future main(List<String> args) async {
   final names = <String>[];
 
   await withProdServices(() async {
-    await for (Package p in dbService.query(Package).run()) {
+    await for (Package p in dbService.query<Package>().run()) {
       names.add(p.name);
       if (names.length % 100 == 0) {
         print('Scanned: ${names.length} packages [current: ${p.name}].');

app/bin/tools/copy_data.dart

@@ -55,23 +55,23 @@ Future migrate(db.DatastoreDB from, db.DatastoreDB to) async {
   }
 
   // Write [Package]s.
-  await for (final Package p in from.query(Package).run()) {
+  await for (final Package p in from.query<Package>().run()) {
     print('Enquqing package ${p.name}');
     entities.add(p);
     await flush();
   }
   await flush(force: true);
 
   // Write [PackageVersion]s.
-  await for (final PackageVersion pv in from.query(PackageVersion).run()) {
+  await for (final PackageVersion pv in from.query<PackageVersion>().run()) {
     print('Enquqing package ${pv.key.parent.id} version ${pv.key.id}');
     entities.add(pv);
     await flush();
   }
   await flush(force: true);
 
   // Write [PrivateKey]s.
-  await for (final PrivateKey pk in from.query(PrivateKey).run()) {
+  await for (final PrivateKey pk in from.query<PrivateKey>().run()) {
     if (pk.key.id == 'singleton') {
       print('Enqueueing key ${pk.key.id}');
       entities.add(pk);