From 111592b25c8a82cba7a0d84261b1ca658ae18ded Mon Sep 17 00:00:00 2001 From: SuperMonster003 Date: Tue, 10 Dec 2024 17:46:13 +0800 Subject: [PATCH] =?UTF-8?q?6.6.1=20-=20Alpha2=20-=20=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E8=84=9A=E6=9C=AC=E5=A2=9E=E5=8A=A0=E9=80=82=E9=85=8D=20Intell?= =?UTF-8?q?ij=20IDEA=202024.3.1=20=E7=9A=84=20Android=20Gradle=20=E7=89=88?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle.kts | 6 +++++- settings.gradle.kts | 1 + version.properties | 6 +++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index d17c978b..8d5c9991 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -98,7 +98,6 @@ dependencies /* Unclassified */ { implementation("net.lingala.zip4j:zip4j:2.11.5") // Log4j - implementation("de.mindpipe.android:android-logging-log4j:1.0.3") // FIXME by SuperMonster003 on Aug 14, 2024. // ! Vulnerable dependency (5 vulnerabilities) for log4j (version 1): // ! - CVE-2022-23307, Score: 8.8 @@ -108,7 +107,9 @@ dependencies /* Unclassified */ { // ! - CVE-2019-17571, Score: 9.8 // ! However, log4j version 2 which requires Android API Level not lower than 26 // ! is not compatible with current project with min API Level 24. + // ! // ! zh-CN: + // ! // ! 依赖库 log4j (第一版本) 是易受攻击的 (含 5 项漏洞): // ! - CVE-2022-23307, 评分: 8.8 // ! - CVE-2022-23305, 评分: 9.8 @@ -119,6 +120,9 @@ dependencies /* Unclassified */ { // ! 与最低 API 级别为 24 的当前项目无法兼容. implementation("log4j:log4j:1.2.17") + // Android Logging Log4j + implementation("de.mindpipe.android:android-logging-log4j:1.0.3") + // Preference implementation("androidx.preference:preference-ktx:1.2.1") diff --git a/settings.gradle.kts b/settings.gradle.kts index 35b707cc..dae913a2 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -198,6 +198,7 @@ pluginManagement { val intelliJIdea = object : Platform( name = "IntelliJIdea", abbr = "idea", vendor = "Jetbrains", androidVersionMap = mapOf( + "2024.3.1" to "8.7.3", /* Dec 10, 2024. */ "2024.3" to "8.7.0-rc01", /* Nov 15, 2024. */ "2024.2" to "8.5.2", /* Aug 13, 2024. */ "2024.1" to "8.2.2", /* Apr 6, 2024. */ diff --git a/version.properties b/version.properties index a2cfce9a..a1f688de 100644 --- a/version.properties +++ b/version.properties @@ -1,5 +1,5 @@ -#Mon Dec 09 20:21:59 CST 2024 -BUILD_TIME=1733746919592 +#Tue Dec 10 15:37:07 CST 2024 +BUILD_TIME=1733816227848 COMPILE_SDK_VERSION=34 JAVA_VERSION=23 JAVA_VERSION_MIN_RADICAL=0 @@ -17,6 +17,6 @@ RAPID_OCR_OPENCV_MOBILE_LABEL_VERSION=13 RAPID_OCR_OPENCV_MOBILE_VERSION=4.5.3 TARGET_SDK_VERSION=34 TARGET_SDK_VERSION_INRT=29 -VERSION_BUILD=2902 +VERSION_BUILD=2903 VERSION_NAME=6.6.1 Alpha2 VSCODE_EXT_REQUIRED_VERSION=1.0.8