third-party-mirrors/ultrasonic
1
0
Fork 0
mirror of https://gitlab.com/ultrasonic/ultrasonic.git synced 2025-06-09 03:52:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jetifier' into 'develop'

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

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

2
gradle/libs.versions.toml
View File

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

6
ultrasonic/build.gradle
View File

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