empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

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
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 63 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/build.gradle
View file

@ -10,7 +10,6 @@ plugins {
id 'app.cash.exhaustive'
id 'kotlin-parcelize'
id 'com.squareup.wire'
id 'android-constants'
id 'translations'
}
@ -94,7 +93,7 @@ android {
testBuildType 'instrumentation'
kotlinOptions {
jvmTarget = "11"
jvmTarget = signalKotlinJvmTarget
freeCompilerArgs = ["-Xallow-result-return-type"]
}

14
benchmark/build.gradle.kts
View file

@ -6,15 +6,15 @@ import org.gradle.kotlin.dsl.extra
val benchmarkLibs = the<org.gradle.accessors.dm.LibrariesForBenchmarkLibs>()
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.test")
id("android-constants")
id("org.jetbrains.kotlin.android")
}
@ -28,7 +28,7 @@ android {
}
kotlinOptions {
jvmTarget = "11"
jvmTarget = signalKotlinJvmTarget
}
defaultConfig {

8
build-logic/build.gradle.kts
View file

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

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 {

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

6
build-logic/tools/build.gradle.kts
View file

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

4
build.gradle
View file

@ -40,11 +40,13 @@ wrapper {
distributionType = Wrapper.DistributionType.ALL
}
apply from: "${rootDir}/constants.gradle.kts"
allprojects {
// Needed because otherwise the kapt task defaults to jvmTarget 17, which "poisons the well" and requires us to bump up too
tasks.withType(KotlinCompile).configureEach {
kotlinOptions {
jvmTarget = "11"
jvmTarget = signalKotlinJvmTarget
}
}
}

1
build-logic/plugins/src/main/java/android-constants.gradle.kts → constants.gradle.kts
View file

@ -3,3 +3,4 @@ val signalCompileSdkVersion by extra("android-33")
val signalTargetSdkVersion by extra(31)
val signalMinSdkVersion by extra(21)
val signalJavaVersion by extra(JavaVersion.VERSION_11)
val signalKotlinJvmTarget by extra("11")

6
libsignal/service/build.gradle
View file

@ -17,13 +17,13 @@ group = lib_signal_service_group_info
java {
withJavadocJar()
withSourcesJar()
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
sourceCompatibility = signalJavaVersion
targetCompatibility = signalJavaVersion
}
tasks.withType(KotlinCompile).configureEach {
kotlinOptions {
jvmTarget = "11"
jvmTarget = signalKotlinJvmTarget
}
}

14
microbenchmark/build.gradle.kts
View file

@ -4,15 +4,15 @@ plugins {
id("com.android.library")
id("androidx.benchmark")
id("org.jetbrains.kotlin.android")
id("android-constants")
id("ktlint")
}
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
android {
namespace = "org.signal.microbenchmark"
@ -24,7 +24,7 @@ android {
}
kotlinOptions {
jvmTarget = "11"
jvmTarget = signalKotlinJvmTarget
}
defaultConfig {

2
settings.gradle
View file

@ -87,4 +87,4 @@ project(':qr-app').projectDir = file('qr/app')
rootProject.name='Signal'
apply from: 'dependencies.gradle'
apply from: 'dependencies.gradle'

13
video-app/build.gradle.kts
View file

@ -7,11 +7,12 @@ plugins {
id("signal-sample-app")
}
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
android {
namespace = "org.thoughtcrime.video.app"
@ -41,7 +42,7 @@ android {
targetCompatibility = signalJavaVersion
}
kotlinOptions {
jvmTarget = "11"
jvmTarget = signalKotlinJvmTarget
}
buildFeatures {
compose = true