Skip to content

Commit f6f5fd6

Browse files
FabtronFabtron
authored
Dependency updates (#216)
1 parent 2004128 commit f6f5fd6

File tree

38 files changed

+198
-193
lines changed

38 files changed

+198
-193
lines changed

‎accessibility-toolbox/build.gradle.kts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@file:Suppress("UnstableApiUsage")
22

3-
@Suppress("DSL_SCOPE_VIOLATION") plugins {
3+
plugins {
44
id(libs.plugins.androidLibrary.get().pluginId)
55
id(libs.plugins.kotlin.android.get().pluginId)
66
id(libs.plugins.dokka.get().pluginId)
@@ -20,11 +20,13 @@ android {
2020

2121
defaultConfig {
2222
minSdk = libs.versions.minSdk.get().toInt()
23-
@Suppress("Deprecation")
24-
targetSdk = libs.versions.targetSdk.get().toInt()
2523
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2624
}
2725

26+
lint {
27+
targetSdk = libs.versions.targetSdk.get().toInt()
28+
}
29+
2830
buildTypes {
2931
release {
3032
postprocessing {

‎build.gradle.kts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
import org.jetbrains.dokka.gradle.AbstractDokkaTask
22
import org.jetbrains.dokka.gradle.DokkaTask
33
import java.net.URI
4+
import java.util.Locale
45

5-
@Suppress("DSL_SCOPE_VIOLATION") plugins {
6+
plugins {
67
alias(libs.plugins.benManesVersions)
78
alias(libs.plugins.versionCatalogUpdate)
89
alias(libs.plugins.dokka)
10+
alias(libs.plugins.compose.compiler) apply false
911
id("maven-publish")
1012
}
1113

@@ -106,7 +108,7 @@ tasks.register("printVersion") {
106108
}
107109

108110
tasks.register("clean", Delete::class) {
109-
delete(rootProject.buildDir)
111+
delete(rootProject.layout.buildDirectory)
110112
}
111113

112114
versionCatalogUpdate {
@@ -117,7 +119,7 @@ versionCatalogUpdate {
117119
}
118120

119121
fun isNonStable(version: String): Boolean {
120-
val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { version.toUpperCase().contains(it) }
122+
val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { version.uppercase(Locale.getDefault()).contains(it) }
121123
val regex = "^[0-9,.v-]+(-r)?$".toRegex()
122124
val isStable = stableKeyword || regex.matches(version)
123125
return isStable.not()

‎core/build.gradle.kts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@file:Suppress("UnstableApiUsage")
22

3-
@Suppress("DSL_SCOPE_VIOLATION") plugins {
3+
plugins {
44
id(libs.plugins.androidLibrary.get().pluginId)
55
id(libs.plugins.kotlin.android.get().pluginId)
66
id(libs.plugins.dokka.get().pluginId)
@@ -20,14 +20,16 @@ android {
2020

2121
defaultConfig {
2222
minSdk = libs.versions.minSdk.get().toInt()
23-
@Suppress("Deprecation")
24-
targetSdk = libs.versions.targetSdk.get().toInt()
2523
consumerProguardFile("proguard-rules.pro")
2624
buildConfigField("String", "VERSION_NAME", "\"${project.extra.get("sdkVersion")}\"")
2725

2826
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2927
}
3028

29+
lint {
30+
targetSdk = libs.versions.targetSdk.get().toInt()
31+
}
32+
3133
buildTypes {
3234
release {
3335
postprocessing {

‎core/src/main/java/io/snabble/sdk/Config.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,9 +207,9 @@ object InterceptorSerializer : JsonSerializer<Interceptor?>, JsonDeserializer<In
207207
val cls = json?.asString
208208
return if (cls != null) {
209209
val clazz = Class.forName(cls)
210-
clazz.newInstance() as Interceptor
210+
clazz.getDeclaredConstructor().newInstance() as Interceptor
211211
} else {
212212
null
213213
}
214214
}
215-
}
215+
}

‎core/src/main/java/io/snabble/sdk/SnabbleInitializer.kt‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import java.util.Properties
1414
* Initializer for the snabble SDK using androidx.startup
1515
*/
1616
class SnabbleInitializer : Initializer<Snabble> {
17+
1718
override fun create(context: Context): Snabble {
1819
val app = context.applicationContext as Application
1920

@@ -47,7 +48,9 @@ class SnabbleInitializer : Initializer<Snabble> {
4748
lastSeenThreshold = properties.getLong("lastSeenThreshold", lastSeenThreshold)
4849
networkInterceptor =
4950
try {
50-
Class.forName(properties.getProperty("networkInterceptor", null))?.newInstance() as Interceptor?
51+
Class.forName(properties.getProperty("networkInterceptor", null))
52+
?.getDeclaredConstructor()
53+
?.newInstance() as Interceptor?
5154
} catch (e: Throwable) {
5255
Logger.w("Could not instantiate network interceptor", e.message)
5356
null
@@ -86,7 +89,9 @@ class SnabbleInitializer : Initializer<Snabble> {
8689
lastSeenThreshold = getLong("snabble_last_seen_threshold", lastSeenThreshold)
8790
networkInterceptor =
8891
try {
89-
Class.forName(getString("snabble_network_interceptor", null))?.newInstance() as Interceptor?
92+
Class.forName(getString("snabble_network_interceptor", null))
93+
?.getDeclaredConstructor()
94+
?.newInstance() as Interceptor?
9095
} catch (e: Throwable) {
9196
Logger.w("Could not instantiate network interceptor", e.message)
9297
null

‎core/src/main/java/io/snabble/sdk/googlepay/GooglePayHelper.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,12 +190,14 @@ class GooglePayHelper(
190190
/**
191191
* Starts a payment data request to google pay
192192
*/
193+
@SuppressWarnings("deprecation")
193194
fun loadPaymentData(priceToPay: String, activity: Activity, requestCode: Int): Boolean {
194195
val paymentDataRequestJson = getPaymentDataRequest(priceToPay)
195196

196197
val request = PaymentDataRequest.fromJson(GsonHolder.get().toJson(paymentDataRequestJson))
197198
val googlePayClient = googlePayClient
198199
val task = googlePayClient.loadPaymentData(request)
200+
// TODO: https://github.com/Adyen/adyen-android/issues/771#issuecomment-1640221564
199201
AutoResolveHelper.resolveTask(task, activity, requestCode)
200202
return true
201203
}

‎gradle/libs.versions.toml‎

Lines changed: 60 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -2,122 +2,116 @@
22
compileSdk = "34"
33
targetSdk = "34"
44
minSdk = "21"
5-
gradlePlugin = "8.5.1"
6-
desugarVersion = "1.1.5"
7-
okhttpVersion = "4.10.0"
8-
# @pin always, manually updated to ensure overall dependency support
9-
kotlin = "1.9.23"
10-
# @pin always, manually updated to ensure overall dependency support
11-
compose-compiler = "1.5.11"
12-
navigation = "2.6.0"
13-
# @pin
14-
compose_version = "1.2.1"
5+
gradlePlugin = "8.6.1"
6+
kotlin = "2.0.20"
7+
navigation = "2.8.1"
158
snabbleSdk = "0.69.6"
16-
androidx-camera = "1.2.3"
17-
androidx-compose-ui = "1.6.7"
18-
com-squareup-okhttp3 = "4.11.0"
19-
io-kotest = "5.6.2"
20-
org-jetbrains-dokka = "1.8.20"
21-
androidx-compose-material = "1.4.3"
9+
androidx-camera = "1.3.4"
10+
androidx-compose-ui = "1.7.2"
11+
com-squareup-okhttp3 = "4.12.0"
12+
io-kotest = "5.9.1"
13+
dokka = "1.9.20"
14+
androidx-compose-material = "1.7.2"
15+
android-lifecycle = "2.8.6"
16+
koin = "4.0.0"
2217

2318
[libraries]
24-
airbnb-lottie = "com.airbnb.android:lottie:6.0.1"
25-
androidx-activityCompose = "androidx.activity:activity-compose:1.7.2"
26-
androidx-appcompat = "androidx.appcompat:appcompat:1.6.1"
19+
airbnb-lottie = "com.airbnb.android:lottie:6.5.2"
20+
androidx-activityCompose = "androidx.activity:activity-compose:1.9.2"
21+
androidx-appcompat = "androidx.appcompat:appcompat:1.7.0"
2722
androidx-biometric = "androidx.biometric:biometric:1.2.0-alpha05"
2823
androidx-camera-camera2 = { module = "androidx.camera:camera-camera2", version.ref = "androidx-camera" }
2924
androidx-camera-core = { module = "androidx.camera:camera-core", version.ref = "androidx-camera" }
3025
androidx-camera-extension = { module = "androidx.camera:camera-extensions", version.ref = "androidx-camera" }
3126
androidx-camera-lifecycle = { module = "androidx.camera:camera-lifecycle", version.ref = "androidx-camera" }
3227
androidx-camera-view = { module = "androidx.camera:camera-view", version.ref = "androidx-camera" }
3328
androidx-cardview = "androidx.cardview:cardview:1.0.0"
34-
androidx-core-ktx = "androidx.core:core-ktx:1.9.0"
29+
androidx-core-ktx = "androidx.core:core-ktx:1.13.1"
3530
androidx-constraintlayout = "androidx.constraintlayout:constraintlayout:2.1.4"
3631
androidx-constraintlayoutCompose = "androidx.constraintlayout:constraintlayout-compose:1.0.1"
3732
# Compose previews won't work w/o this: https://issuetracker.google.com/issues/227767363
3833
androidx-customview = "androidx.customview:customview:1.1.0"
3934
androidx-customview-poolingcontainer = "androidx.customview:customview-poolingcontainer:1.0.0"
4035
androidx-gridlayout = "androidx.gridlayout:gridlayout:1.0.0"
41-
androidx-lifecycle-common = "androidx.lifecycle:lifecycle-common:2.6.1"
36+
androidx-lifecycle-common = {module = "androidx.lifecycle:lifecycle-common", version.ref = "android-lifecycle"}
4237
androidx-lifecycleExtension = "androidx.lifecycle:lifecycle-extensions:2.2.0"
43-
androidx-lifecycleLiveData = "androidx.lifecycle:lifecycle-livedata-ktx:2.6.1"
44-
androidx-lifecycle-process = "androidx.lifecycle:lifecycle-process:2.6.1"
45-
androidx-lifecycleRuntimeKtx = "androidx.lifecycle:lifecycle-runtime-ktx:2.6.1"
46-
androidx-lifecycleRuntimeCompose = "androidx.lifecycle:lifecycle-runtime-compose:2.6.1"
47-
androidx-lifecycleViewmodelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1"
48-
android-material = "com.google.android.material:material:1.9.0"
38+
androidx-lifecycleLiveData = {module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "android-lifecycle"}
39+
androidx-lifecycle-process = {module = "androidx.lifecycle:lifecycle-process", version.ref = "android-lifecycle"}
40+
androidx-lifecycleRuntimeKtx = {module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "android-lifecycle"}
41+
androidx-lifecycleRuntimeCompose = {module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "android-lifecycle"}
42+
androidx-lifecycleViewmodelCompose = {module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "android-lifecycle"}
43+
android-material = "com.google.android.material:material:1.12.0"
4944
androidx-navigation-fragmentKtx = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "navigation" }
5045
androidx-navigation-runtimeKtx = { module = "androidx.navigation:navigation-runtime-ktx", version.ref = "navigation" }
5146
androidx-navigation-uiKtx = { module = "androidx.navigation:navigation-ui-ktx", version.ref = "navigation" }
52-
androidx-preferences = "androidx.preference:preference-ktx:1.2.0"
53-
androidx-recyclerview = "androidx.recyclerview:recyclerview:1.3.0"
54-
androidx-startupRuntime = "androidx.startup:startup-runtime:1.1.1"
47+
androidx-preferences = "androidx.preference:preference-ktx:1.2.1"
48+
androidx-recyclerview = "androidx.recyclerview:recyclerview:1.3.2"
49+
androidx-startupRuntime = "androidx.startup:startup-runtime:1.2.0"
5550
androidx-swiperefreshlayout = "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
56-
androidx-viewpager2 = "androidx.viewpager2:viewpager2:1.0.0"
57-
androidx-webkit = "androidx.webkit:webkit:1.7.0"
58-
apache-commonsLang3 = "org.apache.commons:commons-lang3:3.12.0"
51+
androidx-viewpager2 = "androidx.viewpager2:viewpager2:1.1.0"
52+
androidx-webkit = "androidx.webkit:webkit:1.12.0"
53+
apache-commonsLang3 = "org.apache.commons:commons-lang3:3.17.0"
5954
caverock-androidsvgAar = "com.caverock:androidsvg-aar:1.4"
6055
compose-iconsExtended = { module = "androidx.compose.material:material-icons-extended", version.ref = "androidx-compose-material" }
6156
compose-navigation = { module = "androidx.navigation:navigation-compose", version.ref = "navigation" }
6257
compose-material = { module = "androidx.compose.material:material", version.ref = "androidx-compose-material" }
63-
compose-material3 = "androidx.compose.material3:material3:1.2.1"
64-
compose-material3Themeadapter = "com.google.accompanist:accompanist-themeadapter-material3:0.34.0"
58+
compose-material3 = "androidx.compose.material3:material3:1.3.0"
59+
compose-material3Themeadapter = "com.google.accompanist:accompanist-themeadapter-material3:0.36.0"
6560
compose-ui = { module = "androidx.compose.ui:ui", version.ref = "androidx-compose-ui" }
6661
compose-uiTestManifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "androidx-compose-ui" }
6762
compose-uiTestJunit = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "androidx-compose-ui" }
6863
compose-uiTooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "androidx-compose-ui" }
6964
compose-uiToolingPreview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "androidx-compose-ui" }
7065
compose-uiUtil = { module = "androidx.compose.ui:ui-util", version.ref = "androidx-compose-ui" }
7166
compose-uiViewBinding = { module = "androidx.compose.ui:ui-viewbinding", version.ref = "androidx-compose-ui" }
72-
commonsIo = "commons-io:commons-io:2.5"
73-
datatrans-androidSdk = "ch.datatrans:android-sdk:3.2.0"
74-
desugarJdkLibsNio = "com.android.tools:desugar_jdk_libs_nio:2.0.4"
67+
commonsIo = "commons-io:commons-io:2.17.0"
68+
datatrans-androidSdk = "ch.datatrans:android-sdk:3.7.0"
69+
desugarJdkLibsNio = "com.android.tools:desugar_jdk_libs_nio:2.1.2"
7570
glide-compose = "com.github.bumptech.glide:compose:1.0.0-beta01"
76-
googlePlayServices-maps = "com.google.android.gms:play-services-maps:18.1.0"
77-
googlePlayServices-wallet = "com.google.android.gms:play-services-wallet:19.2.0"
78-
google-mlkit-barcodeScanning = "com.google.mlkit:barcode-scanning:17.1.0"
79-
google-zxing-core = "com.google.zxing:core:3.5.1"
80-
gson = "com.google.code.gson:gson:2.9.1"
81-
iban4j = "org.iban4j:iban4j:3.2.5-RELEASE"
82-
jakewhartonProcessPhoenix = "com.jakewharton:process-phoenix:2.1.2"
71+
googlePlayServices-maps = "com.google.android.gms:play-services-maps:19.0.0"
72+
googlePlayServices-wallet = "com.google.android.gms:play-services-wallet:19.4.0"
73+
google-mlkit-barcodeScanning = "com.google.mlkit:barcode-scanning:17.3.0"
74+
google-zxing-core = "com.google.zxing:core:3.5.3"
75+
gson = "com.google.code.gson:gson:2.11.0"
76+
iban4j = "org.iban4j:iban4j:3.2.10-RELEASE"
77+
jakewhartonProcessPhoenix = "com.jakewharton:process-phoenix:3.0.0"
8378
picasso = "com.squareup.picasso:picasso:2.8"
8479
rekisoftLazyWorker = "eu.rekisoft.android.util:LazyWorker:2.1.0"
8580
relex-circleindicator = "me.relex:circleindicator:2.1.6"
86-
snabble-phoneAuth-countryCodePicker = "io.snabble.phoneauth:countryCodePicker:3.2.2"
81+
snabble-phoneAuth-countryCodePicker = "io.snabble.phoneauth:countryCodePicker:3.3.0"
8782
squareup-okhttp3-loggingInterceptor = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "com-squareup-okhttp3" }
8883
squareup-okhttp3-okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "com-squareup-okhttp3" }
8984
squareup-okhttp3-tls = { module = "com.squareup.okhttp3:okhttp-tls", version.ref = "com-squareup-okhttp3" }
9085
# Testing
9186
androidx-coreTesting = "androidx.arch.core:core-testing:2.2.0"
9287
junit = "junit:junit:4.13.2"
93-
koin-android = "io.insert-koin:koin-android:3.4.2"
94-
koin-androidCompat = "io.insert-koin:koin-android-compat:3.4.2"
95-
koin-androidxCompose = "io.insert-koin:koin-androidx-compose:3.4.5"
96-
koin-core = "io.insert-koin:koin-core:3.4.2"
88+
koin-android = {module = "io.insert-koin:koin-android", version.ref = "koin"}
89+
koin-androidCompat ={module = "io.insert-koin:koin-android-compat", version.ref = "koin"}
90+
koin-androidxCompose = {module = "io.insert-koin:koin-androidx-compose", version.ref = "koin"}
91+
koin-core = {module = "io.insert-koin:koin-core", version.ref = "koin"}
9792
kotest-runnerJunit = { module = "io.kotest:kotest-runner-junit5", version.ref = "io-kotest" }
9893
kotest-assertionsCore = { module = "io.kotest:kotest-assertions-core", version.ref = "io-kotest" }
9994
koltin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
10095
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
101-
kotlinx-serializationJson = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1"
102-
mock = "io.mockk:mockk:1.13.5"
96+
kotlinx-serializationJson = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3"
97+
mockk = "io.mockk:mockk:1.13.12"
10398
# @pin requires higher target
104-
mockito-kotlin = "org.mockito.kotlin:mockito-kotlin:4.1.0"
105-
roboletric = "org.robolectric:robolectric:4.9.2"
99+
mockito-kotlin = "org.mockito.kotlin:mockito-kotlin:5.4.0"
100+
roboletric = "org.robolectric:robolectric:4.13"
106101
roboletric-androidAll = "org.robolectric:android-all:13-robolectric-9030017"
107-
# @pin
108-
sebaslogen-resaca = "com.github.sebaslogen.resaca:resaca:2.3.3"
102+
sebaslogen-resaca = "io.github.sebaslogen:resaca:4.3.0"
109103
squareup-okhttp3-mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "com-squareup-okhttp3" }
110-
test-espressoCore = "androidx.test.espresso:espresso-core:3.5.1"
111-
test-ext-junit = "androidx.test.ext:junit:1.1.5"
112-
test-runner = "androidx.test:runner:1.5.2"
104+
test-espressoCore = "androidx.test.espresso:espresso-core:3.6.1"
105+
test-ext-junit = "androidx.test.ext:junit:1.2.1"
106+
test-runner = "androidx.test:runner:1.6.2"
113107
# Classpath dependencies
114108
classpath-androidGradlePlugin = { module = "com.android.tools.build:gradle", version.ref = "gradlePlugin" }
115109
classpath-kotlinAndroidPlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
116-
classpath-dokkaGradlePlugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "org-jetbrains-dokka" }
117-
classpath-dokkaBase = { module = "org.jetbrains.dokka:dokka-base", version.ref = "org-jetbrains-dokka" }
110+
classpath-dokkaGradlePlugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka" }
111+
classpath-dokkaBase = { module = "org.jetbrains.dokka:dokka-base", version.ref = "dokka" }
118112
classpath-jlouns-gradleCrossPlatformExecPlugin = "gradle.plugin.com.github.jlouns:gradle-cross-platform-exec-plugin:0.5.0"
119113
classpath-qmazzo-sqlitePlugin = "gradle.plugin.gmazzo:sqlite-plugin:0.2"
120-
classpath-bjoernq-unmockPlugin = "com.github.bjoernq:unmockplugin:0.7.9"
114+
classpath-bjoernq-unmockPlugin = "com.github.bjoernq:unmockplugin:0.8.0"
121115

122116
[bundles]
123117
camera = [
@@ -157,11 +151,12 @@ koin = [
157151
[plugins]
158152
androidApplication = { id = "com.android.application", version.ref = "gradlePlugin" }
159153
androidLibrary = { id = "com.android.library", version.ref = "gradlePlugin" }
160-
dokka = "org.jetbrains.dokka:1.8.20"
154+
dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
161155
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
162156
kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
163157
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
164158
snabbleSetup = "io.snabble.setup:1.0.1"
165159
unmock = "de.mobilej.unmock:0.7.9"
166-
benManesVersions = "com.github.ben-manes.versions:0.47.0"
167-
versionCatalogUpdate = "nl.littlerobots.version-catalog-update:0.8.0"
160+
benManesVersions = "com.github.ben-manes.versions:0.51.0"
161+
versionCatalogUpdate = "nl.littlerobots.version-catalog-update:0.8.4"
162+
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎kotlin-sample/build.gradle.kts‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
@file:Suppress("UnstableApiUsage")
2-
3-
@Suppress("DSL_SCOPE_VIOLATION") plugins {
1+
plugins {
42
id(libs.plugins.androidApplication.get().pluginId)
53
id(libs.plugins.kotlin.android.get().pluginId)
64
alias(libs.plugins.snabbleSetup)
5+
alias(libs.plugins.compose.compiler)
76
}
87

98
android {
@@ -44,14 +43,8 @@ android {
4443
jvmTarget = "17"
4544
}
4645

47-
4846
buildFeatures {
4947
buildConfig = true
50-
compose = true
51-
}
52-
53-
composeOptions {
54-
kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
5548
}
5649
}
5750

‎mlkit-scanner-engine/build.gradle.kts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@file:Suppress("UnstableApiUsage")
22

3-
@Suppress("DSL_SCOPE_VIOLATION") plugins {
3+
plugins {
44
id(libs.plugins.androidLibrary.get().pluginId)
55
id(libs.plugins.kotlin.android.get().pluginId)
66
id(libs.plugins.dokka.get().pluginId)
@@ -19,11 +19,13 @@ android {
1919

2020
defaultConfig {
2121
minSdk = libs.versions.minSdk.get().toInt()
22-
@Suppress("Deprecation")
23-
targetSdk = libs.versions.targetSdk.get().toInt()
2422
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2523
}
2624

25+
lint {
26+
targetSdk = libs.versions.targetSdk.get().toInt()
27+
}
28+
2729
buildTypes {
2830
release {
2931
postprocessing {

0 commit comments

Comments
 (0)