Merge pull request #331 from meshtastic/release

1.2.52
pull/335/head
Jm Casler 2021-12-29 12:01:50 -08:00 zatwierdzone przez GitHub
commit 3ed96e56b9
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
3 zmienionych plików z 9 dodań i 11 usunięć

Wyświetl plik

@ -42,8 +42,8 @@ android {
applicationId "com.geeksville.mesh"
minSdkVersion 21 // The oldest emulator image I have tried is 22 (though 21 probably works)
targetSdkVersion 30 // 30 can't work until an explicit location permissions dialog is added
versionCode 20251 // format is Mmmss (where M is 1+the numeric major number
versionName "1.2.51"
versionCode 20252 // format is Mmmss (where M is 1+the numeric major number
versionName "1.2.52"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
// per https://developer.android.com/studio/write/vector-asset-studio
@ -121,15 +121,15 @@ protobuf {
dependencies {
def room_version = '2.3.0'
def room_version = '2.4.0'
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'androidx.appcompat:appcompat:1.3.1'
implementation 'androidx.appcompat:appcompat:1.4.0'
implementation 'androidx.core:core-ktx:1.7.0'
implementation 'androidx.fragment:fragment-ktx:1.3.6'
implementation 'androidx.fragment:fragment-ktx:1.4.0'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.recyclerview:recyclerview:1.2.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
implementation 'com.google.android.material:material:1.4.0'
implementation 'androidx.viewpager2:viewpager2:1.0.0'
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
@ -174,7 +174,7 @@ dependencies {
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.2.0'
implementation 'com.google.android.gms:play-services-auth:20.0.0'
// Add the Firebase SDK for Crashlytics.
implementation 'com.google.firebase:firebase-crashlytics:18.2.6'
@ -190,7 +190,7 @@ dependencies {
implementation('com.journeyapps:zxing-android-embedded:4.1.0') { transitive = false }
implementation 'com.google.zxing:core:3.4.1'
def work_version = '2.7.0'
def work_version = '2.7.1'
// Work Request - used to delay boot event handling
// implementation "androidx.work:work-runtime:$work_version"

Wyświetl plik

@ -21,8 +21,6 @@
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <!-- only useful if this phone can do BTLE -->
<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /> <!-- needed to access bluetooth when app is background -->
<uses-permission android:name="android.permission.WAKE_LOCK" /> <!-- for job intent service -->
<!--
This permission is required for analytics - and soon the MQTT gateway
-->

Wyświetl plik

@ -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.6.0'
ext.kotlin_version = '1.6.10'
ext.coroutines_version = "1.5.2"
repositories {