Skip to content

Commit 9e8f3fc

Browse files
authored
build(deps): dependency updates 20250603
1 parent bee7be6 commit 9e8f3fc

File tree

10 files changed

+212
-778
lines changed

10 files changed

+212
-778
lines changed

AnkiDroid/build.gradle

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,14 @@ dependencies {
439439
testImplementation libs.junit.jupiter.params
440440
testImplementation libs.junit.vintage.engine
441441
testImplementation libs.mockito.inline
442-
testImplementation libs.mockito.kotlin
442+
// only needed until mockito-kotlin bumps transitive core dep to
443+
// a version that supports JDK24 (and eventually 25LTS)
444+
testImplementation libs.mockito.core
445+
testImplementation(libs.mockito.kotlin) {
446+
// only needed until mockito-kotlin bumps transitive core dep to
447+
// a version that supports JDK24 (and eventually 25LTS)
448+
exclude module: "mockitoCore"
449+
}
443450
testImplementation libs.hamcrest
444451
// robolectricDownloader.gradle *may* need a new SDK jar entry if they release one or if we change targetSdk. Instructions in that gradle file.
445452
testImplementation libs.robolectric

AnkiDroid/jacoco.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ import groovy.xml.XmlParser
44
apply plugin: 'jacoco'
55

66
jacoco {
7-
toolVersion = "0.8.13"
7+
toolVersion = libs.versions.jacoco.get()
88

99
}
1010

1111
android {
1212
testCoverage {
13-
jacocoVersion '0.8.13'
13+
jacocoVersion libs.versions.jacoco.get()
1414
}
1515
}
1616

build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,13 @@ subprojects {
103103

104104
val jvmVersion = Jvm.current().javaVersion?.majorVersion
105105
val minSdk = libs.versions.compileSdk.get()
106-
if (jvmVersion != "17" && jvmVersion != "21") {
106+
if (jvmVersion != "17" && jvmVersion != "21" && jvmVersion != "24") {
107107
println("\n\n\n")
108108
println("**************************************************************************************************************")
109109
println("\n\n\n")
110-
println("ERROR: AnkiDroid builds with JVM version 17 or 21.")
110+
println("ERROR: AnkiDroid builds with JVM version 17, 21 and 24.")
111111
println(" Incompatible major version detected: '$jvmVersion'")
112-
if (jvmVersion.parseIntOrDefault(defaultValue = 0) > 21) {
112+
if (jvmVersion.parseIntOrDefault(defaultValue = 0) > 24) {
113113
println("\n\n\n")
114114
println(" If you receive this error because you want to use a newer JDK, we may accept PRs to support new versions.")
115115
println(" Edit the main build.gradle file, find this message in the file, and add support for the new version.")

gradle/libs.versions.toml

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ktlint = '1.5.0'
1818
#
1919
# Old changelogs - See 'Table of Contents' in sidebar
2020
# https://developer.android.com/build/releases/past-releases
21-
androidGradlePlugin = "8.10.0"
21+
androidGradlePlugin = "8.10.1"
2222
# https://developer.android.com/jetpack/androidx/releases/activity
2323
androidxActivity = "1.10.1"
2424
# https://developer.android.com/jetpack/androidx/releases/annotation
@@ -36,11 +36,11 @@ androidxDragAndDrop = "1.0.0"
3636
# https://developer.android.com/jetpack/androidx/releases/exifinterface
3737
androidxExifinterface = "1.4.1"
3838
# https://developer.android.com/jetpack/androidx/releases/fragment
39-
androidxFragmentKtx = "1.8.6"
39+
androidxFragmentKtx = "1.8.7"
4040
# https://developer.android.com/jetpack/androidx/releases/media
4141
androidxMedia = "1.7.0"
4242
# https://developer.android.com/jetpack/androidx/releases/media3
43-
androidxMedia3 = "1.6.1"
43+
androidxMedia3 = "1.7.1"
4444
# https://developer.android.com/jetpack/androidx/releases/preference
4545
androidxPreferenceKtx = "1.2.1"
4646
# https://developer.android.com/jetpack/androidx/releases/recyclerview
@@ -76,28 +76,32 @@ espresso = '3.6.1'
7676
mikehardyGoogleAnalyticsJava7 = "2.0.13"
7777
hamcrest = "3.0"
7878
imageCropper = "4.6.0"
79+
jacoco = "0.8.13"
7980
javaSemver = "0.10.2"
8081
jetbrainsAnnotations = "26.0.2"
81-
json = "20250107"
82+
json = "20250517"
8283
jsoup = "1.20.1"
8384
androidTestJunit = "1.2.1"
84-
junitJupiter = "5.12.2"
85-
junitPlatformLauncher = "1.12.2"
85+
junitJupiter = "5.13.0"
86+
junitPlatformLauncher = "1.13.0"
8687
# https://github.com/JetBrains/kotlin/releases/
87-
kotlin = '2.1.20'
88+
kotlin = '2.1.21'
8889
kotlinxSerializationJson = "1.8.1"
89-
ktlintGradlePlugin = "12.2.0"
90+
ktlintGradlePlugin = "12.3.0"
9091
leakcanaryAndroid = "2.14"
91-
lint = '31.10.0'
92+
lint = '31.10.1'
9293
material = "1.12.0"
9394
materialTapTargetPrompt = "3.3.2"
95+
96+
# Only needed until mockito kotlin updates this transitive itself
97+
mockitoCore = "5.18.0"
9498
mockitoInline = "5.2.0"
95-
mockitoKotlin = "5.4.0"
99+
mockitoKotlin = "5.4.0" # maybe can remove mockitoCore and its usage with release > 5.4.0
96100
mockk = "1.14.2"
97101
nanohttpd = "2.3.1"
98102
okhttp = "4.12.0"
99103
# https://github.com/protocolbuffers/protobuf/releases
100-
protobufKotlinLite = "4.30.2"
104+
protobufKotlinLite = "4.31.1"
101105
# ../AnkiDroid/robolectricDownload.gradle may need changes - read instructions in that file
102106
robolectric = "4.14.1"
103107
searchpreference = "2.7.3"
@@ -193,6 +197,7 @@ kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotl
193197
kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
194198
kotlin-test-junit5 = { module = "org.jetbrains.kotlin:kotlin-test-junit5", version.ref = "kotlin" }
195199
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
200+
mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockitoCore" }
196201
mockito-inline = { module = "org.mockito:mockito-inline", version.ref = "mockitoInline" }
197202
mockito-kotlin = { module = "org.mockito.kotlin:mockito-kotlin", version.ref = "mockitoKotlin" }
198203
mockk = { module = "io.mockk:mockk", version.ref = "mockk" }

gradle/wrapper/gradle-wrapper.jar

59 Bytes
Binary file not shown.

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.13-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ case "$( uname )" in #(
114114
NONSTOP* ) nonstop=true ;;
115115
esac
116116

117-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
117+
CLASSPATH="\\\"\\\""
118118

119119

120120
# Determine the Java command to use to start the JVM.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
213213
set -- \
214214
"-Dorg.gradle.appname=$APP_BASE_NAME" \
215215
-classpath "$CLASSPATH" \
216-
org.gradle.wrapper.GradleWrapperMain \
216+
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
217217
"$@"
218218

219219
# Stop when "xargs" is not available.

gradlew.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ goto fail
7070
:execute
7171
@rem Setup the command line
7272

73-
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
73+
set CLASSPATH=
7474

7575

7676
@rem Execute Gradle
77-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
77+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
7878

7979
:end
8080
@rem End local scope for the variables with windows NT shell

tools/localization/package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,29 +17,29 @@
1717
"author": "AnkiDroid Open Source Team",
1818
"license": "GPL-3.0",
1919
"dependencies": {
20-
"@crowdin/crowdin-api-client": "^1.42.0",
20+
"@crowdin/crowdin-api-client": "^1.44.0",
2121
"axios": "^1.9.0",
2222
"dotenv": "^16.5.0",
2323
"extract-zip": "^2.0.1",
2424
"typescript": "^5.8.3"
2525
},
2626
"devDependencies": {
2727
"@eslint/eslintrc": "^3.3.1",
28-
"@eslint/js": "^9.26.0",
28+
"@eslint/js": "^9.28.0",
2929
"@types/jest": "^29.5.14",
30-
"@types/node": "^22.15.3",
31-
"@typescript-eslint/eslint-plugin": "^8.31.1",
32-
"@typescript-eslint/parser": "^8.31.1",
33-
"eslint": "^9.26.0",
34-
"eslint-config-prettier": "^10.1.2",
30+
"@types/node": "^22.15.29",
31+
"@typescript-eslint/eslint-plugin": "^8.33.0",
32+
"@typescript-eslint/parser": "^8.33.0",
33+
"eslint": "^9.28.0",
34+
"eslint-config-prettier": "^10.1.5",
3535
"eslint-config-standard": "^17.1.0",
3636
"eslint-plugin-import": "^2.31.0",
37-
"eslint-plugin-n": "^17.17.0",
37+
"eslint-plugin-n": "^17.18.0",
3838
"eslint-plugin-promise": "^7.2.1",
39-
"globals": "^16.0.0",
39+
"globals": "^16.2.0",
4040
"jest": "^29.7.0",
4141
"prettier": "^3.5.3",
42-
"ts-jest": "^29.3.2",
42+
"ts-jest": "^29.3.4",
4343
"ts-node": "^10.9.2"
4444
},
4545
"packageManager": "yarn@4.5.3"

0 commit comments

Comments
 (0)