diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 970f1887..258cc370 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ android-compileSdk = "36" android-minSdk = "26" android-targetSdk = "36" androidx-test = "1.7.0" -androidx-test-runner = "1.6.2" +androidx-test-runner = "1.7.0" androidx-test-ext = "1.3.0" biometric = "1.2.0-alpha05" compose = "1.10.0-beta02" @@ -13,7 +13,7 @@ immutable-collections = "0.4.0" coroutines = "1.10.2" agp = "8.10.1" detekt = "1.23.8" -detekt-compose-rules = "0.4.27" +detekt-compose-rules = "0.4.28" java = "21" kermit = "2.0.8" koin = "4.1.1" @@ -25,10 +25,10 @@ lifecycle-navigation3 = "2.10.0-alpha05" navigation3 = "1.0.0-alpha05" kotlinx-serialization = "1.7.3" lifecycle = "2.10.0" -sqlDelight = "2.1.0" +sqlDelight = "2.2.1" turbine = "1.2.1" -triplet-play = "3.12.1" -roborazzi = "1.44.0-alpha03" +triplet-play = "3.12.2" +roborazzi = "1.52.0" robolectric = "4.12.2" [libraries] diff --git a/settings.gradle.kts b/settings.gradle.kts index 680ed6e7..215596b8 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -16,7 +16,7 @@ dependencyResolutionManagement { } plugins { - id("org.gradle.toolchains.foojay-resolver-convention") version "0.10.0" + id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0" } rootProject.name = "money-flow" diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts index 085917dd..7455a601 100644 --- a/shared/build.gradle.kts +++ b/shared/build.gradle.kts @@ -1,3 +1,5 @@ +import java.net.URI + import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi import org.jetbrains.kotlin.gradle.dsl.JvmTarget @@ -147,6 +149,23 @@ dependencies { tasks.withType().configureEach { systemProperty("roborazzi.test.record.dir", rootProject.layout.projectDirectory.dir("image/roborazzi").asFile.path) + + listOf( + "http" to System.getenv("http_proxy"), + "https" to System.getenv("https_proxy"), + ).forEach { (scheme, proxyValue) -> + proxyValue + ?.takeIf { it.isNotBlank() } + ?.let(::URI) + ?.let { proxyUri -> + proxyUri.host?.let { host -> + systemProperty("$scheme.proxyHost", host) + } + proxyUri.port.takeIf { it != -1 }?.let { port -> + systemProperty("$scheme.proxyPort", port) + } + } + } } sqldelight {