Consolidate some constants and add kotlin target JVM version.

build-logic/build.gradle.kts

@@ -1,3 +1,5 @@
+import org.gradle.kotlin.dsl.extra
+
 buildscript {
     val kotlinVersion by extra("1.8.10")
 
@@ -11,11 +13,15 @@ buildscript {
     }
 }
 
+apply(from = "${rootDir}/../constants.gradle.kts")
+
+val signalKotlinJvmTarget: String by extra
+
 allprojects {
     // Needed because otherwise the kapt task defaults to jvmTarget 17, which "poisons the well" and requires us to bump up too
     tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
         kotlinOptions {
-            jvmTarget = "11"
+            jvmTarget = signalKotlinJvmTarget
         }
     }
 }

build-logic/plugins/build.gradle.kts

@@ -1,16 +1,21 @@
+import org.gradle.kotlin.dsl.extra
+
 plugins {
   `kotlin-dsl`
   id("groovy-gradle-plugin")
   id("org.jlleitschuh.gradle.ktlint") version "11.4.2"
 }
 
+val signalJavaVersion: JavaVersion by rootProject.extra
+val signalKotlinJvmTarget: String by rootProject.extra
+
 java {
-  sourceCompatibility = JavaVersion.VERSION_11
-  targetCompatibility = JavaVersion.VERSION_11
+  sourceCompatibility = signalJavaVersion
+  targetCompatibility = signalJavaVersion
 }
 
 kotlinDslPluginOptions {
-  jvmTarget.set("11")
+  jvmTarget.set(signalKotlinJvmTarget)
 }
 
 dependencies {

build-logic/plugins/src/main/java/android-constants.gradle.kts

@@ -1,5 +0,0 @@
-val signalBuildToolsVersion by extra("32.0.0")
-val signalCompileSdkVersion by extra("android-33")
-val signalTargetSdkVersion by extra(31)
-val signalMinSdkVersion by extra(21)
-val signalJavaVersion by extra(JavaVersion.VERSION_11)

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

@@ -8,16 +8,16 @@ import org.gradle.kotlin.dsl.extra
 val libs = the<LibrariesForLibs>()
 val testLibs = the<LibrariesForTestLibs>()
 
-val signalBuildToolsVersion: String by extra
-val signalCompileSdkVersion: String by extra
-val signalTargetSdkVersion: Int by extra
-val signalMinSdkVersion: Int by extra
-val signalJavaVersion: JavaVersion by extra
+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.library")
   id("kotlin-android")
-  id("android-constants")
   id("ktlint")
 }
 
@@ -38,7 +38,7 @@ android {
   }
 
   kotlinOptions {
-    jvmTarget = "11"
+    jvmTarget = signalKotlinJvmTarget
   }
 
   lint {

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

@@ -10,17 +10,17 @@ import org.gradle.kotlin.dsl.the
 val libs = the<LibrariesForLibs>()
 val testLibs = the<LibrariesForTestLibs>()
 
-val signalBuildToolsVersion: String by extra
-val signalCompileSdkVersion: String by extra
-val signalTargetSdkVersion: Int by extra
-val signalMinSdkVersion: Int by extra
-val signalJavaVersion: JavaVersion by extra
+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.application")
   id("kotlin-android")
   id("ktlint")
-  id("android-constants")
 }
 
 android {
@@ -43,7 +43,7 @@ android {
   }
 
   kotlinOptions {
-    jvmTarget = "11"
+    jvmTarget = signalKotlinJvmTarget
   }
 }
 

build-logic/tools/build.gradle.kts

@@ -4,9 +4,11 @@ plugins {
   id("org.jlleitschuh.gradle.ktlint") version "11.4.2"
 }
 
+val signalJavaVersion: JavaVersion by rootProject.extra
+
 java {
-  sourceCompatibility = JavaVersion.VERSION_11
-  targetCompatibility = JavaVersion.VERSION_11
+  sourceCompatibility = signalJavaVersion
+  targetCompatibility = signalJavaVersion
 }
 
 // NOTE: For now, in order to run ktlint on this project, you have to manually run ./gradlew :build-logic:tools:ktlintFormat