From 9e39270c2b4c780c7ded7aa3a583929125c22f89 Mon Sep 17 00:00:00 2001
From: Stuart Morgan <stuartmorgan@google.com>
Date: Mon, 22 Feb 2021 14:36:42 -0500
Subject: [PATCH 1/2] [android_intent] Bump version for NNBD stable

---
 packages/android_intent/CHANGELOG.md | 12 +++---------
 packages/android_intent/pubspec.yaml | 14 +++++++-------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/packages/android_intent/CHANGELOG.md b/packages/android_intent/CHANGELOG.md
index 3e878a50aac2..70926b4f4943 100644
--- a/packages/android_intent/CHANGELOG.md
+++ b/packages/android_intent/CHANGELOG.md
@@ -1,14 +1,8 @@
-## 2.0.0-nullsafety.2
-
-* Update the example app: remove the deprecated `RaisedButton` and `FlatButton` widgets.
-
-## 2.0.0-nullsafety.1
-
-* Fix outdated links across a number of markdown files ([#3276](https://github.com/flutter/plugins/pull/3276))
-
-## 2.0.0-nullsafety
+## 2.0.0
 
 * Migrate to null safety.
+* Fix outdated links across a number of markdown files ([#3276](https://github.com/flutter/plugins/pull/3276))
+* Update the example app: remove the deprecated `RaisedButton` and `FlatButton` widgets.
 
 ## 0.3.7+8
 
diff --git a/packages/android_intent/pubspec.yaml b/packages/android_intent/pubspec.yaml
index c61460718fc1..ba830bddf1df 100644
--- a/packages/android_intent/pubspec.yaml
+++ b/packages/android_intent/pubspec.yaml
@@ -1,7 +1,7 @@
 name: android_intent
 description: Flutter plugin for launching Android Intents. Not supported on iOS.
 homepage: https://github.com/flutter/plugins/tree/master/packages/android_intent
-version: 2.0.0-nullsafety.2
+version: 2.0.0
 
 flutter:
   plugin:
@@ -13,15 +13,15 @@ flutter:
 dependencies:
   flutter:
     sdk: flutter
-  platform: ^3.0.0-nullsafety.4
-  meta: ^1.3.0-nullsafety.6
+  platform: ^3.0.0
+  meta: ^1.3.0
 dev_dependencies:
-  test: ^1.16.0-nullsafety.13
-  mockito: ^4.1.3
+  test: ^1.16.3
+  mockito: ^5.0.0-nullsafety.7
   flutter_test:
     sdk: flutter
-  pedantic: ^1.10.0-nullsafety.1
+  pedantic: ^1.10.0
 
 environment:
-  sdk: ">=2.12.0-0 <3.0.0"
+  sdk: ">=2.12.0-259.9.beta <3.0.0"
   flutter: ">=1.12.13+hotfix.5"

From 1efb77fc888c9c1d1210454168875c9c095c4843 Mon Sep 17 00:00:00 2001
From: Stuart Morgan <stuartmorgan@google.com>
Date: Mon, 22 Feb 2021 14:40:04 -0500
Subject: [PATCH 2/2] Migrate example

---
 .../example/integration_test/android_intent_test.dart       | 6 ++++++
 packages/android_intent/example/pubspec.yaml                | 4 ++--
 .../example/test_driver/integration_test.dart               | 6 ++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/packages/android_intent/example/integration_test/android_intent_test.dart b/packages/android_intent/example/integration_test/android_intent_test.dart
index 78a667b27a09..e11a5e4e4898 100644
--- a/packages/android_intent/example/integration_test/android_intent_test.dart
+++ b/packages/android_intent/example/integration_test/android_intent_test.dart
@@ -1,3 +1,9 @@
+// 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.
+
+// @dart = 2.9
+
 import 'dart:io';
 
 import 'package:android_intent/android_intent.dart';
diff --git a/packages/android_intent/example/pubspec.yaml b/packages/android_intent/example/pubspec.yaml
index 7a0814d4acc0..2b1aab823d12 100644
--- a/packages/android_intent/example/pubspec.yaml
+++ b/packages/android_intent/example/pubspec.yaml
@@ -17,12 +17,12 @@ dev_dependencies:
     path: ../../integration_test
   flutter_driver:
     sdk: flutter
-  pedantic: ^1.8.0
+  pedantic: ^1.10.0
 
 # The following section is specific to Flutter.
 flutter:
   uses-material-design: true
 
 environment:
-  sdk: ">=2.3.0 <3.0.0"
+  sdk: ">=2.12.0-259.9.beta <3.0.0"
   flutter: ">=1.12.13+hotfix.5"
diff --git a/packages/android_intent/example/test_driver/integration_test.dart b/packages/android_intent/example/test_driver/integration_test.dart
index 34483b996049..0378ec31ee3c 100644
--- a/packages/android_intent/example/test_driver/integration_test.dart
+++ b/packages/android_intent/example/test_driver/integration_test.dart
@@ -1,3 +1,9 @@
+// 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.
+
+// @dart = 2.9
+
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';