From 68668a04495f0db96440ad13e352531bd5dca5fd Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Sat, 20 Jul 2019 08:54:37 -0700 Subject: [PATCH 1/7] Fix Android compiler warnings --- packages/package_info/CHANGELOG.md | 4 ++++ .../io/flutter/plugins/packageinfo/PackageInfoPlugin.java | 4 ++-- packages/package_info/pubspec.yaml | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/package_info/CHANGELOG.md b/packages/package_info/CHANGELOG.md index ebd4bf205714..c2deb475c2f3 100644 --- a/packages/package_info/CHANGELOG.md +++ b/packages/package_info/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.4.0+6 + +* Fix Android compiler warnings. + ## 0.4.0+5 * Add iOS-specific warning to README.md. 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 e9d3bfb92042..81fae62a1f4f 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 @@ -39,7 +39,7 @@ public void onMethodCall(MethodCall call, Result result) { PackageManager pm = context.getPackageManager(); PackageInfo info = pm.getPackageInfo(context.getPackageName(), 0); - Map map = new HashMap(); + Map map = new HashMap<>(); map.put("appName", info.applicationInfo.loadLabel(pm).toString()); map.put("packageName", context.getPackageName()); map.put("version", info.versionName); @@ -54,11 +54,11 @@ public void onMethodCall(MethodCall call, Result result) { } } + @SuppressWarnings("deprecation") private static long getLongVersionCode(PackageInfo info) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { return info.getLongVersionCode(); } - //noinspection deprecation return info.versionCode; } } diff --git a/packages/package_info/pubspec.yaml b/packages/package_info/pubspec.yaml index 33afe89f4e96..5a2d29444511 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+5 +version: 0.4.0+6 flutter: plugin: From 7fe3cc8bb45cc1d98f96c5091b0f23d76df1b34b Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Sat, 20 Jul 2019 11:53:14 -0700 Subject: [PATCH 2/7] Ensure no stderr warnings for any builds --- .cirrus.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 6735d0b62e7d..34924cc3f399 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): Revert to "pub global activate flutter_plugin_tools" before landing + - git clone https://github.com/collinjackson/plugin_tools.git -b no_deprecation_warnings flutter_plugin_tools + - pub global activate flutter_plugin_tools -s path matrix: - name: publishable script: ./script/check_publish.sh From 363fa07e9af901b2fb5e2739ea1d912a6d75d264 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Sat, 20 Jul 2019 20:44:02 -0700 Subject: [PATCH 3/7] Fix deprecation warnings for location plugin --- .../lib/location_background_plugin.dart | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/packages/location_background/lib/location_background_plugin.dart b/packages/location_background/lib/location_background_plugin.dart index 479862e7209d..57fd867af016 100644 --- a/packages/location_background/lib/location_background_plugin.dart +++ b/packages/location_background/lib/location_background_plugin.dart @@ -118,10 +118,7 @@ class LocationBackgroundPlugin { PluginUtilities.getCallbackHandle(_backgroundCallbackDispatcher); assert(handle != null, 'Unable to lookup callback.'); _channel - // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter. - // https://github.com/flutter/flutter/issues/26431 - // ignore: strong_mode_implicit_dynamic_method - .invokeMethod(_kStartHeadlessService, [handle.toRawHandle()]); + .invokeMethod(_kStartHeadlessService, [handle.toRawHandle()]); } // The method channel we'll use to communicate with the native portion of our @@ -147,10 +144,7 @@ class LocationBackgroundPlugin { throw ArgumentError.notNull('callback'); } final CallbackHandle handle = PluginUtilities.getCallbackHandle(callback); - // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter. - // https://github.com/flutter/flutter/issues/26431 - // ignore: strong_mode_implicit_dynamic_method - return _channel.invokeMethod(_kMonitorLocationChanges, [ + return _channel.invokeMethod(_kMonitorLocationChanges, [ handle.toRawHandle(), pauseLocationUpdatesAutomatically, showsBackgroundLocationIndicator, @@ -160,8 +154,5 @@ class LocationBackgroundPlugin { /// Stop all location updates. Future cancelLocationUpdates() => - // TODO(amirh): remove this on when the invokeMethod update makes it to stable Flutter. - // https://github.com/flutter/flutter/issues/26431 - // ignore: strong_mode_implicit_dynamic_method - _channel.invokeMethod(_kCancelLocationUpdates); + _channel.invokeMethod(_kCancelLocationUpdates); } From 97f6d295a63e1bead86c2e2b9db7751b169438dd Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 22 Jul 2019 15:48:54 -0700 Subject: [PATCH 4/7] Bump for release --- packages/location_background/CHANGELOG.md | 4 ++++ packages/location_background/pubspec.yaml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/location_background/CHANGELOG.md b/packages/location_background/CHANGELOG.md index e9815106d525..25c67329556f 100644 --- a/packages/location_background/CHANGELOG.md +++ b/packages/location_background/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.1.0+2 + +* Fix Dart deprecation warnings. + ## 0.1.0+1 * Log a more detailed warning at build time about the previous AndroidX diff --git a/packages/location_background/pubspec.yaml b/packages/location_background/pubspec.yaml index ed3b828a81c0..3fd25a0c2abc 100644 --- a/packages/location_background/pubspec.yaml +++ b/packages/location_background/pubspec.yaml @@ -2,7 +2,7 @@ name: location_background_plugin description: A new flutter plugin project. author: Flutter Team homepage: https://github.com/flutter/plugins/tree/master/packages/location_background -version: 0.1.0+1 +version: 0.1.0+2 publish_to: none dependencies: From 2796746b1d4ce46f6b83f347f60c41f3b4616dfa Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 22 Jul 2019 16:07:31 -0700 Subject: [PATCH 5/7] Revert .cirrus.yml that was pointing at branch temporarily --- .cirrus.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 34924cc3f399..6735d0b62e7d 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): Revert to "pub global activate flutter_plugin_tools" before landing - - git clone https://github.com/collinjackson/plugin_tools.git -b no_deprecation_warnings 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 63a861f60196a847e54070e305fda402395838bc Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Wed, 24 Jul 2019 09:37:46 -0700 Subject: [PATCH 6/7] Reformat --- .../location_background/lib/location_background_plugin.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/location_background/lib/location_background_plugin.dart b/packages/location_background/lib/location_background_plugin.dart index 57fd867af016..f5ff556966fb 100644 --- a/packages/location_background/lib/location_background_plugin.dart +++ b/packages/location_background/lib/location_background_plugin.dart @@ -117,8 +117,8 @@ class LocationBackgroundPlugin { final CallbackHandle handle = PluginUtilities.getCallbackHandle(_backgroundCallbackDispatcher); assert(handle != null, 'Unable to lookup callback.'); - _channel - .invokeMethod(_kStartHeadlessService, [handle.toRawHandle()]); + _channel.invokeMethod( + _kStartHeadlessService, [handle.toRawHandle()]); } // The method channel we'll use to communicate with the native portion of our From 4659ecbbefea14243cc3663027e0b4f667f281d9 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Wed, 24 Jul 2019 13:44:27 -0700 Subject: [PATCH 7/7] Specify min Flutter SDK --- packages/location_background/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/location_background/pubspec.yaml b/packages/location_background/pubspec.yaml index 3fd25a0c2abc..158d3cb77dc0 100644 --- a/packages/location_background/pubspec.yaml +++ b/packages/location_background/pubspec.yaml @@ -20,4 +20,4 @@ flutter: environment: sdk: ">=2.0.0-dev.28.0 <3.0.0" - flutter: ">=0.4.4 <2.0.0" + flutter: ">=1.5.0 <2.0.0"