Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions AnkiDroid/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,9 @@
# Ignore unused packages
-dontwarn javax.naming.**
-dontwarn org.ietf.jgss.**

# Ignore intended-to-be-optional re2j classes - only needed if using re2j for jsoup regex
# jsoup safely falls back to JDK regex if re2j not on classpath, but has concrete re2j refs
# See https://github.com/jhy/jsoup/issues/2459 - may be resolved in future, then this may be removed
# See https://github.com/ankidroid/Anki-Android/pull/19985
-dontwarn com.google.re2j.**
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

package com.ichi2.anki.multiprofile

import android.annotation.SuppressLint
import android.content.Context
import android.content.SharedPreferences
import androidx.test.core.app.ApplicationProvider
Expand Down Expand Up @@ -137,6 +138,7 @@ class ProfileContextWrapperTest {
// --- Shared pref tests ---

@Test
@SuppressLint("WrongConstant") // mockito eq support
fun `getSharedPreferences prefixes name for custom profile`() {
val wrapper = ProfileContextWrapper.create(baseContext, profileId, profileBaseDir)
val originalName = "deck_options"
Expand All @@ -152,6 +154,7 @@ class ProfileContextWrapperTest {
}

@Test
@SuppressLint("WrongConstant") // mockito eq support
fun `getSharedPreferences does not prefix name for default profile`() {
val wrapper = ProfileContextWrapper.create(baseContext, ProfileId.DEFAULT, profileBaseDir)
val originalName = "deck_options"
Expand All @@ -166,6 +169,7 @@ class ProfileContextWrapperTest {
}

@Test
@SuppressLint("WrongConstant") // mockito eq support
fun `getSharedPreferences does not double-prefix if name is already prefixed`() {
val wrapper = ProfileContextWrapper.create(baseContext, profileId, profileBaseDir)
val alreadyPrefixedName = "profile_${profileId.value}_deck_options"
Expand Down
13 changes: 7 additions & 6 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ ktlint = '1.8.0'
#
# Old changelogs - See 'Table of Contents' in sidebar
# https://developer.android.com/build/releases/past-releases
androidGradlePlugin = "8.13.2"
androidGradlePlugin = "9.0.0"
# https://developer.android.com/jetpack/androidx/releases/activity
androidxActivity = "1.12.2"
# https://developer.android.com/jetpack/androidx/releases/annotation
Expand Down Expand Up @@ -83,26 +83,27 @@ jacoco = "0.8.14"
javaSemver = "0.10.2"
jetbrainsAnnotations = "26.0.2-1"
json = "20251224"
jsoup = "1.21.2"
# https://github.com/jhy/jsoup/releases
jsoup = "1.22.1"
androidTestJunit = "1.3.0"
# https://github.com/junit-team/junit5/releases/
junit = "6.0.1"
junit = "6.0.2"
# https://github.com/JetBrains/kotlin/releases/
kotlin = '2.2.10'
# https://github.com/Kotlin/kotlinx.serialization/releases
kotlinxSerializationJson = "1.9.0"
ktlintGradlePlugin = "14.0.1"
leakcanaryAndroid = "2.14"
lint = '31.13.2'
lint = '32.0.0'
material = "1.13.0"

mockitoInline = "5.2.0"
mockitoKotlin = "6.1.0"
mockitoKotlin = "6.2.0"
mockk = "1.14.7"
nanohttpd = "2.3.1"
okhttp = "5.3.2"
# https://github.com/protocolbuffers/protobuf/releases
protobufKotlinLite = "4.33.2"
protobufKotlinLite = "4.33.4"
# ../AnkiDroid/robolectricDownload.gradle may need changes - read instructions in that file
robolectric = "4.16"
# https://github.com/takahirom/roborazzi/releases
Expand Down
8 changes: 4 additions & 4 deletions tools/localization/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@
"@eslint/eslintrc": "^3.3.3",
"@eslint/js": "^9.39.2",
"@types/jest": "^30.0.0",
"@types/node": "^25.0.3",
"@typescript-eslint/eslint-plugin": "^8.50.1",
"@typescript-eslint/parser": "^8.50.1",
"@types/node": "^25.0.6",
"@typescript-eslint/eslint-plugin": "^8.52.0",
"@typescript-eslint/parser": "^8.52.0",
"eslint": "^9.39.2",
"eslint-config-prettier": "^10.1.8",
"eslint-config-standard": "^17.1.0",
"eslint-plugin-import": "^2.32.0",
"eslint-plugin-n": "^17.23.1",
"eslint-plugin-promise": "^7.2.1",
"globals": "^16.5.0",
"globals": "^17.0.0",
"jest": "^30.2.0",
"prettier": "^3.7.4",
"ts-jest": "^29.4.6",
Expand Down
Loading
Loading