Bless AndreK

TardisMoon · May 12, 2024 · ef8a6f6 · ef8a6f6
1 parent c79d390
commit ef8a6f6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -220,9 +220,13 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: '*.jar')
 
-    implementation 'com.paulmandal.atak:libcotshrink:1.0.4'
+    implementation ('com.paulmandal.atak:libcotshrink:1.0.4') {
+        exclude group: 'com.google.protobuf', module: 'protobuf-javalite'
+    }
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime:1.0-M1-1.4.0-rc"
-    implementation 'com.google.protobuf:protobuf-kotlin-lite:3.21.12'
+    implementation 'com.google.protobuf:protobuf-kotlin:3.21.12'
+
+
 
 
 
@@ -231,22 +235,22 @@ dependencies {
 
 protobuf {
     protoc {
-        artifact = 'com.google.protobuf:protoc:3.21.9'
+        artifact = 'com.google.protobuf:protoc:3.21.12'
     }
+    /*
     plugins {
         javalite {
             // The codegen for lite comes as a separate artifact
             artifact = 'com.google.protobuf:protoc-gen-javalite:3.0.0'
         }
     }
+    */
     generateProtoTasks {
         all().each { task ->
             task.builtins {
                 java {
-                    option 'lite'
                 }
                 kotlin {
-                    option 'lite'
                 }
             }
         }

diff --git a/app/src/main/protobufs b/app/src/main/protobufs
+0 −6		meshtastic/channel.proto
+0 −11		meshtastic/mesh.proto
+0 −5		meshtastic/telemetry.proto