diff --git a/Cargo.lock b/Cargo.lock index a6ab7371e5..f25a7634a0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -44,7 +44,7 @@ dependencies = [ "sha3", "strum_macros", "text-splitter", - "thiserror 1.0.69", + "thiserror 2.0.11", "tiktoken-rs", "tree-sitter", "tree-sitter-c", diff --git a/Cargo.toml b/Cargo.toml index d1a6d1df7f..88348fcb81 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,49 +11,69 @@ members = [ resolver = "3" [workspace.package] -edition = "2024" +edition = "2024" [workspace.dependencies] -affine_common = { path = "./packages/common/native" } -affine_nbstore = { path = "./packages/frontend/native/nbstore" } -anyhow = "1" -base64-simd = "0.8" -block2 = "0.6" -chrono = "0.4" -core-foundation = "0.10" -coreaudio-rs = "0.12" -criterion2 = { version = "3", default-features = false } -dispatch2 = "0.2" -dotenvy = "0.15" -file-format = { version = "0.26", features = ["reader"] } -homedir = "0.3" -libc = "0.2" -mimalloc = "0.1" -mp3lame-encoder = "0.2" -napi = { version = "3.0.0-alpha.31", features = ["async", "chrono_date", "error_anyhow", "napi9", "serde"] } -napi-build = { version = "2" } -napi-derive = { version = "3.0.0-alpha.28" } -notify = { version = "8", features = ["serde"] } -objc2 = "0.6" -objc2-foundation = "0.3" -once_cell = "1" -parking_lot = "0.12" -rand = "0.9" -rayon = "1.10" -rubato = "0.16" -screencapturekit = "0.3" -serde = "1" -serde_json = "1" -sha3 = "0.10" -sqlx = { version = "0.8", default-features = false, features = ["chrono", "macros", "migrate", "runtime-tokio", "sqlite", "tls-rustls"] } -symphonia = { version = "0.5", features = ["all", "opt-simd"] } -thiserror = "2" -tiktoken-rs = "0.6" -tokio = "1.37" -uniffi = "0.29" -uuid = "1.8" -v_htmlescape = "0.15" -y-octo = { git = "https://github.com/y-crdt/y-octo.git", branch = "main" } +affine_common = { path = "./packages/common/native" } +affine_nbstore = { path = "./packages/frontend/native/nbstore" } +anyhow = "1" +base64-simd = "0.8" +block2 = "0.6" +chrono = "0.4" +core-foundation = "0.10" +coreaudio-rs = "0.12" +criterion2 = { version = "3", default-features = false } +dispatch2 = "0.2" +docx-parser = { git = "https://github.com/toeverything/docx-parser" } +dotenvy = "0.15" +file-format = { version = "0.26", features = ["reader"] } +homedir = "0.3" +infer = { version = "0.19.0" } +libc = "0.2" +mimalloc = "0.1" +mp3lame-encoder = "0.2" +napi = { version = "3.0.0-alpha.31", features = ["async", "chrono_date", "error_anyhow", "napi9", "serde"] } +napi-build = { version = "2" } +napi-derive = { version = "3.0.0-alpha.28" } +notify = { version = "8", features = ["serde"] } +objc2 = "0.6" +objc2-foundation = "0.3" +once_cell = "1" +parking_lot = "0.12" +path-ext = "0.1.1" +pdf-extract = "0.8.2" +rand = "0.9" +rayon = "1.10" +readability = { version = "0.3.0", default-features = false } +rubato = "0.16" +screencapturekit = "0.3" +serde = "1" +serde_json = "1" +sha3 = "0.10" +sqlx = { version = "0.8", default-features = false, features = ["chrono", "macros", "migrate", "runtime-tokio", "sqlite", "tls-rustls"] } +strum_macros = "0.27.0" +symphonia = { version = "0.5", features = ["all", "opt-simd"] } +text-splitter = "0.24" +thiserror = "2" +tiktoken-rs = "0.6" +tokio = "1.37" +tree-sitter = { version = "0.25" } +tree-sitter-c = { version = "0.23" } +tree-sitter-c-sharp = { version = "0.23" } +tree-sitter-cpp = { version = "0.23" } +tree-sitter-go = { version = "0.23" } +tree-sitter-java = { version = "0.23" } +tree-sitter-javascript = { version = "0.23" } +tree-sitter-kotlin-ng = { version = "1.1" } +tree-sitter-python = { version = "0.23" } +tree-sitter-rust = { version = "0.23" } +tree-sitter-scala = { version = "0.23" } +tree-sitter-typescript = { version = "0.23" } +uniffi = "0.29" +url = { version = "2.5" } +uuid = "1.8" +v_htmlescape = "0.15" +y-octo = { git = "https://github.com/y-crdt/y-octo.git", branch = "main" } [profile.dev.package.sqlx-macros] opt-level = 3 diff --git a/packages/backend/server/migrations/migration_lock.toml b/packages/backend/server/migrations/migration_lock.toml index fbffa92c2b..99e4f20090 100644 --- a/packages/backend/server/migrations/migration_lock.toml +++ b/packages/backend/server/migrations/migration_lock.toml @@ -1,3 +1,3 @@ # Please do not edit this file manually # It should be added in your version-control system (i.e. Git) -provider = "postgresql" \ No newline at end of file +provider = "postgresql" diff --git a/packages/common/native/Cargo.toml b/packages/common/native/Cargo.toml index d159fb1bdd..b319fb9244 100644 --- a/packages/common/native/Cargo.toml +++ b/packages/common/native/Cargo.toml @@ -27,28 +27,28 @@ chrono = { workspace = true } rand = { workspace = true } sha3 = { workspace = true } -docx-parser = { git = "https://github.com/toeverything/docx-parser", optional = true } -infer = { version = "0.19.0", optional = true } -path-ext = { version = "0.1.1", optional = true } -pdf-extract = { version = "0.8.2", optional = true } -readability = { version = "0.3.0", optional = true, default-features = false } -serde_json = { version = "1.0", optional = true } -strum_macros = { version = "0.27.0", optional = true } -text-splitter = { version = "0.24", features = ["markdown", "tiktoken-rs"], optional = true } -thiserror = { version = "2", optional = true } -tree-sitter = { version = "0.25", optional = true } -tree-sitter-c = { version = "0.23", optional = true } -tree-sitter-c-sharp = { version = "0.23", optional = true } -tree-sitter-cpp = { version = "0.23", optional = true } -tree-sitter-go = { version = "0.23", optional = true } -tree-sitter-java = { version = "0.23", optional = true } -tree-sitter-javascript = { version = "0.23", optional = true } -tree-sitter-kotlin-ng = { version = "1.1", optional = true } -tree-sitter-python = { version = "0.23", optional = true } -tree-sitter-rust = { version = "0.23", optional = true } -tree-sitter-scala = { version = "0.23", optional = true } -tree-sitter-typescript = { version = "0.23", optional = true } -url = { version = "2.5", optional = true } +docx-parser = { workspace = true, optional = true } +infer = { workspace = true, optional = true } +path-ext = { workspace = true, optional = true } +pdf-extract = { workspace = true, optional = true } +readability = { workspace = true, optional = true, default-features = false } +serde_json = { workspace = true, optional = true } +strum_macros = { workspace = true, optional = true } +text-splitter = { workspace = true, features = ["markdown", "tiktoken-rs"], optional = true } +thiserror = { workspace = true, optional = true } +tree-sitter = { workspace = true, optional = true } +tree-sitter-c = { workspace = true, optional = true } +tree-sitter-c-sharp = { workspace = true, optional = true } +tree-sitter-cpp = { workspace = true, optional = true } +tree-sitter-go = { workspace = true, optional = true } +tree-sitter-java = { workspace = true, optional = true } +tree-sitter-javascript = { workspace = true, optional = true } +tree-sitter-kotlin-ng = { workspace = true, optional = true } +tree-sitter-python = { workspace = true, optional = true } +tree-sitter-rust = { workspace = true, optional = true } +tree-sitter-scala = { workspace = true, optional = true } +tree-sitter-typescript = { workspace = true, optional = true } +url = { workspace = true, optional = true } tiktoken-rs = { workspace = true } diff --git a/packages/frontend/apps/android/App/gradle/libs.versions.toml b/packages/frontend/apps/android/App/gradle/libs.versions.toml index c081befd17..e7828b00d3 100644 --- a/packages/frontend/apps/android/App/gradle/libs.versions.toml +++ b/packages/frontend/apps/android/App/gradle/libs.versions.toml @@ -1,46 +1,46 @@ [versions] +androidGradlePlugin = "8.8.2" androidxEspressoCore = "3.6.1" -androidxJunit = "1.2.1" -browser = "1.8.0" -coreKtx = "1.15.0" -material = "1.12.0" -material3 = "1.3.1" -coreSplashScreen = "1.0.1" -jna = "5.16.0" -junitVersion = "4.13.2" -kotlin = "2.1.10" -kotlinxCoroutines = "1.10.1" -rustAndroid = "0.9.6" -appcompat = "1.7.0" -coordinatorLayout = "1.3.0" -googleServices = "4.4.2" -androidGradlePlugin = "8.8.2" -apollo = "4.1.1" +androidxJunit = "1.2.1" +apollo = "4.1.1" +appcompat = "1.7.0" +browser = "1.8.0" +coordinatorLayout = "1.3.0" +coreKtx = "1.15.0" +coreSplashScreen = "1.0.1" +googleServices = "4.4.2" +jna = "5.16.0" +junitVersion = "4.13.2" +kotlin = "2.1.10" +kotlinxCoroutines = "1.10.1" +material = "1.12.0" +material3 = "1.3.1" +rustAndroid = "0.9.6" [libraries] -androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" } -androidx-browser = { module = "androidx.browser:browser", version.ref = "browser" } +androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" } +androidx-browser = { module = "androidx.browser:browser", version.ref = "browser" } androidx-coordinatorlayout = { module = "androidx.coordinatorlayout:coordinatorlayout", version.ref = "coordinatorLayout" } -androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "coreKtx" } +androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "coreKtx" } androidx-core-splashscreen = { module = "androidx.core:core-splashscreen", version.ref = "coreSplashScreen" } -androidx-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "androidxEspressoCore" } -androidx-junit = { module = "androidx.test.ext:junit", version.ref = "androidxJunit" } -androidx-material3 = { module = "androidx.compose.material3:material3", version.ref = "material3" } -kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinxCoroutines" } -kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinxCoroutines"} +androidx-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "androidxEspressoCore" } +androidx-junit = { module = "androidx.test.ext:junit", version.ref = "androidxJunit" } +androidx-material3 = { module = "androidx.compose.material3:material3", version.ref = "material3" } +kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinxCoroutines" } +kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinxCoroutines" } -google-services = { module = "com.google.gms:google-services", version.ref = "googleServices" } -google-material = { module = "com.google.android.material:material", version.ref = "material" } android-gradlePlugin = { module = "com.android.tools.build:gradle", version.ref = "androidGradlePlugin" } -jna = { module = "net.java.dev.jna:jna", version.ref = "jna" } -junit = { module = "junit:junit", version.ref = "junitVersion" } -apollo-runtime = { module = "com.apollographql.apollo:apollo-runtime", version.ref = "apollo" } -apollo-api = { module = "com.apollographql.apollo:apollo-api", version.ref = "apollo" } +apollo-api = { module = "com.apollographql.apollo:apollo-api", version.ref = "apollo" } +apollo-runtime = { module = "com.apollographql.apollo:apollo-runtime", version.ref = "apollo" } +google-material = { module = "com.google.android.material:material", version.ref = "material" } +google-services = { module = "com.google.gms:google-services", version.ref = "googleServices" } +jna = { module = "net.java.dev.jna:jna", version.ref = "jna" } +junit = { module = "junit:junit", version.ref = "junitVersion" } [plugins] -android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" } -android-library = { id = "com.android.library", version.ref = "androidGradlePlugin" } -kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } -rust-android = { id = "org.mozilla.rust-android-gradle.rust-android", version.ref = "rustAndroid" } -apollo-android = { id = "com.apollographql.apollo", version.ref = "apollo" } +android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" } +android-library = { id = "com.android.library", version.ref = "androidGradlePlugin" } +apollo-android = { id = "com.apollographql.apollo", version.ref = "apollo" } jetbrains-kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } +kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } +rust-android = { id = "org.mozilla.rust-android-gradle.rust-android", version.ref = "rustAndroid" }