diff --git a/gradle/variables.gradle b/gradle/variables.gradle index 93ffcbcb9dc31042435d8efeccf4ab60f01be706..7f0f564b5b9e8984fa11dd094a575a60fc5b4301 100644 --- a/gradle/variables.gradle +++ b/gradle/variables.gradle @@ -1,9 +1,9 @@ ext { kotlin_version = '1.7.10' hilt_version = '2.43.2' - nav_version = '2.4.2' - tor_version = '0.4.5.12-2' - obfs4_version = '0.0.12' + nav_version = '2.5.2' + tor_version = '0.4.5.14' + obfs4_version = '0.0.14' junit_version = '5.7.2' mockk_version = '1.10.4' ktlint_plugin_version = '10.2.1' diff --git a/mailbox-android/build.gradle b/mailbox-android/build.gradle index 7f0aa388a6f3740cf3e7d5e9776157375dcac03b..76e1c15d33a78333cf6f13db65ee54090bf49de8 100644 --- a/mailbox-android/build.gradle +++ b/mailbox-android/build.gradle @@ -15,8 +15,8 @@ checkstyle { } android { - compileSdkVersion 32 - buildToolsVersion "32.0.0" + compileSdkVersion 33 + buildToolsVersion "33.0.0" defaultConfig { applicationId "org.briarproject.mailbox" @@ -32,7 +32,11 @@ android { buildTypes { release { - minifyEnabled false + minifyEnabled true + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + debug { + minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } @@ -64,12 +68,12 @@ dependencies { implementation 'org.briarproject:dont-kill-me-lib:0.2.5' implementation 'com.github.tony19:logback-android:2.0.0' - implementation 'androidx.appcompat:appcompat:1.4.2' - implementation "androidx.activity:activity-ktx:1.4.0" - implementation "androidx.fragment:fragment-ktx:1.4.1" + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation "androidx.activity:activity-ktx:1.6.0" + implementation "androidx.fragment:fragment-ktx:1.5.3" implementation 'androidx.preference:preference-ktx:1.2.0' - def lifecycle_version = "2.4.1" + def lifecycle_version = "2.5.1" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version" diff --git a/mailbox-android/proguard-rules.pro b/mailbox-android/proguard-rules.pro index 481bb434814107eb79d7a30b676d344b0df2f8ce..8644c9c80602a1ad9467956725a47cd340feef07 100644 --- a/mailbox-android/proguard-rules.pro +++ b/mailbox-android/proguard-rules.pro @@ -5,17 +5,7 @@ # For more details, see # http://developer.android.com/guide/developing/tools/proguard.html -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} +-dontobfuscate +-keepattributes SourceFile, LineNumberTable, *Annotation*, Signature, InnerClasses, EnclosingMethod -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file +-keep class org.h2.** { *; }