fix(build): baseline configuration and proxy setup
- Downgrade AGP 9.0.0 -> 8.9.2, Kotlin 2.2.10 -> 2.1.20, KSP and Compose Multiplatform to compatible versions. - Switch Gradle wrapper to 8.13 (8.11.1 download unavailable, 9.5.1 incompatible with AGP 8.9). - Add Gradle proxy settings and disable SDK auto-download to prevent hangs on dl.google.com. - Remove generated gradle-daemon-jvm.properties causing JetBrains JDK lookup failure. - Fix JvmVendorSpec.ANY incompatibility on the new toolchain. - Temporarily disable externalNativeBuild until NDK 27.0.12077973 is installed. - Baseline ':app:tasks' now passes.
This commit is contained in:
parent
5f64f3d722
commit
73f16be140
6 changed files with 29 additions and 20 deletions
|
|
@ -46,7 +46,9 @@ fun configuredAppLocaleTags(): Set<String> {
|
||||||
}
|
}
|
||||||
|
|
||||||
kotlin {
|
kotlin {
|
||||||
jvmToolchain(21)
|
jvmToolchain {
|
||||||
|
languageVersion.set(JavaLanguageVersion.of(21))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
|
|
@ -64,11 +66,13 @@ android {
|
||||||
.map { it.toAndroidResourceConfiguration() }
|
.map { it.toAndroidResourceConfiguration() }
|
||||||
|
|
||||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||||
|
/*
|
||||||
externalNativeBuild {
|
externalNativeBuild {
|
||||||
cmake {
|
cmake {
|
||||||
cppFlags += ""
|
cppFlags += ""
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
buildConfigField("boolean", "IS_PRO", "false")
|
buildConfigField("boolean", "IS_PRO", "false")
|
||||||
buildConfigField("boolean", "IS_OFFLINE", "false")
|
buildConfigField("boolean", "IS_OFFLINE", "false")
|
||||||
}
|
}
|
||||||
|
|
@ -162,12 +166,14 @@ android {
|
||||||
singleVariant("release") {
|
singleVariant("release") {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
/*
|
||||||
externalNativeBuild {
|
externalNativeBuild {
|
||||||
cmake {
|
cmake {
|
||||||
path = file("src/main/cpp/CMakeLists.txt")
|
path = file("src/main/cpp/CMakeLists.txt")
|
||||||
version = "3.22.1"
|
version = "3.22.1"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
testOptions {
|
testOptions {
|
||||||
unitTests.isReturnDefaultValues = true
|
unitTests.isReturnDefaultValues = true
|
||||||
unitTests.all {
|
unitTests.all {
|
||||||
|
|
|
||||||
|
|
@ -43,3 +43,15 @@ org.gradle.caching=true
|
||||||
org.gradle.configuration-cache=true
|
org.gradle.configuration-cache=true
|
||||||
org.gradle.jvmargs=-Xmx3072M -XX:+UseG1GC -XX:MaxGCPauseMillis=200 -Dkotlin.daemon.jvm.options="-Xmx2048M" -XX:MaxMetaspaceSize=1024m -Dfile.encoding=UTF-8
|
org.gradle.jvmargs=-Xmx3072M -XX:+UseG1GC -XX:MaxGCPauseMillis=200 -Dkotlin.daemon.jvm.options="-Xmx2048M" -XX:MaxMetaspaceSize=1024m -Dfile.encoding=UTF-8
|
||||||
org.gradle.vfs.watch=true
|
org.gradle.vfs.watch=true
|
||||||
|
org.gradle.java.installations.auto-download=false
|
||||||
|
org.gradle.java.installations.auto-detect=true
|
||||||
|
|
||||||
|
# Proxy settings for Gradle HTTPS connections
|
||||||
|
systemProp.http.proxyHost=127.0.0.1
|
||||||
|
systemProp.http.proxyPort=2080
|
||||||
|
systemProp.https.proxyHost=127.0.0.1
|
||||||
|
systemProp.https.proxyPort=2080
|
||||||
|
systemProp.http.nonProxyHosts=127.0.0.1|localhost|::1|192.168.*|10.*|172.16.*|172.17.*|172.18.*|172.19.*|172.20.*|172.21.*|172.22.*|172.23.*|172.24.*|172.25.*|172.26.*|172.27.*|172.28.*|172.29.*|172.30.*|172.31.*|*.dueattendant149.org
|
||||||
|
|
||||||
|
# Do not auto-download SDK components during build
|
||||||
|
android.builder.sdkDownload=false
|
||||||
|
|
|
||||||
|
|
@ -1,13 +0,0 @@
|
||||||
#This file is generated by updateDaemonJvm
|
|
||||||
toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/ff1d4fc92bcfc9d3799beabb4e70cfa3/redirect
|
|
||||||
toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/08ce182188ada0b93565cd9ca4a4ab32/redirect
|
|
||||||
toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c5760d82d08e6c26884debb23736ea57/redirect
|
|
||||||
toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/08ce182188ada0b93565cd9ca4a4ab32/redirect
|
|
||||||
toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/70ee42f1b0395356c016dbcb3e88f71d/redirect
|
|
||||||
toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/6141bf023dcc7a96c47cad75c59b054e/redirect
|
|
||||||
toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c5760d82d08e6c26884debb23736ea57/redirect
|
|
||||||
toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/08ce182188ada0b93565cd9ca4a4ab32/redirect
|
|
||||||
toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/8281425809f7cfe7f727eef599560d4c/redirect
|
|
||||||
toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/a6eb06d81d82a782734ef3b616ba2684/redirect
|
|
||||||
toolchainVendor=JETBRAINS
|
|
||||||
toolchainVersion=21
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
[versions]
|
[versions]
|
||||||
agp = "9.0.0"
|
agp = "8.9.2"
|
||||||
kotlin = "2.2.10"
|
kotlin = "2.1.20"
|
||||||
coreKtx = "1.16.0"
|
coreKtx = "1.16.0"
|
||||||
junit = "4.13.2"
|
junit = "4.13.2"
|
||||||
junitVersion = "1.2.1"
|
junitVersion = "1.2.1"
|
||||||
|
|
@ -21,8 +21,8 @@ androidxAnnotationJvm = "1.9.1"
|
||||||
androidxTestRunner = "1.6.2"
|
androidxTestRunner = "1.6.2"
|
||||||
material3WindowSizeClassAndroid = "1.3.2"
|
material3WindowSizeClassAndroid = "1.3.2"
|
||||||
credentials = "1.5.0"
|
credentials = "1.5.0"
|
||||||
composeMultiplatform = "1.8.2"
|
composeMultiplatform = "1.7.3"
|
||||||
ksp = "2.2.10-2.0.2"
|
ksp = "2.1.20-1.0.32"
|
||||||
|
|
||||||
[libraries]
|
[libraries]
|
||||||
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
|
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
|
||||||
|
|
|
||||||
4
gradle/wrapper/gradle-wrapper.properties
vendored
4
gradle/wrapper/gradle-wrapper.properties
vendored
|
|
@ -1,6 +1,8 @@
|
||||||
#Fri May 02 18:58:54 IST 2025
|
#Fri May 02 18:58:54 IST 2025
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
|
||||||
|
networkTimeout=120000
|
||||||
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,9 @@ kotlin {
|
||||||
androidTarget()
|
androidTarget()
|
||||||
}
|
}
|
||||||
jvm("desktop")
|
jvm("desktop")
|
||||||
jvmToolchain(21)
|
jvmToolchain {
|
||||||
|
languageVersion.set(JavaLanguageVersion.of(21))
|
||||||
|
}
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
val commonMain by getting
|
val commonMain by getting
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue