Update to Anki 23.10

ankitects · Sep 20, 2023 · 98f154b · 98f154b
1 parent 8dc1607
commit 98f154b
Show file tree

Hide file tree

Showing 8 changed files with 682 additions and 131 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/anki b/anki
diff --git a/build_rust/Cargo.toml b/build_rust/Cargo.toml
@@ -11,4 +11,4 @@ anki_process = { version = "0.0.0", path = "../anki/rslib/process" }
 anyhow = "1.0.75"
 camino = "1.1.6"
 glob = "0.3.1"
-which = "4.4.0"
+which = "4.4.2"
diff --git a/gradle.properties b/gradle.properties
@@ -19,7 +19,7 @@ android.useAndroidX=true
 android.enableJetifier=false
 
 GROUP=io.github.david-allison-1
-VERSION_NAME=0.1.25-anki2.1.66
+VERSION_NAME=0.1.26-anki23.10
 
 POM_INCEPTION_YEAR=2020
 

diff --git a/rsdroid/src/main/java/net/ankiweb/rsdroid/Backend.kt b/rsdroid/src/main/java/net/ankiweb/rsdroid/Backend.kt
@@ -57,7 +57,7 @@ open class Backend(langs: Iterable<String> = listOf("en")) : GeneratedBackend(),
                     collectionPath.replace(".anki2", ".media.db"))
         }
         checkMainThreadOp()
-        openCollection(collectionPath, mediaFolder, mediaDb, false)
+        openCollection(collectionPath, mediaFolder, mediaDb)
     }
 
     /** Forces a full media check on next sync. Only valid with new backend. */
@@ -102,9 +102,9 @@ open class Backend(langs: Iterable<String> = listOf("en")) : GeneratedBackend(),
     /**
      * Open a collection. There must not already be an open collection.
      */
-    override fun openCollection(collectionPath: String, mediaFolderPath: String, mediaDbPath: String, forceSchema11: Boolean) {
+    override fun openCollection(collectionPath: String, mediaFolderPath: String, mediaDbPath: String) {
         try {
-            super.openCollection(collectionPath, mediaFolderPath, mediaDbPath, forceSchema11)
+            super.openCollection(collectionPath, mediaFolderPath, mediaDbPath)
         } catch (exc: BackendException.BackendDbException) {
             throw exc.toSQLiteException("db open")
         }

diff --git a/rsdroid/src/test/java/net/ankiweb/CollectionCreationTest.java b/rsdroid/src/test/java/net/ankiweb/CollectionCreationTest.java
@@ -43,7 +43,7 @@ public void ensureCollectionCreatedIsValid() {
 
         Configuration config = getConfiguration(path);
 
-        Backend backend = BackendFactory.getBackend(getTargetContext());
+        Backend backend = BackendFactory.getBackend();
         backend.openCollection(":memory:");
         SupportSQLiteDatabase database = AnkiSupportSQLiteDatabase.withRustBackend(backend);
 

diff --git a/rslib-bridge/Cargo.toml b/rslib-bridge/Cargo.toml
@@ -28,7 +28,7 @@ anki_i18n = { version = "0.0.0", path = "../anki/rslib/i18n" }
 anyhow = "1.0.75"
 glob = "0.3.1"
 inflections = "1.1.1"
-prost-reflect = "0.11.4"
+prost-reflect = "0.11.5"
 prost-types = "0.11.9"
-serde = { version = "1.0.186", features = ["derive"] }
-serde_json = "1.0.105"
+serde = { version = "1.0.188", features = ["derive"] }
+serde_json = "1.0.107"
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
 # older versions may fail to compile; newer versions may fail the clippy tests
-channel = "1.70"
+channel = "1.72"