Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
BppleMan committed Jan 7, 2025
2 parents ac7c777 + 1b8f6d6 commit df88199
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 13 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/kommand publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,18 @@ permissions:

jobs:
publish:
runs-on: macos-12
runs-on: macos-14
steps:
- uses: actions/checkout@v4

- name: Set up Cargo
uses: actions-rust-lang/[email protected]
with:
toolchain: 1.69.0
toolchain: 1.83.0
target: ${{ matrix.cargo_target }}

- name: Set up just
run: cargo install just --version 1.15.0
run: cargo install just

- name: Set up JDK 17
uses: actions/[email protected]
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/kommand test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
include:
- platform: macos
arch: x64
os: macos-12
os: macos-14
cargo_target: x86_64-apple-darwin
task: macosX64Test
jdk_arch: x64
Expand Down Expand Up @@ -73,11 +73,11 @@ jobs:
- name: Set up Cargo
uses: actions-rust-lang/[email protected]
with:
toolchain: 1.69.0
toolchain: 1.83.0
target: ${{ matrix.cargo_target }}

- name: Set up just
run: cargo install just --version 1.15.0
run: cargo install just

- name: Set up JDK 17
uses: actions/[email protected]
Expand Down
11 changes: 5 additions & 6 deletions README-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

一个可以将外部命令跑在子进程的库,用于Kotlin Native/JVM

# v2.1.2
# v2.3.0

Rust 是一门兼顾性能和工程性的优秀语言。

Expand All @@ -18,7 +18,7 @@ Rust 是一门兼顾性能和工程性的优秀语言。
- `CreateChildProcess` of [win32 api]
- `java.lang.ProcessBuilder` of JVM

在 2.0 版本中,我们使用 Rust 标准库来提供创建子进程的功能。
在 2.x 版本中,我们使用 Rust 标准库来提供创建子进程的功能。

- `std::process::Command` of Rust
- `java.lang.ProcessBuilder` of JVM
Expand All @@ -42,8 +42,8 @@ Rust 是一门兼顾性能和工程性的优秀语言。

# 依赖于

- Rust Standard Library 1.69.0
- Kotlin Multiplatform 1.9.21
- Rust Standard Library 1.83.0
- Kotlin Multiplatform 2.1.0

# 用法

Expand Down Expand Up @@ -95,8 +95,7 @@ https://github.com/kgit2/kommand/blob/7367c60db7b3475be0de17474dbcec3d518894ba/k

### 1. 依赖

- rust toolchain - <= 1.69.0 (https://rustup.rs) (建议)
- cross (install with `cargo install cross`)
- rust toolchain - 1.83.0 (https://rustup.rs)
- just (install with `cargo install just`)
- 交叉编译工具链
- x86_64-apple-darwin
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ Dependency:

### 1. Dependencies

- rust toolchain - >= 1.83.0 (https://rustup.rs)
- rust toolchain - 1.83.0 (https://rustup.rs)
- just (install with `cargo install just`)
- cross-compile toolchain
- x86_64-apple-darwin
Expand Down

0 comments on commit df88199

Please sign in to comment.