From 14fd296348f7500125c631eb63dca859521b62fd Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Mon, 2 Mar 2020 15:49:12 -0800
Subject: [PATCH 1/5] Update to remove Swift

---
 packages/espresso/pubspec.yaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/espresso/pubspec.yaml b/packages/espresso/pubspec.yaml
index f59b4140d676..6324c2d4711e 100644
--- a/packages/espresso/pubspec.yaml
+++ b/packages/espresso/pubspec.yaml
@@ -1,6 +1,6 @@
 name: espresso
 description: Java classes for testing Flutter apps using Espresso.
-version: 0.0.1+3
+version: 0.0.1+2
 homepage: https://github.com/flutter/plugins/espresso
 
 environment:
@@ -14,7 +14,6 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  pedantic: ^1.8.0
 
 # The following section is specific to Flutter.
 flutter:

From 13d3b55aead8a4d6fee9956ed450843c7daee94d Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Mon, 2 Mar 2020 15:50:12 -0800
Subject: [PATCH 2/5] Remove file that was causing build failures on iOS

---
 packages/espresso/CHANGELOG.md                     |  6 +-----
 .../espresso/ios/Classes/SwiftEspressoPlugin.swift | 14 --------------
 packages/espresso/ios/espresso.podspec             |  2 +-
 3 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 100644 packages/espresso/ios/Classes/SwiftEspressoPlugin.swift

diff --git a/packages/espresso/CHANGELOG.md b/packages/espresso/CHANGELOG.md
index 0fbb332ebcbf..b9f1b5c42645 100644
--- a/packages/espresso/CHANGELOG.md
+++ b/packages/espresso/CHANGELOG.md
@@ -1,10 +1,6 @@
-## 0.0.1+3
-
-* Make the pedantic dev_dependency explicit.
-
 ## 0.0.1+2
 
-* Update te example app to avoid using deprecated api.
+* Remove Swift file that was causing build failures on iOS.
 
 ## 0.0.1+1
 
diff --git a/packages/espresso/ios/Classes/SwiftEspressoPlugin.swift b/packages/espresso/ios/Classes/SwiftEspressoPlugin.swift
deleted file mode 100644
index 2ff3024ce33a..000000000000
--- a/packages/espresso/ios/Classes/SwiftEspressoPlugin.swift
+++ /dev/null
@@ -1,14 +0,0 @@
-import Flutter
-import UIKit
-
-public class SwiftEspressoPlugin: NSObject, FlutterPlugin {
-  public static func register(with registrar: FlutterPluginRegistrar) {
-    let channel = FlutterMethodChannel(name: "espresso", binaryMessenger: registrar.messenger())
-    let instance = SwiftEspressoPlugin()
-    registrar.addMethodCallDelegate(instance, channel: channel)
-  }
-
-  public func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) {
-    result("iOS " + UIDevice.current.systemVersion)
-  }
-}
diff --git a/packages/espresso/ios/espresso.podspec b/packages/espresso/ios/espresso.podspec
index cd64afa1d3c5..8c35525d66cf 100644
--- a/packages/espresso/ios/espresso.podspec
+++ b/packages/espresso/ios/espresso.podspec
@@ -14,10 +14,10 @@ A new flutter plugin project.
   s.author           = { 'Your Company' => 'email@example.com' }
   s.source           = { :path => '.' }
   s.source_files = 'Classes/**/*'
+  s.public_header_files = 'Classes/**/*.h'
   s.dependency 'Flutter'
   s.platform = :ios, '8.0'
 
   # Flutter.framework does not contain a i386 slice. Only x86_64 simulators are supported.
   s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'VALID_ARCHS[sdk=iphonesimulator*]' => 'x86_64' }
-  s.swift_version = '5.0'
 end

From c7f10f0d1ad7af8de8aa20ee98755fcb15fcb1af Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Mon, 2 Mar 2020 15:52:38 -0800
Subject: [PATCH 3/5] update CHANGELOG

---
 packages/espresso/CHANGELOG.md | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/espresso/CHANGELOG.md b/packages/espresso/CHANGELOG.md
index b9f1b5c42645..16b543795d8f 100644
--- a/packages/espresso/CHANGELOG.md
+++ b/packages/espresso/CHANGELOG.md
@@ -1,7 +1,15 @@
-## 0.0.1+2
+## 0.1.1+4
 
 * Remove Swift file that was causing build failures on iOS.
 
+## 0.0.1+3
+
+* Make the pedantic dev_dependency explicit.
+
+## 0.0.1+2
+
+* Update te example app to avoid using deprecated api.
+
 ## 0.0.1+1
 
 * Updates to README to avoid unnecessary imports and warnings.

From 2c47cf8f0775de35a4c197d29bb7cc1291779cbd Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Mon, 2 Mar 2020 16:09:43 -0800
Subject: [PATCH 4/5] Fix pubspec.yaml

---
 packages/espresso/pubspec.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/espresso/pubspec.yaml b/packages/espresso/pubspec.yaml
index 6324c2d4711e..50f613af6c84 100644
--- a/packages/espresso/pubspec.yaml
+++ b/packages/espresso/pubspec.yaml
@@ -1,6 +1,6 @@
 name: espresso
 description: Java classes for testing Flutter apps using Espresso.
-version: 0.0.1+2
+version: 0.0.1+4
 homepage: https://github.com/flutter/plugins/espresso
 
 environment:
@@ -14,6 +14,7 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
+  pedantic: ^1.8.0
 
 # The following section is specific to Flutter.
 flutter:

From 3c363c3cd800f6944db72f302c0b199b6e12bd56 Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Wed, 4 Mar 2020 12:22:23 -0800
Subject: [PATCH 5/5] fix CHANGELOG

---
 packages/espresso/CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/espresso/CHANGELOG.md b/packages/espresso/CHANGELOG.md
index 16b543795d8f..073c400586b3 100644
--- a/packages/espresso/CHANGELOG.md
+++ b/packages/espresso/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 0.1.1+4
+## 0.0.1+4
 
 * Remove Swift file that was causing build failures on iOS.