Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-20 11:08:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Consolidate some constants and add kotlin target JVM version.

Browse Source
This commit is contained in:
Alex Hart
2023-08-16 15:29:45 -03:00
committed by GitHub
parent fbf4de0ec5
commit 18f9c6b1f0
13 changed files with 63 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
build-logic/plugins/build.gradle.kts
View File

@@ -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 {

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

@@ -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)

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

@@ -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 {

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

@@ -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
}
}