Skip to content

Commit 164f311

Browse files
committed
updates for 4.8.1
1 parent a958e08 commit 164f311

File tree

2 files changed

+30
-7
lines changed

2 files changed

+30
-7
lines changed

app/build.gradle

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ buildscript {
3838
return getProperty(urlKey, null) != null
3939
}
4040

41-
ext.takrepoUrl = getProperty(urlKey, 'http://localhost/')
41+
ext.takrepoUrl = getProperty(urlKey, 'https://localhost/')
4242
ext.takrepoUser = getProperty('takrepo.user', 'invalid')
4343
ext.takrepoPassword = getProperty('takrepo.password', 'invalid')
4444
ext.takdevPlugin = getProperty('takdev.plugin', "${rootDir}/../../atak-gradle-takdev.jar")
@@ -59,7 +59,7 @@ buildscript {
5959
}
6060
}
6161
dependencies {
62-
classpath 'com.android.tools.build:gradle:4.0.2'
62+
classpath 'com.android.tools.build:gradle:4.2.2'
6363
if(isDevKitEnabled()) {
6464
classpath "com.atakmap.gradle:atak-gradle-takdev:${takdevVersion}"
6565
} else {
@@ -129,13 +129,18 @@ def getVersionCode() {
129129

130130

131131
android {
132-
compileSdkVersion 26
133-
buildToolsVersion "29.0.2"
132+
compileSdkVersion 33
133+
buildToolsVersion "34.0.0"
134134

135135
dexOptions {
136136
jumboMode = true
137137
}
138138

139+
compileOptions {
140+
sourceCompatibility JavaVersion.VERSION_1_8
141+
targetCompatibility JavaVersion.VERSION_1_8
142+
}
143+
139144
lintOptions {
140145
checkReleaseBuilds true
141146
// Or, if you prefer, you can continue to check for errors in release builds,
@@ -289,6 +294,7 @@ android {
289294

290295
dependencies {
291296
implementation fileTree(dir: 'libs', include: '*.jar')
292-
implementation 'com.paulmandal.atak:libcotshrink:1.0.2'
293-
//implementation 'com.google.protobuf:protobuf-lite:3.0.1'
297+
implementation 'com.paulmandal.atak:libcotshrink:1.0.3'
298+
294299
}
300+

app/proguard-gradle.txt

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
-keepattributes SourceFile,LineNumberTable
99

1010
-applymapping <atak.proguard.mapping>
11-
-repackageclasses atakplugin.PluginTemplate
11+
-repackageclasses atakplugin.aprstak
1212

1313
-keepattributes *Annotation*
1414
-keepattributes Signature, InnerClasses
@@ -56,3 +56,20 @@
5656
# overcome an existing bug in the gradle subsystem (3.5.x)
5757
-keep class module-info
5858

59+
# libcotshrink
60+
-keep class javax.** {*;}
61+
-keep class com.google.** {*;}
62+
-keep class com.siemens.** {*;}
63+
-keep class com.sun.** {*;}
64+
-keep class eo.view.** {*;}
65+
-keep class javax.** {*;}
66+
-keep class me.dm7.** {*;}
67+
-keep class org.apache.** {*;}
68+
-keep class org.w3c.** {*;}
69+
-keep class org.xml.** {*;}
70+
-keep class org.xmlpull.** {*;}
71+
72+
73+
-dontwarn org.xmlpull.**
74+
-dontwarn org.xml.sax.ContentHandler
75+
-dontwarn org.xml.sax.XMLReader

0 commit comments

Comments
 (0)