Skip to content

Commit d8fdde6

Browse files
authored
Dependency updates (#255)
1 parent b1510a6 commit d8fdde6

File tree

25 files changed

+234
-138
lines changed

25 files changed

+234
-138
lines changed

.idea/codeStyles/Project.xml

Lines changed: 35 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

accessibility-toolbox/build.gradle.kts

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

3+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
4+
35
plugins {
46
id(libs.plugins.androidLibrary.get().pluginId)
57
id(libs.plugins.kotlin.android.get().pluginId)
@@ -50,12 +52,13 @@ android {
5052
getByName("androidTest").java.srcDirs("src/androidTest/kotlin")
5153
}
5254

53-
kotlinOptions {
54-
freeCompilerArgs = listOf(
55-
*kotlinOptions.freeCompilerArgs.toTypedArray(),
56-
"-Xjvm-default=all"
57-
)
58-
jvmTarget = "17"
55+
kotlin {
56+
compilerOptions {
57+
jvmTarget = JvmTarget.JVM_17
58+
freeCompilerArgs.addAll(
59+
"-Xjvm-default=all"
60+
)
61+
}
5962
}
6063

6164
lint {

build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ buildscript {
2929
}
3030
}
3131

32-
val sdkVersion = libs.versions.snabbleSdk.get()
33-
3432
allprojects {
3533
repositories {
3634
google()

core/build.gradle.kts

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

3+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
4+
35
plugins {
46
id(libs.plugins.androidLibrary.get().pluginId)
57
id(libs.plugins.kotlin.android.get().pluginId)
@@ -48,12 +50,13 @@ android {
4850
targetCompatibility = JavaVersion.VERSION_17
4951
}
5052

51-
kotlinOptions {
52-
freeCompilerArgs = listOf(
53-
*kotlinOptions.freeCompilerArgs.toTypedArray(),
54-
"-Xjvm-default=all"
55-
)
56-
jvmTarget = "17"
53+
kotlin {
54+
compilerOptions {
55+
jvmTarget = JvmTarget.JVM_17
56+
freeCompilerArgs.addAll(
57+
"-Xjvm-default=all"
58+
)
59+
}
5760
}
5861

5962
buildFeatures {

gradle/libs.versions.toml

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2,37 +2,37 @@
22
compileSdk = "35"
33
targetSdk = "35"
44
minSdk = "21"
5-
gradlePlugin = "8.9.2"
6-
kotlin = "2.0.20"
7-
navigation = "2.8.1"
5+
gradlePlugin = "8.11.0"
6+
kotlin = "2.2.0"
7+
navigation = "2.9.1"
88
snabbleSdk = "0.69.6"
9-
androidx-camera = "1.3.4"
10-
androidx-compose-ui = "1.7.2"
9+
androidx-camera = "1.4.2"
10+
androidx-compose-ui = "1.8.3"
1111
com-squareup-okhttp3 = "4.12.0"
1212
io-kotest = "5.9.1"
1313
dokka = "1.9.20"
14-
androidx-compose-material = "1.7.2"
15-
android-lifecycle = "2.8.6"
16-
koin = "4.0.0"
14+
androidx-compose-material = "1.8.3"
15+
android-lifecycle = "2.9.1"
16+
koin = "4.1.0"
1717

1818
[libraries]
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"
19+
airbnb-lottie = "com.airbnb.android:lottie:6.6.7"
20+
androidx-activityCompose = "androidx.activity:activity-compose:1.10.1"
21+
androidx-appcompat = "androidx.appcompat:appcompat:1.7.1"
2222
androidx-biometric = "androidx.biometric:biometric:1.2.0-alpha05"
2323
androidx-camera-camera2 = { module = "androidx.camera:camera-camera2", version.ref = "androidx-camera" }
2424
androidx-camera-core = { module = "androidx.camera:camera-core", version.ref = "androidx-camera" }
2525
androidx-camera-extension = { module = "androidx.camera:camera-extensions", version.ref = "androidx-camera" }
2626
androidx-camera-lifecycle = { module = "androidx.camera:camera-lifecycle", version.ref = "androidx-camera" }
2727
androidx-camera-view = { module = "androidx.camera:camera-view", version.ref = "androidx-camera" }
2828
androidx-cardview = "androidx.cardview:cardview:1.0.0"
29-
androidx-core-ktx = "androidx.core:core-ktx:1.13.1"
30-
androidx-constraintlayout = "androidx.constraintlayout:constraintlayout:2.1.4"
31-
androidx-constraintlayoutCompose = "androidx.constraintlayout:constraintlayout-compose:1.0.1"
29+
androidx-core-ktx = "androidx.core:core-ktx:1.16.0"
30+
androidx-constraintlayout = "androidx.constraintlayout:constraintlayout:2.2.1"
31+
androidx-constraintlayoutCompose = "androidx.constraintlayout:constraintlayout-compose:1.1.1"
3232
# Compose previews won't work w/o this: https://issuetracker.google.com/issues/227767363
33-
androidx-customview = "androidx.customview:customview:1.1.0"
34-
androidx-customview-poolingcontainer = "androidx.customview:customview-poolingcontainer:1.0.0"
35-
androidx-gridlayout = "androidx.gridlayout:gridlayout:1.0.0"
33+
androidx-customview = "androidx.customview:customview:1.2.0"
34+
androidx-customview-poolingcontainer = "androidx.customview:customview-poolingcontainer:1.1.0"
35+
androidx-gridlayout = "androidx.gridlayout:gridlayout:1.1.0"
3636
androidx-lifecycle-common = {module = "androidx.lifecycle:lifecycle-common", version.ref = "android-lifecycle"}
3737
androidx-lifecycleExtension = "androidx.lifecycle:lifecycle-extensions:2.2.0"
3838
androidx-lifecycleLiveData = {module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "android-lifecycle"}
@@ -45,17 +45,17 @@ androidx-navigation-fragmentKtx = { module = "androidx.navigation:navigation-fra
4545
androidx-navigation-runtimeKtx = { module = "androidx.navigation:navigation-runtime-ktx", version.ref = "navigation" }
4646
androidx-navigation-uiKtx = { module = "androidx.navigation:navigation-ui-ktx", version.ref = "navigation" }
4747
androidx-preferences = "androidx.preference:preference-ktx:1.2.1"
48-
androidx-recyclerview = "androidx.recyclerview:recyclerview:1.3.2"
48+
androidx-recyclerview = "androidx.recyclerview:recyclerview:1.4.0"
4949
androidx-startupRuntime = "androidx.startup:startup-runtime:1.2.0"
5050
androidx-swiperefreshlayout = "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
5151
androidx-viewpager2 = "androidx.viewpager2:viewpager2:1.1.0"
52-
androidx-webkit = "androidx.webkit:webkit:1.12.0"
52+
androidx-webkit = "androidx.webkit:webkit:1.14.0"
5353
apache-commonsLang3 = "org.apache.commons:commons-lang3:3.17.0"
5454
caverock-androidsvgAar = "com.caverock:androidsvg-aar:1.4"
55-
compose-iconsExtended = { module = "androidx.compose.material:material-icons-extended", version.ref = "androidx-compose-material" }
55+
compose-iconsExtended = { module = "androidx.compose.material:material-icons-extended", version = "1.7.8" }
5656
compose-navigation = { module = "androidx.navigation:navigation-compose", version.ref = "navigation" }
5757
compose-material = { module = "androidx.compose.material:material", version.ref = "androidx-compose-material" }
58-
compose-material3 = "androidx.compose.material3:material3:1.3.0"
58+
compose-material3 = "androidx.compose.material3:material3:1.3.2"
5959
compose-material3Themeadapter = "com.google.accompanist:accompanist-themeadapter-material3:0.36.0"
6060
compose-ui = { module = "androidx.compose.ui:ui", version.ref = "androidx-compose-ui" }
6161
compose-uiTestManifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "androidx-compose-ui" }
@@ -64,18 +64,18 @@ compose-uiTooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "
6464
compose-uiToolingPreview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "androidx-compose-ui" }
6565
compose-uiUtil = { module = "androidx.compose.ui:ui-util", version.ref = "androidx-compose-ui" }
6666
compose-uiViewBinding = { module = "androidx.compose.ui:ui-viewbinding", version.ref = "androidx-compose-ui" }
67-
commonsIo = "commons-io:commons-io:2.17.0"
67+
commonsIo = "commons-io:commons-io:2.19.0"
6868
datatrans-androidSdk = "ch.datatrans:android-sdk:3.7.0"
69-
desugarJdkLibsNio = "com.android.tools:desugar_jdk_libs_nio:2.1.2"
69+
desugarJdkLibsNio = "com.android.tools:desugar_jdk_libs_nio:2.1.5"
7070
glide-compose = "com.github.bumptech.glide:compose:1.0.0-beta01"
71-
googlePlayServices-maps = "com.google.android.gms:play-services-maps:19.0.0"
71+
googlePlayServices-maps = "com.google.android.gms:play-services-maps:19.2.0"
7272
googlePlayServices-wallet = "com.google.android.gms:play-services-wallet:19.4.0"
7373
google-mlkit-barcodeScanning = "com.google.mlkit:barcode-scanning:17.3.0"
7474
google-zxing-core = "com.google.zxing:core:3.5.3"
75-
gson = "com.google.code.gson:gson:2.11.0"
75+
gson = "com.google.code.gson:gson:2.13.1"
7676
iban4j = "org.iban4j:iban4j:3.2.10-RELEASE"
7777
jakewhartonProcessPhoenix = "com.jakewharton:process-phoenix:3.0.0"
78-
picasso = "com.squareup.picasso:picasso:2.8"
78+
picasso = "com.squareup.picasso:picasso:2.71828"
7979
rekisoftLazyWorker = "eu.rekisoft.android.util:LazyWorker:2.1.0"
8080
relex-circleindicator = "me.relex:circleindicator:2.1.6"
8181
snabble-phoneAuth-countryCodePicker = "io.snabble.phoneauth:countryCodePicker:3.3.0"
@@ -93,13 +93,13 @@ kotest-runnerJunit = { module = "io.kotest:kotest-runner-junit5", version.ref =
9393
kotest-assertionsCore = { module = "io.kotest:kotest-assertions-core", version.ref = "io-kotest" }
9494
koltin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
9595
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
96-
kotlinx-serializationJson = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3"
97-
mockk = "io.mockk:mockk:1.13.12"
96+
kotlinx-serializationJson = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0"
97+
mockk = "io.mockk:mockk:1.14.4"
9898
# @pin requires higher target
9999
mockito-kotlin = "org.mockito.kotlin:mockito-kotlin:5.4.0"
100-
roboletric = "org.robolectric:robolectric:4.13"
100+
roboletric = "org.robolectric:robolectric:4.15.1"
101101
roboletric-androidAll = "org.robolectric:android-all:13-robolectric-9030017"
102-
sebaslogen-resaca = "io.github.sebaslogen:resaca:4.3.0"
102+
sebaslogen-resaca = "io.github.sebaslogen:resaca:4.4.8"
103103
squareup-okhttp3-mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "com-squareup-okhttp3" }
104104
test-espressoCore = "androidx.test.espresso:espresso-core:3.6.1"
105105
test-ext-junit = "androidx.test.ext:junit:1.2.1"
@@ -111,7 +111,7 @@ classpath-dokkaGradlePlugin = { module = "org.jetbrains.dokka:dokka-gradle-plugi
111111
classpath-dokkaBase = { module = "org.jetbrains.dokka:dokka-base", version.ref = "dokka" }
112112
classpath-jlouns-gradleCrossPlatformExecPlugin = "gradle.plugin.com.github.jlouns:gradle-cross-platform-exec-plugin:0.5.0"
113113
classpath-qmazzo-sqlitePlugin = "gradle.plugin.gmazzo:sqlite-plugin:0.2"
114-
classpath-bjoernq-unmockPlugin = "com.github.bjoernq:unmockplugin:0.8.0"
114+
classpath-bjoernq-unmockPlugin = "com.github.bjoernq:unmockplugin:0.9.0"
115115

116116
[bundles]
117117
camera = [
@@ -157,6 +157,6 @@ kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref =
157157
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
158158
snabbleSetup = "io.snabble.setup:1.0.1"
159159
unmock = "de.mobilej.unmock:0.7.9"
160-
benManesVersions = "com.github.ben-manes.versions:0.51.0"
161-
versionCatalogUpdate = "nl.littlerobots.version-catalog-update:0.8.4"
160+
benManesVersions = "com.github.ben-manes.versions:0.52.0"
161+
versionCatalogUpdate = "nl.littlerobots.version-catalog-update:1.0.0"
162162
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.11.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

kotlin-sample/build.gradle.kts

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
2+
13
plugins {
24
id(libs.plugins.androidApplication.get().pluginId)
35
id(libs.plugins.kotlin.android.get().pluginId)
@@ -17,7 +19,10 @@ android {
1719
versionCode = 1
1820
versionName = "1.0"
1921

20-
resourceConfigurations.addAll(listOf("de", "en"))
22+
androidResources {
23+
localeFilters.addAll(listOf("de", "en"))
24+
}
25+
2126
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2227
}
2328

@@ -35,12 +40,13 @@ android {
3540
targetCompatibility = JavaVersion.VERSION_17
3641
}
3742

38-
kotlinOptions {
39-
freeCompilerArgs = listOf(
40-
*kotlinOptions.freeCompilerArgs.toTypedArray(),
41-
"-Xjvm-default=all"
42-
)
43-
jvmTarget = "17"
43+
kotlin {
44+
compilerOptions {
45+
jvmTarget = JvmTarget.JVM_17
46+
freeCompilerArgs.addAll(
47+
"-Xjvm-default=all"
48+
)
49+
}
4450
}
4551

4652
buildFeatures {

mlkit-scanner-engine/build.gradle.kts

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

3+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
4+
35
plugins {
46
id(libs.plugins.androidLibrary.get().pluginId)
57
id(libs.plugins.kotlin.android.get().pluginId)
@@ -43,14 +45,16 @@ android {
4345
targetCompatibility = JavaVersion.VERSION_17
4446
}
4547

46-
kotlinOptions {
47-
freeCompilerArgs = listOf(
48-
*kotlinOptions.freeCompilerArgs.toTypedArray(),
49-
"-Xjvm-default=all"
50-
)
51-
jvmTarget = "17"
48+
kotlin {
49+
compilerOptions {
50+
jvmTarget = JvmTarget.JVM_17
51+
freeCompilerArgs.addAll(
52+
"-Xjvm-default=all"
53+
)
54+
}
5255
}
5356

57+
5458
lint {
5559
abortOnError = false
5660
}

ui-toolkit/build.gradle.kts

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

3+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
4+
35
plugins {
46
id(libs.plugins.androidLibrary.get().pluginId)
57
id(libs.plugins.kotlin.android.get().pluginId)
@@ -52,12 +54,13 @@ android {
5254
targetCompatibility = JavaVersion.VERSION_17
5355
}
5456

55-
kotlinOptions {
56-
freeCompilerArgs = listOf(
57-
*kotlinOptions.freeCompilerArgs.toTypedArray(),
58-
"-Xjvm-default=all"
59-
)
60-
jvmTarget = "17"
57+
kotlin {
58+
compilerOptions {
59+
jvmTarget = JvmTarget.JVM_17
60+
freeCompilerArgs.addAll(
61+
"-Xjvm-default=all"
62+
)
63+
}
6164
}
6265

6366
buildFeatures {
@@ -97,6 +100,7 @@ dependencies {
97100
implementation(libs.sebaslogen.resaca)
98101

99102
implementation(libs.bundles.compose)
103+
implementation(libs.androidx.swiperefreshlayout)
100104
debugImplementation(libs.bundles.compose.debug)
101105

102106
implementation(libs.bundles.koin)

ui-toolkit/src/main/kotlin/io/snabble/sdk/dynamicview/domain/model/ButtonItem.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import androidx.annotation.ColorRes
55
data class ButtonItem(
66
override val id: String,
77
val text: String,
8-
@ColorRes val foregroundColor: Int?,
9-
@ColorRes val backgroundColor: Int?,
8+
@param:ColorRes val foregroundColor: Int?,
9+
@param:ColorRes val backgroundColor: Int?,
1010
val padding: Padding,
1111
) : Widget

0 commit comments

Comments
 (0)