chore: update deps

hanabi1224 · hanabi1224 · commit b76486f7385a · 2022-12-01T03:37:09.000+08:00
diff --git a/bench/bench_wasm.yaml b/bench/bench_wasm.yaml
@@ -55,15 +55,16 @@ runtime_version_parameter:
 environments:
   - os: linux
     compiler: wasmer/llvm
+    enabled: false
     version: latest
     compiler_version_command: wasmer --version
     runtime_version_parameter:
     env:
       RUSTFLAGS: -C target-feature=+simd128
-    include: rust
+    include: rust-wasm
     include_sub_dir: src
     before_build:
-      - cargo build --release --target wasm32-wasi --no-default-features --features wasm --target-dir /tmp/rustwasm/target
+      - cargo build --release --target wasm32-wasi --target-dir /tmp/rustwasm/target
     build: wasmer create-exe --llvm --enable-all -o out/app /tmp/rustwasm/target/wasm32-wasi/release/_app.wasm
     out_dir: out
     run_cmd: app
@@ -74,10 +75,10 @@ environments:
     runtime_version_parameter: --version
     env:
       RUSTFLAGS: -C target-feature=+simd128
-    include: rust
+    include: rust-wasm
     include_sub_dir: src
     before_build:
-      - cargo build --release --target wasm32-wasi --no-default-features --features wasm --target-dir /tmp/rustwasm/target
+      - cargo build --release --target wasm32-wasi --target-dir /tmp/rustwasm/target
     build: mv /tmp/rustwasm/target/wasm32-wasi/release/_app.wasm out
     out_dir: out
     run_cmd: wasmtime run --wasm-features all _app.wasm
@@ -87,10 +88,10 @@ environments:
     version: latest
     compiler_version_command:
     runtime_version_parameter: --version
-    include: rust
+    include: rust-wasm
     include_sub_dir: src
     before_build:
-      - cargo build --release --target wasm32-wasi --no-default-features --features wasm --target-dir /tmp/rustwasm/target
+      - cargo build --release --target wasm32-wasi --target-dir /tmp/rustwasm/target
     build: mv /tmp/rustwasm/target/wasm32-wasi/release/_app.wasm out && cp wrapper.js out
     out_dir: out
     run_cmd: node --experimental-wasi-unstable-preview1 --experimental-wasm-modules wrapper.js
@@ -103,10 +104,10 @@ environments:
     runtime_version_parameter:
     env:
       RUSTFLAGS: -C target-feature=+simd128
-    include: rust
+    include: rust-wasm
     include_sub_dir: src
     before_build:
-      - cargo build --release --target wasm32-wasi --no-default-features --features wasm --target-dir /tmp/rustwasm/target
+      - cargo build --release --target wasm32-wasi --target-dir /tmp/rustwasm/target
       - deno bundle --unstable wrapper.ts app.ts
     build: deno compile --no-check --unstable --allow-env --allow-read -o out/app app.ts
     after_build:
diff --git a/bench/bench_wasm_graal.yaml b/bench/bench_wasm_graal.yaml
@@ -51,10 +51,10 @@ environments:
   - os: linux
     compiler: wasm/graal
     version: latest
-    include: rust
+    include: rust-wasm
     include_sub_dir: src
     before_build:
-      - cargo build --release --target wasm32-wasi --no-default-features --features wasm --target-dir /tmp/rustwasm/target
+      - cargo build --release --target wasm32-wasi --target-dir /tmp/rustwasm/target
     build: mv /tmp/rustwasm/target/wasm32-wasi/release/_app.wasm out
     out_dir: out
     run_cmd: graalwasm _app.wasm
diff --git a/bench/bench_wasm_wasm_edge.yaml b/bench/bench_wasm_wasm_edge.yaml
@@ -60,10 +60,10 @@ environments:
     version: latest
     env:
       RUSTFLAGS: -C target-feature=+simd128
-    include: rust
+    include: rust-wasm
     include_sub_dir: src
     before_build:
-      - cargo build --release --target wasm32-wasi --no-default-features --features wasm --target-dir /tmp/rustwasm/target
+      - cargo build --release --target wasm32-wasi --target-dir /tmp/rustwasm/target
     build: wasmedgec --enable-all --generic-binary /tmp/rustwasm/target/wasm32-wasi/release/_app.wasm out/app.so
     out_dir: out
     run_cmd: wasmedge --enable-all app.so
diff --git a/bench/include/kotlin-jvm/build.gradle.kts b/bench/include/kotlin-jvm/build.gradle.kts
@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler
 import org.jetbrains.kotlin.config.KotlinCompilerVersion
 
 plugins {
-    val kotlinVersion = "1.7.21"
+    val kotlinVersion = "1.7.22"
     kotlin("jvm").version(kotlinVersion)
     kotlin("plugin.serialization").version(kotlinVersion)
     // kotlin("plugin.spring").version(kotlinVersion)
diff --git a/bench/include/kotlin-jvm/gradle/wrapper/gradle-wrapper.properties b/bench/include/kotlin-jvm/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/bench/include/kotlin-native/build.gradle.kts b/bench/include/kotlin-native/build.gradle.kts
@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.config.KotlinCompilerVersion
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 
 plugins {
-  val kotlinVersion = "1.7.21"
+  val kotlinVersion = "1.7.22"
   kotlin("multiplatform").version(kotlinVersion)
   kotlin("plugin.serialization").version(kotlinVersion)
   id("com.github.ben-manes.versions").version("0.44.0")
diff --git a/bench/include/kotlin-native/gradle/wrapper/gradle-wrapper.properties b/bench/include/kotlin-native/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/bench/include/rust-wasm/.gitignore b/bench/include/rust-wasm/.gitignore
@@ -0,0 +1,6 @@
+!Cargo.toml
+!rust-toolchain.toml
+!*.js
+!*.ts
+!self_signed_certs/
+!.cargo
diff --git a/bench/include/rust-wasm/Cargo.toml b/bench/include/rust-wasm/Cargo.toml
@@ -0,0 +1,49 @@
+[package]
+edition = "2021"
+name = "_app"
+version = "0.1.0"
+
+[features]
+default = [
+  "wasm",
+]
+
+wasm = [
+  "tokio/rt",
+  "tokio/sync",
+  "tokio/macros",
+]
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[dependencies]
+anyhow = "1"
+bitvec = "1"
+elliptic-curve = "0"
+generic-array = "0"
+hashbrown = "0"
+hashlink = "0"
+hex = "0"
+ibig = "0"
+k256 = "0"
+lasso = "0"
+lazy_static = "1"
+md5 = "0"
+num-bigint = "0"
+num-traits = "0"
+num_cpus = "1"
+numeric-array = "0"
+rand = "0"
+rayon = "1"
+regex = "1"
+serde = {version = "1", features = ["derive"]}
+serde_json = {version = "1", features = ["float_roundtrip", "preserve_order"]}
+static-rc = "0"
+
+tokio = {version = "~1.20", optional = true}
+
+[profile.release]
+codegen-units = 1
+lto = true
+opt-level = 3
+overflow-checks = false
+strip = true
diff --git a/bench/include/rust-wasm/rust-toolchain.toml b/bench/include/rust-wasm/rust-toolchain.toml
@@ -0,0 +1,3 @@
+[toolchain]
+channel = "stable"
+targets = ["wasm32-wasi"]
diff --git a/bench/include/rust-wasm/wrapper.js b/bench/include/rust-wasm/wrapper.js
diff --git a/bench/include/rust-wasm/wrapper.ts b/bench/include/rust-wasm/wrapper.ts
diff --git a/bench/include/rust/Cargo.toml b/bench/include/rust/Cargo.toml
@@ -16,11 +16,6 @@ default = [
   "reqwest",
   "warp",
 ]
-wasm = [
-  "tokio/rt",
-  "tokio/sync",
-  "tokio/macros",
-]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
@@ -50,12 +45,12 @@ static-rc = "0"
 async-channel = {version = "1", optional = true}
 async-executor = {version = "1", optional = true}
 async-std = {version = "1", optional = true}
-axum = {version = "0.5", optional = true, features = ["http1", "http2"]}
+axum = {version = "0.6", optional = true, features = ["http1", "http2"]}
 axum-server = {version = "0.4", optional = true, features = ["tls-rustls"]}
 flume = {version = "0", optional = true}
 futures-lite = {version = "1", optional = true}
 reqwest = {version = "0.11", optional = true, default-features = false, features = ["json", "rustls-tls"]}
-tokio = {version = "~1.20", optional = true}
+tokio = {version = "1.22", optional = true}
 warp = {version = "0.3", optional = true, features = ["tls"]}
 
 [profile.release]
diff --git a/bench/include/rust/rust-toolchain.toml b/bench/include/rust/rust-toolchain.toml
@@ -1,3 +1,2 @@
 [toolchain]
 channel = "stable"
-targets = ["wasm32-wasi"]
diff --git a/bench/update.sh b/bench/update.sh
@@ -16,6 +16,10 @@ pushd include/rust
 cargo update
 popd
 
+pushd include/rust-wasm
+cargo update
+popd
+
 pushd include/rust-nightly
 cargo +nightly update
 popd

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[toolchain]`
	`2`	`+channel = "stable"`
	`3`	`+targets = ["wasm32-wasi"]`