Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-28 21:57:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move values from constants.gradle into libs.versions.toml

Browse Source
This commit is contained in:
Greyson Parrelli
2025-12-31 10:26:34 -05:00
committed by jeffrey-signal
parent 06bdc36136
commit 5b3c51013b
16 changed files with 69 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
build-logic/plugins/src/main/java/signal-library.gradle.kts
View File

@@ -3,18 +3,10 @@
import org.gradle.accessors.dm.LibrariesForLibs
import org.gradle.accessors.dm.LibrariesForTestLibs
import org.gradle.api.JavaVersion
import org.gradle.kotlin.dsl.extra
val libs = the<LibrariesForLibs>()
val testLibs = the<LibrariesForTestLibs>()
val signalBuildToolsVersion: String by rootProject.extra
val signalCompileSdkVersion: String by rootProject.extra
val signalTargetSdkVersion: Int by rootProject.extra
val signalMinSdkVersion: Int by rootProject.extra
val signalJavaVersion: JavaVersion by rootProject.extra
val signalKotlinJvmTarget: String by rootProject.extra
plugins {
// We cannot use the version catalog in the plugins block in convention plugins (it's not supported).
// Instead, plugin versions are controlled through the dependencies block in the build.gradle.kts.
@@ -24,22 +16,22 @@ plugins {
}
android {
buildToolsVersion = signalBuildToolsVersion
compileSdkVersion = signalCompileSdkVersion
buildToolsVersion = libs.versions.buildTools.get()
compileSdkVersion = libs.versions.compileSdk.get()
defaultConfig {
minSdk = signalMinSdkVersion
minSdk = libs.versions.minSdk.get().toInt()
vectorDrawables.useSupportLibrary = true
}
compileOptions {
isCoreLibraryDesugaringEnabled = true
sourceCompatibility = signalJavaVersion
targetCompatibility = signalJavaVersion
sourceCompatibility = JavaVersion.toVersion(libs.versions.javaVersion.get())
targetCompatibility = JavaVersion.toVersion(libs.versions.javaVersion.get())
}
kotlinOptions {
jvmTarget = signalKotlinJvmTarget
jvmTarget = libs.versions.kotlinJvmTarget.get()
suppressWarnings = true
}

23
build-logic/plugins/src/main/java/signal-sample-app.gradle.kts
View File

@@ -3,20 +3,11 @@
import org.gradle.accessors.dm.LibrariesForLibs
import org.gradle.accessors.dm.LibrariesForTestLibs
import org.gradle.api.JavaVersion
import org.gradle.kotlin.dsl.extra
import org.gradle.kotlin.dsl.provideDelegate
import org.gradle.kotlin.dsl.the
val libs = the<LibrariesForLibs>()
val testLibs = the<LibrariesForTestLibs>()
val signalBuildToolsVersion: String by rootProject.extra
val signalCompileSdkVersion: String by rootProject.extra
val signalTargetSdkVersion: Int by rootProject.extra
val signalMinSdkVersion: Int by rootProject.extra
val signalJavaVersion: JavaVersion by rootProject.extra
val signalKotlinJvmTarget: String by rootProject.extra
plugins {
// We cannot use the version catalog in the plugins block in convention plugins (it's not supported).
// Instead, plugin versions are controlled through the dependencies block in the build.gradle.kts.
@@ -26,25 +17,25 @@ plugins {
}
android {
buildToolsVersion = signalBuildToolsVersion
compileSdkVersion = signalCompileSdkVersion
buildToolsVersion = libs.versions.buildTools.get()
compileSdkVersion = libs.versions.compileSdk.get()
defaultConfig {
versionCode = 1
versionName = "1.0"
minSdk = signalMinSdkVersion
targetSdk = signalTargetSdkVersion
minSdk = libs.versions.minSdk.get().toInt()
targetSdk = libs.versions.targetSdk.get().toInt()
}
compileOptions {
isCoreLibraryDesugaringEnabled = true
sourceCompatibility = signalJavaVersion
targetCompatibility = signalJavaVersion
sourceCompatibility = JavaVersion.toVersion(libs.versions.javaVersion.get())
targetCompatibility = JavaVersion.toVersion(libs.versions.javaVersion.get())
}
kotlinOptions {
jvmTarget = signalKotlinJvmTarget
jvmTarget = libs.versions.kotlinJvmTarget.get()
suppressWarnings = true
}