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/lib/location_background_plugin.dart b/packages/location_background/lib/location_background_plugin.dart
index 479862e7209d..f5ff556966fb 100644
--- a/packages/location_background/lib/location_background_plugin.dart
+++ b/packages/location_background/lib/location_background_plugin.dart
@@ -117,11 +117,8 @@ class LocationBackgroundPlugin {
     final CallbackHandle handle =
         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, <dynamic>[handle.toRawHandle()]);
+    _channel.invokeMethod<void>(
+        _kStartHeadlessService, <dynamic>[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, <dynamic>[
+    return _channel.invokeMethod<bool>(_kMonitorLocationChanges, <dynamic>[
       handle.toRawHandle(),
       pauseLocationUpdatesAutomatically,
       showsBackgroundLocationIndicator,
@@ -160,8 +154,5 @@ class LocationBackgroundPlugin {
 
   /// Stop all location updates.
   Future<void> 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<void>(_kCancelLocationUpdates);
 }
diff --git a/packages/location_background/pubspec.yaml b/packages/location_background/pubspec.yaml
index ed3b828a81c0..158d3cb77dc0 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 <flutter-dev@googlegroups.com>
 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:
@@ -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"
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<String, String> map = new HashMap<String, String>();
+        Map<String, String> 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 <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/package_info
-version: 0.4.0+5
+version: 0.4.0+6
 
 flutter:
   plugin: