From 3a8ed8bf2044c014be7173c55780795cbb81addd Mon Sep 17 00:00:00 2001
From: geeksville <kevinh@geeksville.com>
Date: Wed, 29 Apr 2020 11:39:43 -0700
Subject: [PATCH] 0.6.0 (and update to latest libs)

---
 app/build.gradle      | 12 ++++++------
 geeksville-androidlib |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 997c70b11..e15dca3a4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ android {
         applicationId "com.geeksville.mesh"
         minSdkVersion 22 // The oldest emulator image I have tried is 22 (though 21 probably works)
         targetSdkVersion 29
-        versionCode 159
-        versionName "0.5.9"
+        versionCode 160
+        versionName "0.6.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -100,7 +100,7 @@ dependencies {
     implementation 'androidx.viewpager2:viewpager2:1.0.0'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.2.0'
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 
@@ -118,7 +118,7 @@ dependencies {
     // For now I'm not using javalite, because I want JSON printing
     //implementation 'com.google.protobuf:protobuf-java:3.11.1'
     //implementation 'com.google.protobuf:protobuf-java-util:3.11.1'
-    implementation 'com.google.protobuf:protobuf-javalite:3.11.1'
+    implementation 'com.google.protobuf:protobuf-javalite:3.11.4'
 
     // mapbox
     implementation 'com.mapbox.mapboxsdk:mapbox-android-sdk:9.1.0'
@@ -133,7 +133,7 @@ dependencies {
     implementation 'com.google.android.gms:play-services-auth:18.0.0'
 
     // Add the Firebase SDK for Crashlytics.
-    implementation 'com.google.firebase:firebase-crashlytics:17.0.0-beta04'
+    implementation 'com.google.firebase:firebase-crashlytics:17.0.0'
 
     // 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"
@@ -144,7 +144,7 @@ dependencies {
     // barcode support
     // per https://github.com/journeyapps/zxing-android-embedded for support of android version 22
     implementation('com.journeyapps:zxing-android-embedded:4.1.0') { transitive = false }
-    implementation 'com.google.zxing:core:3.3.0'
+    implementation 'com.google.zxing:core:3.4.0'
 
     implementation project(':geeksville-androidlib')
 }
diff --git a/geeksville-androidlib b/geeksville-androidlib
index 3cd0234f3..e3d602bb1 160000
--- a/geeksville-androidlib
+++ b/geeksville-androidlib
@@ -1 +1 @@
-Subproject commit 3cd0234f35caefff935b30ecf83f1aeb2994145a
+Subproject commit e3d602bb112303d5dcbb44ddf964545d088654d3