From 1a6fa5c48b136a685c25579d52dde677348d8d6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville-Matti=20Hakanp=C3=A4=C3=A4?=
 <ville-matti.hakanpaa@futuriot.com>
Date: Wed, 18 Dec 2019 15:02:09 +0200
Subject: [PATCH 1/3] Update Flutter version so setState and other literals
 will work

---
 pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index cf94a1a4..5e4ac2e7 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -4,7 +4,7 @@ description: A new Flutter application.
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.0.0-dev.68.0 <3.0.0"
+  sdk: ">=2.2.0 <3.0.0"
 
 dependencies:
   flutter:

From 1e71145e8720514b9b2b7c29dad347d0959aa149 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville-Matti=20Hakanp=C3=A4=C3=A4?=
 <ville-matti.hakanpaa@futuriot.com>
Date: Wed, 18 Dec 2019 15:03:14 +0200
Subject: [PATCH 2/3] Better .gitignore

---
 .gitignore | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/.gitignore b/.gitignore
index 47e0b4d6..f7c0d5e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,16 +17,42 @@
 .idea/
 
 # Visual Studio Code related
+.classpath
+.project
+.settings/
 .vscode/
 
+# Flutter repo-specific
+/bin/cache/
+/bin/mingit/
+/dev/benchmarks/mega_gallery/
+/dev/bots/.recipe_deps
+/dev/bots/android_tools/
+/dev/docs/doc/
+/dev/docs/flutter.docs.zip
+/dev/docs/lib/
+/dev/docs/pubspec.yaml
+/dev/integration_tests/**/xcuserdata
+/dev/integration_tests/**/Pods
+/packages/flutter/coverage/
+version
+
+# packages file containing multi-root paths
+.packages.generated
+
 # Flutter/Dart/Pub related
 **/doc/api/
 .dart_tool/
 .flutter-plugins
+.flutter-plugins-dependencies
 .packages
 .pub-cache/
 .pub/
 build/
+flutter_*.png
+linked_*.ds
+unlinked.ds
+unlinked_spec.ds
 
 # Android related
 **/android/**/gradle-wrapper.jar
@@ -36,6 +62,8 @@ build/
 **/android/gradlew.bat
 **/android/local.properties
 **/android/**/GeneratedPluginRegistrant.java
+**/android/key.properties
+*.jks
 
 # iOS/XCode related
 **/ios/**/*.mode1v3
@@ -56,16 +84,22 @@ build/
 **/ios/.generated/
 **/ios/Flutter/App.framework
 **/ios/Flutter/Flutter.framework
+**/ios/Flutter/Flutter.podspec
 **/ios/Flutter/Generated.xcconfig
 **/ios/Flutter/app.flx
 **/ios/Flutter/app.zip
 **/ios/Flutter/flutter_assets/
+**/ios/Flutter/flutter_export_environment.sh
 **/ios/ServiceDefinitions.json
 **/ios/Runner/GeneratedPluginRegistrant.*
 
+# Coverage
+coverage/
+
 # Exceptions to above rules.
 !**/ios/**/default.mode1v3
 !**/ios/**/default.mode2v3
 !**/ios/**/default.pbxuser
 !**/ios/**/default.perspectivev3
 !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
+!/dev/ci/**/Gemfile.lock
\ No newline at end of file

From 1e89eb973b9cfa6a6bd5a265ffcc6f965003a8c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville-Matti=20Hakanp=C3=A4=C3=A4?=
 <ville-matti.hakanpaa@futuriot.com>
Date: Wed, 18 Dec 2019 15:05:29 +0200
Subject: [PATCH 3/3] Made it compile with latest Android updates

---
 android/app/build.gradle                         | 2 +-
 android/build.gradle                             | 2 +-
 android/gradle/wrapper/gradle-wrapper.properties | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index ec87a918..1036ad70 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     lintOptions {
         disable 'InvalidPackage'
diff --git a/android/build.gradle b/android/build.gradle
index bb8a3038..6de37289 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.5.3'
     }
 }
 
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 2819f022..63ab3ae0 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip