From 93312a07143c9f7eb998fe6b007c7ba7c3b1209a Mon Sep 17 00:00:00 2001 From: tarsin Date: Fri, 5 Aug 2022 22:13:03 +0800 Subject: [PATCH] Dependencies tweaks --- app/build.gradle | 13 +++---------- build.gradle | 4 ++-- gradle.properties | 1 + 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 913f4c5f2..2130ffb5c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -39,12 +39,6 @@ android { versionCode 180005 versionName "1.8.1.0-alpha01" resConfigs 'zh', 'zh-rCN', 'zh-rHK', 'zh-rTW', 'es', 'ja', 'ko', 'fr', 'de', 'th' - - externalNativeBuild { - cmake { - arguments '-DANDROID_STL=none' - } - } } externalNativeBuild { @@ -100,8 +94,8 @@ dependencies { implementation "androidx.activity:activity:$activity_version" implementation "androidx.activity:activity-ktx:$activity_version" - implementation "androidx.annotation:annotation:1.4.0" - implementation "androidx.annotation:annotation-experimental:1.2.0" + implementation "androidx.annotation:annotation:1.5.0-alpha01" + implementation "androidx.annotation:annotation-experimental:1.3.0-alpha01" implementation "androidx.appcompat:appcompat:1.6.0-alpha05" def arch_core_version = "2.1.0" @@ -123,10 +117,9 @@ dependencies { implementation "androidx.core:core-ktx:$core_version" implementation "androidx.customview:customview:1.2.0-alpha01" - implementation "androidx.documentfile:documentfile:1.1.0-alpha01" implementation "androidx.dynamicanimation:dynamicanimation:1.1.0-alpha03" - def fragment_version = "1.5.1" + def fragment_version = "1.6.0-alpha01" implementation "androidx.fragment:fragment:$fragment_version" implementation "androidx.fragment:fragment-ktx:$fragment_version" diff --git a/build.gradle b/build.gradle index 511cf430f..a21539dbe 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ plugins { id 'com.android.application' version '7.2.2' apply false - id 'org.jetbrains.kotlin.android' version '1.7.10' apply false - id 'com.google.devtools.ksp' version '1.7.10-1.0.6' + id 'org.jetbrains.kotlin.android' version '1.7.20-Beta' apply false + id 'com.google.devtools.ksp' version '1.7.20-Beta-1.0.6' apply false } task clean(type: Delete) { diff --git a/gradle.properties b/gradle.properties index 319ee4fef..7d32adc36 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,6 +17,7 @@ # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects org.gradle.parallel=true +org.gradle.caching=true android.useAndroidX=true android.enableJetifier=true android.enableAppCompileTimeRClass=true