diff --git a/.gitmodules b/.gitmodules index 2e7f1273..e225f97e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "geeksville-androidlib"] path = geeksville-androidlib url = https://github.com/meshtastic/geeksville-androidlib.git +[submodule "design"] + path = design + url = https://github.com/meshtastic/meshtastic-design.git diff --git a/app/build.gradle b/app/build.gradle index 76523230..3650acd0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -165,7 +165,7 @@ dependencies { implementation 'com.google.android.gms:play-services-auth:19.0.0' // Add the Firebase SDK for Crashlytics. - implementation 'com.google.firebase:firebase-crashlytics:17.3.0' + implementation 'com.google.firebase:firebase-crashlytics:17.3.1' // 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" @@ -178,7 +178,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.4.0' + def work_version = '2.5.0' // Work Request - used to delay boot event handling // implementation "androidx.work:work-runtime:$work_version" diff --git a/build.gradle b/build.gradle index e0bb43c8..5c61f9d6 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.1.1' + classpath 'com.android.tools.build:gradle:4.1.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version" diff --git a/design b/design new file mode 160000 index 00000000..73ba05ce --- /dev/null +++ b/design @@ -0,0 +1 @@ +Subproject commit 73ba05ceef8beff81eb546a0b9e8ecad03a1216d diff --git a/geeksville-androidlib b/geeksville-androidlib index eeeab655..f3812d84 160000 --- a/geeksville-androidlib +++ b/geeksville-androidlib @@ -1 +1 @@ -Subproject commit eeeab655618ea3e978caa1ed5fdfb9b68a503d38 +Subproject commit f3812d8484c571f62c72d1509a1e02357fda5b8e