Skip to content

Commit

Permalink
Clean up
Browse files Browse the repository at this point in the history 
- updated the build version and target sdk

- removed the proguard diff text

- fixed the manifest missing exported in the activity
  • Loading branch information
@niccellular
niccellular committed Sep 7, 2023
1 parent 5e7ef0f commit 2d0b8ad
Show file tree
Hide file tree
Showing 6 changed files with 226 additions and 25 deletions.
220 changes: 220 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,3 +270,223 @@ app/build/android_keystore
.gradle/7.3.3/dependencies-accessors/gc.properties
.gradle/7.3.3/dependencies-accessors/dependencies-accessors.lock
.gradle/7.3.3/checksums/checksums.lock
app/build/generated/aidl_source_output_dir/civRelease/out/com/geeksville/mesh/IMeshService.java
app/build/generated/source/buildConfig/civ/release/com/atakmap/android/meshtastic/plugin/BuildConfig.java
app/build/intermediates/aapt_proguard_file/civRelease/aapt_rules.txt
app/build/intermediates/annotation_processor_list/civRelease/annotationProcessors.json
app/build/intermediates/apk/civ/release/ATAK-Plugin-Meshtastic Plugin-1.0.2-5e7ef0f2-4.8.1-civ-release.apk
app/build/intermediates/apk/civ/release/output-metadata.json
app/build/intermediates/apk_ide_redirect_file/civRelease/redirect.txt
app/build/intermediates/app_metadata/civRelease/app-metadata.properties
app/build/intermediates/assets/civRelease/mergeCivReleaseAssets/plugin.xml
app/build/intermediates/compatible_screen_manifest/civRelease/output-metadata.json
app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/civRelease/R.jar
app/build/intermediates/compressed_assets/civRelease/out/assets/plugin.xml.jar
app/build/intermediates/default_proguard_files/global/proguard-android-optimize.txt-7.2.2
app/build/intermediates/default_proguard_files/global/proguard-android.txt-7.2.2
app/build/intermediates/default_proguard_files/global/proguard-defaults.txt-7.2.2
app/build/intermediates/dex/civRelease/minifyCivReleaseWithR8/classes.dex
app/build/intermediates/incremental/civRelease-mergeJavaRes/merge-state
app/build/intermediates/incremental/civRelease-mergeJavaRes/zip-cache/0BkMDSYduf0hPkHtllxGvU13dho=
app/build/intermediates/incremental/civRelease-mergeJavaRes/zip-cache/4KuLaeEQcNX8iaNPWQjeGOjEvIo=
app/build/intermediates/incremental/civRelease-mergeJavaRes/zip-cache/4wGhhBawggL_xioSol8tSf_Vy1g=
app/build/intermediates/incremental/civRelease-mergeJavaRes/zip-cache/9H4GvtD3jbTpw7O+WlrXdDb_oHw=
app/build/intermediates/incremental/civRelease-mergeJavaRes/zip-cache/A4AubnQLtbGo7t2yFlmQvRRz4Bc=
app/build/intermediates/incremental/civRelease-mergeJavaRes/zip-cache/BNQrPUVZ0MMS9r9laZgohgq5quo=
app/build/intermediates/incremental/civRelease-mergeJavaRes/zip-cache/bPHmO8giJ_cIhlIzCs7qjQ9ovSI=
app/build/intermediates/incremental/civRelease-mergeJavaRes/zip-cache/bXZ619A4ytUcvTevfuQOErU6sLg=
app/build/intermediates/incremental/civRelease-mergeJavaRes/zip-cache/E5TaKiEkfJQjTNx8HYvYRTNyzP8=
app/build/intermediates/incremental/civRelease-mergeJavaRes/zip-cache/iSx2110Ii970wpZLvm_U841p_iI=
app/build/intermediates/incremental/civRelease-mergeJavaRes/zip-cache/Ki_AMSbuiLjRGADypHhhU3iAfng=
app/build/intermediates/incremental/civRelease-mergeJavaRes/zip-cache/M4UDiFyvskSGoj9miTa5tzbE80U=
app/build/intermediates/incremental/civRelease-mergeJavaRes/zip-cache/OnJ+i2f_ktAEN+WNW_3om8oFiiI=
app/build/intermediates/incremental/civRelease-mergeJavaRes/zip-cache/pq72BQuI2BZ4cz_OpIGZE2jZAsc=
app/build/intermediates/incremental/civRelease-mergeJavaRes/zip-cache/Qi2WzPstRTQdzWnjy4dHJUoU45Y=
app/build/intermediates/incremental/civRelease-mergeJavaRes/zip-cache/rGdr+jwHRYLVQqlr35pbdd76FnA=
app/build/intermediates/incremental/civRelease-mergeJavaRes/zip-cache/T6mxQKacayyfQWop+NzeBPDG6LI=
app/build/intermediates/incremental/civRelease-mergeJavaRes/zip-cache/ULSuGxbRlrqBTtDILfK0Rc5FG7w=
app/build/intermediates/incremental/civRelease-mergeJavaRes/zip-cache/VsX8itP9iEmPBdcl_aW869yrEL8=
app/build/intermediates/incremental/civRelease-mergeJavaRes/zip-cache/x9gWHAq4EGmMjFQFn342gi9LEpQ=
app/build/intermediates/incremental/civRelease/mergeCivReleaseResources/compile-file-map.properties
app/build/intermediates/incremental/civRelease/mergeCivReleaseResources/merged.dir/values/values.xml
app/build/intermediates/incremental/civRelease/mergeCivReleaseResources/merger.xml
app/build/intermediates/incremental/lintVitalAnalyzeCivRelease/civRelease-mainArtifact-dependencies.xml
app/build/intermediates/incremental/lintVitalAnalyzeCivRelease/civRelease-mainArtifact-libraries.xml
app/build/intermediates/incremental/lintVitalAnalyzeCivRelease/civRelease.xml
app/build/intermediates/incremental/lintVitalAnalyzeCivRelease/module.xml
app/build/intermediates/incremental/lintVitalReportCivRelease/civRelease-mainArtifact-dependencies.xml
app/build/intermediates/incremental/lintVitalReportCivRelease/civRelease-mainArtifact-libraries.xml
app/build/intermediates/incremental/lintVitalReportCivRelease/civRelease.xml
app/build/intermediates/incremental/lintVitalReportCivRelease/module.xml
app/build/intermediates/incremental/mergeCivReleaseAssets/merger.xml
app/build/intermediates/incremental/mergeCivReleaseJniLibFolders/merger.xml
app/build/intermediates/incremental/mergeCivReleaseShaders/merger.xml
app/build/intermediates/incremental/packageCivRelease/tmp/civRelease/dex-renamer-state.txt
app/build/intermediates/incremental/packageCivRelease/tmp/civRelease/zip-cache/androidResources
app/build/intermediates/incremental/packageCivRelease/tmp/civRelease/zip-cache/javaResources0
app/build/intermediates/javac/civRelease/classes/com/atakmap/android/meshtastic/MeshtasticMapComponent$1.class
app/build/intermediates/javac/civRelease/classes/com/atakmap/android/meshtastic/MeshtasticMapComponent$ServiceConnectionState.class
app/build/intermediates/javac/civRelease/classes/com/atakmap/android/meshtastic/MeshtasticMapComponent.class
app/build/intermediates/javac/civRelease/classes/com/atakmap/android/meshtastic/MeshtasticReceiver.class
app/build/intermediates/javac/civRelease/classes/com/atakmap/android/meshtastic/MeshtasticWidget.class
app/build/intermediates/javac/civRelease/classes/com/atakmap/android/meshtastic/plugin/BuildConfig.class
app/build/intermediates/javac/civRelease/classes/com/atakmap/android/meshtastic/plugin/MeshtasticLifecycle.class
app/build/intermediates/javac/civRelease/classes/com/atakmap/android/meshtastic/plugin/MeshtasticTool.class
app/build/intermediates/javac/civRelease/classes/com/atakmap/android/meshtastic/plugin/PluginNativeLoader.class
app/build/intermediates/javac/civRelease/classes/com/geeksville/mesh/IMeshService$_Parcel.class
app/build/intermediates/javac/civRelease/classes/com/geeksville/mesh/IMeshService$Default.class
app/build/intermediates/javac/civRelease/classes/com/geeksville/mesh/IMeshService$Stub$Proxy.class
app/build/intermediates/javac/civRelease/classes/com/geeksville/mesh/IMeshService$Stub.class
app/build/intermediates/javac/civRelease/classes/com/geeksville/mesh/IMeshService.class
app/build/intermediates/lint-cache/lint-cache-version.txt
app/build/intermediates/lint_vital_intermediate_text_report/civRelease/lint-results-civRelease.txt
app/build/intermediates/lint_vital_return_value/civRelease/return-value-civRelease.txt
app/build/intermediates/manifest_merge_blame_file/civRelease/manifest-merger-blame-civ-release-report.txt
app/build/intermediates/merged_java_res/civRelease/base.jar
app/build/intermediates/merged_manifest/civRelease/AndroidManifest.xml
app/build/intermediates/merged_manifests/civRelease/AndroidManifest.xml
app/build/intermediates/merged_manifests/civRelease/output-metadata.json
app/build/intermediates/merged_res/civRelease/drawable_btn_gray.xml.flat
app/build/intermediates/merged_res/civRelease/drawable_ic_green.png.flat
app/build/intermediates/merged_res/civRelease/drawable_ic_launcher.png.flat
app/build/intermediates/merged_res/civRelease/drawable_ic_red.png.flat
app/build/intermediates/merged_res/civRelease/drawable_new_dark_button_bg.xml.flat
app/build/intermediates/merged_res/civRelease/drawable_new_dark_button_disabled.xml.flat
app/build/intermediates/merged_res/civRelease/drawable_new_dark_button_selected.xml.flat
app/build/intermediates/merged_res/civRelease/layout_main_layout.xml.flat
app/build/intermediates/merged_res/civRelease/values_values.arsc.flat
app/build/intermediates/merged_res/civRelease/xml_preferences.xml.flat
app/build/intermediates/merged_res_blame_folder/civRelease/out/multi-v2/civRelease.json
app/build/intermediates/merged_res_blame_folder/civRelease/out/multi-v2/values.json
app/build/intermediates/merged_res_blame_folder/civRelease/out/single/civRelease.json
app/build/intermediates/metadata_library_dependencies_report/civRelease/dependencies.pb
app/build/intermediates/navigation_json/civRelease/navigation.json
app/build/intermediates/optimized_processed_res/civRelease/output-metadata.json
app/build/intermediates/optimized_processed_res/civRelease/resources-civ-release-optimize.ap_
app/build/intermediates/packaged_manifests/civRelease/AndroidManifest.xml
app/build/intermediates/packaged_manifests/civRelease/output-metadata.json
app/build/intermediates/processed_res/civRelease/out/output-metadata.json
app/build/intermediates/processed_res/civRelease/out/resources-civRelease.ap_
app/build/intermediates/runtime_symbol_list/civRelease/R.txt
app/build/intermediates/sdk_dependency_data/civRelease/sdkDependencyData.pb
app/build/intermediates/shrunk_java_res/civRelease/shrunkJavaRes.jar
app/build/intermediates/signing_config_versions/civRelease/signing-config-versions.json
app/build/intermediates/source_set_path_map/civRelease/file-map.txt
app/build/intermediates/stable_resource_ids_file/civRelease/stableIds.txt
app/build/intermediates/symbol_list_with_package_name/civRelease/package-aware-r.txt
app/build/kotlin/compileCivReleaseKotlin/build-history.bin
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/inputs/source-to-output.tab
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/inputs/source-to-output.tab.keystream
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/inputs/source-to-output.tab.keystream.len
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/inputs/source-to-output.tab.len
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/inputs/source-to-output.tab.values.at
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/inputs/source-to-output.tab_i
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/inputs/source-to-output.tab_i.len
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/class-attributes.tab
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/class-attributes.tab.keystream
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/class-attributes.tab.keystream.len
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/class-attributes.tab.len
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/class-attributes.tab.values.at
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/class-attributes.tab_i
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/class-attributes.tab_i.len
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream.len
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.len
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i.len
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/constants.tab
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/constants.tab.keystream
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/constants.tab.keystream.len
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/constants.tab.len
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/constants.tab.values.at
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/constants.tab_i
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/constants.tab_i.len
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i.len
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/proto.tab
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream.len
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/proto.tab.len
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/proto.tab_i
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/proto.tab_i.len
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.len
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i.len
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/subtypes.tab
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/subtypes.tab.keystream
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/subtypes.tab.keystream.len
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/subtypes.tab.len
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/subtypes.tab.values.at
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/subtypes.tab_i
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/subtypes.tab_i.len
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/supertypes.tab
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/supertypes.tab.keystream
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/supertypes.tab.keystream.len
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/supertypes.tab.len
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/supertypes.tab.values.at
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/supertypes.tab_i
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/jvm/kotlin/supertypes.tab_i.len
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/lookups/counters.tab
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/lookups/file-to-id.tab
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/lookups/file-to-id.tab.keystream
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/lookups/file-to-id.tab.keystream.len
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/lookups/file-to-id.tab.len
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/lookups/file-to-id.tab.values.at
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/lookups/file-to-id.tab_i
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/lookups/file-to-id.tab_i.len
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/lookups/id-to-file.tab
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/lookups/id-to-file.tab.keystream
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/lookups/id-to-file.tab.len
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/lookups/id-to-file.tab.values.at
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/lookups/id-to-file.tab_i
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/lookups/id-to-file.tab_i.len
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/lookups/lookups.tab
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/lookups/lookups.tab.keystream
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/lookups/lookups.tab.keystream.len
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/lookups/lookups.tab.len
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/lookups/lookups.tab.values.at
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/lookups/lookups.tab_i
app/build/kotlin/compileCivReleaseKotlin/caches-jvm/lookups/lookups.tab_i.len
app/build/kotlin/compileCivReleaseKotlin/last-build.bin
app/build/kotlinToolingMetadata/kotlin-tooling-metadata.json
app/build/outputs/logs/manifest-merger-civ-release-report.txt
app/build/outputs/mapping/civRelease/configuration.txt
app/build/outputs/mapping/civRelease/mapping.txt
app/build/outputs/mapping/civRelease/missing_rules.txt
app/build/outputs/mapping/civRelease/seeds.txt
app/build/outputs/sdk-dependencies/civRelease/sdkDependencies.txt
app/build/proguard-civ-release-mapping.txt
app/build/tmp/compileCivReleaseJavaWithJavac/previous-compilation-data.bin
app/build/tmp/kotlin-classes/civRelease/com/geeksville/mesh/DataPacket$CREATOR.class
app/build/tmp/kotlin-classes/civRelease/com/geeksville/mesh/DataPacket.class
app/build/tmp/kotlin-classes/civRelease/com/geeksville/mesh/DeviceMetrics$Companion.class
app/build/tmp/kotlin-classes/civRelease/com/geeksville/mesh/DeviceMetrics$Creator.class
app/build/tmp/kotlin-classes/civRelease/com/geeksville/mesh/DeviceMetrics.class
app/build/tmp/kotlin-classes/civRelease/com/geeksville/mesh/EnvironmentMetrics$Companion.class
app/build/tmp/kotlin-classes/civRelease/com/geeksville/mesh/EnvironmentMetrics$Creator.class
app/build/tmp/kotlin-classes/civRelease/com/geeksville/mesh/EnvironmentMetrics.class
app/build/tmp/kotlin-classes/civRelease/com/geeksville/mesh/MeshUser$Creator.class
app/build/tmp/kotlin-classes/civRelease/com/geeksville/mesh/MeshUser.class
app/build/tmp/kotlin-classes/civRelease/com/geeksville/mesh/MessageStatus$Creator.class
app/build/tmp/kotlin-classes/civRelease/com/geeksville/mesh/MessageStatus.class
app/build/tmp/kotlin-classes/civRelease/com/geeksville/mesh/MyNodeInfo$CREATOR.class
app/build/tmp/kotlin-classes/civRelease/com/geeksville/mesh/MyNodeInfo.class
app/build/tmp/kotlin-classes/civRelease/com/geeksville/mesh/NodeInfo$Creator.class
app/build/tmp/kotlin-classes/civRelease/com/geeksville/mesh/NodeInfo.class
app/build/tmp/kotlin-classes/civRelease/com/geeksville/mesh/Position$Companion.class
app/build/tmp/kotlin-classes/civRelease/com/geeksville/mesh/Position$Creator.class
app/build/tmp/kotlin-classes/civRelease/com/geeksville/mesh/Position.class
app/build/tmp/kotlin-classes/civRelease/META-INF/ATAK-Plugin-Meshtastic Plugin-1.0.2-5e7ef0f2-4.8.1_civRelease.kotlin_module
6 changes: 3 additions & 3 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

buildscript {

ext.PLUGIN_VERSION = "1.3"
ext.PLUGIN_VERSION = "1.0.2"
ext.ATAK_VERSION = "4.8.1"

def takdevVersion = '2.+'
Expand Down Expand Up @@ -87,8 +87,8 @@ apply plugin: 'kotlinx-serialization'
apply plugin: 'atak-takdev-plugin'

android {
compileSdkVersion 30
buildToolsVersion "30.0.3"
compileSdkVersion 33
buildToolsVersion "34.0.0"

dexOptions {
jumboMode = true
Expand Down
Binary file removed app/key.jks
View file
Binary file not shown.
1 change: 1 addition & 0 deletions app/key.jks
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/Users/user/atak/key.jks
4 changes: 0 additions & 4 deletions app/proguard-gradle.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,6 @@
# These classes use Parcelable
-keep class com.geeksville.mesh.** { *; }

<<<<<<< HEAD
# ATAK Forwarder Libraries
=======
>>>>>>> aa1549a6a8b4cfcecd8a437bb9713abc62753cba
-keep class com.google.** {*;}
-keep class com.siemens.** {*;}
-keep class com.sun.** {*;}
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@

<!-- allow for plugin discovery -->
<activity android:name="com.atakmap.app.component"
tools:ignore="MissingClass">
tools:ignore="MissingClass"
android:exported="true">
<intent-filter android:label="@string/app_name">
<action android:name="com.atakmap.app.component" />
</intent-filter>
Expand Down
Loading

0 comments on commit 2d0b8ad

Please sign in to comment.