updates for 4.8.1

niccellular · Sep 12, 2023 · 164f311 · 164f311
1 parent a958e08
commit 164f311
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 7 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -38,7 +38,7 @@ buildscript {
         return getProperty(urlKey, null) != null
     }
 
-    ext.takrepoUrl = getProperty(urlKey, 'http://localhost/')
+    ext.takrepoUrl = getProperty(urlKey, 'https://localhost/')
     ext.takrepoUser = getProperty('takrepo.user', 'invalid')
     ext.takrepoPassword = getProperty('takrepo.password', 'invalid')
     ext.takdevPlugin = getProperty('takdev.plugin', "${rootDir}/../../atak-gradle-takdev.jar")
@@ -59,7 +59,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.2'
+        classpath 'com.android.tools.build:gradle:4.2.2'
         if(isDevKitEnabled()) {
             classpath "com.atakmap.gradle:atak-gradle-takdev:${takdevVersion}"
         } else {
@@ -129,13 +129,18 @@ def getVersionCode() {
 
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion "29.0.2"
+    compileSdkVersion 33
+    buildToolsVersion "34.0.0"
 
    dexOptions {
         jumboMode = true
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
     lintOptions {
           checkReleaseBuilds true
           // Or, if you prefer, you can continue to check for errors in release builds,
@@ -289,6 +294,7 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: '*.jar')
-    implementation 'com.paulmandal.atak:libcotshrink:1.0.2'
-    //implementation 'com.google.protobuf:protobuf-lite:3.0.1'
+    implementation 'com.paulmandal.atak:libcotshrink:1.0.3'
+
 }
+
diff --git a/app/proguard-gradle.txt b/app/proguard-gradle.txt
@@ -8,7 +8,7 @@
 -keepattributes SourceFile,LineNumberTable
 
 -applymapping <atak.proguard.mapping>
--repackageclasses atakplugin.PluginTemplate
+-repackageclasses atakplugin.aprstak
 
 -keepattributes *Annotation*
 -keepattributes Signature, InnerClasses
@@ -56,3 +56,20 @@
 # overcome an existing bug in the gradle subsystem (3.5.x)
 -keep class module-info
 
+# libcotshrink
+-keep class javax.** {*;}
+-keep class com.google.** {*;}
+-keep class com.siemens.** {*;}
+-keep class com.sun.** {*;}
+-keep class eo.view.** {*;}
+-keep class javax.** {*;}
+-keep class me.dm7.** {*;}
+-keep class org.apache.** {*;}
+-keep class org.w3c.** {*;}
+-keep class org.xml.** {*;}
+-keep class org.xmlpull.** {*;}
+
+
+-dontwarn org.xmlpull.**
+-dontwarn org.xml.sax.ContentHandler
+-dontwarn org.xml.sax.XMLReader