Convert Groovy to Kotlin. Update dependencies

This commit is contained in:
sictiru 2023-07-28 14:31:13 -07:00
parent 66e0265d7f
commit a5203c670a
4 changed files with 60 additions and 59 deletions

View file

@ -1,52 +0,0 @@
plugins {
id 'com.android.test'
id 'org.jetbrains.kotlin.android'
}
android {
namespace 'com.newsblur.benchmark'
compileSdk 33
compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
kotlinOptions {
jvmTarget = '1.8'
}
defaultConfig {
minSdk 23
targetSdk 33
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
}
buildTypes {
// This benchmark buildType is used for benchmarking, and should function like your
// release build (for example, with minification on). It's signed with a debug key
// for easy local/CI testing.
benchmark {
debuggable = true
signingConfig = debug.signingConfig
matchingFallbacks = ['release']
}
}
targetProjectPath = ':app'
experimentalProperties['android.experimental.self-instrumenting'] = true
}
dependencies {
implementation 'androidx.test.ext:junit:1.1.5'
implementation 'androidx.test.espresso:espresso-core:3.5.1'
implementation 'androidx.test.uiautomator:uiautomator:2.2.0'
implementation 'androidx.benchmark:benchmark-macro-junit4:1.1.1'
}
androidComponents {
beforeVariants(selector().all()) {
enabled = buildType == 'benchmark'
}
}

View file

@ -0,0 +1,53 @@
plugins {
id("com.android.test")
kotlin("android")
}
android {
namespace = "com.newsblur.benchmark"
compileSdk = 33
compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = "17"
}
defaultConfig {
minSdk = 23
targetSdk = 33
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
// This benchmark buildType is used for benchmarking, and should function like your
// release build (for example, with minification on). It's signed with a debug key
// for easy local/CI testing.
maybeCreate("benchmark")
getByName("benchmark") {
isDebuggable = true
signingConfig = signingConfigs.getByName("debug")
matchingFallbacks += listOf("release")
}
}
targetProjectPath = ":app"
experimentalProperties["android.experimental.self-instrumenting"] = true
}
dependencies {
implementation("androidx.test.ext:junit:1.1.5")
implementation("androidx.test.espresso:espresso-core:3.5.1")
implementation("androidx.test.uiautomator:uiautomator:2.2.0")
implementation("androidx.benchmark:benchmark-macro-junit4:1.1.1")
}
androidComponents {
beforeVariants(selector().all()) {
it.enabled = it.buildType == "benchmark"
}
}

View file

@ -53,12 +53,12 @@ android {
}
dependencies {
implementation("androidx.fragment:fragment-ktx:1.5.7")
implementation("androidx.recyclerview:recyclerview:1.3.0")
implementation("androidx.fragment:fragment-ktx:1.6.1")
implementation("androidx.recyclerview:recyclerview:1.3.1")
implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
implementation("com.squareup.okhttp3:okhttp:4.10.0")
implementation("com.squareup.okhttp3:okhttp:4.11.0")
implementation("com.google.code.gson:gson:2.10")
implementation("com.android.billingclient:billing:6.0.0")
implementation("com.android.billingclient:billing:6.0.1")
implementation("com.google.android.play:core:1.10.3")
implementation("com.google.android.material:material:1.9.0")
implementation("androidx.preference:preference-ktx:1.2.0")

View file

@ -1,10 +1,10 @@
plugins {
id("com.android.application") version "8.0.1" apply false
id("com.android.library") version "8.0.1" apply false
id("com.android.application") version "8.1.0" apply false
id("com.android.library") version "8.1.0" apply false
id("org.jetbrains.kotlin.android") version "1.8.10" apply false
id("org.jetbrains.kotlin.kapt") version "1.8.10" apply false
id("com.google.dagger.hilt.android") version "2.44.2" apply false
id("com.android.test") version "8.0.1" apply false
id("com.android.test") version "8.1.0" apply false
}
allprojects {