From dd39b98ae92387d0fe99c121f3cfe3d2554d2148 Mon Sep 17 00:00:00 2001
From: Oliver <oliver.henry.walters@gmail.com>
Date: Mon, 12 Jul 2021 23:32:30 +1000
Subject: [PATCH] Getting the project to compile again...

---
 android/app/build.gradle                  | 13 +++++++++----
 android/build.gradle                      |  9 ++-------
 ios/Flutter/flutter_export_environment.sh |  6 +++---
 pubspec.yaml                              |  4 ++--
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 90858c7a..b4181680 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -22,8 +22,8 @@ if (flutterVersionName == null) {
 }
 
 apply plugin: 'com.android.application'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 apply plugin: 'kotlin-android'
+apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 def keystoreProperties = new Properties()
 def keystorePropertiesFile = rootProject.file('key.properties')
@@ -32,7 +32,11 @@ if (keystorePropertiesFile.exists()) {
 }
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
+
+    sourceSets {
+        main.java.srcDirs += 'src/main/kotlin'
+    }
 
     packagingOptions {
         exclude 'META-INF/proguard/androidx-annotations.pro'
@@ -45,7 +49,7 @@ android {
     defaultConfig {
         applicationId "inventree.inventree_app"
         minSdkVersion 25
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -78,7 +82,8 @@ dependencies {
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
-    androidTestImplementation 'com.android.support:multidex:1.0.0'
+    androidTestImplementation 'com.android.support:multidex:2.0.1'
+    implementation "androidx.core:core:1.5.0-rc01"
     implementation 'androidx.appcompat:appcompat:1.0.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
diff --git a/android/build.gradle b/android/build.gradle
index 6eb9a08d..13b686e5 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.0'
+        classpath 'com.android.tools.build:gradle:4.1.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -25,12 +25,7 @@ subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
     project.evaluationDependsOn(':app')
     project.configurations.all {
-        resolutionStrategy.eachDependency { details ->
-            if (details.requested.group == 'androidx.core' &&
-                    !details.requested.name.contains('androidx')) {
-                details.useVersion "1.0.2"
-            }
-        }
+
     }
 }
 
diff --git a/ios/Flutter/flutter_export_environment.sh b/ios/Flutter/flutter_export_environment.sh
index 45b3742b..4b84d6e6 100644
--- a/ios/Flutter/flutter_export_environment.sh
+++ b/ios/Flutter/flutter_export_environment.sh
@@ -1,13 +1,13 @@
 #!/bin/sh
 # This is a generated file; do not edit or check into version control.
-export "FLUTTER_ROOT=C:\flutter"
+export "FLUTTER_ROOT=c:\flutter"
 export "FLUTTER_APPLICATION_PATH=C:\inventree-app"
 export "COCOAPODS_PARALLEL_CODE_SIGN=true"
 export "FLUTTER_TARGET=lib\main.dart"
 export "FLUTTER_BUILD_DIR=build"
 export "SYMROOT=${SOURCE_ROOT}/../build\ios"
-export "FLUTTER_BUILD_NAME=0.1.5"
-export "FLUTTER_BUILD_NUMBER=9"
+export "FLUTTER_BUILD_NAME=0.2.6"
+export "FLUTTER_BUILD_NUMBER=14"
 export "DART_OBFUSCATION=false"
 export "TRACK_WIDGET_CREATION=false"
 export "TREE_SHAKE_ICONS=false"
diff --git a/pubspec.yaml b/pubspec.yaml
index f90ca616..b3f634e2 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -7,7 +7,7 @@ description: InvenTree stock management
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 0.2.5+13
+version: 0.2.6+14
 
 environment:
   sdk: ">=2.12.0 <3.0.0"
@@ -30,7 +30,7 @@ dependencies:
   font_awesome_flutter: ^9.1.0            # FontAwesome icon set
   flutter_speed_dial: ^3.0.5              # FAB menu elements
   sentry_flutter: 5.0.0                   # Error reporting
-  flutter_typeahead: ^3.1.3               # Auto-complete input field
+  flutter_typeahead: ^3.1.0               # Auto-complete input field
   image_picker: ^0.8.0                    # Select or take photos
   url_launcher: 6.0.0                     # Open link in system browser
   flutter_markdown: ^0.6.2                # Rendering markdown