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

3
app/build.gradle
View File

@@ -10,7 +10,6 @@ plugins {
id 'app.cash.exhaustive' id 'app.cash.exhaustive'
id 'kotlin-parcelize' id 'kotlin-parcelize'
id 'com.squareup.wire' id 'com.squareup.wire'
id 'android-constants'
id 'translations' id 'translations'
} }
@@ -94,7 +93,7 @@ android {
testBuildType 'instrumentation' testBuildType 'instrumentation'
kotlinOptions { kotlinOptions {
jvmTarget = "11" jvmTarget = signalKotlinJvmTarget
freeCompilerArgs = ["-Xallow-result-return-type"] 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 benchmarkLibs = the<org.gradle.accessors.dm.LibrariesForBenchmarkLibs>()
val signalBuildToolsVersion: String by extra val signalBuildToolsVersion: String by rootProject.extra
val signalCompileSdkVersion: String by extra val signalCompileSdkVersion: String by rootProject.extra
val signalTargetSdkVersion: Int by extra val signalTargetSdkVersion: Int by rootProject.extra
val signalMinSdkVersion: Int by extra val signalMinSdkVersion: Int by rootProject.extra
val signalJavaVersion: JavaVersion by extra val signalJavaVersion: JavaVersion by rootProject.extra
val signalKotlinJvmTarget: String by rootProject.extra
plugins { plugins {
id("com.android.test") id("com.android.test")
id("android-constants")
id("org.jetbrains.kotlin.android") id("org.jetbrains.kotlin.android")
} }
@@ -28,7 +28,7 @@ android {
} }
kotlinOptions { kotlinOptions {
jvmTarget = "11" jvmTarget = signalKotlinJvmTarget
} }
defaultConfig { defaultConfig {

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

@@ -1,3 +1,5 @@
import org.gradle.kotlin.dsl.extra
buildscript { buildscript {
val kotlinVersion by extra("1.8.10") val kotlinVersion by extra("1.8.10")
@@ -11,11 +13,15 @@ buildscript {
} }
} }
apply(from = "${rootDir}/../constants.gradle.kts")
val signalKotlinJvmTarget: String by extra
allprojects { allprojects {
// Needed because otherwise the kapt task defaults to jvmTarget 17, which "poisons the well" and requires us to bump up too // 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 { tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
kotlinOptions { 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 { plugins {
`kotlin-dsl` `kotlin-dsl`
id("groovy-gradle-plugin") id("groovy-gradle-plugin")
id("org.jlleitschuh.gradle.ktlint") version "11.4.2" id("org.jlleitschuh.gradle.ktlint") version "11.4.2"
} }
val signalJavaVersion: JavaVersion by rootProject.extra
val signalKotlinJvmTarget: String by rootProject.extra
java { java {
sourceCompatibility = JavaVersion.VERSION_11 sourceCompatibility = signalJavaVersion
targetCompatibility = JavaVersion.VERSION_11 targetCompatibility = signalJavaVersion
} }
kotlinDslPluginOptions { kotlinDslPluginOptions {
jvmTarget.set("11") jvmTarget.set(signalKotlinJvmTarget)
} }
dependencies { 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 libs = the<LibrariesForLibs>()
val testLibs = the<LibrariesForTestLibs>() val testLibs = the<LibrariesForTestLibs>()
val signalBuildToolsVersion: String by extra val signalBuildToolsVersion: String by rootProject.extra
val signalCompileSdkVersion: String by extra val signalCompileSdkVersion: String by rootProject.extra
val signalTargetSdkVersion: Int by extra val signalTargetSdkVersion: Int by rootProject.extra
val signalMinSdkVersion: Int by extra val signalMinSdkVersion: Int by rootProject.extra
val signalJavaVersion: JavaVersion by extra val signalJavaVersion: JavaVersion by rootProject.extra
val signalKotlinJvmTarget: String by rootProject.extra
plugins { plugins {
id("com.android.library") id("com.android.library")
id("kotlin-android") id("kotlin-android")
id("android-constants")
id("ktlint") id("ktlint")
} }
@@ -38,7 +38,7 @@ android {
} }
kotlinOptions { kotlinOptions {
jvmTarget = "11" jvmTarget = signalKotlinJvmTarget
} }
lint { 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 libs = the<LibrariesForLibs>()
val testLibs = the<LibrariesForTestLibs>() val testLibs = the<LibrariesForTestLibs>()
val signalBuildToolsVersion: String by extra val signalBuildToolsVersion: String by rootProject.extra
val signalCompileSdkVersion: String by extra val signalCompileSdkVersion: String by rootProject.extra
val signalTargetSdkVersion: Int by extra val signalTargetSdkVersion: Int by rootProject.extra
val signalMinSdkVersion: Int by extra val signalMinSdkVersion: Int by rootProject.extra
val signalJavaVersion: JavaVersion by extra val signalJavaVersion: JavaVersion by rootProject.extra
val signalKotlinJvmTarget: String by rootProject.extra
plugins { plugins {
id("com.android.application") id("com.android.application")
id("kotlin-android") id("kotlin-android")
id("ktlint") id("ktlint")
id("android-constants")
} }
android { android {
@@ -43,7 +43,7 @@ android {
} }
kotlinOptions { 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" id("org.jlleitschuh.gradle.ktlint") version "11.4.2"
} }
val signalJavaVersion: JavaVersion by rootProject.extra
java { java {
sourceCompatibility = JavaVersion.VERSION_11 sourceCompatibility = signalJavaVersion
targetCompatibility = JavaVersion.VERSION_11 targetCompatibility = signalJavaVersion
} }
// NOTE: For now, in order to run ktlint on this project, you have to manually run ./gradlew :build-logic:tools:ktlintFormat // 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 distributionType = Wrapper.DistributionType.ALL
} }
apply from: "${rootDir}/constants.gradle.kts"
allprojects { allprojects {
// Needed because otherwise the kapt task defaults to jvmTarget 17, which "poisons the well" and requires us to bump up too // 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 { tasks.withType(KotlinCompile).configureEach {
kotlinOptions { 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 signalTargetSdkVersion by extra(31)
val signalMinSdkVersion by extra(21) val signalMinSdkVersion by extra(21)
val signalJavaVersion by extra(JavaVersion.VERSION_11) 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 { java {
withJavadocJar() withJavadocJar()
withSourcesJar() withSourcesJar()
sourceCompatibility = JavaVersion.VERSION_11 sourceCompatibility = signalJavaVersion
targetCompatibility = JavaVersion.VERSION_11 targetCompatibility = signalJavaVersion
} }
tasks.withType(KotlinCompile).configureEach { tasks.withType(KotlinCompile).configureEach {
kotlinOptions { kotlinOptions {
jvmTarget = "11" jvmTarget = signalKotlinJvmTarget
} }
} }

14
microbenchmark/build.gradle.kts
View File

@@ -4,15 +4,15 @@ plugins {
id("com.android.library") id("com.android.library")
id("androidx.benchmark") id("androidx.benchmark")
id("org.jetbrains.kotlin.android") id("org.jetbrains.kotlin.android")
id("android-constants")
id("ktlint") id("ktlint")
} }
val signalBuildToolsVersion: String by extra val signalBuildToolsVersion: String by rootProject.extra
val signalCompileSdkVersion: String by extra val signalCompileSdkVersion: String by rootProject.extra
val signalTargetSdkVersion: Int by extra val signalTargetSdkVersion: Int by rootProject.extra
val signalMinSdkVersion: Int by extra val signalMinSdkVersion: Int by rootProject.extra
val signalJavaVersion: JavaVersion by extra val signalJavaVersion: JavaVersion by rootProject.extra
val signalKotlinJvmTarget: String by rootProject.extra
android { android {
namespace = "org.signal.microbenchmark" namespace = "org.signal.microbenchmark"
@@ -24,7 +24,7 @@ android {
} }
kotlinOptions { kotlinOptions {
jvmTarget = "11" jvmTarget = signalKotlinJvmTarget
} }
defaultConfig { defaultConfig {

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

@@ -7,11 +7,12 @@ plugins {
id("signal-sample-app") id("signal-sample-app")
} }
val signalBuildToolsVersion: String by extra val signalBuildToolsVersion: String by rootProject.extra
val signalCompileSdkVersion: String by extra val signalCompileSdkVersion: String by rootProject.extra
val signalTargetSdkVersion: Int by extra val signalTargetSdkVersion: Int by rootProject.extra
val signalMinSdkVersion: Int by extra val signalMinSdkVersion: Int by rootProject.extra
val signalJavaVersion: JavaVersion by extra val signalJavaVersion: JavaVersion by rootProject.extra
val signalKotlinJvmTarget: String by rootProject.extra
android { android {
namespace = "org.thoughtcrime.video.app" namespace = "org.thoughtcrime.video.app"
@@ -41,7 +42,7 @@ android {
targetCompatibility = signalJavaVersion targetCompatibility = signalJavaVersion
} }
kotlinOptions { kotlinOptions {
jvmTarget = "11" jvmTarget = signalKotlinJvmTarget
} }
buildFeatures { buildFeatures {
compose = true compose = true