Update ktlint and gradle plugin.

This commit is contained in:
Cody Henthorne
2023-06-23 13:09:24 -04:00
committed by Nicholas
parent 65255121de
commit c17d62aeab
69 changed files with 447 additions and 176 deletions

View File

@@ -1,11 +1,11 @@
@file:Suppress("UnstableApiUsage")
plugins {
id("com.android.library")
id("androidx.benchmark")
id("org.jetbrains.kotlin.android")
id("android-constants")
id("ktlint")
id("com.android.library")
id("androidx.benchmark")
id("org.jetbrains.kotlin.android")
id("android-constants")
id("ktlint")
}
val signalBuildToolsVersion: String by extra
@@ -15,49 +15,49 @@ val signalMinSdkVersion: Int by extra
val signalJavaVersion: JavaVersion by extra
android {
namespace = "org.signal.microbenchmark"
compileSdkVersion = signalCompileSdkVersion
namespace = "org.signal.microbenchmark"
compileSdkVersion = signalCompileSdkVersion
compileOptions {
sourceCompatibility = signalJavaVersion
targetCompatibility = signalJavaVersion
compileOptions {
sourceCompatibility = signalJavaVersion
targetCompatibility = signalJavaVersion
}
kotlinOptions {
jvmTarget = "11"
}
defaultConfig {
minSdk = signalMinSdkVersion
targetSdk = signalTargetSdkVersion
testInstrumentationRunner = "androidx.benchmark.junit4.AndroidBenchmarkRunner"
}
testBuildType = "release"
buildTypes {
debug {
// Since isDebuggable can't be modified by gradle for library modules,
// it must be done in a manifest - see src/androidTest/AndroidManifest.xml
isMinifyEnabled = true
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "benchmark-proguard-rules.pro")
}
kotlinOptions {
jvmTarget = "11"
}
defaultConfig {
minSdk = signalMinSdkVersion
targetSdk = signalTargetSdkVersion
testInstrumentationRunner = "androidx.benchmark.junit4.AndroidBenchmarkRunner"
}
testBuildType = "release"
buildTypes {
debug {
// Since isDebuggable can't be modified by gradle for library modules,
// it must be done in a manifest - see src/androidTest/AndroidManifest.xml
isMinifyEnabled = true
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "benchmark-proguard-rules.pro")
}
release {
isDefault = true
}
release {
isDefault = true
}
}
}
dependencies {
lintChecks(project(":lintchecks"))
lintChecks(project(":lintchecks"))
// Base dependencies
androidTestImplementation(testLibs.junit.junit)
androidTestImplementation(benchmarkLibs.androidx.test.ext.junit)
androidTestImplementation(benchmarkLibs.androidx.benchmark.micro)
// Base dependencies
androidTestImplementation(testLibs.junit.junit)
androidTestImplementation(benchmarkLibs.androidx.test.ext.junit)
androidTestImplementation(benchmarkLibs.androidx.benchmark.micro)
// Dependencies of modules being tested
androidTestImplementation(project(":libsignal-service"))
androidTestImplementation(libs.libsignal.android)
androidTestImplementation(libs.google.protobuf.javalite)
// Dependencies of modules being tested
androidTestImplementation(project(":libsignal-service"))
androidTestImplementation(libs.libsignal.android)
androidTestImplementation(libs.google.protobuf.javalite)
}