diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 551d479b..0f4a1a9c 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,12 +1,10 @@ - + - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 54874b2c..dba811c8 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -16,6 +16,7 @@ diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 404ddafe..e8f81507 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -4,5 +4,6 @@ + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 21fee36a..e0c2a57e 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 00000000..e52f5091 --- /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 20fef190..473a5bc4 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 81725c2c..fe37d07f 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