Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-08-04 20:34:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update compileSdk to 37.

Browse Source
This commit is contained in:
Greyson Parrelli
2026-07-17 12:27:40 -04:00
parent c0283fb75f
commit 297b7fedd3
11 changed files with 51 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/build.gradle.kts
+12 -7
View File
@@ -154,7 +154,11 @@ android {
experimentalProperties["android.experimental.enableScreenshotTest"] = true
buildToolsVersion = libs.versions.buildTools.get()
compileSdkVersion(libs.versions.compileSdk.get())
compileSdk {
version = release(libs.versions.compileSdk.get().toInt())
}
ndkVersion = libs.versions.ndk.get()
flavorDimensions += listOf("distribution", "environment")
@@ -191,12 +195,12 @@ android {
sourceSets {
getByName("test") {
java.srcDir("$projectDir/src/testShared")
java.directories += "$projectDir/src/testShared"
}
getByName("androidTest") {
java.srcDir("$projectDir/src/testShared")
java.srcDir("$projectDir/src/benchmarkShared/java")
java.directories += "$projectDir/src/testShared"
java.directories += "$projectDir/src/benchmarkShared/java"
}
}
@@ -411,6 +415,7 @@ android {
isDefault = false
isDebuggable = false
isMinifyEnabled = true
isShrinkResources = true
matchingFallbacks += "debug"
buildConfigField("String", "BUILD_VARIANT_TYPE", "\"Benchmark\"")
buildConfigField("boolean", "TRACING_ENABLED", "true")
@@ -521,18 +526,18 @@ android {
android.buildTypes.configureEach {
val path = if (name == "release") releaseDir else debugDir
sourceSets.named(name) {
java.srcDir(path)
java.directories += path
}
}
sourceSets {
getByName("mocked") {
java.srcDir("$projectDir/src/benchmarkShared/java")
java.directories += "$projectDir/src/benchmarkShared/java"
manifest.srcFile("$projectDir/src/benchmarkShared/AndroidManifest.xml")
}
getByName("benchmark") {
java.srcDir("$projectDir/src/benchmarkShared/java")
java.directories += "$projectDir/src/benchmarkShared/java"
manifest.srcFile("$projectDir/src/benchmarkShared/AndroidManifest.xml")
}
}
baseline-profile/build.gradle.kts
+2 -1
View File
@@ -7,8 +7,9 @@ plugins {
android {
namespace = "org.signal.baselineprofile"
compileSdk {
version = release(36)
version = release(libs.versions.compileSdk.get().toInt())
}
compileOptions {
benchmark/build.gradle.kts
+4 -1
View File
@@ -13,7 +13,10 @@ plugins {
android {
namespace = "org.signal.benchmark"
compileSdkVersion(libs.versions.compileSdk.get())
compileSdk {
version = release(libs.versions.compileSdk.get().toInt())
}
compileOptions {
sourceCompatibility = JavaVersion.toVersion(libs.versions.javaVersion.get())
build-logic/plugins/src/main/java/signal-library.gradle.kts
+4 -1
View File
@@ -17,7 +17,10 @@ plugins {
android {
buildToolsVersion = libs.versions.buildTools.get()
compileSdkVersion(libs.versions.compileSdk.get())
compileSdk {
version = release(libs.versions.compileSdk.get().toInt())
}
defaultConfig {
minSdk = libs.versions.minSdk.get().toInt()
build-logic/plugins/src/main/java/signal-sample-app.gradle.kts
+4 -1
View File
@@ -18,7 +18,10 @@ plugins {
android {
buildToolsVersion = libs.versions.buildTools.get()
compileSdkVersion(libs.versions.compileSdk.get())
compileSdk {
version = release(libs.versions.compileSdk.get().toInt())
}
defaultConfig {
versionCode = 1
demo/camera/build.gradle.kts
+4 -1
View File
@@ -6,7 +6,10 @@ plugins {
android {
namespace = "org.signal.camera.demo"
compileSdkVersion(libs.versions.compileSdk.get())
compileSdk {
version = release(libs.versions.compileSdk.get().toInt())
}
defaultConfig {
applicationId = "org.signal.camera.demo"
demo/video/build.gradle.kts
+5 -2
View File
@@ -19,7 +19,10 @@ val localProperties: Properties? = if (localPropertiesFile.exists()) {
android {
namespace = "org.thoughtcrime.video.app"
compileSdkVersion(libs.versions.compileSdk.get())
compileSdk {
version = release(libs.versions.compileSdk.get().toInt())
}
defaultConfig {
applicationId = "org.thoughtcrime.video.app"
@@ -76,7 +79,7 @@ android {
if (sampleVideosPath != null) {
val sampleVideosDir = File(sampleVideosPath)
if (sampleVideosDir.isDirectory) {
getByName("androidTest").assets.srcDir(sampleVideosDir)
getByName("androidTest").assets.directories.add(sampleVideosPath)
}
}
}
gradle/libs.versions.toml
+1 -1
View File
@@ -4,7 +4,7 @@
[versions]
# SDK & Build Versions
buildTools = "36.0.0"
compileSdk = "android-36.1"
compileSdk = "37"
targetSdk = "35"
minSdk = "23"
ndk = "28.0.13004108"
gradle/verification-metadata.xml
+8 -8
View File
@@ -4088,14 +4088,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="2f7beb5e9f441b9f32c12df0a34121155163dfd047804b116262eaad33928388" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.layoutlib" name="layoutlib-runtime" version="16.1.0-jdk17">
<artifact name="layoutlib-runtime-16.1.0-jdk17.jar">
<sha256 value="baef8b5bd54f318d8805863d6193acaf6c21efe292485747aa7362836d372f4c" origin="Generated by Gradle"/>
</artifact>
<artifact name="layoutlib-runtime-16.1.0-jdk17.module">
<sha256 value="9b70ce71371926ab9e2d69a10741621fbfd0e141a883afe88351cba798e96979" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.layoutlib" name="layoutlib-runtime" version="16.1.0-jdk17">
<artifact name="layoutlib-runtime-16.1.0-jdk17.jar">
<sha256 value="baef8b5bd54f318d8805863d6193acaf6c21efe292485747aa7362836d372f4c" origin="Generated by Gradle"/>
</artifact>
<artifact name="layoutlib-runtime-16.1.0-jdk17.module">
<sha256 value="9b70ce71371926ab9e2d69a10741621fbfd0e141a883afe88351cba798e96979" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.lint" name="lint" version="32.2.1">
<artifact name="lint-32.2.1.jar">
<sha256 value="137408c526de7a645e4f380559b29f4b85dd1ac1f374c1d33eec450afb6b415c" origin="Generated by Gradle"/>
microbenchmark/build.gradle.kts
+4 -1
View File
@@ -11,7 +11,10 @@ plugins {
android {
namespace = "org.signal.microbenchmark"
compileSdkVersion(libs.versions.compileSdk.get())
compileSdk {
version = release(libs.versions.compileSdk.get().toInt())
}
compileOptions {
isCoreLibraryDesugaringEnabled = true
reproducible-builds/Dockerfile
+3 -3
View File
@@ -14,9 +14,9 @@ RUN apt install -oAcquire::https::Verify-Peer=false -y ca-certificates
RUN apt update
RUN apt install -y git openjdk-21-jdk-headless unzip wget
ENV ANDROID_COMMAND_LINE_TOOLS_FILENAME=commandlinetools-linux-10406996_latest.zip
ENV ANDROID_COMMAND_LINE_TOOLS_SHA256=8919e8752979db73d8321e9babe2caedcc393750817c1a5f56c128ec442fb540
ENV ANDROID_API_LEVELS=android-36.1
ENV ANDROID_COMMAND_LINE_TOOLS_FILENAME=commandlinetools-linux-14742923_latest.zip
ENV ANDROID_COMMAND_LINE_TOOLS_SHA256=04453066b540409d975c676d781da1477479dde3761310f1a7eb92a1dfb15af7
ENV ANDROID_API_LEVELS=android-37.0
ENV ANDROID_BUILD_TOOLS_VERSION=36.0.0
ENV ANDROID_HOME=/usr/local/android-sdk-linux