Skip to content

Commit

Permalink
Merge pull request #149 from redbadger/deps
Browse files Browse the repository at this point in the history
Update Dependencies
  • Loading branch information
StuartHarris authored Oct 24, 2023
2 parents 72abb62 + 17e6db5 commit ea6428a
Show file tree
Hide file tree
Showing 97 changed files with 10,231 additions and 13,409 deletions.
197 changes: 88 additions & 109 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ rust-version = "1.66"

[workspace.dependencies]
anyhow = "1.0.75"
serde = "1.0.188"
serde = "1.0.189"
4 changes: 2 additions & 2 deletions crux_cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ console = "0.15.7"
ignore = "0.4.20"
ramhorns = "0.14.0"
serde = { workspace = true, features = ["derive"] }
similar = { version = "2.2.1", features = ["inline"] }
toml = "0.8.1"
similar = { version = "2.3.0", features = ["inline"] }
toml = "0.8.2"
8 changes: 4 additions & 4 deletions crux_core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ serde = { workspace = true, features = ["derive"] }
serde_json = "1.0.107"
serde-generate = { version = "0.25.1", optional = true }
serde-reflection = { version = "0.3.6", optional = true }
thiserror = "1.0.49"
uuid = { version = "1.4.1", features = ["v4", "wasm-bindgen", "js", "serde"] }
thiserror = "1.0.50"
uuid = { version = "1.5.0", features = ["v4", "wasm-bindgen", "js", "serde"] }
wasm-bindgen = "0.2.87"

[dev-dependencies]
Expand All @@ -37,8 +37,8 @@ async-channel = "1.9"
crux_macros = { version = "0.3", path = "../crux_macros" }
crux_http = { version = "0.4", path = "../crux_http" }
crux_time = { version = "0.1", path = "../crux_time" }
serde = { version = "1.0.188", features = ["derive"] }
serde = { version = "1.0.189", features = ["derive"] }
static_assertions = "1.1"
rand = "0.8"
uuid = { version = "1.4.1", features = ["v4", "serde"] }
uuid = { version = "1.5.0", features = ["v4", "serde"] }
url = "2.4.1"
2 changes: 1 addition & 1 deletion crux_http/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ rust-version.workspace = true

[dependencies]
anyhow.workspace = true
async-trait = "0.1.73"
async-trait = "0.1.74"
crux_core = { version = ">=0.4", path = "../crux_core" }
crux_macros = { version = "0.3", path = "../crux_macros" }
derive_builder = "0.12.0"
Expand Down
6 changes: 3 additions & 3 deletions crux_macros/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ proc-macro = true
[dependencies]
darling = "0.20.3"
proc-macro-error = "1.0.4"
proc-macro2 = "1.0.67"
proc-macro2 = "1.0.69"
quote = "1.0.33"
syn = "2.0.37"
syn = "2.0.38"

[dev-dependencies]
insta = "1.33"
insta = "1.34"
prettyplease = "0.2"
2 changes: 1 addition & 1 deletion docs/book.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ title = "Crux: Cross-platform app development in Rust"

[preprocessor.admonish]
command = "mdbook-admonish"
assets_version = "2.0.2" # do not edit: managed by `mdbook-admonish install`
assets_version = "3.0.0" # do not edit: managed by `mdbook-admonish install`

[output]

Expand Down
162 changes: 75 additions & 87 deletions docs/mdbook-admonish.css

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions examples/bridge_echo/Android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -56,28 +56,28 @@ dependencies {
implementation platform('androidx.compose:compose-bom:2023.08.00')
androidTestImplementation platform('androidx.compose:compose-bom:2023.08.00')

implementation 'androidx.compose.material3:material3:1.2.0-alpha06'
implementation 'androidx.compose.material3:material3:1.2.0-alpha10'

// Optional - Integration with activities
implementation("androidx.activity:activity-compose:1.7.2")
implementation("androidx.activity:activity-compose:1.8.0")
// Optional - Integration with ViewModels
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1")
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2")
// Optional - Integration with LiveData
implementation("androidx.compose.runtime:runtime-livedata")

implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3'

implementation 'androidx.core:core-ktx:1.10.1'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1'
implementation 'androidx.activity:activity-compose:1.7.2'
implementation "androidx.compose.ui:ui:1.5.0"
implementation "androidx.compose.ui:ui-tooling-preview:1.5.0"
implementation 'androidx.core:core-ktx:1.12.0'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.2'
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2'
implementation 'androidx.activity:activity-compose:1.8.0'
implementation "androidx.compose.ui:ui:1.5.4"
implementation "androidx.compose.ui:ui-tooling-preview:1.5.4"
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.5.0"
debugImplementation "androidx.compose.ui:ui-tooling:1.5.0"
debugImplementation "androidx.compose.ui:ui-test-manifest:1.5.0"
androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.5.4"
debugImplementation "androidx.compose.ui:ui-tooling:1.5.4"
debugImplementation "androidx.compose.ui:ui-test-manifest:1.5.4"
}
4 changes: 2 additions & 2 deletions examples/bridge_echo/Android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id 'com.android.application' version '8.1.1' apply false
id 'com.android.library' version '8.1.1' apply false
id 'com.android.application' version '8.1.2' apply false
id 'com.android.library' version '8.1.2' apply false
id 'org.jetbrains.kotlin.android' version '1.9.10' apply false
id "org.mozilla.rust-android-gradle.rust-android" version "0.9.3" apply false
}
4 changes: 2 additions & 2 deletions examples/bridge_echo/Android/shared/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ android {
dependencies {
implementation 'net.java.dev.jna:jna:5.13.0@aar'

implementation 'androidx.core:core-ktx:1.10.1'
implementation 'androidx.core:core-ktx:1.12.0'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'com.google.android.material:material:1.9.0'
implementation 'com.google.android.material:material:1.10.0'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
Expand Down
Loading

0 comments on commit ea6428a

Please sign in to comment.