Skip to content

Commit 7f1190a

Browse files
authored
Dependency updates and remove obsolete samples (#141)
* Update dependencies and upgrade target versions. * remove obsolete Samples.
1 parent 0fb6539 commit 7f1190a

File tree

122 files changed

+48
-2933
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+48
-2933
lines changed

accessibility-toolbox/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ android {
3939

4040
compileOptions {
4141
isCoreLibraryDesugaringEnabled = true
42-
sourceCompatibility = JavaVersion.VERSION_1_8
43-
targetCompatibility = JavaVersion.VERSION_1_8
42+
sourceCompatibility = JavaVersion.VERSION_17
43+
targetCompatibility = JavaVersion.VERSION_17
4444
}
4545

4646
sourceSets {
@@ -54,7 +54,7 @@ android {
5454
*kotlinOptions.freeCompilerArgs.toTypedArray(),
5555
"-Xjvm-default=all"
5656
)
57-
jvmTarget = "1.8"
57+
jvmTarget = "17"
5858
}
5959

6060
lint {

core/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,16 @@ android {
4242

4343
compileOptions {
4444
isCoreLibraryDesugaringEnabled = true
45-
sourceCompatibility = JavaVersion.VERSION_1_8
46-
targetCompatibility = JavaVersion.VERSION_1_8
45+
sourceCompatibility = JavaVersion.VERSION_17
46+
targetCompatibility = JavaVersion.VERSION_17
4747
}
4848

4949
kotlinOptions {
5050
freeCompilerArgs = listOf(
5151
*kotlinOptions.freeCompilerArgs.toTypedArray(),
5252
"-Xjvm-default=all"
5353
)
54-
jvmTarget = "1.8"
54+
jvmTarget = "17"
5555
}
5656

5757
testOptions {

gradle/libs.versions.toml

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,22 @@ gradlePlugin = "8.0.2"
66
desugarVersion = "1.1.5"
77
okhttpVersion = "4.10.0"
88
# @pin always, manually updated to ensure overall dependency support
9-
kotlin = "1.8.10"
9+
kotlin = "1.8.22"
1010
# @pin always, manually updated to ensure overall dependency support
11-
compose-compiler = "1.4.3"
12-
navigation = "2.5.3"
11+
compose-compiler = "1.4.8"
12+
navigation = "2.6.0"
1313
# @pin
1414
compose_version = "1.2.1"
1515
snabbleSdk = "0.69.6"
1616
androidx-camera = "1.2.3"
1717
androidx-compose-ui = "1.4.3"
1818
com-squareup-okhttp3 = "4.11.0"
1919
io-kotest = "5.6.2"
20-
org-jetbrains-dokka = "1.8.10"
20+
org-jetbrains-dokka = "1.8.20"
21+
androidx-compose-material = "1.4.3"
2122

2223
[libraries]
23-
airbnb-lottie = "com.airbnb.android:lottie:6.0.0"
24+
airbnb-lottie = "com.airbnb.android:lottie:6.0.1"
2425
androidx-activityCompose = "androidx.activity:activity-compose:1.7.2"
2526
androidx-appcompat = "androidx.appcompat:appcompat:1.6.1"
2627
androidx-biometric = "androidx.biometric:biometric:1.2.0-alpha05"
@@ -57,7 +58,7 @@ androidx-webkit = "androidx.webkit:webkit:1.7.0"
5758
apache-commonsLang3 = "org.apache.commons:commons-lang3:3.12.0"
5859
caverock-androidsvgAar = "com.caverock:androidsvg-aar:1.4"
5960
compose-navigation = { module = "androidx.navigation:navigation-compose", version.ref = "navigation" }
60-
compose-material = "androidx.compose.material:material:1.4.3"
61+
compose-material = { module = "androidx.compose.material:material", version.ref = "androidx-compose-material" }
6162
compose-material3 = "androidx.compose.material3:material3:1.1.0-alpha08"
6263
compose-material3Themeadapter = "com.google.accompanist:accompanist-themeadapter-material3:0.30.1"
6364
compose-ui = { module = "androidx.compose.ui:ui", version.ref = "androidx-compose-ui" }
@@ -67,13 +68,13 @@ compose-uiTooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "
6768
compose-uiToolingPreview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "androidx-compose-ui" }
6869
compose-uiUtil = { module = "androidx.compose.ui:ui-util", version.ref = "androidx-compose-ui" }
6970
compose-uiViewBinding = { module = "androidx.compose.ui:ui-viewbinding", version.ref = "androidx-compose-ui" }
70-
compose-iconsExtended = "androidx.compose.material:material-icons-extended:1.4.3"
71+
compose-iconsExtended = { module = "androidx.compose.material:material-icons-extended", version.ref = "androidx-compose-material" }
7172
commonsIo = "commons-io:commons-io:2.5"
72-
datatrans-androidSdk = "ch.datatrans:android-sdk:3.0.2"
73+
datatrans-androidSdk = "ch.datatrans:android-sdk:3.1.1"
7374
# @pin until a newer version been tested successfully: https://developer.android.com/studio/write/java8-support#library-desugaring-versions
7475
desugarJdkLibs = "com.android.tools:desugar_jdk_libs:1.1.5"
7576
googlePlayServices-maps = "com.google.android.gms:play-services-maps:18.1.0"
76-
googlePlayServices-wallet = "com.google.android.gms:play-services-wallet:19.1.0"
77+
googlePlayServices-wallet = "com.google.android.gms:play-services-wallet:19.2.0"
7778
google-mlkit-barcodeScanning = "com.google.mlkit:barcode-scanning:17.1.0"
7879
google-zxing-core = "com.google.zxing:core:3.5.1"
7980
gson = "com.google.code.gson:gson:2.9.1"
@@ -88,10 +89,10 @@ squareup-okhttp3-tls = { module = "com.squareup.okhttp3:okhttp-tls", version.ref
8889
# Testing
8990
androidx-coreTesting = "androidx.arch.core:core-testing:2.2.0"
9091
junit = "junit:junit:4.13.2"
91-
koin-android = "io.insert-koin:koin-android:3.4.1"
92-
koin-androidCompat = "io.insert-koin:koin-android-compat:3.4.1"
92+
koin-android = "io.insert-koin:koin-android:3.4.2"
93+
koin-androidCompat = "io.insert-koin:koin-android-compat:3.4.2"
9394
koin-androidxCompose = "io.insert-koin:koin-androidx-compose:3.4.5"
94-
koin-core = "io.insert-koin:koin-core:3.4.1"
95+
koin-core = "io.insert-koin:koin-core:3.4.2"
9596
kotest-runnerJunit = { module = "io.kotest:kotest-runner-junit5", version.ref = "io-kotest" }
9697
kotest-assertionsCore = { module = "io.kotest:kotest-assertions-core", version.ref = "io-kotest" }
9798
koltin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
@@ -155,11 +156,11 @@ koin = [
155156
[plugins]
156157
androidApplication = { id = "com.android.application", version.ref = "gradlePlugin" }
157158
androidLibrary = { id = "com.android.library", version.ref = "gradlePlugin" }
158-
dokka = "org.jetbrains.dokka:1.8.10"
159+
dokka = "org.jetbrains.dokka:1.8.20"
159160
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
160161
kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
161162
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
162163
snabbleSetup = "io.snabble.setup:1.0.1"
163164
unmock = "de.mobilej.unmock:0.7.9"
164-
benManesVersions = "com.github.ben-manes.versions:0.46.0"
165+
benManesVersions = "com.github.ben-manes.versions:0.47.0"
165166
versionCatalogUpdate = "nl.littlerobots.version-catalog-update:0.8.0"

gradle/wrapper/gradle-wrapper.jar

1.73 KB
Binary file not shown.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
44
networkTimeout=10000
5+
validateDistributionUrl=true
56
zipStoreBase=GRADLE_USER_HOME
67
zipStorePath=wrapper/dists

gradlew

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,6 @@ done
8585
APP_BASE_NAME=${0##*/}
8686
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
8787

88-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
89-
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
90-
9188
# Use the maximum available, or set MAX_FD != -1 to use that value.
9289
MAX_FD=maximum
9390

@@ -133,10 +130,13 @@ location of your Java installation."
133130
fi
134131
else
135132
JAVACMD=java
136-
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
133+
if ! command -v java >/dev/null 2>&1
134+
then
135+
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
137136
138137
Please set the JAVA_HOME variable in your environment to match the
139138
location of your Java installation."
139+
fi
140140
fi
141141

142142
# Increase the maximum file descriptors if we can.
@@ -197,6 +197,10 @@ if "$cygwin" || "$msys" ; then
197197
done
198198
fi
199199

200+
201+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
202+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
203+
200204
# Collect all arguments for the java command;
201205
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
202206
# shell script including quotes and variable substitutions, so put them in

java-sample/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

java-sample/README.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

java-sample/build.gradle.kts

Lines changed: 0 additions & 86 deletions
This file was deleted.

java-sample/proguard-rules.pro

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)