From ea56191df8ac9660c3d768a3200fb09c4ad2c99d Mon Sep 17 00:00:00 2001
From: Alex Burlton <alexburlton@hotmail.com>
Date: Fri, 18 Feb 2022 10:59:18 +0000
Subject: [PATCH] more bumps of gradle & kotlin to get build working,
 hopefully...

---
 .github/workflows/flutter.yml                    | 1 +
 android/app/build.gradle                         | 2 +-
 android/build.gradle                             | 6 +++---
 android/gradle.properties                        | 1 -
 android/gradle/wrapper/gradle-wrapper.properties | 3 +--
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/flutter.yml b/.github/workflows/flutter.yml
index 77900b9..38abc34 100644
--- a/.github/workflows/flutter.yml
+++ b/.github/workflows/flutter.yml
@@ -17,3 +17,4 @@ jobs:
     - run: dart format --line-length 120 --set-exit-if-changed .
     - run: flutter analyze
     - run: flutter test
+    - run: flutter build apk
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 77c5c23..12623d0 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 31
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
diff --git a/android/build.gradle b/android/build.gradle
index 3100ad2..58c7aa8 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.5.31'
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:4.1.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
diff --git a/android/gradle.properties b/android/gradle.properties
index 38c8d45..94adc3a 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,4 +1,3 @@
 org.gradle.jvmargs=-Xmx1536M
-android.enableR8=true
 android.useAndroidX=true
 android.enableJetifier=true
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 296b146..622ab64 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Fri Jun 23 08:50:38 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip