Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-05-14 12:10:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix lint crash by switching static-ips to properties.

Browse Source
This commit is contained in:
Greyson Parrelli
2026-05-05 16:46:32 -04:00
parent 799e57dbe9
commit 2ffbf09b1b
5 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/build.gradle.kts
+2 -1
View File
@@ -24,7 +24,8 @@ plugins {
id("licenses")
}
apply(from = "static-ips.gradle.kts")
val staticIps = Properties().apply { file("static-ips.properties").reader().use { load(it) } }
staticIps.stringPropertyNames().forEach { rootProject.extra[it] = staticIps.getProperty(it) }
val canonicalVersionCode = 1684
val canonicalVersionName = "8.9.1"
app/static-ips.gradle.kts
-9
View File
@@ -1,9 +0,0 @@
rootProject.extra["service_ips"] = """new String[]{"13.248.212.111","76.223.92.165"}"""
rootProject.extra["storage_ips"] = """new String[]{"142.251.45.211"}"""
rootProject.extra["cdn_ips"] = """new String[]{"18.238.49.106","18.238.49.6","18.238.49.66","18.238.49.90"}"""
rootProject.extra["cdn2_ips"] = """new String[]{"104.18.10.47","104.18.11.47"}"""
rootProject.extra["cdn3_ips"] = """new String[]{"104.18.10.47","104.18.11.47"}"""
rootProject.extra["sfu_ips"] = """new String[]{"34.117.136.13"}"""
rootProject.extra["content_proxy_ips"] = """new String[]{"107.178.250.75"}"""
rootProject.extra["svr2_ips"] = """new String[]{"20.119.62.85"}"""
rootProject.extra["cdsi_ips"] = """new String[]{"40.122.45.194"}"""
app/static-ips.properties
+9
View File
@@ -0,0 +1,9 @@
service_ips=new String[]{"13.248.212.111","76.223.92.165"}
storage_ips=new String[]{"142.251.45.211"}
cdn_ips=new String[]{"18.238.49.106","18.238.49.6","18.238.49.66","18.238.49.90"}
cdn2_ips=new String[]{"104.18.10.47","104.18.11.47"}
cdn3_ips=new String[]{"104.18.10.47","104.18.11.47"}
sfu_ips=new String[]{"34.117.136.13"}
content_proxy_ips=new String[]{"107.178.250.75"}
svr2_ips=new String[]{"20.119.62.85"}
cdsi_ips=new String[]{"40.122.45.194"}
build-logic/plugins/src/main/java/translations.gradle.kts
+11 -12
View File
@@ -519,25 +519,24 @@ tasks.register("excludeNonTranslatables") {
tasks.register("resolveStaticIps") {
group = "Static Files"
description = "Fetches static IPs for core hosts and writes them to static-ips.gradle"
description = "Fetches static IPs for core hosts and writes them to static-ips.properties"
val projectDirFile = projectDir
doLast {
val staticIpResolver = StaticIpResolver()
val tripleQuote = "\"\"\""
val content = """
rootProject.extra["service_ips"] = $tripleQuote${staticIpResolver.resolveToBuildConfig("chat.signal.org")}$tripleQuote
rootProject.extra["storage_ips"] = $tripleQuote${staticIpResolver.resolveToBuildConfig("storage.signal.org")}$tripleQuote
rootProject.extra["cdn_ips"] = $tripleQuote${staticIpResolver.resolveToBuildConfig("cdn.signal.org")}$tripleQuote
rootProject.extra["cdn2_ips"] = $tripleQuote${staticIpResolver.resolveToBuildConfig("cdn2.signal.org")}$tripleQuote
rootProject.extra["cdn3_ips"] = $tripleQuote${staticIpResolver.resolveToBuildConfig("cdn3.signal.org")}$tripleQuote
rootProject.extra["sfu_ips"] = $tripleQuote${staticIpResolver.resolveToBuildConfig("sfu.voip.signal.org")}$tripleQuote
rootProject.extra["content_proxy_ips"] = $tripleQuote${staticIpResolver.resolveToBuildConfig("contentproxy.signal.org")}$tripleQuote
rootProject.extra["svr2_ips"] = $tripleQuote${staticIpResolver.resolveToBuildConfig("svr2.signal.org")}$tripleQuote
rootProject.extra["cdsi_ips"] = $tripleQuote${staticIpResolver.resolveToBuildConfig("cdsi.signal.org")}$tripleQuote
service_ips=${staticIpResolver.resolveToBuildConfig("chat.signal.org")}
storage_ips=${staticIpResolver.resolveToBuildConfig("storage.signal.org")}
cdn_ips=${staticIpResolver.resolveToBuildConfig("cdn.signal.org")}
cdn2_ips=${staticIpResolver.resolveToBuildConfig("cdn2.signal.org")}
cdn3_ips=${staticIpResolver.resolveToBuildConfig("cdn3.signal.org")}
sfu_ips=${staticIpResolver.resolveToBuildConfig("sfu.voip.signal.org")}
content_proxy_ips=${staticIpResolver.resolveToBuildConfig("contentproxy.signal.org")}
svr2_ips=${staticIpResolver.resolveToBuildConfig("svr2.signal.org")}
cdsi_ips=${staticIpResolver.resolveToBuildConfig("cdsi.signal.org")}
""".trimIndent() + "\n"
File(projectDirFile, "static-ips.gradle.kts").writeText(content)
File(projectDirFile, "static-ips.properties").writeText(content)
}
}
gradle.properties
+2 -3
View File
@@ -4,6 +4,8 @@ android.experimental.androidTest.numManagedDeviceShards=1
org.gradle.configuration-cache=true
org.gradle.configuration-cache.problems=fail
android.generateSyncIssueWhenLibraryConstraintsAreEnabled=false
android.lint.useK2Uast=true
# We never want to use auto-provisioning, as it breaks reproducible builds.
# This should not be a problem, because we never configure a "javaRepositories"
# item to tell Gradle where to auto-provision the toolchain from, but adding
@@ -11,9 +13,6 @@ android.generateSyncIssueWhenLibraryConstraintsAreEnabled=false
# See: https://docs.gradle.org/current/userguide/toolchains.html#sub:disable_auto_provision
org.gradle.java.installations.auto-download=false
# Prevents lint crash when analyzing uncompiled kotlin gradle scripts
android.lint.useK2Uast=false
# Test fixtures support for Android modules
android.experimental.enableTestFixturesKotlinSupport=true
android.defaults.buildfeatures.resvalues=true