From 85172df49aef0222684ddcc7dac48c2a15aacc59 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 7 Oct 2019 05:03:16 -0700 Subject: [PATCH 01/53] Support the v2 Android embedder --- packages/package_info/CHANGELOG.md | 4 ++ .../packageinfo/PackageInfoPlugin.java | 38 +++++++++++++++---- .../android/app/src/main/AndroidManifest.xml | 11 ++++++ .../packageinfoexample/MainActivity.java | 0 .../example/android/gradle.properties | 2 + packages/package_info/pubspec.yaml | 2 +- 6 files changed, 48 insertions(+), 9 deletions(-) create mode 100644 packages/package_info/example/android/app/src/main/java/dev/flutter/plugins/packageinfoexample/MainActivity.java diff --git a/packages/package_info/CHANGELOG.md b/packages/package_info/CHANGELOG.md index a041f9115004..386f701c8f52 100644 --- a/packages/package_info/CHANGELOG.md +++ b/packages/package_info/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.4.0+8 + +* Support the v2 Android embedder. + ## 0.4.0+7 * Update and migrate iOS example project. diff --git a/packages/package_info/android/src/main/java/io/flutter/plugins/packageinfo/PackageInfoPlugin.java b/packages/package_info/android/src/main/java/io/flutter/plugins/packageinfo/PackageInfoPlugin.java index 81fae62a1f4f..d9f098bdd26f 100644 --- a/packages/package_info/android/src/main/java/io/flutter/plugins/packageinfo/PackageInfoPlugin.java +++ b/packages/package_info/android/src/main/java/io/flutter/plugins/packageinfo/PackageInfoPlugin.java @@ -8,6 +8,8 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.os.Build; +import io.flutter.embedding.engine.plugins.FlutterPlugin; +import io.flutter.plugin.common.BinaryMessenger; import io.flutter.plugin.common.MethodCall; import io.flutter.plugin.common.MethodChannel; import io.flutter.plugin.common.MethodChannel.MethodCallHandler; @@ -17,14 +19,35 @@ import java.util.Map; /** PackageInfoPlugin */ -public class PackageInfoPlugin implements MethodCallHandler { - private final Registrar mRegistrar; +public class PackageInfoPlugin implements MethodCallHandler, FlutterPlugin { + private Context applicationContext; + private MethodChannel methodChannel; /** Plugin registration. */ public static void registerWith(Registrar registrar) { - final MethodChannel channel = + final BatteryPlugin instance = new BatteryPlugin(); + instance.onAttachedToEngine(registrar.context(), registrar.messenger()); + } + + @Override + public void onAttachedToEngine(FlutterPluginBinding binding) { + applicationContext = binding.getApplicationContext(); + onAttachedToEngine( + binding.getApplicationContext(), binding.getFlutterEngine().getDartExecutor()); + } + + private void onAttachedToEngine(Context applicationContext, BinaryMessenger messenger) { + this.applicationContext = applicationContext; + methodChannel = new MethodChannel(registrar.messenger(), "plugins.flutter.io/package_info"); - channel.setMethodCallHandler(new PackageInfoPlugin(registrar)); + methodChannel.setMethodCallHandler(new PackageInfoPlugin(registrar)); + } + + @Override + public void onDetachedFromEngine(FlutterPluginBinding binding) { + applicationContext = null; + methodChannel.setMethodCallHandler(null); + methodChannel = null; } private PackageInfoPlugin(Registrar registrar) { @@ -34,14 +57,13 @@ private PackageInfoPlugin(Registrar registrar) { @Override public void onMethodCall(MethodCall call, Result result) { try { - Context context = mRegistrar.context(); if (call.method.equals("getAll")) { - PackageManager pm = context.getPackageManager(); - PackageInfo info = pm.getPackageInfo(context.getPackageName(), 0); + PackageManager pm = applicationContext.getPackageManager(); + PackageInfo info = pm.getPackageInfo(applicationContext.getPackageName(), 0); Map map = new HashMap<>(); map.put("appName", info.applicationInfo.loadLabel(pm).toString()); - map.put("packageName", context.getPackageName()); + map.put("packageName", applicationContext.getPackageName()); map.put("version", info.versionName); map.put("buildNumber", String.valueOf(getLongVersionCode(info))); diff --git a/packages/package_info/example/android/app/src/main/AndroidManifest.xml b/packages/package_info/example/android/app/src/main/AndroidManifest.xml index 3e46c5d3bf06..a5db69552255 100644 --- a/packages/package_info/example/android/app/src/main/AndroidManifest.xml +++ b/packages/package_info/example/android/app/src/main/AndroidManifest.xml @@ -10,6 +10,17 @@ android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection" android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize"> + + + + + + diff --git a/packages/package_info/example/android/app/src/main/java/dev/flutter/plugins/packageinfoexample/MainActivity.java b/packages/package_info/example/android/app/src/main/java/dev/flutter/plugins/packageinfoexample/MainActivity.java new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/packages/package_info/example/android/gradle.properties b/packages/package_info/example/android/gradle.properties index 8bd86f680510..d12b9a8297e5 100644 --- a/packages/package_info/example/android/gradle.properties +++ b/packages/package_info/example/android/gradle.properties @@ -1 +1,3 @@ org.gradle.jvmargs=-Xmx1536M +android.enableR8=true +android.useAndroidX=true diff --git a/packages/package_info/pubspec.yaml b/packages/package_info/pubspec.yaml index f24b5d711adf..a67c827ec386 100644 --- a/packages/package_info/pubspec.yaml +++ b/packages/package_info/pubspec.yaml @@ -3,7 +3,7 @@ description: Flutter plugin for querying information about the application package, such as CFBundleVersion on iOS or versionCode on Android. author: Flutter Team homepage: https://github.com/flutter/plugins/tree/master/packages/package_info -version: 0.4.0+7 +version: 0.4.0+8 flutter: plugin: From 17bd422995e04ec5c19ca58c84a294c66da9961a Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 7 Oct 2019 05:41:45 -0700 Subject: [PATCH 02/53] Move to dev namespace --- .../plugins/packageinfo/PackageInfoPlugin.java | 12 ++++-------- .../plugins/packageinfoexample/MainActivity.java | 16 ++++++++++++++++ packages/package_info/pubspec.yaml | 2 +- 3 files changed, 21 insertions(+), 9 deletions(-) rename packages/package_info/android/src/main/java/{io => dev}/flutter/plugins/packageinfo/PackageInfoPlugin.java (88%) diff --git a/packages/package_info/android/src/main/java/io/flutter/plugins/packageinfo/PackageInfoPlugin.java b/packages/package_info/android/src/main/java/dev/flutter/plugins/packageinfo/PackageInfoPlugin.java similarity index 88% rename from packages/package_info/android/src/main/java/io/flutter/plugins/packageinfo/PackageInfoPlugin.java rename to packages/package_info/android/src/main/java/dev/flutter/plugins/packageinfo/PackageInfoPlugin.java index d9f098bdd26f..9213b7188f0a 100644 --- a/packages/package_info/android/src/main/java/io/flutter/plugins/packageinfo/PackageInfoPlugin.java +++ b/packages/package_info/android/src/main/java/dev/flutter/plugins/packageinfo/PackageInfoPlugin.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -package io.flutter.plugins.packageinfo; +package dev.flutter.plugins.packageinfo; import android.content.Context; import android.content.pm.PackageInfo; @@ -25,7 +25,7 @@ public class PackageInfoPlugin implements MethodCallHandler, FlutterPlugin { /** Plugin registration. */ public static void registerWith(Registrar registrar) { - final BatteryPlugin instance = new BatteryPlugin(); + final PackageInfoPlugin instance = new PackageInfoPlugin(); instance.onAttachedToEngine(registrar.context(), registrar.messenger()); } @@ -39,8 +39,8 @@ public void onAttachedToEngine(FlutterPluginBinding binding) { private void onAttachedToEngine(Context applicationContext, BinaryMessenger messenger) { this.applicationContext = applicationContext; methodChannel = - new MethodChannel(registrar.messenger(), "plugins.flutter.io/package_info"); - methodChannel.setMethodCallHandler(new PackageInfoPlugin(registrar)); + new MethodChannel(messenger, "plugins.flutter.io/package_info"); + methodChannel.setMethodCallHandler(new PackageInfoPlugin()); } @Override @@ -50,10 +50,6 @@ public void onDetachedFromEngine(FlutterPluginBinding binding) { methodChannel = null; } - private PackageInfoPlugin(Registrar registrar) { - this.mRegistrar = registrar; - } - @Override public void onMethodCall(MethodCall call, Result result) { try { diff --git a/packages/package_info/example/android/app/src/main/java/dev/flutter/plugins/packageinfoexample/MainActivity.java b/packages/package_info/example/android/app/src/main/java/dev/flutter/plugins/packageinfoexample/MainActivity.java index e69de29bb2d1..82acbee70fef 100644 --- a/packages/package_info/example/android/app/src/main/java/dev/flutter/plugins/packageinfoexample/MainActivity.java +++ b/packages/package_info/example/android/app/src/main/java/dev/flutter/plugins/packageinfoexample/MainActivity.java @@ -0,0 +1,16 @@ +// Copyright 2017 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package dev.flutter.plugins.packageinfoexample; + +import io.flutter.embedding.android.FlutterActivity; +import io.flutter.embedding.engine.FlutterEngine; +import io.flutter.plugins.packageinfo.PackageInfoPlugin; + +public class MainActivity extends FlutterActivity { + @Override + public void configureFlutterEngine(FlutterEngine flutterEngine) { + flutterEngine.getPlugins().add(new PackageInfoPlugin()); + } +} \ No newline at end of file diff --git a/packages/package_info/pubspec.yaml b/packages/package_info/pubspec.yaml index a67c827ec386..4d1508c0be12 100644 --- a/packages/package_info/pubspec.yaml +++ b/packages/package_info/pubspec.yaml @@ -7,7 +7,7 @@ version: 0.4.0+8 flutter: plugin: - androidPackage: io.flutter.plugins.packageinfo + androidPackage: dev.flutter.plugins.packageinfo iosPrefix: FLT pluginClass: PackageInfoPlugin From fe8d3a810c83237876479ec2010b907c46bd3cbd Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 7 Oct 2019 05:51:27 -0700 Subject: [PATCH 03/53] Add enableR8 --- packages/package_info/example/android/app/gradle.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/package_info/example/android/app/gradle.properties b/packages/package_info/example/android/app/gradle.properties index 5465fec0ecad..845d3bcf6963 100644 --- a/packages/package_info/example/android/app/gradle.properties +++ b/packages/package_info/example/android/app/gradle.properties @@ -1,2 +1,3 @@ android.enableJetifier=true -android.useAndroidX=true \ No newline at end of file +android.useAndroidX=true +android.enableR8=true From 83dd9f0cfca7b156e72338614042af1911384170 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 7 Oct 2019 05:52:32 -0700 Subject: [PATCH 04/53] reformat --- .../flutter/plugins/packageinfo/PackageInfoPlugin.java | 5 ++--- .../plugins/packageinfoexample/MainActivity.java | 10 +++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/packages/package_info/android/src/main/java/dev/flutter/plugins/packageinfo/PackageInfoPlugin.java b/packages/package_info/android/src/main/java/dev/flutter/plugins/packageinfo/PackageInfoPlugin.java index 9213b7188f0a..ffe80274a6c1 100644 --- a/packages/package_info/android/src/main/java/dev/flutter/plugins/packageinfo/PackageInfoPlugin.java +++ b/packages/package_info/android/src/main/java/dev/flutter/plugins/packageinfo/PackageInfoPlugin.java @@ -33,13 +33,12 @@ public static void registerWith(Registrar registrar) { public void onAttachedToEngine(FlutterPluginBinding binding) { applicationContext = binding.getApplicationContext(); onAttachedToEngine( - binding.getApplicationContext(), binding.getFlutterEngine().getDartExecutor()); + binding.getApplicationContext(), binding.getFlutterEngine().getDartExecutor()); } private void onAttachedToEngine(Context applicationContext, BinaryMessenger messenger) { this.applicationContext = applicationContext; - methodChannel = - new MethodChannel(messenger, "plugins.flutter.io/package_info"); + methodChannel = new MethodChannel(messenger, "plugins.flutter.io/package_info"); methodChannel.setMethodCallHandler(new PackageInfoPlugin()); } diff --git a/packages/package_info/example/android/app/src/main/java/dev/flutter/plugins/packageinfoexample/MainActivity.java b/packages/package_info/example/android/app/src/main/java/dev/flutter/plugins/packageinfoexample/MainActivity.java index 82acbee70fef..cf229ad73251 100644 --- a/packages/package_info/example/android/app/src/main/java/dev/flutter/plugins/packageinfoexample/MainActivity.java +++ b/packages/package_info/example/android/app/src/main/java/dev/flutter/plugins/packageinfoexample/MainActivity.java @@ -9,8 +9,8 @@ import io.flutter.plugins.packageinfo.PackageInfoPlugin; public class MainActivity extends FlutterActivity { - @Override - public void configureFlutterEngine(FlutterEngine flutterEngine) { - flutterEngine.getPlugins().add(new PackageInfoPlugin()); - } -} \ No newline at end of file + @Override + public void configureFlutterEngine(FlutterEngine flutterEngine) { + flutterEngine.getPlugins().add(new PackageInfoPlugin()); + } +} From 0946eeb3007ef01b1f7e219b03ec054cb1fdb32a Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 7 Oct 2019 06:10:55 -0700 Subject: [PATCH 05/53] Include testing --- .../packageinfoexample/MainActivityTest.java | 15 +++++++++++++++ .../packageinfoexample/MainActivityTest.java | 15 +++++++++++++++ packages/package_info/example/pubspec.yaml | 1 + .../example/test_driver/package_info.dart | 4 +--- .../example/test_driver/package_info_test.dart | 8 +++----- 5 files changed, 35 insertions(+), 8 deletions(-) create mode 100644 packages/package_info/example/android/app/src/androidTest/java/dev/flutter/plugins/packageinfoexample/MainActivityTest.java create mode 100644 packages/package_info/example/android/app/src/androidTest/java/io/flutter/plugins/packageinfoexample/MainActivityTest.java diff --git a/packages/package_info/example/android/app/src/androidTest/java/dev/flutter/plugins/packageinfoexample/MainActivityTest.java b/packages/package_info/example/android/app/src/androidTest/java/dev/flutter/plugins/packageinfoexample/MainActivityTest.java new file mode 100644 index 000000000000..24cc9b28fbb0 --- /dev/null +++ b/packages/package_info/example/android/app/src/androidTest/java/dev/flutter/plugins/packageinfoexample/MainActivityTest.java @@ -0,0 +1,15 @@ +// Copyright 2019 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package dev.flutter.plugins.packageinfoexample; + +import androidx.test.rule.ActivityTestRule; +import dev.flutter.plugins.instrumentationadapter.FlutterRunner; +import org.junit.Rule; +import org.junit.runner.RunWith; + +@RunWith(FlutterRunner.class) +public class MainActivityTest { + @Rule public ActivityTestRule rule = new ActivityTestRule<>(MainActivity.class); +} diff --git a/packages/package_info/example/android/app/src/androidTest/java/io/flutter/plugins/packageinfoexample/MainActivityTest.java b/packages/package_info/example/android/app/src/androidTest/java/io/flutter/plugins/packageinfoexample/MainActivityTest.java new file mode 100644 index 000000000000..ff2c0f38e6bc --- /dev/null +++ b/packages/package_info/example/android/app/src/androidTest/java/io/flutter/plugins/packageinfoexample/MainActivityTest.java @@ -0,0 +1,15 @@ +// Copyright 2019 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package io.flutter.plugins.packageinfoexample; + +import androidx.test.rule.ActivityTestRule; +import dev.flutter.plugins.instrumentationadapter.FlutterRunner; +import org.junit.Rule; +import org.junit.runner.RunWith; + +@RunWith(FlutterRunner.class) +public class MainActivityTest { + @Rule public ActivityTestRule rule = new ActivityTestRule<>(MainActivity.class); +} diff --git a/packages/package_info/example/pubspec.yaml b/packages/package_info/example/pubspec.yaml index e4844cd95648..4b06cb3e3be0 100644 --- a/packages/package_info/example/pubspec.yaml +++ b/packages/package_info/example/pubspec.yaml @@ -10,6 +10,7 @@ dependencies: dev_dependencies: flutter_driver: sdk: flutter + instrumentation_adapter: "^0.1.3" test: any flutter: diff --git a/packages/package_info/example/test_driver/package_info.dart b/packages/package_info/example/test_driver/package_info.dart index 97c2db6363c7..fc7c397ac9fb 100644 --- a/packages/package_info/example/test_driver/package_info.dart +++ b/packages/package_info/example/test_driver/package_info.dart @@ -5,9 +5,7 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:package_info/package_info.dart'; void main() { - final Completer completer = Completer(); - enableFlutterDriverExtension(handler: (_) => completer.future); - tearDownAll(() => completer.complete(null)); + InstrumentationAdapterFlutterBinding.ensureInitialized(); group('package_info test driver', () { test('test package info result', () async { diff --git a/packages/package_info/example/test_driver/package_info_test.dart b/packages/package_info/example/test_driver/package_info_test.dart index c1d690c17ee3..143d5053acf9 100644 --- a/packages/package_info/example/test_driver/package_info_test.dart +++ b/packages/package_info/example/test_driver/package_info_test.dart @@ -2,9 +2,7 @@ import 'package:flutter_driver/flutter_driver.dart'; import 'package:test/test.dart'; void main() { - test('package_info', () async { - final FlutterDriver driver = await FlutterDriver.connect(); - await driver.requestData(null, timeout: const Duration(minutes: 1)); - driver.close(); - }); + final FlutterDriver driver = await FlutterDriver.connect(); + await driver.requestData(null, timeout: const Duration(minutes: 1)); + driver.close(); } From ab5be52c3eb653c486dd1fee9b3607008e40fdd0 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 7 Oct 2019 06:43:03 -0700 Subject: [PATCH 06/53] Add a unit test and migrate to e2e test binding --- packages/package_info/CHANGELOG.md | 2 ++ .../flutter/plugins/packageinfoexample/MainActivityTest.java | 2 +- packages/package_info/example/test_driver/package_info.dart | 3 ++- packages/package_info/test/package_info_e2e.dart | 0 packages/package_info/test/package_info_test.dart | 0 5 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 packages/package_info/test/package_info_e2e.dart create mode 100644 packages/package_info/test/package_info_test.dart diff --git a/packages/package_info/CHANGELOG.md b/packages/package_info/CHANGELOG.md index 386f701c8f52..c8c99a9068cb 100644 --- a/packages/package_info/CHANGELOG.md +++ b/packages/package_info/CHANGELOG.md @@ -1,6 +1,8 @@ ## 0.4.0+8 * Support the v2 Android embedder. +* Add a unit test. +* Migrate to using the new e2e test binding. ## 0.4.0+7 diff --git a/packages/package_info/example/android/app/src/androidTest/java/dev/flutter/plugins/packageinfoexample/MainActivityTest.java b/packages/package_info/example/android/app/src/androidTest/java/dev/flutter/plugins/packageinfoexample/MainActivityTest.java index 24cc9b28fbb0..21ef8f9cb48c 100644 --- a/packages/package_info/example/android/app/src/androidTest/java/dev/flutter/plugins/packageinfoexample/MainActivityTest.java +++ b/packages/package_info/example/android/app/src/androidTest/java/dev/flutter/plugins/packageinfoexample/MainActivityTest.java @@ -11,5 +11,5 @@ @RunWith(FlutterRunner.class) public class MainActivityTest { - @Rule public ActivityTestRule rule = new ActivityTestRule<>(MainActivity.class); + @Rule public ActivityTestRule rule = new ActivityTestRule<>(MainActivity.class); } diff --git a/packages/package_info/example/test_driver/package_info.dart b/packages/package_info/example/test_driver/package_info.dart index fc7c397ac9fb..a12a14cdfc9c 100644 --- a/packages/package_info/example/test_driver/package_info.dart +++ b/packages/package_info/example/test_driver/package_info.dart @@ -2,13 +2,14 @@ import 'dart:async'; import 'dart:io'; import 'package:flutter_driver/driver_extension.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:instrumentation_adapter/instrumentation_adapter.dart'; import 'package:package_info/package_info.dart'; void main() { InstrumentationAdapterFlutterBinding.ensureInitialized(); group('package_info test driver', () { - test('test package info result', () async { + testWidgets('test package info result', () async { final PackageInfo info = await PackageInfo.fromPlatform(); // These tests are based on the example app. The tests should be updated if any related info changes. if (Platform.isAndroid) { diff --git a/packages/package_info/test/package_info_e2e.dart b/packages/package_info/test/package_info_e2e.dart new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/packages/package_info/test/package_info_test.dart b/packages/package_info/test/package_info_test.dart new file mode 100644 index 000000000000..e69de29bb2d1 From a4fc6ba4a3592af8c67bd92b0094619480008914 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 7 Oct 2019 07:57:49 -0700 Subject: [PATCH 07/53] Fix bugs uncovered by e2e tests --- .../dev/flutter/plugins/packageinfo/PackageInfoPlugin.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/package_info/android/src/main/java/dev/flutter/plugins/packageinfo/PackageInfoPlugin.java b/packages/package_info/android/src/main/java/dev/flutter/plugins/packageinfo/PackageInfoPlugin.java index ffe80274a6c1..7b88a2834c6b 100644 --- a/packages/package_info/android/src/main/java/dev/flutter/plugins/packageinfo/PackageInfoPlugin.java +++ b/packages/package_info/android/src/main/java/dev/flutter/plugins/packageinfo/PackageInfoPlugin.java @@ -31,7 +31,6 @@ public static void registerWith(Registrar registrar) { @Override public void onAttachedToEngine(FlutterPluginBinding binding) { - applicationContext = binding.getApplicationContext(); onAttachedToEngine( binding.getApplicationContext(), binding.getFlutterEngine().getDartExecutor()); } @@ -39,7 +38,7 @@ public void onAttachedToEngine(FlutterPluginBinding binding) { private void onAttachedToEngine(Context applicationContext, BinaryMessenger messenger) { this.applicationContext = applicationContext; methodChannel = new MethodChannel(messenger, "plugins.flutter.io/package_info"); - methodChannel.setMethodCallHandler(new PackageInfoPlugin()); + methodChannel.setMethodCallHandler(this); } @Override From 4cb7bf2971fb77537bc72492c5cfdb112596a404 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 7 Oct 2019 07:58:27 -0700 Subject: [PATCH 08/53] Convert to androidX, move some things around --- .../package_info/android/gradle.properties | 1 + .../packageinfoexample/MainActivity.java | 2 +- .../example/test_driver/package_info.dart | 34 +++++++++---------- .../test_driver/package_info_test.dart | 2 +- .../package_info/test/package_info_e2e.dart | 0 5 files changed, 19 insertions(+), 20 deletions(-) delete mode 100644 packages/package_info/test/package_info_e2e.dart diff --git a/packages/package_info/android/gradle.properties b/packages/package_info/android/gradle.properties index 8bd86f680510..7884ce914984 100644 --- a/packages/package_info/android/gradle.properties +++ b/packages/package_info/android/gradle.properties @@ -1 +1,2 @@ org.gradle.jvmargs=-Xmx1536M +android.enableJetifier=true diff --git a/packages/package_info/example/android/app/src/main/java/dev/flutter/plugins/packageinfoexample/MainActivity.java b/packages/package_info/example/android/app/src/main/java/dev/flutter/plugins/packageinfoexample/MainActivity.java index cf229ad73251..7f0a68331a53 100644 --- a/packages/package_info/example/android/app/src/main/java/dev/flutter/plugins/packageinfoexample/MainActivity.java +++ b/packages/package_info/example/android/app/src/main/java/dev/flutter/plugins/packageinfoexample/MainActivity.java @@ -6,7 +6,7 @@ import io.flutter.embedding.android.FlutterActivity; import io.flutter.embedding.engine.FlutterEngine; -import io.flutter.plugins.packageinfo.PackageInfoPlugin; +import dev.flutter.plugins.packageinfo.PackageInfoPlugin; public class MainActivity extends FlutterActivity { @Override diff --git a/packages/package_info/example/test_driver/package_info.dart b/packages/package_info/example/test_driver/package_info.dart index a12a14cdfc9c..964fd51dc612 100644 --- a/packages/package_info/example/test_driver/package_info.dart +++ b/packages/package_info/example/test_driver/package_info.dart @@ -8,23 +8,21 @@ import 'package:package_info/package_info.dart'; void main() { InstrumentationAdapterFlutterBinding.ensureInitialized(); - group('package_info test driver', () { - testWidgets('test package info result', () async { - final PackageInfo info = await PackageInfo.fromPlatform(); - // These tests are based on the example app. The tests should be updated if any related info changes. - if (Platform.isAndroid) { - expect(info.appName, 'package_info_example'); - expect(info.buildNumber, '1'); - expect(info.packageName, 'io.flutter.plugins.packageinfoexample'); - expect(info.version, '1.0'); - } else if (Platform.isIOS) { - expect(info.appName, 'Package Info Example'); - expect(info.buildNumber, '1'); - expect(info.packageName, 'io.flutter.plugins.packageInfoExample'); - expect(info.version, '1.0'); - } else { - throw (UnsupportedError('platform not supported')); - } - }); + testWidgets('test package info result', (WidgetTester tester) async { + final PackageInfo info = await PackageInfo.fromPlatform(); + // These tests are based on the example app. The tests should be updated if any related info changes. + if (Platform.isAndroid) { + expect(info.appName, 'package_info_example'); + expect(info.buildNumber, '1'); + expect(info.packageName, 'io.flutter.plugins.packageinfoexample'); + expect(info.version, '1.0'); + } else if (Platform.isIOS) { + expect(info.appName, 'Package Info Example'); + expect(info.buildNumber, '1'); + expect(info.packageName, 'io.flutter.plugins.packageInfoExample'); + expect(info.version, '1.0'); + } else { + throw (UnsupportedError('platform not supported')); + } }); } diff --git a/packages/package_info/example/test_driver/package_info_test.dart b/packages/package_info/example/test_driver/package_info_test.dart index 143d5053acf9..664715db333f 100644 --- a/packages/package_info/example/test_driver/package_info_test.dart +++ b/packages/package_info/example/test_driver/package_info_test.dart @@ -1,7 +1,7 @@ import 'package:flutter_driver/flutter_driver.dart'; import 'package:test/test.dart'; -void main() { +Future main() async { final FlutterDriver driver = await FlutterDriver.connect(); await driver.requestData(null, timeout: const Duration(minutes: 1)); driver.close(); diff --git a/packages/package_info/test/package_info_e2e.dart b/packages/package_info/test/package_info_e2e.dart deleted file mode 100644 index e69de29bb2d1..000000000000 From a9866da687c2d2e7e74bb6089343c5c0a1368fe9 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 7 Oct 2019 07:58:32 -0700 Subject: [PATCH 09/53] Add a unit test --- .../package_info/test/package_info_test.dart | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/packages/package_info/test/package_info_test.dart b/packages/package_info/test/package_info_test.dart index e69de29bb2d1..a6257f65919c 100644 --- a/packages/package_info/test/package_info_test.dart +++ b/packages/package_info/test/package_info_test.dart @@ -0,0 +1,53 @@ +// Copyright 2019 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'dart:io'; + +import 'package:flutter/services.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:package_info/package_info.dart'; +import 'package:platform/platform.dart'; + +void main() { + TestWidgetsFlutterBinding.ensureInitialized(); + + const MethodChannel channel = + MethodChannel('plugins.flutter.io/package_info'); + List log; + String response; + + channel.setMockMethodCallHandler((MethodCall methodCall) async { + log.add(methodCall); + switch (methodCall.method) { + case 'getAll': + return { + 'appName': 'package_info_example', + 'buildNumber': '1', + 'packageName': 'io.flutter.plugins.packageinfoexample', + 'version': '1.0', + }; + default: + assert(false); + break; + } + }); + + setUp(() { + log = []; + }); + + test('fromPlatform', () async { + final PackageInfo info = await PackageInfo.fromPlatform(); + expect(info.appName, 'package_info_example'); + expect(info.buildNumber, '1'); + expect(info.packageName, 'io.flutter.plugins.packageinfoexample'); + expect(info.version, '1.0'); + expect( + log, + [ + isMethodCall('getAll'), + ], + ); + }); +} From 0639c4603b22f8e374e65f82f3afdc4a345eda4c Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 7 Oct 2019 08:00:06 -0700 Subject: [PATCH 10/53] Rename test to be more descriptive --- packages/package_info/example/test_driver/package_info.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/package_info/example/test_driver/package_info.dart b/packages/package_info/example/test_driver/package_info.dart index 964fd51dc612..06eee9068947 100644 --- a/packages/package_info/example/test_driver/package_info.dart +++ b/packages/package_info/example/test_driver/package_info.dart @@ -8,7 +8,7 @@ import 'package:package_info/package_info.dart'; void main() { InstrumentationAdapterFlutterBinding.ensureInitialized(); - testWidgets('test package info result', (WidgetTester tester) async { + testWidgets('fromPlatform', (WidgetTester tester) async { final PackageInfo info = await PackageInfo.fromPlatform(); // These tests are based on the example app. The tests should be updated if any related info changes. if (Platform.isAndroid) { From 55813be6705b6cf89fa93b5977fd20dda54c3678 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 7 Oct 2019 08:00:32 -0700 Subject: [PATCH 11/53] Reformat --- .../dev/flutter/plugins/packageinfoexample/MainActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/package_info/example/android/app/src/main/java/dev/flutter/plugins/packageinfoexample/MainActivity.java b/packages/package_info/example/android/app/src/main/java/dev/flutter/plugins/packageinfoexample/MainActivity.java index 7f0a68331a53..027a4332d2a3 100644 --- a/packages/package_info/example/android/app/src/main/java/dev/flutter/plugins/packageinfoexample/MainActivity.java +++ b/packages/package_info/example/android/app/src/main/java/dev/flutter/plugins/packageinfoexample/MainActivity.java @@ -4,9 +4,9 @@ package dev.flutter.plugins.packageinfoexample; +import dev.flutter.plugins.packageinfo.PackageInfoPlugin; import io.flutter.embedding.android.FlutterActivity; import io.flutter.embedding.engine.FlutterEngine; -import dev.flutter.plugins.packageinfo.PackageInfoPlugin; public class MainActivity extends FlutterActivity { @Override From e7d4f2164712d3868135a7974e52b0dd97b7f697 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 7 Oct 2019 08:06:05 -0700 Subject: [PATCH 12/53] Update CHANGELOG --- packages/package_info/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/package_info/CHANGELOG.md b/packages/package_info/CHANGELOG.md index c8c99a9068cb..001a4a8c1282 100644 --- a/packages/package_info/CHANGELOG.md +++ b/packages/package_info/CHANGELOG.md @@ -1,6 +1,7 @@ ## 0.4.0+8 * Support the v2 Android embedder. +* Update to AndroidX. * Add a unit test. * Migrate to using the new e2e test binding. From ff1e2cf02d4d75acb8b5628cb1ce2e69e25ea11d Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 7 Oct 2019 08:50:16 -0700 Subject: [PATCH 13/53] Add an integration test of the example app --- .../example/test/package_info.dart | 48 +++++++++++++++++++ .../example/test_driver/package_info.dart | 19 ++++++++ 2 files changed, 67 insertions(+) create mode 100644 packages/package_info/example/test/package_info.dart diff --git a/packages/package_info/example/test/package_info.dart b/packages/package_info/example/test/package_info.dart new file mode 100644 index 000000000000..406dfaedf807 --- /dev/null +++ b/packages/package_info/example/test/package_info.dart @@ -0,0 +1,48 @@ +import 'dart:async'; +import 'dart:io'; +import 'package:flutter_driver/driver_extension.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:instrumentation_adapter/instrumentation_adapter.dart'; +import 'package:package_info/package_info.dart'; +import 'package:package_info_example/main.dart'; + +void main() { + InstrumentationAdapterFlutterBinding.ensureInitialized(); + + testWidgets('fromPlatform', (WidgetTester tester) async { + final PackageInfo info = await PackageInfo.fromPlatform(); + // These tests are based on the example app. The tests should be updated if any related info changes. + if (Platform.isAndroid) { + expect(info.appName, 'package_info_example'); + expect(info.buildNumber, '1'); + expect(info.packageName, 'io.flutter.plugins.packageinfoexample'); + expect(info.version, '1.0'); + } else if (Platform.isIOS) { + expect(info.appName, 'Package Info Example'); + expect(info.buildNumber, '1'); + expect(info.packageName, 'io.flutter.plugins.packageInfoExample'); + expect(info.version, '1.0'); + } else { + throw (UnsupportedError('platform not supported')); + } + }); + + testWidgets('example', (WidgetTester tester) async { + await tester.pumpWidget(MyApp()); + await tester.pumpAndSettle(); + if (Platform.isAndroid) { + expect(find.text('package_info_example'), findsOneWidget); + expect(find.text('1'), findsOneWidget); + expect(find.text('io.flutter.plugins.packageinfoexample'), findsOneWidget); + expect(find.text('1.0'), findsOneWidget); + } else if (Platform.isIOS) { + expect(find.text('Package Info Example'), findsOneWidget); + expect(find.text('1'), findsOneWidget); + expect(find.text('io.flutter.plugins.packageInfoExample'), findsOneWidget); + expect(find.text('1.0'), findsOneWidget); + } else { + throw (UnsupportedError('platform not supported')); + } + + }); +} diff --git a/packages/package_info/example/test_driver/package_info.dart b/packages/package_info/example/test_driver/package_info.dart index 06eee9068947..00768c1685e6 100644 --- a/packages/package_info/example/test_driver/package_info.dart +++ b/packages/package_info/example/test_driver/package_info.dart @@ -4,6 +4,7 @@ import 'package:flutter_driver/driver_extension.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:instrumentation_adapter/instrumentation_adapter.dart'; import 'package:package_info/package_info.dart'; +import 'package:package_info_example/main.dart' as app; void main() { InstrumentationAdapterFlutterBinding.ensureInitialized(); @@ -25,4 +26,22 @@ void main() { throw (UnsupportedError('platform not supported')); } }); + + testWidgets('example', (WidgetTester tester) async { + await tester.pumpWidget(app.MyApp()); + if (Platform.isAndroid) { + expect(find.text('package_info_example'), findsOneWidget); + expect(find.text('1'), findsOneWidget); + expect(find.text('io.flutter.plugins.packageinfoexample'), findsOneWidget); + expect(find.text('1.0'), findsOneWidget); + } else if (Platform.isIOS) { + expect(find.text('Package Info Example'), findsOneWidget); + expect(find.text('1'), findsOneWidget); + expect(find.text('io.flutter.plugins.packageInfoExample'), findsOneWidget); + expect(find.text('1.0'), findsOneWidget); + } else { + throw (UnsupportedError('platform not supported')); + } + + }); } From 1c6448c6a9e84e9ab900afb65dfcf678ce40ef73 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 7 Oct 2019 08:55:44 -0700 Subject: [PATCH 14/53] Add e2e extension --- ...ackage_info.dart => package_info_e2e.dart} | 0 .../example/test_driver/package_info.dart | 47 ------------------- ...o_test.dart => package_info_e2e_test.dart} | 0 3 files changed, 47 deletions(-) rename packages/package_info/example/test/{package_info.dart => package_info_e2e.dart} (100%) delete mode 100644 packages/package_info/example/test_driver/package_info.dart rename packages/package_info/example/test_driver/{package_info_test.dart => package_info_e2e_test.dart} (100%) diff --git a/packages/package_info/example/test/package_info.dart b/packages/package_info/example/test/package_info_e2e.dart similarity index 100% rename from packages/package_info/example/test/package_info.dart rename to packages/package_info/example/test/package_info_e2e.dart diff --git a/packages/package_info/example/test_driver/package_info.dart b/packages/package_info/example/test_driver/package_info.dart deleted file mode 100644 index 00768c1685e6..000000000000 --- a/packages/package_info/example/test_driver/package_info.dart +++ /dev/null @@ -1,47 +0,0 @@ -import 'dart:async'; -import 'dart:io'; -import 'package:flutter_driver/driver_extension.dart'; -import 'package:flutter_test/flutter_test.dart'; -import 'package:instrumentation_adapter/instrumentation_adapter.dart'; -import 'package:package_info/package_info.dart'; -import 'package:package_info_example/main.dart' as app; - -void main() { - InstrumentationAdapterFlutterBinding.ensureInitialized(); - - testWidgets('fromPlatform', (WidgetTester tester) async { - final PackageInfo info = await PackageInfo.fromPlatform(); - // These tests are based on the example app. The tests should be updated if any related info changes. - if (Platform.isAndroid) { - expect(info.appName, 'package_info_example'); - expect(info.buildNumber, '1'); - expect(info.packageName, 'io.flutter.plugins.packageinfoexample'); - expect(info.version, '1.0'); - } else if (Platform.isIOS) { - expect(info.appName, 'Package Info Example'); - expect(info.buildNumber, '1'); - expect(info.packageName, 'io.flutter.plugins.packageInfoExample'); - expect(info.version, '1.0'); - } else { - throw (UnsupportedError('platform not supported')); - } - }); - - testWidgets('example', (WidgetTester tester) async { - await tester.pumpWidget(app.MyApp()); - if (Platform.isAndroid) { - expect(find.text('package_info_example'), findsOneWidget); - expect(find.text('1'), findsOneWidget); - expect(find.text('io.flutter.plugins.packageinfoexample'), findsOneWidget); - expect(find.text('1.0'), findsOneWidget); - } else if (Platform.isIOS) { - expect(find.text('Package Info Example'), findsOneWidget); - expect(find.text('1'), findsOneWidget); - expect(find.text('io.flutter.plugins.packageInfoExample'), findsOneWidget); - expect(find.text('1.0'), findsOneWidget); - } else { - throw (UnsupportedError('platform not supported')); - } - - }); -} diff --git a/packages/package_info/example/test_driver/package_info_test.dart b/packages/package_info/example/test_driver/package_info_e2e_test.dart similarity index 100% rename from packages/package_info/example/test_driver/package_info_test.dart rename to packages/package_info/example/test_driver/package_info_e2e_test.dart From 1e9cc0639893ce9c4fa9be2500e11c4db67e5110 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 7 Oct 2019 08:58:44 -0700 Subject: [PATCH 15/53] Fix analyzer issues --- packages/package_info/example/test/package_info_e2e.dart | 2 -- .../example/test_driver/package_info_e2e_test.dart | 1 - packages/package_info/test/package_info_test.dart | 8 ++------ 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/packages/package_info/example/test/package_info_e2e.dart b/packages/package_info/example/test/package_info_e2e.dart index 406dfaedf807..5f4336840570 100644 --- a/packages/package_info/example/test/package_info_e2e.dart +++ b/packages/package_info/example/test/package_info_e2e.dart @@ -1,6 +1,4 @@ -import 'dart:async'; import 'dart:io'; -import 'package:flutter_driver/driver_extension.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:instrumentation_adapter/instrumentation_adapter.dart'; import 'package:package_info/package_info.dart'; diff --git a/packages/package_info/example/test_driver/package_info_e2e_test.dart b/packages/package_info/example/test_driver/package_info_e2e_test.dart index 664715db333f..38fe6c447e05 100644 --- a/packages/package_info/example/test_driver/package_info_e2e_test.dart +++ b/packages/package_info/example/test_driver/package_info_e2e_test.dart @@ -1,5 +1,4 @@ import 'package:flutter_driver/flutter_driver.dart'; -import 'package:test/test.dart'; Future main() async { final FlutterDriver driver = await FlutterDriver.connect(); diff --git a/packages/package_info/test/package_info_test.dart b/packages/package_info/test/package_info_test.dart index a6257f65919c..47d48fde2d2d 100644 --- a/packages/package_info/test/package_info_test.dart +++ b/packages/package_info/test/package_info_test.dart @@ -2,12 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'dart:io'; - import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:package_info/package_info.dart'; -import 'package:platform/platform.dart'; void main() { TestWidgetsFlutterBinding.ensureInitialized(); @@ -15,7 +12,6 @@ void main() { const MethodChannel channel = MethodChannel('plugins.flutter.io/package_info'); List log; - String response; channel.setMockMethodCallHandler((MethodCall methodCall) async { log.add(methodCall); @@ -29,7 +25,7 @@ void main() { }; default: assert(false); - break; + return null; } }); @@ -46,7 +42,7 @@ void main() { expect( log, [ - isMethodCall('getAll'), + isMethodCall('getAll', arguments: null), ], ); }); From 502e72f9d1729ed947f4264d34e4fb5048f3fd33 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 7 Oct 2019 13:28:36 -0700 Subject: [PATCH 16/53] reformat --- packages/package_info/example/test/package_info_e2e.dart | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/package_info/example/test/package_info_e2e.dart b/packages/package_info/example/test/package_info_e2e.dart index 5f4336840570..5fbefd6ad22f 100644 --- a/packages/package_info/example/test/package_info_e2e.dart +++ b/packages/package_info/example/test/package_info_e2e.dart @@ -31,16 +31,17 @@ void main() { if (Platform.isAndroid) { expect(find.text('package_info_example'), findsOneWidget); expect(find.text('1'), findsOneWidget); - expect(find.text('io.flutter.plugins.packageinfoexample'), findsOneWidget); + expect( + find.text('io.flutter.plugins.packageinfoexample'), findsOneWidget); expect(find.text('1.0'), findsOneWidget); } else if (Platform.isIOS) { expect(find.text('Package Info Example'), findsOneWidget); expect(find.text('1'), findsOneWidget); - expect(find.text('io.flutter.plugins.packageInfoExample'), findsOneWidget); + expect( + find.text('io.flutter.plugins.packageInfoExample'), findsOneWidget); expect(find.text('1.0'), findsOneWidget); } else { throw (UnsupportedError('platform not supported')); } - }); } From e3107bfc1cf73edfb1a68dce50bd11ea53b805b5 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 7 Oct 2019 13:28:47 -0700 Subject: [PATCH 17/53] jetify --- packages/package_info/example/android/gradle.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/package_info/example/android/gradle.properties b/packages/package_info/example/android/gradle.properties index d12b9a8297e5..05413bc45d00 100644 --- a/packages/package_info/example/android/gradle.properties +++ b/packages/package_info/example/android/gradle.properties @@ -1,3 +1,4 @@ org.gradle.jvmargs=-Xmx1536M +android.enableJetifier=true android.enableR8=true android.useAndroidX=true From 2a0c3cc7b359f4784f10a0993e70aa48986fc649 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 7 Oct 2019 15:06:37 -0700 Subject: [PATCH 18/53] Return exit code --- .../package_info/example/test_driver/package_info_e2e_test.dart | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/package_info/example/test_driver/package_info_e2e_test.dart b/packages/package_info/example/test_driver/package_info_e2e_test.dart index 38fe6c447e05..ef9ef4b4c425 100644 --- a/packages/package_info/example/test_driver/package_info_e2e_test.dart +++ b/packages/package_info/example/test_driver/package_info_e2e_test.dart @@ -4,4 +4,5 @@ Future main() async { final FlutterDriver driver = await FlutterDriver.connect(); await driver.requestData(null, timeout: const Duration(minutes: 1)); driver.close(); + exit(result == 'pass' ? 0 : 1); } From f7717affc31af5047760a9f5976d0ecf3dcdfe31 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 7 Oct 2019 15:06:46 -0700 Subject: [PATCH 19/53] enableR8 --- packages/shared_preferences/example/android/gradle.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/shared_preferences/example/android/gradle.properties b/packages/shared_preferences/example/android/gradle.properties index 8bd86f680510..7be3d8b46841 100644 --- a/packages/shared_preferences/example/android/gradle.properties +++ b/packages/shared_preferences/example/android/gradle.properties @@ -1 +1,2 @@ org.gradle.jvmargs=-Xmx1536M +android.enableR8=true From f9c7d16e403be91f040565e507581b5af5aeb064 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 7 Oct 2019 15:07:09 -0700 Subject: [PATCH 20/53] Update to point to e2e package --- packages/package_info/example/pubspec.yaml | 2 +- packages/package_info/pubspec.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/package_info/example/pubspec.yaml b/packages/package_info/example/pubspec.yaml index 4b06cb3e3be0..4c383e90bcfb 100644 --- a/packages/package_info/example/pubspec.yaml +++ b/packages/package_info/example/pubspec.yaml @@ -10,8 +10,8 @@ dependencies: dev_dependencies: flutter_driver: sdk: flutter - instrumentation_adapter: "^0.1.3" test: any + e2e: "^0.2.0" flutter: uses-material-design: true diff --git a/packages/package_info/pubspec.yaml b/packages/package_info/pubspec.yaml index 4d1508c0be12..f97e47b5b4f7 100644 --- a/packages/package_info/pubspec.yaml +++ b/packages/package_info/pubspec.yaml @@ -21,6 +21,7 @@ dev_dependencies: flutter_driver: sdk: flutter test: any + e2e: "^0.2.0" environment: sdk: ">=2.0.0-dev.28.0 <3.0.0" From 7c928fcc84edd6355a692302445a10bea87b6692 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 7 Oct 2019 15:45:49 -0700 Subject: [PATCH 21/53] Amir CR feedback --- .../example/android/app/src/main/AndroidManifest.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/package_info/example/android/app/src/main/AndroidManifest.xml b/packages/package_info/example/android/app/src/main/AndroidManifest.xml index a5db69552255..91da0585064a 100644 --- a/packages/package_info/example/android/app/src/main/AndroidManifest.xml +++ b/packages/package_info/example/android/app/src/main/AndroidManifest.xml @@ -10,10 +10,6 @@ android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection" android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize"> - - - - Date: Mon, 7 Oct 2019 15:58:29 -0700 Subject: [PATCH 22/53] Bump min version to 1.6.7 --- packages/package_info/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/package_info/pubspec.yaml b/packages/package_info/pubspec.yaml index f97e47b5b4f7..d665d2227ab0 100644 --- a/packages/package_info/pubspec.yaml +++ b/packages/package_info/pubspec.yaml @@ -25,4 +25,4 @@ dev_dependencies: environment: sdk: ">=2.0.0-dev.28.0 <3.0.0" - flutter: ">=1.5.0 <2.0.0" + flutter: ">=1.6.7 <2.0.0" From 45a6d9d1e32134c79cc641202be6b21f2a74e241 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 7 Oct 2019 17:18:03 -0700 Subject: [PATCH 23/53] Move test location --- .../example/{test => test_driver}/package_info_e2e.dart | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename packages/package_info/example/{test => test_driver}/package_info_e2e.dart (100%) diff --git a/packages/package_info/example/test/package_info_e2e.dart b/packages/package_info/example/test_driver/package_info_e2e.dart similarity index 100% rename from packages/package_info/example/test/package_info_e2e.dart rename to packages/package_info/example/test_driver/package_info_e2e.dart From 397395d294813161850aa7e697c77f5bbcf3f368 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 7 Oct 2019 17:38:22 -0700 Subject: [PATCH 24/53] Fix analyzer failures --- .../package_info/example/test_driver/package_info_e2e.dart | 4 ++-- .../example/test_driver/package_info_e2e_test.dart | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/package_info/example/test_driver/package_info_e2e.dart b/packages/package_info/example/test_driver/package_info_e2e.dart index 5fbefd6ad22f..9f46bc3c1109 100644 --- a/packages/package_info/example/test_driver/package_info_e2e.dart +++ b/packages/package_info/example/test_driver/package_info_e2e.dart @@ -1,11 +1,11 @@ import 'dart:io'; import 'package:flutter_test/flutter_test.dart'; -import 'package:instrumentation_adapter/instrumentation_adapter.dart'; +import 'package:e2e/e2e.dart'; import 'package:package_info/package_info.dart'; import 'package:package_info_example/main.dart'; void main() { - InstrumentationAdapterFlutterBinding.ensureInitialized(); + E2EWidgetsFlutterBinding.ensureInitialized(); testWidgets('fromPlatform', (WidgetTester tester) async { final PackageInfo info = await PackageInfo.fromPlatform(); diff --git a/packages/package_info/example/test_driver/package_info_e2e_test.dart b/packages/package_info/example/test_driver/package_info_e2e_test.dart index ef9ef4b4c425..b12b2eee73c4 100644 --- a/packages/package_info/example/test_driver/package_info_e2e_test.dart +++ b/packages/package_info/example/test_driver/package_info_e2e_test.dart @@ -1,8 +1,11 @@ +import 'dart:io'; + import 'package:flutter_driver/flutter_driver.dart'; Future main() async { final FlutterDriver driver = await FlutterDriver.connect(); - await driver.requestData(null, timeout: const Duration(minutes: 1)); + final String result = + await driver.requestData(null, timeout: const Duration(minutes: 1)); driver.close(); exit(result == 'pass' ? 0 : 1); -} +} \ No newline at end of file From c44fed0ef9c38a841015ac90191894fbff4d5099 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 7 Oct 2019 18:47:25 -0700 Subject: [PATCH 25/53] reformat --- .../package_info/example/test_driver/package_info_e2e_test.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/package_info/example/test_driver/package_info_e2e_test.dart b/packages/package_info/example/test_driver/package_info_e2e_test.dart index b12b2eee73c4..099570e40023 100644 --- a/packages/package_info/example/test_driver/package_info_e2e_test.dart +++ b/packages/package_info/example/test_driver/package_info_e2e_test.dart @@ -8,4 +8,4 @@ Future main() async { await driver.requestData(null, timeout: const Duration(minutes: 1)); driver.close(); exit(result == 'pass' ? 0 : 1); -} \ No newline at end of file +} From e276af06c3b9f05d7affb5426007049ebf8a77ca Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 7 Oct 2019 18:51:16 -0700 Subject: [PATCH 26/53] Add copyrights --- .../package_info/example/test_driver/package_info_e2e.dart | 4 ++++ .../example/test_driver/package_info_e2e_test.dart | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/packages/package_info/example/test_driver/package_info_e2e.dart b/packages/package_info/example/test_driver/package_info_e2e.dart index 9f46bc3c1109..243ddf6563f7 100644 --- a/packages/package_info/example/test_driver/package_info_e2e.dart +++ b/packages/package_info/example/test_driver/package_info_e2e.dart @@ -1,3 +1,7 @@ +// Copyright 2019, the Chromium project authors. Please see the AUTHORS file +// for details. All rights reserved. Use of this source code is governed by a +// BSD-style license that can be found in the LICENSE file. + import 'dart:io'; import 'package:flutter_test/flutter_test.dart'; import 'package:e2e/e2e.dart'; diff --git a/packages/package_info/example/test_driver/package_info_e2e_test.dart b/packages/package_info/example/test_driver/package_info_e2e_test.dart index 099570e40023..349836165747 100644 --- a/packages/package_info/example/test_driver/package_info_e2e_test.dart +++ b/packages/package_info/example/test_driver/package_info_e2e_test.dart @@ -1,3 +1,7 @@ +// Copyright 2019, the Chromium project authors. Please see the AUTHORS file +// for details. All rights reserved. Use of this source code is governed by a +// BSD-style license that can be found in the LICENSE file. + import 'dart:io'; import 'package:flutter_driver/flutter_driver.dart'; @@ -9,3 +13,4 @@ Future main() async { driver.close(); exit(result == 'pass' ? 0 : 1); } +` \ No newline at end of file From ba5ea9361b4a84267073fec75ad58212818b1e5f Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 7 Oct 2019 18:54:04 -0700 Subject: [PATCH 27/53] Remove backtick --- .../package_info/example/test_driver/package_info_e2e_test.dart | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/package_info/example/test_driver/package_info_e2e_test.dart b/packages/package_info/example/test_driver/package_info_e2e_test.dart index 349836165747..ac4ea11482e2 100644 --- a/packages/package_info/example/test_driver/package_info_e2e_test.dart +++ b/packages/package_info/example/test_driver/package_info_e2e_test.dart @@ -13,4 +13,3 @@ Future main() async { driver.close(); exit(result == 'pass' ? 0 : 1); } -` \ No newline at end of file From 83db9b77881b7764de9d53d9044ffb56df832831 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 14 Oct 2019 15:03:33 -0700 Subject: [PATCH 28/53] Test using plugin_tools from a branch --- .cirrus.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 0caa1a226807..1b78da6a050a 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -8,7 +8,9 @@ task: - flutter channel master - flutter upgrade - git fetch origin master - activate_script: pub global activate flutter_plugin_tools + activate_script: + - git clone git@github.com:collinjackson/plugin_tools.git + - pub global activate flutter plugin_tools -s path matrix: - name: publishable script: ./script/check_publish.sh From fd15c6dcf5965c73f3d05cd76506404df00958ac Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 14 Oct 2019 15:07:38 -0700 Subject: [PATCH 29/53] Fix package name --- .../flutter/plugins/packageinfoexample/MainActivityTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/package_info/example/android/app/src/androidTest/java/dev/flutter/plugins/packageinfoexample/MainActivityTest.java b/packages/package_info/example/android/app/src/androidTest/java/dev/flutter/plugins/packageinfoexample/MainActivityTest.java index 21ef8f9cb48c..45198857b0b6 100644 --- a/packages/package_info/example/android/app/src/androidTest/java/dev/flutter/plugins/packageinfoexample/MainActivityTest.java +++ b/packages/package_info/example/android/app/src/androidTest/java/dev/flutter/plugins/packageinfoexample/MainActivityTest.java @@ -5,7 +5,7 @@ package dev.flutter.plugins.packageinfoexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.instrumentationadapter.FlutterRunner; +import dev.flutter.plugins.e2e.FlutterRunner; import org.junit.Rule; import org.junit.runner.RunWith; From 6160d81f8e295eabd346d1c37f7cfb8d9b0b7f8e Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 14 Oct 2019 15:13:08 -0700 Subject: [PATCH 30/53] Update to new package conventions --- .../plugins/packageinfo/PackageInfoPlugin.java | 0 .../EmbedderV1ActivityTest.java} | 4 ++-- .../packageinfoexample/MainActivityTest.java | 2 +- .../packageinfoexample/MainActivity.java | 16 ---------------- .../packageinfoexample/EmbedderV1Activity.java | 17 +++++++++++++++++ .../packageinfoexample/MainActivity.java | 11 +++++------ packages/package_info/pubspec.yaml | 2 +- 7 files changed, 26 insertions(+), 26 deletions(-) rename packages/package_info/android/src/main/java/{dev => io}/flutter/plugins/packageinfo/PackageInfoPlugin.java (100%) rename packages/package_info/example/android/app/src/androidTest/java/{dev/flutter/plugins/packageinfoexample/MainActivityTest.java => io/flutter/plugins/packageinfoexample/EmbedderV1ActivityTest.java} (79%) delete mode 100644 packages/package_info/example/android/app/src/main/java/dev/flutter/plugins/packageinfoexample/MainActivity.java create mode 100644 packages/package_info/example/android/app/src/main/java/io/flutter/plugins/packageinfoexample/EmbedderV1Activity.java diff --git a/packages/package_info/android/src/main/java/dev/flutter/plugins/packageinfo/PackageInfoPlugin.java b/packages/package_info/android/src/main/java/io/flutter/plugins/packageinfo/PackageInfoPlugin.java similarity index 100% rename from packages/package_info/android/src/main/java/dev/flutter/plugins/packageinfo/PackageInfoPlugin.java rename to packages/package_info/android/src/main/java/io/flutter/plugins/packageinfo/PackageInfoPlugin.java diff --git a/packages/package_info/example/android/app/src/androidTest/java/dev/flutter/plugins/packageinfoexample/MainActivityTest.java b/packages/package_info/example/android/app/src/androidTest/java/io/flutter/plugins/packageinfoexample/EmbedderV1ActivityTest.java similarity index 79% rename from packages/package_info/example/android/app/src/androidTest/java/dev/flutter/plugins/packageinfoexample/MainActivityTest.java rename to packages/package_info/example/android/app/src/androidTest/java/io/flutter/plugins/packageinfoexample/EmbedderV1ActivityTest.java index 45198857b0b6..ff2c0f38e6bc 100644 --- a/packages/package_info/example/android/app/src/androidTest/java/dev/flutter/plugins/packageinfoexample/MainActivityTest.java +++ b/packages/package_info/example/android/app/src/androidTest/java/io/flutter/plugins/packageinfoexample/EmbedderV1ActivityTest.java @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -package dev.flutter.plugins.packageinfoexample; +package io.flutter.plugins.packageinfoexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.e2e.FlutterRunner; +import dev.flutter.plugins.instrumentationadapter.FlutterRunner; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/package_info/example/android/app/src/androidTest/java/io/flutter/plugins/packageinfoexample/MainActivityTest.java b/packages/package_info/example/android/app/src/androidTest/java/io/flutter/plugins/packageinfoexample/MainActivityTest.java index ff2c0f38e6bc..4241bf194002 100644 --- a/packages/package_info/example/android/app/src/androidTest/java/io/flutter/plugins/packageinfoexample/MainActivityTest.java +++ b/packages/package_info/example/android/app/src/androidTest/java/io/flutter/plugins/packageinfoexample/MainActivityTest.java @@ -5,7 +5,7 @@ package io.flutter.plugins.packageinfoexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.instrumentationadapter.FlutterRunner; +import dev.flutter.plugins.e2e.FlutterRunner; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/package_info/example/android/app/src/main/java/dev/flutter/plugins/packageinfoexample/MainActivity.java b/packages/package_info/example/android/app/src/main/java/dev/flutter/plugins/packageinfoexample/MainActivity.java deleted file mode 100644 index 027a4332d2a3..000000000000 --- a/packages/package_info/example/android/app/src/main/java/dev/flutter/plugins/packageinfoexample/MainActivity.java +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright 2017 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -package dev.flutter.plugins.packageinfoexample; - -import dev.flutter.plugins.packageinfo.PackageInfoPlugin; -import io.flutter.embedding.android.FlutterActivity; -import io.flutter.embedding.engine.FlutterEngine; - -public class MainActivity extends FlutterActivity { - @Override - public void configureFlutterEngine(FlutterEngine flutterEngine) { - flutterEngine.getPlugins().add(new PackageInfoPlugin()); - } -} diff --git a/packages/package_info/example/android/app/src/main/java/io/flutter/plugins/packageinfoexample/EmbedderV1Activity.java b/packages/package_info/example/android/app/src/main/java/io/flutter/plugins/packageinfoexample/EmbedderV1Activity.java new file mode 100644 index 000000000000..6b4ea9c0289f --- /dev/null +++ b/packages/package_info/example/android/app/src/main/java/io/flutter/plugins/packageinfoexample/EmbedderV1Activity.java @@ -0,0 +1,17 @@ +// Copyright 2017 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package io.flutter.plugins.packageinfoexample; + +import android.os.Bundle; +import io.flutter.app.FlutterActivity; +import io.flutter.plugins.GeneratedPluginRegistrant; + +public class MainActivity extends FlutterActivity { + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + GeneratedPluginRegistrant.registerWith(this); + } +} diff --git a/packages/package_info/example/android/app/src/main/java/io/flutter/plugins/packageinfoexample/MainActivity.java b/packages/package_info/example/android/app/src/main/java/io/flutter/plugins/packageinfoexample/MainActivity.java index 6b4ea9c0289f..e474cdffe3f3 100644 --- a/packages/package_info/example/android/app/src/main/java/io/flutter/plugins/packageinfoexample/MainActivity.java +++ b/packages/package_info/example/android/app/src/main/java/io/flutter/plugins/packageinfoexample/MainActivity.java @@ -4,14 +4,13 @@ package io.flutter.plugins.packageinfoexample; -import android.os.Bundle; -import io.flutter.app.FlutterActivity; -import io.flutter.plugins.GeneratedPluginRegistrant; +import io.flutter.plugins.packageinfo.PackageInfoPlugin; +import io.flutter.embedding.android.FlutterActivity; +import io.flutter.embedding.engine.FlutterEngine; public class MainActivity extends FlutterActivity { @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - GeneratedPluginRegistrant.registerWith(this); + public void configureFlutterEngine(FlutterEngine flutterEngine) { + flutterEngine.getPlugins().add(new PackageInfoPlugin()); } } diff --git a/packages/package_info/pubspec.yaml b/packages/package_info/pubspec.yaml index d665d2227ab0..e2d27f69e18d 100644 --- a/packages/package_info/pubspec.yaml +++ b/packages/package_info/pubspec.yaml @@ -7,7 +7,7 @@ version: 0.4.0+8 flutter: plugin: - androidPackage: dev.flutter.plugins.packageinfo + androidPackage: io.flutter.plugins.packageinfo iosPrefix: FLT pluginClass: PackageInfoPlugin From 0bd73754bbc0bf9e544201bb43aaaafc94b83edc Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 14 Oct 2019 15:22:29 -0700 Subject: [PATCH 31/53] Add build.gradle --- packages/package_info/android/build.gradle | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/packages/package_info/android/build.gradle b/packages/package_info/android/build.gradle index 2feb6adb735d..eb75e2334d4a 100644 --- a/packages/package_info/android/build.gradle +++ b/packages/package_info/android/build.gradle @@ -45,3 +45,28 @@ android { disable 'InvalidPackage' } } + +// TODO(amirh): Remove this hack once androidx.lifecycle is included on stable. https://github.com/flutter/flutter/issues/42348 +afterEvaluate { + def containsEmbeddingDependencies = false + for (def configuration : configurations.all) { + for (def dependency : configuration.dependencies) { + if (dependency.group == 'io.flutter' && + dependency.name.startsWith('flutter_embedding') && + dependency.isTransitive()) + { + containsEmbeddingDependencies = true + break + } + } + } + if (!containsEmbeddingDependencies) { + android { + dependencies { + def lifecycle_version = "2.1.0" + api "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version" + api "androidx.lifecycle:lifecycle-runtime:$lifecycle_version" + } + } + } +} From 2af845757277bbc2d4b3fce0e9cfa5813d82b116 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 14 Oct 2019 15:28:44 -0700 Subject: [PATCH 32/53] Fix package names --- .../io/flutter/plugins/packageinfo/PackageInfoPlugin.java | 2 +- .../plugins/packageinfoexample/EmbedderV1ActivityTest.java | 6 +++--- .../plugins/packageinfoexample/EmbedderV1Activity.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/package_info/android/src/main/java/io/flutter/plugins/packageinfo/PackageInfoPlugin.java b/packages/package_info/android/src/main/java/io/flutter/plugins/packageinfo/PackageInfoPlugin.java index 7b88a2834c6b..45593de41782 100644 --- a/packages/package_info/android/src/main/java/io/flutter/plugins/packageinfo/PackageInfoPlugin.java +++ b/packages/package_info/android/src/main/java/io/flutter/plugins/packageinfo/PackageInfoPlugin.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -package dev.flutter.plugins.packageinfo; +package io.flutter.plugins.packageinfo; import android.content.Context; import android.content.pm.PackageInfo; diff --git a/packages/package_info/example/android/app/src/androidTest/java/io/flutter/plugins/packageinfoexample/EmbedderV1ActivityTest.java b/packages/package_info/example/android/app/src/androidTest/java/io/flutter/plugins/packageinfoexample/EmbedderV1ActivityTest.java index ff2c0f38e6bc..5c4d7bbb1e20 100644 --- a/packages/package_info/example/android/app/src/androidTest/java/io/flutter/plugins/packageinfoexample/EmbedderV1ActivityTest.java +++ b/packages/package_info/example/android/app/src/androidTest/java/io/flutter/plugins/packageinfoexample/EmbedderV1ActivityTest.java @@ -5,11 +5,11 @@ package io.flutter.plugins.packageinfoexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.instrumentationadapter.FlutterRunner; +import dev.flutter.plugins.e2e.FlutterRunner; import org.junit.Rule; import org.junit.runner.RunWith; @RunWith(FlutterRunner.class) -public class MainActivityTest { - @Rule public ActivityTestRule rule = new ActivityTestRule<>(MainActivity.class); +public class EmbedderV1ActivityTest { + @Rule public ActivityTestRule rule = new ActivityTestRule<>(EmbedderV1Activity.class); } diff --git a/packages/package_info/example/android/app/src/main/java/io/flutter/plugins/packageinfoexample/EmbedderV1Activity.java b/packages/package_info/example/android/app/src/main/java/io/flutter/plugins/packageinfoexample/EmbedderV1Activity.java index 6b4ea9c0289f..170d0f8cb767 100644 --- a/packages/package_info/example/android/app/src/main/java/io/flutter/plugins/packageinfoexample/EmbedderV1Activity.java +++ b/packages/package_info/example/android/app/src/main/java/io/flutter/plugins/packageinfoexample/EmbedderV1Activity.java @@ -8,7 +8,7 @@ import io.flutter.app.FlutterActivity; import io.flutter.plugins.GeneratedPluginRegistrant; -public class MainActivity extends FlutterActivity { +public class EmbedderV1Activity extends FlutterActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); From 0121e9e247a1346f1b279cec965142dc47d2e059 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 14 Oct 2019 15:35:32 -0700 Subject: [PATCH 33/53] Fix activity launch --- .../example/android/app/src/main/AndroidManifest.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/package_info/example/android/app/src/main/AndroidManifest.xml b/packages/package_info/example/android/app/src/main/AndroidManifest.xml index 91da0585064a..87a7ae5762db 100644 --- a/packages/package_info/example/android/app/src/main/AndroidManifest.xml +++ b/packages/package_info/example/android/app/src/main/AndroidManifest.xml @@ -10,17 +10,17 @@ android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection" android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize"> + + + + - - - - - From e5a370b456ffcc79a16f385170466f70f76edf51 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 14 Oct 2019 16:48:23 -0700 Subject: [PATCH 34/53] Update https checkout --- .cirrus.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 1b78da6a050a..6b50c64fb059 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -9,7 +9,8 @@ task: - flutter upgrade - git fetch origin master activate_script: - - git clone git@github.com:collinjackson/plugin_tools.git + # Remove before landing + - git clone https://github.com/collinjackson/plugin_tools.git - pub global activate flutter plugin_tools -s path matrix: - name: publishable From 4f2ab2f61d4facdf2f2283a4f4b9d743a2bd8557 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 14 Oct 2019 17:53:02 -0700 Subject: [PATCH 35/53] Update to point to latest e2e plugin, add E2E plugin to example, clean up AndroidManifest.xml --- .../example/android/app/src/main/AndroidManifest.xml | 2 +- .../io/flutter/plugins/packageinfoexample/MainActivity.java | 1 + packages/package_info/example/pubspec.yaml | 2 +- packages/package_info/pubspec.yaml | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/package_info/example/android/app/src/main/AndroidManifest.xml b/packages/package_info/example/android/app/src/main/AndroidManifest.xml index 87a7ae5762db..ff440c8539ab 100644 --- a/packages/package_info/example/android/app/src/main/AndroidManifest.xml +++ b/packages/package_info/example/android/app/src/main/AndroidManifest.xml @@ -15,7 +15,7 @@ - =2.0.0-dev.28.0 <3.0.0" From ced1f8df0a52fd3e332a323f04cb217442862100 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 14 Oct 2019 18:13:29 -0700 Subject: [PATCH 36/53] Fix temporary cirrus command --- .cirrus.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 6b50c64fb059..3a0ad643e37d 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -10,8 +10,8 @@ task: - git fetch origin master activate_script: # Remove before landing - - git clone https://github.com/collinjackson/plugin_tools.git - - pub global activate flutter plugin_tools -s path + - git clone https://github.com/collinjackson/plugin_tools.git flutter_plugin_tools + - pub global activate flutter_plugin_tools -s path matrix: - name: publishable script: ./script/check_publish.sh From 054b1a0a96651ad7f09ca787234154566a8578df Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 14 Oct 2019 18:17:36 -0700 Subject: [PATCH 37/53] Remove singleTop from AndroidManifest.xml --- .../example/android/app/src/main/AndroidManifest.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/package_info/example/android/app/src/main/AndroidManifest.xml b/packages/package_info/example/android/app/src/main/AndroidManifest.xml index ff440c8539ab..1b95d5d9cde4 100644 --- a/packages/package_info/example/android/app/src/main/AndroidManifest.xml +++ b/packages/package_info/example/android/app/src/main/AndroidManifest.xml @@ -5,7 +5,6 @@ Date: Tue, 15 Oct 2019 15:22:20 -0700 Subject: [PATCH 38/53] Add missing import --- .../java/io/flutter/plugins/packageinfoexample/MainActivity.java | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/package_info/example/android/app/src/main/java/io/flutter/plugins/packageinfoexample/MainActivity.java b/packages/package_info/example/android/app/src/main/java/io/flutter/plugins/packageinfoexample/MainActivity.java index 14a5a81f521e..42989e5edf7c 100644 --- a/packages/package_info/example/android/app/src/main/java/io/flutter/plugins/packageinfoexample/MainActivity.java +++ b/packages/package_info/example/android/app/src/main/java/io/flutter/plugins/packageinfoexample/MainActivity.java @@ -4,6 +4,7 @@ package io.flutter.plugins.packageinfoexample; +import dev.flutter.plugins.e2e.E2EPlugin; import io.flutter.plugins.packageinfo.PackageInfoPlugin; import io.flutter.embedding.android.FlutterActivity; import io.flutter.embedding.engine.FlutterEngine; From 1e8f811dda0a5a308c2188ade9e354fc80994f7a Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Tue, 15 Oct 2019 15:58:53 -0700 Subject: [PATCH 39/53] Revert cirrus changes --- .cirrus.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 3a0ad643e37d..0caa1a226807 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -8,10 +8,7 @@ task: - flutter channel master - flutter upgrade - git fetch origin master - activate_script: - # Remove before landing - - git clone https://github.com/collinjackson/plugin_tools.git flutter_plugin_tools - - pub global activate flutter_plugin_tools -s path + activate_script: pub global activate flutter_plugin_tools matrix: - name: publishable script: ./script/check_publish.sh From e497d955ce4fb837e2d3b44edd753845bad5b0e8 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Tue, 15 Oct 2019 16:02:01 -0700 Subject: [PATCH 40/53] Add comment --- .../io/flutter/plugins/packageinfoexample/MainActivity.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/package_info/example/android/app/src/main/java/io/flutter/plugins/packageinfoexample/MainActivity.java b/packages/package_info/example/android/app/src/main/java/io/flutter/plugins/packageinfoexample/MainActivity.java index 42989e5edf7c..91b2045ae1a2 100644 --- a/packages/package_info/example/android/app/src/main/java/io/flutter/plugins/packageinfoexample/MainActivity.java +++ b/packages/package_info/example/android/app/src/main/java/io/flutter/plugins/packageinfoexample/MainActivity.java @@ -10,6 +10,8 @@ import io.flutter.embedding.engine.FlutterEngine; public class MainActivity extends FlutterActivity { + // TODO(jackson): Remove this once v2 of GeneratedPluginRegistrant rolls to stable. + // https://github.com/flutter/flutter/issues/42694 @Override public void configureFlutterEngine(FlutterEngine flutterEngine) { flutterEngine.getPlugins().add(new PackageInfoPlugin()); From f21476a171a51caac8b1533f92ebd5ddcd9cdfc3 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Tue, 15 Oct 2019 16:04:06 -0700 Subject: [PATCH 41/53] reformat --- .../plugins/packageinfoexample/EmbedderV1ActivityTest.java | 4 +++- .../io/flutter/plugins/packageinfoexample/MainActivity.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/package_info/example/android/app/src/androidTest/java/io/flutter/plugins/packageinfoexample/EmbedderV1ActivityTest.java b/packages/package_info/example/android/app/src/androidTest/java/io/flutter/plugins/packageinfoexample/EmbedderV1ActivityTest.java index 5c4d7bbb1e20..47362ba64a9d 100644 --- a/packages/package_info/example/android/app/src/androidTest/java/io/flutter/plugins/packageinfoexample/EmbedderV1ActivityTest.java +++ b/packages/package_info/example/android/app/src/androidTest/java/io/flutter/plugins/packageinfoexample/EmbedderV1ActivityTest.java @@ -11,5 +11,7 @@ @RunWith(FlutterRunner.class) public class EmbedderV1ActivityTest { - @Rule public ActivityTestRule rule = new ActivityTestRule<>(EmbedderV1Activity.class); + @Rule + public ActivityTestRule rule = + new ActivityTestRule<>(EmbedderV1Activity.class); } diff --git a/packages/package_info/example/android/app/src/main/java/io/flutter/plugins/packageinfoexample/MainActivity.java b/packages/package_info/example/android/app/src/main/java/io/flutter/plugins/packageinfoexample/MainActivity.java index 91b2045ae1a2..cb417e5b0067 100644 --- a/packages/package_info/example/android/app/src/main/java/io/flutter/plugins/packageinfoexample/MainActivity.java +++ b/packages/package_info/example/android/app/src/main/java/io/flutter/plugins/packageinfoexample/MainActivity.java @@ -5,9 +5,9 @@ package io.flutter.plugins.packageinfoexample; import dev.flutter.plugins.e2e.E2EPlugin; -import io.flutter.plugins.packageinfo.PackageInfoPlugin; import io.flutter.embedding.android.FlutterActivity; import io.flutter.embedding.engine.FlutterEngine; +import io.flutter.plugins.packageinfo.PackageInfoPlugin; public class MainActivity extends FlutterActivity { // TODO(jackson): Remove this once v2 of GeneratedPluginRegistrant rolls to stable. From a2bca9cf8742dc2a56bf10989c687285d3204f7b Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Tue, 15 Oct 2019 17:13:19 -0700 Subject: [PATCH 42/53] Enable Firebase Test Lab test --- .cirrus.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 0caa1a226807..c6781cfb7aa5 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -24,7 +24,7 @@ task: script: ./script/incremental_build.sh analyze - name: build_all_plugins_apk script: ./script/build_all_plugins_app.sh apk - - name: build-apks+java-test+drive-examples + - name: build-apks+java-test+firebase-test-lab env: matrix: PLUGIN_SHARDING: "--shardIndex 0 --shardCount 2" @@ -43,6 +43,7 @@ task: - export CIRRUS_COMMIT_MESSAGE="" - ./script/incremental_build.sh build-examples --apk - ./script/incremental_build.sh java-test # must come after apk build + - ./script/incremental_build.sh firebase-test-lab - export CIRRUS_CHANGE_MESSAGE=`cat /tmp/cirrus_change_message.txt` - export CIRRUS_COMMIT_MESSAGE=`cat /tmp/cirrus_commit_message.txt` From 77d22f39ff9eb93f8f77906916a6b7cc0456c7bc Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Tue, 15 Oct 2019 17:20:11 -0700 Subject: [PATCH 43/53] =?UTF-8?q?Revert=20file=20that=20shouldn=E2=80=99t?= =?UTF-8?q?=20have=20been=20modified?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/shared_preferences/example/android/gradle.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/shared_preferences/example/android/gradle.properties b/packages/shared_preferences/example/android/gradle.properties index 7be3d8b46841..8bd86f680510 100644 --- a/packages/shared_preferences/example/android/gradle.properties +++ b/packages/shared_preferences/example/android/gradle.properties @@ -1,2 +1 @@ org.gradle.jvmargs=-Xmx1536M -android.enableR8=true From a0c5273be83f7777183b3ade951a930eee1c187a Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Wed, 16 Oct 2019 19:29:17 -0700 Subject: [PATCH 44/53] Temporary commit to try out flutter_plugin_tools changes --- .cirrus.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index c6781cfb7aa5..3df313a18254 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -8,7 +8,10 @@ task: - flutter channel master - flutter upgrade - git fetch origin master - activate_script: pub global activate flutter_plugin_tools + activate_script: + # TODO(jackson): Remove before landing + - git clone https://github.com/flutter/plugin_tools flutter_plugin_tools + - pub global activate flutter_plugin_tools -s path matrix: - name: publishable script: ./script/check_publish.sh From b6c0ceb67a73e6145783c2eb1f96bca28dad9736 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Thu, 17 Oct 2019 07:25:16 -0700 Subject: [PATCH 45/53] Set Firebase Test Lab key in .cirrus.yml --- .cirrus.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 3df313a18254..444c3126d18c 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -33,6 +33,7 @@ task: PLUGIN_SHARDING: "--shardIndex 0 --shardCount 2" PLUGIN_SHARDING: "--shardIndex 1 --shardCount 2" MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550] + GCLOUD_FIREBASE_TESTLAB_KEY: ENCRYPTED[07586610af1fdfc894e5969f70ef2458341b9b7e9c3b7c4225a663b4a48732b7208a4d91c3b7d45305a6b55fa2a37fc4] script: # Unsetting CIRRUS_CHANGE_MESSAGE and CIRRUS_COMMIT_MESSAGE as they # might include non-ASCII characters which makes Gradle crash. @@ -46,7 +47,12 @@ task: - export CIRRUS_COMMIT_MESSAGE="" - ./script/incremental_build.sh build-examples --apk - ./script/incremental_build.sh java-test # must come after apk build - - ./script/incremental_build.sh firebase-test-lab + - if [[ $GCLOUD_FIREBASE_TESTLAB_KEY == ENCRYPTED* ]]; then + - echo "This user does not have permission to run Firebase Test Lab tests." + - else + - echo $GCLOUD_FIREBASE_TESTLAB_KEY > ${HOME}/gcloud-service-key.json + - ./script/incremental_build.sh firebase-test-lab + - fi - export CIRRUS_CHANGE_MESSAGE=`cat /tmp/cirrus_change_message.txt` - export CIRRUS_COMMIT_MESSAGE=`cat /tmp/cirrus_commit_message.txt` From d95a8c54cf78113adb6028291481cd7e079f5114 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Thu, 17 Oct 2019 07:34:42 -0700 Subject: [PATCH 46/53] Add gcloud to Dockerfile --- .ci/Dockerfile | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.ci/Dockerfile b/.ci/Dockerfile index a69f9cb67526..a7e08e184a86 100644 --- a/.ci/Dockerfile +++ b/.ci/Dockerfile @@ -7,3 +7,15 @@ RUN yes | sdkmanager \ "extras;android;m2repository" RUN yes | sdkmanager --licenses + +# Add repo for gcloud sdk and install it +RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | \ + tee -a /etc/apt/sources.list.d/google-cloud-sdk.list + +RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | \ + apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - + +RUN apt-get update && apt-get install -y google-cloud-sdk && \ + gcloud config set core/disable_usage_reporting true && \ + gcloud config set component_manager/disable_update_check true + From d1b8e10018fae8bf5121988e78a730a8434e1cd0 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Thu, 17 Oct 2019 07:46:17 -0700 Subject: [PATCH 47/53] add some sudo --- .ci/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci/Dockerfile b/.ci/Dockerfile index a7e08e184a86..5ac3d453106c 100644 --- a/.ci/Dockerfile +++ b/.ci/Dockerfile @@ -10,12 +10,12 @@ RUN yes | sdkmanager --licenses # Add repo for gcloud sdk and install it RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | \ - tee -a /etc/apt/sources.list.d/google-cloud-sdk.list + sudo tee -a /etc/apt/sources.list.d/google-cloud-sdk.list RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | \ - apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - + sudo apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - -RUN apt-get update && apt-get install -y google-cloud-sdk && \ +RUN sudo apt-get update && sudo apt-get install -y google-cloud-sdk && \ gcloud config set core/disable_usage_reporting true && \ gcloud config set component_manager/disable_update_check true From 881c1c908948e96858401ca22a7d293f7f601fc2 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Thu, 17 Oct 2019 07:54:46 -0700 Subject: [PATCH 48/53] Add gpg-agent package --- .ci/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci/Dockerfile b/.ci/Dockerfile index 5ac3d453106c..4866e4e9dce9 100644 --- a/.ci/Dockerfile +++ b/.ci/Dockerfile @@ -12,10 +12,10 @@ RUN yes | sdkmanager --licenses RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | \ sudo tee -a /etc/apt/sources.list.d/google-cloud-sdk.list -RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | \ - sudo apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - - -RUN sudo apt-get update && sudo apt-get install -y google-cloud-sdk && \ +RUN sudo apt-get update && sudo apt-get install -y gpg-agent google-cloud-sdk && \ gcloud config set core/disable_usage_reporting true && \ gcloud config set component_manager/disable_update_check true +RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | \ + sudo apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - + From a42674b39a4a70a87ccb7ee8ae30bfac078d3211 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Thu, 17 Oct 2019 08:04:36 -0700 Subject: [PATCH 49/53] reorder commands --- .ci/Dockerfile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.ci/Dockerfile b/.ci/Dockerfile index 4866e4e9dce9..db03a1a9cdae 100644 --- a/.ci/Dockerfile +++ b/.ci/Dockerfile @@ -10,12 +10,15 @@ RUN yes | sdkmanager --licenses # Add repo for gcloud sdk and install it RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | \ - sudo tee -a /etc/apt/sources.list.d/google-cloud-sdk.list + sudo tee -a /etc/apt/sources.list.d/google-cloud-sdk.list -RUN sudo apt-get update && sudo apt-get install -y gpg-agent google-cloud-sdk && \ +RUN sudo apt-get update && sudo apt-get install -y gpg-agent + +RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | \ + sudo apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - && + +RUN sudo apt-get update && sudo apt-get install -y google-cloud-sdk && \ gcloud config set core/disable_usage_reporting true && \ gcloud config set component_manager/disable_update_check true -RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | \ - sudo apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - From 64e33520fef1f5c0d29525d20b1f2e8a2087483b Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Thu, 17 Oct 2019 08:11:34 -0700 Subject: [PATCH 50/53] Reorder commands again --- .ci/Dockerfile | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/.ci/Dockerfile b/.ci/Dockerfile index db03a1a9cdae..ea7f6be02646 100644 --- a/.ci/Dockerfile +++ b/.ci/Dockerfile @@ -1,19 +1,11 @@ FROM cirrusci/flutter:stable -RUN yes | sdkmanager \ - "platforms;android-27" \ - "build-tools;27.0.3" \ - "extras;google;m2repository" \ - "extras;android;m2repository" - -RUN yes | sdkmanager --licenses - # Add repo for gcloud sdk and install it +RUN sudo apt-get update && sudo apt-get install -y gpg-agent + RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | \ sudo tee -a /etc/apt/sources.list.d/google-cloud-sdk.list -RUN sudo apt-get update && sudo apt-get install -y gpg-agent - RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | \ sudo apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - && @@ -21,4 +13,10 @@ RUN sudo apt-get update && sudo apt-get install -y google-cloud-sdk && \ gcloud config set core/disable_usage_reporting true && \ gcloud config set component_manager/disable_update_check true +RUN yes | sdkmanager \ + "platforms;android-27" \ + "build-tools;27.0.3" \ + "extras;google;m2repository" \ + "extras;android;m2repository" +RUN yes | sdkmanager --licenses From 491234f3ecded3ab320affd6f957e23ba4ee9b89 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Thu, 17 Oct 2019 08:26:48 -0700 Subject: [PATCH 51/53] add more install commands --- .ci/Dockerfile | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.ci/Dockerfile b/.ci/Dockerfile index ea7f6be02646..d4b6848a103c 100644 --- a/.ci/Dockerfile +++ b/.ci/Dockerfile @@ -1,8 +1,18 @@ FROM cirrusci/flutter:stable -# Add repo for gcloud sdk and install it -RUN sudo apt-get update && sudo apt-get install -y gpg-agent +RUN sudo apt-get update -y + +RUN sudo apt-get install -y --no-install-recommends \ + git \ + wget \ + curl \ + zip \ + unzip \ + apt-transport-https \ + ca-certificates \ + gnupg +# Add repo for gcloud sdk and install it RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | \ sudo tee -a /etc/apt/sources.list.d/google-cloud-sdk.list From a16cfd20ba8b63d1b79f601e19dba4b6a73478cf Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Thu, 17 Oct 2019 08:31:46 -0700 Subject: [PATCH 52/53] remove extraneous && --- .ci/Dockerfile | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/.ci/Dockerfile b/.ci/Dockerfile index d4b6848a103c..bae957da08eb 100644 --- a/.ci/Dockerfile +++ b/.ci/Dockerfile @@ -2,22 +2,14 @@ FROM cirrusci/flutter:stable RUN sudo apt-get update -y -RUN sudo apt-get install -y --no-install-recommends \ - git \ - wget \ - curl \ - zip \ - unzip \ - apt-transport-https \ - ca-certificates \ - gnupg +RUN sudo apt-get install -y --no-install-recommends gnupg # Add repo for gcloud sdk and install it RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | \ sudo tee -a /etc/apt/sources.list.d/google-cloud-sdk.list RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | \ - sudo apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - && + sudo apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - RUN sudo apt-get update && sudo apt-get install -y google-cloud-sdk && \ gcloud config set core/disable_usage_reporting true && \ From 1e84ad0fa916a34804ff7a64bf728d171222cdc4 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Thu, 17 Oct 2019 10:40:11 -0700 Subject: [PATCH 53/53] Remove changes not intended to be landed --- .cirrus.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 444c3126d18c..9ee572939474 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -8,10 +8,7 @@ task: - flutter channel master - flutter upgrade - git fetch origin master - activate_script: - # TODO(jackson): Remove before landing - - git clone https://github.com/flutter/plugin_tools flutter_plugin_tools - - pub global activate flutter_plugin_tools -s path + activate_script: pub global activate flutter_plugin_tools matrix: - name: publishable script: ./script/check_publish.sh