diff --git a/app/build.gradle b/app/build.gradle index 8cab59122..08e0929fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -90,7 +90,7 @@ play { // per protobuf-gradle-plugin docs, this is recommended for android protobuf { protoc { - artifact = 'com.google.protobuf:protoc:3.13.0' + artifact = 'com.google.protobuf:protoc:3.15.3' } generateProtoTasks { all().each { task -> @@ -145,7 +145,7 @@ dependencies { implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version" // For now I'm not using javalite, because I want JSON printing - implementation ('com.google.protobuf:protobuf-java:3.14.0') + implementation ('com.google.protobuf:protobuf-java:3.15.3') // For UART access // implementation 'com.google.android.things:androidthings:1.0' @@ -158,7 +158,7 @@ dependencies { implementation 'com.squareup.okhttp3:okhttp:4.9.0' // location services - implementation 'com.google.android.gms:play-services-location:17.1.0' + implementation 'com.google.android.gms:play-services-location:18.0.0' // For Google Sign-In (owner name accesss) implementation 'com.google.android.gms:play-services-auth:19.0.0' diff --git a/build.gradle b/build.gradle index cfef6d972..2f1a66ec5 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.4.30' + ext.kotlin_version = '1.4.31' ext.coroutines_version = "1.3.9" repositories { @@ -20,11 +20,11 @@ buildscript { // Add the Crashlytics Gradle plugin. // Check that you have the Google Services Gradle plugin v4.3.2 or later // (if not, add it). - classpath 'com.google.gms:google-services:4.3.4' - classpath 'com.google.firebase:firebase-crashlytics-gradle:2.4.1' + classpath 'com.google.gms:google-services:4.3.5' + classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.0' // protobuf plugin - docs here https://github.com/google/protobuf-gradle-plugin - classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.14' + classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.15' //classpath "app.brant:amazonappstorepublisher:0.1.0" classpath 'com.github.triplet.gradle:play-publisher:2.8.0' diff --git a/geeksville-androidlib b/geeksville-androidlib index cd0d0ab68..9b15752bb 160000 --- a/geeksville-androidlib +++ b/geeksville-androidlib @@ -1 +1 @@ -Subproject commit cd0d0ab688af967af7e609f6f10fdf2dde1249bc +Subproject commit 9b15752bb0ce1fa383a9f4b65e204d4dd0afb03b