Skip to content

Commit

Permalink
Merge pull request dart-archive/gcloud#112 from dart-lang/sort_direct…
Browse files Browse the repository at this point in the history
…ives

fix sort_directives violations
  • Loading branch information
pq authored Apr 26, 2021
2 parents 7c5e035 + b0203ad commit 0507f35
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 20 deletions.
3 changes: 2 additions & 1 deletion pkgs/gcloud/example/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@

import 'dart:async' show Future;
import 'dart:convert' show utf8;
import 'package:googleapis_auth/auth_io.dart' as auth;

import 'package:gcloud/storage.dart';
import 'package:googleapis_auth/auth_io.dart' as auth;

// Note: The README.md contains more details on how to use this package.

Expand Down
2 changes: 1 addition & 1 deletion pkgs/gcloud/lib/pubsub.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import 'dart:async';
import 'dart:collection';
import 'dart:convert';
import 'dart:io';
import 'package:http/http.dart' as http;

import 'package:googleapis/pubsub/v1.dart' as pubsub;
import 'package:http/http.dart' as http;

import 'common.dart';
import 'service_scope.dart' as ss;
Expand Down
5 changes: 2 additions & 3 deletions pkgs/gcloud/lib/storage.dart
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,9 @@ import 'dart:async';
import 'dart:collection' show UnmodifiableListView, UnmodifiableMapView;
import 'dart:convert';

import 'package:http/http.dart' as http;

import 'package:googleapis/storage/v1.dart' as storage_api;
import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
import 'package:googleapis/storage/v1.dart' as storage_api;
import 'package:http/http.dart' as http;

import 'common.dart';
import 'service_scope.dart' as ss;
Expand Down
3 changes: 1 addition & 2 deletions pkgs/gcloud/test/datastore/e2e/datastore_test_impl.dart
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,11 @@ library datastore_test;
/// $ gcloud datastore create-indexes index.yaml
///
/// Now, wait for indexing done
import 'dart:async';

import 'package:gcloud/common.dart';
import 'package:gcloud/datastore.dart';
import 'package:gcloud/src/datastore_impl.dart' as datastore_impl;
import 'package:gcloud/common.dart';
import 'package:http/http.dart';
import 'package:test/test.dart';

Expand Down
2 changes: 1 addition & 1 deletion pkgs/gcloud/test/datastore/error_matchers.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ library error_matchers;

import 'dart:io';

import 'package:test/test.dart';
import 'package:gcloud/datastore.dart';
import 'package:test/test.dart';

const isApplicationError = TypeMatcher<ApplicationError>();

Expand Down
3 changes: 1 addition & 2 deletions pkgs/gcloud/test/db/e2e/metamodel_test_impl.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,11 @@ library metamodel_test;

import 'dart:async';

import 'package:test/test.dart';

import 'package:gcloud/datastore.dart';
import 'package:gcloud/datastore.dart' show Key, Partition;
import 'package:gcloud/db.dart' as db;
import 'package:gcloud/db/metamodel.dart';
import 'package:test/test.dart';

List<Entity> buildEntitiesWithDifferentNamespaces() {
Key newKey(String namespace, String kind, int id) {
Expand Down
2 changes: 1 addition & 1 deletion pkgs/gcloud/test/db/properties_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ library gcloud.db.properties_test;

import 'dart:typed_data';

import 'package:gcloud/db.dart';
import 'package:gcloud/datastore.dart' as datastore;
import 'package:gcloud/db.dart';
import 'package:test/test.dart';

void main() {
Expand Down
6 changes: 2 additions & 4 deletions pkgs/gcloud/test/pubsub/pubsub_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,10 @@
import 'dart:async';
import 'dart:convert';

import 'package:http/http.dart' as http;
import 'package:test/test.dart';

import 'package:gcloud/pubsub.dart';

import 'package:googleapis/pubsub/v1.dart' as pubsub;
import 'package:http/http.dart' as http;
import 'package:test/test.dart';

import '../common.dart';
import '../common_e2e.dart';
Expand Down
2 changes: 1 addition & 1 deletion pkgs/gcloud/test/storage/e2e_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ library gcloud.storage;

import 'dart:async';

import 'package:googleapis/storage/v1.dart' as storage_api;
import 'package:gcloud/storage.dart';
import 'package:googleapis/storage/v1.dart' as storage_api;
import 'package:test/test.dart';

import '../common_e2e.dart';
Expand Down
6 changes: 2 additions & 4 deletions pkgs/gcloud/test/storage/storage_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,10 @@ library gcloud.storage;
import 'dart:async';
import 'dart:convert';

import 'package:http/http.dart' as http;
import 'package:test/test.dart';

import 'package:gcloud/storage.dart';

import 'package:googleapis/storage/v1.dart' as storage;
import 'package:http/http.dart' as http;
import 'package:test/test.dart';

import '../common.dart';
import '../common_e2e.dart';
Expand Down

0 comments on commit 0507f35

Please sign in to comment.