merge upstream

2022-08-06 20:17:53 +02:00
parent bd076c3e5d
commit 0f7df7a71c
59 changed files with 1386 additions and 672 deletions
--- a/lib/dataimage/build.gradle.kts
+++ b/lib/dataimage/build.gradle.kts
@ -4,12 +4,11 @@ plugins {
 }

 android {
-    compileSdkVersion(AndroidConfig.compileSdk)
-    buildToolsVersion(AndroidConfig.buildTools)
+    compileSdk = AndroidConfig.compileSdk

    defaultConfig {
-        minSdkVersion(AndroidConfig.minSdk)
-        targetSdkVersion(AndroidConfig.targetSdk)
+        minSdk = AndroidConfig.minSdk
+        targetSdk = AndroidConfig.targetSdk
    }
 }

@ -18,7 +17,7 @@ repositories {
 }

 dependencies {
-    compileOnly(Dependencies.kotlin.stdlib)
-    compileOnly(Dependencies.okhttp)
-    compileOnly(Dependencies.jsoup)
+    compileOnly(libs.kotlin.stdlib)
+    compileOnly(libs.okhttp)
+    compileOnly(libs.jsoup)
 }