Dependency updates 20241202 (#17537)

* build(deps): bump androidxMedia3 from 1.4.1 to 1.5.0 Bumps `androidxMedia3` from 1.4.1 to 1.5.0. Updates `androidx.media3:media3-ui` from 1.4.1 to 1.5.0 - [Release notes](https://github.com/androidx/media/releases) - [Changelog](https://github.com/androidx/media/blob/release/RELEASENOTES.md) - [Commits](androidx/media@1.4.1...1.5.0) Updates `androidx.media3:media3-exoplayer-dash` from 1.4.1 to 1.5.0 - [Release notes](https://github.com/androidx/media/releases) - [Changelog](https://github.com/androidx/media/blob/release/RELEASENOTES.md) - [Commits](androidx/media@1.4.1...1.5.0) Updates `androidx.media3:media3-exoplayer` from 1.4.1 to 1.5.0 - [Release notes](https://github.com/androidx/media/releases) - [Changelog](https://github.com/androidx/media/blob/release/RELEASENOTES.md) - [Commits](androidx/media@1.4.1...1.5.0) --- updated-dependencies: - dependency-name: androidx.media3:media3-ui dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: androidx.media3:media3-exoplayer-dash dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: androidx.media3:media3-exoplayer dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * build(deps): bump org.jsoup:jsoup from 1.18.1 to 1.18.2 Bumps [org.jsoup:jsoup](https://github.com/jhy/jsoup) from 1.18.1 to 1.18.2. - [Release notes](https://github.com/jhy/jsoup/releases) - [Changelog](https://github.com/jhy/jsoup/blob/master/CHANGES.md) - [Commits](jhy/jsoup@jsoup-1.18.1...jsoup-1.18.2) --- updated-dependencies: - dependency-name: org.jsoup:jsoup dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * build(deps): bump com.google.protobuf:protobuf-kotlin-lite Bumps com.google.protobuf:protobuf-kotlin-lite from 4.28.3 to 4.29.0. --- updated-dependencies: - dependency-name: com.google.protobuf:protobuf-kotlin-lite dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * build(deps): bump the non-breaking group across 1 directory with 6 updates Bumps the non-breaking group with 6 updates in the /tools/localization directory: | Package | From | To | | --- | --- | --- | | [axios](https://github.com/axios/axios) | `1.7.7` | `1.7.8` | | [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) | `22.9.3` | `22.10.1` | | [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) | `8.15.0` | `8.16.0` | | [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) | `8.15.0` | `8.16.0` | | [eslint-plugin-promise](https://github.com/eslint-community/eslint-plugin-promise) | `7.1.0` | `7.2.1` | | [prettier](https://github.com/prettier/prettier) | `3.3.3` | `3.4.1` | Updates `axios` from 1.7.7 to 1.7.8 - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](axios/axios@v1.7.7...v1.7.8) Updates `@types/node` from 22.9.3 to 22.10.1 - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) Updates `@typescript-eslint/eslint-plugin` from 8.15.0 to 8.16.0 - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.16.0/packages/eslint-plugin) Updates `@typescript-eslint/parser` from 8.15.0 to 8.16.0 - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.16.0/packages/parser) Updates `eslint-plugin-promise` from 7.1.0 to 7.2.1 - [Release notes](https://github.com/eslint-community/eslint-plugin-promise/releases) - [Changelog](https://github.com/eslint-community/eslint-plugin-promise/blob/main/CHANGELOG.md) - [Commits](eslint-community/eslint-plugin-promise@v7.1.0...v7.2.1) Updates `prettier` from 3.3.3 to 3.4.1 - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](prettier/prettier@3.3.3...3.4.1) --- updated-dependencies: - dependency-name: axios dependency-type: direct:production update-type: version-update:semver-patch dependency-group: non-breaking - dependency-name: "@types/node" dependency-type: direct:development update-type: version-update:semver-minor dependency-group: non-breaking - dependency-name: "@typescript-eslint/eslint-plugin" dependency-type: direct:development update-type: version-update:semver-minor dependency-group: non-breaking - dependency-name: "@typescript-eslint/parser" dependency-type: direct:development update-type: version-update:semver-minor dependency-group: non-breaking - dependency-name: eslint-plugin-promise dependency-type: direct:development update-type: version-update:semver-minor dependency-group: non-breaking - dependency-name: prettier dependency-type: direct:development update-type: version-update:semver-minor dependency-group: non-breaking ... Signed-off-by: dependabot[bot] <[email protected]> * build(deps): bump kotlin from 2.0.21 to 2.1.0 (#17514) * build(deps): bump kotlin from 2.0.21 to 2.1.0 Bumps `kotlin` from 2.0.21 to 2.1.0. Updates `org.jetbrains.kotlin:kotlin-stdlib` from 2.0.21 to 2.1.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v2.1.0/ChangeLog.md) - [Commits](JetBrains/kotlin@v2.0.21...v2.1.0) Updates `org.jetbrains.kotlin:kotlin-reflect` from 2.0.21 to 2.1.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v2.1.0/ChangeLog.md) - [Commits](JetBrains/kotlin@v2.0.21...v2.1.0) Updates `org.jetbrains.kotlin:kotlin-test` from 2.0.21 to 2.1.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v2.1.0/ChangeLog.md) - [Commits](JetBrains/kotlin@v2.0.21...v2.1.0) Updates `org.jetbrains.kotlin:kotlin-test-junit` from 2.0.21 to 2.1.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v2.1.0/ChangeLog.md) - [Commits](JetBrains/kotlin@v2.0.21...v2.1.0) Updates `org.jetbrains.kotlin:kotlin-test-junit5` from 2.0.21 to 2.1.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v2.1.0/ChangeLog.md) - [Commits](JetBrains/kotlin@v2.0.21...v2.1.0) Updates `org.jetbrains.kotlin.android` from 2.0.21 to 2.1.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v2.1.0/ChangeLog.md) - [Commits](JetBrains/kotlin@v2.0.21...v2.1.0) Updates `org.jetbrains.kotlin.plugin.parcelize` from 2.0.21 to 2.1.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v2.1.0/ChangeLog.md) - [Commits](JetBrains/kotlin@v2.0.21...v2.1.0) Updates `org.jetbrains.kotlin.jvm` from 2.0.21 to 2.1.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v2.1.0/ChangeLog.md) - [Commits](JetBrains/kotlin@v2.0.21...v2.1.0) Updates `org.jetbrains.kotlin.plugin.serialization` from 2.0.21 to 2.1.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v2.1.0/ChangeLog.md) - [Commits](JetBrains/kotlin@v2.0.21...v2.1.0) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-stdlib dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin:kotlin-reflect dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin:kotlin-test dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin:kotlin-test-junit dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin:kotlin-test-junit5 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin.android dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin.plugin.parcelize dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin.jvm dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin.plugin.serialization dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * test: make all values in array string cleans up subtle change / tightening of type system in Kotlin --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mike Hardy <[email protected]> * build(deps): bump org.jsoup:jsoup from 1.18.2 to 1.18.3 Bumps [org.jsoup:jsoup](https://github.com/jhy/jsoup) from 1.18.2 to 1.18.3. - [Release notes](https://github.com/jhy/jsoup/releases) - [Changelog](https://github.com/jhy/jsoup/blob/master/CHANGES.md) - [Commits](jhy/jsoup@jsoup-1.18.2...jsoup-1.18.3) --- updated-dependencies: - dependency-name: org.jsoup:jsoup dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * build(deps-dev): bump the non-breaking group (#17534) Bumps the non-breaking group in /tools/localization with 3 updates: [@eslint/js](https://github.com/eslint/eslint/tree/HEAD/packages/js), [eslint](https://github.com/eslint/eslint) and [globals](https://github.com/sindresorhus/globals). Updates `@eslint/js` from 9.15.0 to 9.16.0 - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/commits/v9.16.0/packages/js) Updates `eslint` from 9.15.0 to 9.16.0 - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](eslint/eslint@v9.15.0...v9.16.0) Updates `globals` from 15.12.0 to 15.13.0 - [Release notes](https://github.com/sindresorhus/globals/releases) - [Commits](sindresorhus/globals@v15.12.0...v15.13.0) --- updated-dependencies: - dependency-name: "@eslint/js" dependency-type: direct:development update-type: version-update:semver-minor dependency-group: non-breaking - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor dependency-group: non-breaking - dependency-name: globals dependency-type: direct:development update-type: version-update:semver-minor dependency-group: non-breaking ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): remove+recreate yarn.lock to get all transitive updates * build(deps): migrate to modern yarn in our localization js package * build(deps): adopt android gradle plugin 8.7.3 --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
ankidroid · Dec 2, 2024 · 081c265 · 081c265
1 parent b0e6996
commit 081c265
Show file tree

Hide file tree

Showing 7 changed files with 6,751 additions and 3,844 deletions.
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/servicemodel/PreferenceUpgradeServiceTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/servicemodel/PreferenceUpgradeServiceTest.kt
@@ -113,10 +113,10 @@ class PreferenceUpgradeServiceTest : RobolectricTest() {
         // add two example toolbar buttons
         val buttons = HashUtil.hashSetInit<String>(2)
 
-        var values = arrayOf(0, "<h1>", "</h1>")
+        var values = arrayOf("0", "<h1>", "</h1>")
         buttons.add(values.joinToString(Consts.FIELD_SEPARATOR))
 
-        values = arrayOf(1, "<p>", "</p>")
+        values = arrayOf("1", "<p>", "</p>")
         buttons.add(values.joinToString(Consts.FIELD_SEPARATOR))
 
         prefs.edit {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -10,7 +10,7 @@ acra = '5.12.0'
 #
 # Old changelogs - See 'Table of Contents' in sidebar
 # https://developer.android.com/build/releases/past-releases
-androidGradlePlugin = "8.7.2"
+androidGradlePlugin = "8.7.3"
 # https://developer.android.com/jetpack/androidx/releases/activity
 androidxActivity = "1.9.3"
 # https://developer.android.com/jetpack/androidx/releases/annotation
@@ -32,7 +32,7 @@ androidxFragmentKtx = "1.8.5"
 # https://developer.android.com/jetpack/androidx/releases/media
 androidxMedia = "1.7.0"
 # https://developer.android.com/jetpack/androidx/releases/media3
-androidxMedia3 = "1.4.1"
+androidxMedia3 = "1.5.0"
 # https://developer.android.com/jetpack/androidx/releases/preference
 androidxPreferenceKtx = "1.2.1"
 # https://developer.android.com/jetpack/androidx/releases/recyclerview
@@ -74,12 +74,12 @@ imageCropper = "4.6.0"
 javaSemver = "0.10.2"
 jetbrainsAnnotations = "26.0.1"
 json = "20240303"
-jsoup = "1.18.1"
+jsoup = "1.18.3"
 androidTestJunit = "1.2.1"
 junitJupiter = "5.11.3"
 junitPlatformLauncher = "1.11.3"
 # https://github.com/JetBrains/kotlin/releases/
-kotlin = '2.0.21'
+kotlin = '2.1.0'
 kotlinxSerializationJson = "1.7.3"
 ktlint = "11.6.1"
 leakcanaryAndroid = "2.14"
@@ -92,7 +92,7 @@ mockk = "1.13.13"
 nanohttpd = "2.3.1"
 okhttp = "4.12.0"
 # https://github.com/protocolbuffers/protobuf/releases
-protobufKotlinLite = "4.28.3"
+protobufKotlinLite = "4.29.0"
 # ../AnkiDroid/robolectricDownload.gradle may need changes - read instructions in that file
 robolectric = "4.14.1"
 searchpreference = "2.5.1"

diff --git a/tools/localization/.gitignore b/tools/localization/.gitignore
@@ -107,4 +107,21 @@ dist
 ankidroid.zip
 
 # translation extract dir
-temp_dir
+temp_dir
+
+# yarn berry (v2+) stuff
+.yarn-integrity
+.yarn/*
+# !.yarn/cache
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
+**/.yarn/*
+# !**/.yarn/cache
+!**/.yarn/patches
+!**/.yarn/plugins
+!**/.yarn/releases
+!**/.yarn/sdks
+!**/.yarn/versions
diff --git a/tools/localization/.yarn/releases/yarn-4.5.3.cjs b/tools/localization/.yarn/releases/yarn-4.5.3.cjs
diff --git a/tools/localization/.yarnrc.yml b/tools/localization/.yarnrc.yml
@@ -0,0 +1,3 @@
+nodeLinker: node-modules
+
+yarnPath: .yarn/releases/yarn-4.5.3.cjs
diff --git a/tools/localization/package.json b/tools/localization/package.json
@@ -18,28 +18,29 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@crowdin/crowdin-api-client": "^1.39.1",
-        "axios": "^1.7.7",
+        "axios": "^1.7.8",
         "dotenv": "^16.4.4",
         "extract-zip": "^2.0.1",
         "typescript": "^5.7.2"
     },
     "devDependencies": {
         "@eslint/eslintrc": "^3.2.0",
-        "@eslint/js": "^9.15.0",
+        "@eslint/js": "^9.16.0",
         "@types/jest": "^29.5.14",
-        "@types/node": "^22.9.3",
-        "@typescript-eslint/eslint-plugin": "^8.15.0",
-        "@typescript-eslint/parser": "^8.15.0",
-        "eslint": "^9.15.0",
+        "@types/node": "^22.10.1",
+        "@typescript-eslint/eslint-plugin": "^8.16.0",
+        "@typescript-eslint/parser": "^8.16.0",
+        "eslint": "^9.16.0",
         "eslint-config-prettier": "^9.1.0",
         "eslint-config-standard": "^17.1.0",
         "eslint-plugin-import": "^2.31.0",
         "eslint-plugin-n": "^17.14.0",
-        "eslint-plugin-promise": "^7.0.0",
-        "globals": "^15.12.0",
+        "eslint-plugin-promise": "^7.2.1",
+        "globals": "^15.13.0",
         "jest": "^29.7.0",
-        "prettier": "^3.2.5",
+        "prettier": "^3.4.1",
         "ts-jest": "^29.2.5",
         "ts-node": "^10.9.2"
-    }
+    },
+    "packageManager": "[email protected]"
 }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		nodeLinker: node-modules

		yarnPath: .yarn/releases/yarn-4.5.3.cjs