Merge pull request #7 from meshtastic/4.10.0

Merge latest plugin architecture. I do not plan to support the older ATAK plugin arch going foward.
meshtastic · Feb 8, 2024 · 26fbecf · 26fbecf
2 parents ede8b77 + 2cf3649
commit 26fbecf
Show file tree

Hide file tree

Showing 11 changed files with 475 additions and 250 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,9 @@
 
 buildscript {
 
-    ext.PLUGIN_VERSION = "1.0.4"
-    ext.ATAK_VERSION = "4.8.1"
+
+    ext.PLUGIN_VERSION = "1.0.5"
+    ext.ATAK_VERSION = "4.10.0"
 
     def takdevVersion = '2.+'
 
@@ -59,7 +60,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:7.4.2'
         if(isDevKitEnabled()) {
             classpath "com.atakmap.gradle:atak-gradle-takdev:${takdevVersion}"
         } else {
@@ -81,6 +82,7 @@ allprojects {
 }
 
 apply plugin: 'com.android.application'
+apply plugin: 'com.google.protobuf'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-parcelize'
 apply plugin: 'kotlinx-serialization'
@@ -187,6 +189,11 @@ android {
             setProperty("archivesBaseName", "ATAK-Plugin-" + rootProject.name + "-" + PLUGIN_VERSION + "-" + getVersionName() + "-" + ATAK_VERSION)
             defaultConfig.versionCode = getVersionCode()
             defaultConfig.versionName = PLUGIN_VERSION + " (" + getVersionName() + ") - [" + ATAK_VERSION + "]"
+
+
+            proto {
+                srcDir 'src/main/protobufs'
+            }
         }
 
         // Move the build types to build-types/<type>
@@ -213,8 +220,35 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: '*.jar')
 
-    implementation 'com.paulmandal.atak:libcotshrink:1.0.3'
+    implementation 'com.paulmandal.atak:libcotshrink:1.0.4'
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime:1.0-M1-1.4.0-rc"
+    implementation 'com.google.protobuf:protobuf-kotlin-lite:3.21.12'
+
+
+
 
+}
 
+protobuf {
+    protoc {
+        artifact = 'com.google.protobuf:protoc:3.21.9'
+    }
+    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/proguard-gradle.txt b/app/proguard-gradle.txt
@@ -50,9 +50,10 @@
 
 -keep class * extends transapps.maps.plugin.tool.Tool {
 }
--keep class * implements transapps.maps.plugin.lifecycle.Lifecycle {
+-keep class * implements gov.tak.api.plugin.IPlugin {
 }
 
+
 # overcome an existing bug in the gradle subsystem (3.5.x)
 -keep class module-info
 

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -16,9 +16,8 @@
 
        <!-- allow for plugin discovery -->
        <activity android:name="com.atakmap.app.component"
-           tools:ignore="MissingClass"
-           android:exported="true">
-           <intent-filter android:label="@string/app_name">
+           tools:ignore="MissingClass" android:exported="true">
+           <intent-filter android:label="@string/app_name" >
               <action android:name="com.atakmap.app.component" />
            </intent-filter>
        </activity>

diff --git a/app/src/main/assets/plugin.xml b/app/src/main/assets/plugin.xml
@@ -3,7 +3,7 @@
 <plugin>
 
     <extension
-        type="transapps.maps.plugin.lifecycle.Lifecycle"
+        type="gov.tak.api.plugin.IPlugin"
         impl="com.atakmap.android.meshtastic.plugin.MeshtasticLifecycle"
         singleton="true" />