diff --git a/app/build.gradle.kts b/app/build.gradle.kts index da67bfd11..2471fc8c0 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -27,7 +27,7 @@ android { vectorDrawables.useSupportLibrary = true versionName = Config.version versionCode = Config.versionCode - ndk.abiFilters("armeabi-v7a", "arm64-v8a", "x86", "x86_64") + ndk.abiFilters.addAll(listOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64")) } buildTypes { @@ -51,18 +51,22 @@ android { } packagingOptions { - exclude("/META-INF/*") - exclude("/org/bouncycastle/**") - exclude("/kotlin/**") - exclude("/kotlinx/**") - exclude("/okhttp3/**") - exclude("/*.txt") - exclude("/*.bin") - doNotStrip("**/*.so") + resources { + excludes.add("/META-INF/*") + excludes.add("/org/bouncycastle/**") + excludes.add("/kotlin/**") + excludes.add("/kotlinx/**") + excludes.add("/okhttp3/**") + excludes.add("/*.txt") + excludes.add("/*.bin") + } + jniLibs { + keepDebugSymbols.add("**/*.so") + } } kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "11" } } @@ -170,7 +174,7 @@ android.applicationVariants.all { } } } - registerJavaGeneratingTask(genSrcTask.get(), outSrcDir) + registerJavaGeneratingTask(genSrcTask, outSrcDir) } dependencies { @@ -185,7 +189,7 @@ dependencies { implementation("com.github.topjohnwu:lz4-java:1.7.1") implementation("com.jakewharton.timber:timber:4.7.1") - val vBC = "1.68" + val vBC = "1.69" implementation("org.bouncycastle:bcprov-jdk15on:${vBC}") implementation("org.bouncycastle:bcpkix-jdk15on:${vBC}") @@ -232,10 +236,10 @@ dependencies { implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0") implementation("androidx.browser:browser:1.3.0") implementation("androidx.preference:preference:1.1.1") - implementation("androidx.recyclerview:recyclerview:1.2.0") - implementation("androidx.fragment:fragment-ktx:1.3.3") + implementation("androidx.recyclerview:recyclerview:1.2.1") + implementation("androidx.fragment:fragment-ktx:1.3.6") implementation("androidx.work:work-runtime-ktx:2.5.0") implementation("androidx.transition:transition:1.4.1") - implementation("androidx.core:core-ktx:1.3.2") - implementation("com.google.android.material:material:1.3.0") + implementation("androidx.core:core-ktx:1.6.0") + implementation("com.google.android.material:material:1.4.0") } diff --git a/build.gradle.kts b/build.gradle.kts index e08fe3d08..9620babf9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -16,8 +16,8 @@ buildscript { extra["vNav"] = vNav dependencies { - classpath("com.android.tools.build:gradle:4.2.1") - classpath(kotlin("gradle-plugin", version = "1.5.0")) + classpath("com.android.tools.build:gradle:7.0.0") + classpath(kotlin("gradle-plugin", version = "1.5.21")) classpath("androidx.navigation:navigation-safe-args-gradle-plugin:${vNav}") // NOTE: Do not place your application dependencies here; they belong @@ -54,8 +54,8 @@ subprojects { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 80a809a26..93e629ce2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip diff --git a/stub/build.gradle.kts b/stub/build.gradle.kts index d9fbad229..450e34a00 100644 --- a/stub/build.gradle.kts +++ b/stub/build.gradle.kts @@ -24,7 +24,7 @@ android { } } - aaptOptions { + androidResources { additionalParameters("--package-id", "0x80") }