Merge branch 'jetifier' into 'develop'

Disable jetifier, update Picasso

See merge request ultrasonic/ultrasonic!809
This commit is contained in:
birdbird 2022-08-19 06:21:39 +00:00
commit e1927cda44
3 changed files with 7 additions and 3 deletions

View File

@ -10,4 +10,4 @@ kotlin.caching.enabled=true
kotlin.incremental.usePreciseJavaTracking=true
android.useAndroidX=true
android.enableJetifier=true
android.enableJetifier=false

View File

@ -27,7 +27,7 @@ retrofit = "2.9.0"
jackson = "2.10.1"
okhttp = "4.10.0"
koin = "3.2.0"
picasso = "2.71828"
picasso = "2.8"
junit4 = "4.13.2"
junit5 = "5.8.1"

View File

@ -37,17 +37,18 @@ android {
applicationIdSuffix ".debug"
}
}
sourceSets {
main.java.srcDirs += "${projectDir}/src/main/kotlin"
test.java.srcDirs += "${projectDir}/src/test/kotlin"
}
packagingOptions {
resources {
excludes += ['META-INF/LICENSE']
}
}
kotlinOptions {
jvmTarget = "1.8"
}
@ -67,6 +68,7 @@ android {
arg("room.schemaLocation", "$rootDir/ultrasonic/schemas".toString())
}
}
lint {
baseline = file("lint-baseline.xml")
abortOnError true
@ -135,4 +137,6 @@ dependencies {
testImplementation libs.robolectric
implementation libs.timber
}