diff --git a/gradle.properties b/gradle.properties index 2635181c..a7c0d4f8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,4 +10,4 @@ kotlin.caching.enabled=true kotlin.incremental.usePreciseJavaTracking=true android.useAndroidX=true -android.enableJetifier=true +android.enableJetifier=false diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8a107622..ae9866ab 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -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" diff --git a/ultrasonic/build.gradle b/ultrasonic/build.gradle index fbf0b199..c2da6b7c 100644 --- a/ultrasonic/build.gradle +++ b/ultrasonic/build.gradle @@ -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 + } +