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

app/build.gradle.kts

@@ -56,14 +56,6 @@ val selectableVariants = listOf(
   "websiteProdRelease"
 )
 
-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 signalNdkVersion: String by rootProject.extra
-val signalJavaVersion: JavaVersion by rootProject.extra
-val signalKotlinJvmTarget: String by rootProject.extra
-
 wire {
   kotlin {
     javaInterop = true
@@ -87,9 +79,9 @@ ktlint {
 android {
   namespace = "org.thoughtcrime.securesms"
 
-  buildToolsVersion = signalBuildToolsVersion
+  buildToolsVersion = libs.versions.buildTools.get()
-  compileSdkVersion = signalCompileSdkVersion
+  compileSdkVersion = libs.versions.compileSdk.get()
-  ndkVersion = signalNdkVersion
+  ndkVersion = libs.versions.ndk.get()
 
   flavorDimensions += listOf("distribution", "environment")
   testBuildType = "instrumentation"
@@ -97,7 +89,7 @@ android {
   android.bundle.language.enableSplit = false
 
   kotlinOptions {
-    jvmTarget = signalKotlinJvmTarget
+    jvmTarget = libs.versions.kotlinJvmTarget.get()
     freeCompilerArgs = listOf("-Xjvm-default=all")
     suppressWarnings = true
   }
@@ -142,8 +134,8 @@ android {
 
   compileOptions {
     isCoreLibraryDesugaringEnabled = true
-    sourceCompatibility = signalJavaVersion
+    sourceCompatibility = JavaVersion.toVersion(libs.versions.javaVersion.get())
-    targetCompatibility = signalJavaVersion
+    targetCompatibility = JavaVersion.toVersion(libs.versions.javaVersion.get())
   }
 
   packaging {
@@ -187,8 +179,8 @@ android {
     versionCode = (canonicalVersionCode * maxHotfixVersions) + possibleHotfixVersions[currentHotfixVersion]
     versionName = canonicalVersionName
 
-    minSdk = signalMinSdkVersion
+    minSdk = libs.versions.minSdk.get().toInt()
-    targetSdk = signalTargetSdkVersion
+    targetSdk = libs.versions.targetSdk.get().toInt()
 
     vectorDrawables.useSupportLibrary = true
     project.ext.set("archivesBaseName", "Signal")

benchmark/build.gradle.kts

@@ -6,13 +6,6 @@ import org.gradle.kotlin.dsl.extra
 
 val benchmarkLibs = the<org.gradle.accessors.dm.LibrariesForBenchmarkLibs>()
 
-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 {
     id("com.android.test")
     id("org.jetbrains.kotlin.android")
@@ -20,20 +13,20 @@ plugins {
 
 android {
     namespace = "org.signal.benchmark"
-    compileSdkVersion = signalCompileSdkVersion
+    compileSdkVersion = libs.versions.compileSdk.get()
 
     compileOptions {
-        sourceCompatibility = signalJavaVersion
+        sourceCompatibility = JavaVersion.toVersion(libs.versions.javaVersion.get())
-        targetCompatibility = signalJavaVersion
+        targetCompatibility = JavaVersion.toVersion(libs.versions.javaVersion.get())
     }
 
     kotlinOptions {
-        jvmTarget = signalKotlinJvmTarget
+        jvmTarget = libs.versions.kotlinJvmTarget.get()
     }
 
     defaultConfig {
         minSdk = 23
-        targetSdk = signalTargetSdkVersion
+        targetSdk = libs.versions.targetSdk.get().toInt()
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 

build-logic/build.gradle.kts

@@ -9,5 +9,3 @@ buildscript {
   }
 }
 
-apply(from = "${rootDir}/../constants.gradle.kts")
-

build-logic/plugins/build.gradle.kts

@@ -1,22 +1,17 @@
-import org.gradle.kotlin.dsl.extra
-
 plugins {
   `kotlin-dsl`
   alias(libs.plugins.ktlint)
   id("groovy-gradle-plugin")
 }
 
-val signalJavaVersion: JavaVersion by rootProject.extra
-val signalKotlinJvmTarget: String by rootProject.extra
-
 java {
-  sourceCompatibility = signalJavaVersion
+  sourceCompatibility = JavaVersion.toVersion(libs.versions.javaVersion.get())
-  targetCompatibility = signalJavaVersion
+  targetCompatibility = JavaVersion.toVersion(libs.versions.javaVersion.get())
 }
 
 kotlin {
   jvmToolchain {
-    languageVersion.set(JavaLanguageVersion.of(signalKotlinJvmTarget))
+    languageVersion.set(JavaLanguageVersion.of(libs.versions.kotlinJvmTarget.get()))
   }
   compilerOptions {
     suppressWarnings = true

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

@@ -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
+  buildToolsVersion = libs.versions.buildTools.get()
-  compileSdkVersion = signalCompileSdkVersion
+  compileSdkVersion = libs.versions.compileSdk.get()
 
   defaultConfig {
-    minSdk = signalMinSdkVersion
+    minSdk = libs.versions.minSdk.get().toInt()
     vectorDrawables.useSupportLibrary = true
   }
 
   compileOptions {
     isCoreLibraryDesugaringEnabled = true
-    sourceCompatibility = signalJavaVersion
+    sourceCompatibility = JavaVersion.toVersion(libs.versions.javaVersion.get())
-    targetCompatibility = signalJavaVersion
+    targetCompatibility = JavaVersion.toVersion(libs.versions.javaVersion.get())
   }
 
   kotlinOptions {
-    jvmTarget = signalKotlinJvmTarget
+    jvmTarget = libs.versions.kotlinJvmTarget.get()
     suppressWarnings = true
   }
 

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

@@ -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
+  buildToolsVersion = libs.versions.buildTools.get()
-  compileSdkVersion = signalCompileSdkVersion
+  compileSdkVersion = libs.versions.compileSdk.get()
 
   defaultConfig {
     versionCode = 1
     versionName = "1.0"
 
-    minSdk = signalMinSdkVersion
+    minSdk = libs.versions.minSdk.get().toInt()
-    targetSdk = signalTargetSdkVersion
+    targetSdk = libs.versions.targetSdk.get().toInt()
   }
 
   compileOptions {
     isCoreLibraryDesugaringEnabled = true
-    sourceCompatibility = signalJavaVersion
+    sourceCompatibility = JavaVersion.toVersion(libs.versions.javaVersion.get())
-    targetCompatibility = signalJavaVersion
+    targetCompatibility = JavaVersion.toVersion(libs.versions.javaVersion.get())
   }
 
   kotlinOptions {
-    jvmTarget = signalKotlinJvmTarget
+    jvmTarget = libs.versions.kotlinJvmTarget.get()
     suppressWarnings = true
   }
 

build-logic/tools/build.gradle.kts

@@ -4,17 +4,14 @@ plugins {
   alias(libs.plugins.ktlint)
 }
 
-val signalJavaVersion: JavaVersion by rootProject.extra
-val signalKotlinJvmTarget: String by rootProject.extra
-
 java {
-  sourceCompatibility = signalJavaVersion
+  sourceCompatibility = JavaVersion.toVersion(libs.versions.javaVersion.get())
-  targetCompatibility = signalJavaVersion
+  targetCompatibility = JavaVersion.toVersion(libs.versions.javaVersion.get())
 }
 
 kotlin {
   jvmToolchain {
-    languageVersion = JavaLanguageVersion.of(signalKotlinJvmTarget)
+    languageVersion = JavaLanguageVersion.of(libs.versions.kotlinJvmTarget.get())
   }
 }
 

build.gradle.kts

@@ -46,8 +46,6 @@ tasks.withType<Wrapper> {
   distributionType = Wrapper.DistributionType.ALL
 }
 
-apply(from = "$rootDir/constants.gradle.kts")
-
 subprojects {
   if (JavaVersion.current().isJava8Compatible) {
     allprojects {
@@ -126,7 +124,8 @@ tasks.register("checkStopship") {
 
     val excludedDirectories = listOf(
       "app/build",
-      "libsignal-service/build"
+      "libsignal-service/build",
+      ".idea"
     )
 
     val allowedExtensions = setOf("kt", "kts", "java", "xml")

constants.gradle.kts

@@ -1,7 +0,0 @@
-val signalBuildToolsVersion by extra("35.0.0")
-val signalCompileSdkVersion by extra("android-36")
-val signalTargetSdkVersion by extra(35)
-val signalMinSdkVersion by extra(23)
-val signalNdkVersion by extra("28.0.13004108")
-val signalJavaVersion by extra(JavaVersion.VERSION_17)
-val signalKotlinJvmTarget by extra("17")

core-models/build.gradle.kts

@@ -3,9 +3,6 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-val signalJavaVersion: JavaVersion by rootProject.extra
-val signalKotlinJvmTarget: String by rootProject.extra
-
 plugins {
   id("java-library")
   id("org.jetbrains.kotlin.jvm")
@@ -13,13 +10,13 @@ plugins {
 }
 
 java {
-  sourceCompatibility = signalJavaVersion
+  sourceCompatibility = JavaVersion.toVersion(libs.versions.javaVersion.get())
-  targetCompatibility = signalJavaVersion
+  targetCompatibility = JavaVersion.toVersion(libs.versions.javaVersion.get())
 }
 
 kotlin {
   jvmToolchain {
-    languageVersion = JavaLanguageVersion.of(signalKotlinJvmTarget)
+    languageVersion = JavaLanguageVersion.of(libs.versions.kotlinJvmTarget.get())
   }
 }
 

core-util-jvm/build.gradle.kts

@@ -5,9 +5,6 @@
 
 import org.gradle.api.tasks.SourceSetContainer
 
-val signalJavaVersion: JavaVersion by rootProject.extra
-val signalKotlinJvmTarget: String by rootProject.extra
-
 plugins {
   id("java-library")
   id("org.jetbrains.kotlin.jvm")
@@ -16,13 +13,13 @@ plugins {
 }
 
 java {
-  sourceCompatibility = signalJavaVersion
+  sourceCompatibility = JavaVersion.toVersion(libs.versions.javaVersion.get())
-  targetCompatibility = signalJavaVersion
+  targetCompatibility = JavaVersion.toVersion(libs.versions.javaVersion.get())
 }
 
 kotlin {
   jvmToolchain {
-    languageVersion = JavaLanguageVersion.of(signalKotlinJvmTarget)
+    languageVersion = JavaLanguageVersion.of(libs.versions.kotlinJvmTarget.get())
   }
 }
 

gradle/libs.versions.toml

@@ -2,6 +2,19 @@
 # ./gradlew --write-verification-metadata sha256 qa --rerun-tasks
 
 [versions]
+# SDK & Build Versions
+buildTools = "35.0.0"
+compileSdk = "android-36"
+targetSdk = "35"
+minSdk = "23"
+ndk = "28.0.13004108"
+javaVersion = "17"
+kotlinJvmTarget = "17"
+gradle = "8.9.0"
+kotlin = "2.2.20"
+android-gradle-plugin = "8.10.1"
+
+# Other versions
 androidx-appcompat = "1.7.0"
 androidx-activity = "1.12.0"
 androidx-camera = "1.3.4"
@@ -13,11 +26,8 @@ androidx-navigation = "2.8.5"
 androidx-navigation3-core = "1.0.0"
 androidx-window = "1.3.0"
 glide = "4.15.1"
-gradle = "8.9.0"
-kotlin = "2.2.20"
 libsignal-client = "0.86.8"
 mp4parser = "1.9.39"
-android-gradle-plugin = "8.10.1"
 accompanist = "0.28.0"
 nanohttpd = "2.3.1"
 navigation-safe-args-gradle-plugin = "2.8.5"

libsignal-service/build.gradle.kts

@@ -18,24 +18,17 @@ plugins {
   id("com.squareup.wire")
 }
 
-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
-
 java {
   withJavadocJar()
   withSourcesJar()
-  sourceCompatibility = signalJavaVersion
+  sourceCompatibility = JavaVersion.toVersion(libs.versions.javaVersion.get())
-  targetCompatibility = signalJavaVersion
+  targetCompatibility = JavaVersion.toVersion(libs.versions.javaVersion.get())
 }
 
 tasks.withType<KotlinCompile>().configureEach {
   kotlin {
     compilerOptions {
-      jvmTarget = JvmTarget.fromTarget(signalKotlinJvmTarget)
+      jvmTarget = JvmTarget.fromTarget(libs.versions.kotlinJvmTarget.get())
       freeCompilerArgs = listOf("-Xjvm-default=all")
       suppressWarnings = true
     }

lintchecks/build.gradle.kts

@@ -1,19 +1,16 @@
-val signalJavaVersion: JavaVersion by rootProject.extra
-val signalKotlinJvmTarget: String by rootProject.extra
-
 plugins {
   id("java-library")
   id("org.jetbrains.kotlin.jvm")
 }
 
 java {
-  sourceCompatibility = signalJavaVersion
+  sourceCompatibility = JavaVersion.toVersion(libs.versions.javaVersion.get())
-  targetCompatibility = signalJavaVersion
+  targetCompatibility = JavaVersion.toVersion(libs.versions.javaVersion.get())
 }
 
 kotlin {
   jvmToolchain {
-    languageVersion = JavaLanguageVersion.of(signalKotlinJvmTarget)
+    languageVersion = JavaLanguageVersion.of(libs.versions.kotlinJvmTarget.get())
   }
 }
 

microbenchmark/build.gradle.kts

@@ -7,29 +7,22 @@ plugins {
   id("ktlint")
 }
 
-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
-
 android {
   namespace = "org.signal.microbenchmark"
-  compileSdkVersion = signalCompileSdkVersion
+  compileSdkVersion = libs.versions.compileSdk.get()
 
   compileOptions {
     isCoreLibraryDesugaringEnabled = true
-    sourceCompatibility = signalJavaVersion
+    sourceCompatibility = JavaVersion.toVersion(libs.versions.javaVersion.get())
-    targetCompatibility = signalJavaVersion
+    targetCompatibility = JavaVersion.toVersion(libs.versions.javaVersion.get())
   }
 
   kotlinOptions {
-    jvmTarget = signalKotlinJvmTarget
+    jvmTarget = libs.versions.kotlinJvmTarget.get()
   }
 
   defaultConfig {
-    minSdk = signalMinSdkVersion
+    minSdk = libs.versions.minSdk.get().toInt()
     testInstrumentationRunner = "androidx.benchmark.junit4.AndroidBenchmarkRunner"
   }
 

video/app/build.gradle.kts

@@ -8,21 +8,14 @@ plugins {
   alias(libs.plugins.compose.compiler)
 }
 
-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
-
 android {
   namespace = "org.thoughtcrime.video.app"
-  compileSdkVersion = signalCompileSdkVersion
+  compileSdkVersion = libs.versions.compileSdk.get()
 
   defaultConfig {
     applicationId = "org.thoughtcrime.video.app"
     minSdk = 23
-    targetSdk = signalTargetSdkVersion
+    targetSdk = libs.versions.targetSdk.get().toInt()
     versionCode = 1
     versionName = "1.0"
 
@@ -39,11 +32,11 @@ android {
     }
   }
   compileOptions {
-    sourceCompatibility = signalJavaVersion
+    sourceCompatibility = JavaVersion.toVersion(libs.versions.javaVersion.get())
-    targetCompatibility = signalJavaVersion
+    targetCompatibility = JavaVersion.toVersion(libs.versions.javaVersion.get())
   }
   kotlinOptions {
-    jvmTarget = signalKotlinJvmTarget
+    jvmTarget = libs.versions.kotlinJvmTarget.get()
   }
   buildFeatures {
     compose = true