From f61cd458473d0d529fa6b21483f09f00db97171c Mon Sep 17 00:00:00 2001
From: Kevin Hester <kevinh@geeksville.com>
Date: Wed, 21 Oct 2020 17:50:54 +0800
Subject: [PATCH] update to new gradle/android studio 4.1

---
 .idea/compiler.xml                       | 4 +---
 .idea/gradle.xml                         | 1 +
 .idea/vcs.xml                            | 1 +
 app/build.gradle                         | 6 +++---
 app/src/main/assets/firmware             | 1 +
 build.gradle                             | 2 +-
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 7 files changed, 10 insertions(+), 9 deletions(-)
 create mode 120000 app/src/main/assets/firmware

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 551d479b0..0f4a1a9c8 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel>
+    <bytecodeTargetLevel target="1.8">
       <module name="app" target="1.8" />
       <module name="geeksville-androidlib" target="1.7" />
       <module name="Mesh Util-geeksville-androidlib" target="1.7" />
-      <module name="Mesh_Util.app" target="1.8" />
-      <module name="Mesh_Util.geeksville-androidlib" target="1.7" />
     </bytecodeTargetLevel>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 54874b2cf..dba811c87 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -16,6 +16,7 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
+        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 404ddafec..e8f81507d 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -4,5 +4,6 @@
     <mapping directory="" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/app/src/main/proto" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/geeksville-androidlib" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/mesh_shared/src/main/proto" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 21fee36ad..e0c2a57e1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -114,11 +114,11 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.core:core-ktx:1.3.1'
+    implementation 'androidx.core:core-ktx:1.3.2'
     implementation 'androidx.fragment:fragment-ktx:1.2.5'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.2'
     implementation 'com.google.android.material:material:1.2.1'
     implementation 'androidx.viewpager2:viewpager2:1.0.0'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
@@ -166,7 +166,7 @@ dependencies {
     implementation 'com.google.android.gms:play-services-auth:18.1.0'
 
     // Add the Firebase SDK for Crashlytics.
-    implementation 'com.google.firebase:firebase-crashlytics:17.2.1'
+    implementation 'com.google.firebase:firebase-crashlytics:17.2.2'
 
     // alas implementation bug deep in the bowels when I tried it for my SyncBluetoothDevice class
     // implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.3"
diff --git a/app/src/main/assets/firmware b/app/src/main/assets/firmware
new file mode 120000
index 000000000..e52f5091a
--- /dev/null
+++ b/app/src/main/assets/firmware
@@ -0,0 +1 @@
+../../../../../meshtastic-esp32/release/latest/forandroid
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 20fef1900..473a5bc44 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 81725c2c8..fe37d07f9 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat May 30 13:30:38 PDT 2020
+#Wed Oct 21 17:39:27 CST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip