6.6.2 - Alpha - 修复 dx 库在 Android 7.x 无法正常使用的问题 (issue #293)

This commit is contained in:
SuperMonster003
2025-01-12 12:34:27 +08:00
parent 5da132ab0b
commit b713bbcf84
8 changed files with 26 additions and 23 deletions

View File

@@ -149,6 +149,7 @@ dependencies /* Unclassified */ {
// Dex
implementation(files("$rootDir/libs/com.android.dx-1.14.jar"))
implementation(files("$rootDir/libs/com.legacy.android.dx-1.7.0.jar"))
// OpenCV
implementation(project(":libs:org.opencv-4.8.0"))
@@ -820,13 +821,6 @@ class Versions(filePath: String) {
private val javaVersionMinRadical: Int = properties["JAVA_VERSION_MIN_RADICAL"].let { it as String }.toInt()
private val javaVersionRaw = properties["JAVA_VERSION"] as String
private var javaVersionInfoSuffix = ""
private val javaVersionCeilMap = mapOf(
"idea" to mapOf(
"2023.2" to javaVersionMinSuggested, /* Aug 17, 2023. */
"2023.1" to javaVersionMinSuggested, /* Aug 17, 2023. */
"2022.3" to javaVersionMinSuggested, /* Aug 17, 2023. */
),
)
val javaVersion: JavaVersion by lazy {
var niceVersionInt = javaVersionRaw.toInt()