meshtastic/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-20 22:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

0.6.0 (and update to latest libs)

Browse source
This commit is contained in:
geeksville 2020-04-29 11:39:43 -07:00
parent f4e96b936f
commit 3a8ed8bf20
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/build.gradle
View file

@ -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')
}

2
geeksville-androidlib

@ -1 +1 @@
Subproject commit 3cd0234f35caefff935b30ecf83f1aeb2994145a
Subproject commit e3d602bb112303d5dcbb44ddf964545d088654d3