Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies #55

Merged
merged 6 commits into from
Nov 5, 2023
Merged

Update dependencies #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9752660
Update build.sh
DianQK Nov 4, 2023
9913b8f
Update Cargo.lock
DianQK Nov 4, 2023
44910c5
Update rust-toolchain.toml
DianQK Nov 4, 2023
5054b9c
Update ruslin-data
DianQK Nov 4, 2023
48652ad
Update ndk
DianQK Nov 5, 2023
2a5cea9
Set CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
DianQK Nov 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
echo $ANDROID_SDK_ROOT
HIGHEST_NDK_VERSION=$(ls $ANDROID_SDK_ROOT/ndk | tail -n1)
echo "Highest Android NDK: $HIGHEST_NDK_VERSION"
EXPECTED_NDK_VERSION=25.2.9519653
EXPECTED_NDK_VERSION=26.1.10909125
echo "Expected Android NDK: $EXPECTED_NDK_VERSION"
[[ "$EXPECTED_NDK_VERSION" == "$HIGHEST_NDK_VERSION" ]];
echo "ANDROID_NDK_VERSION=$EXPECTED_NDK_VERSION" >> $GITHUB_ENV
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
echo $ANDROID_SDK_ROOT
HIGHEST_NDK_VERSION=$(ls $ANDROID_SDK_ROOT/ndk | tail -n1)
echo "Highest Android NDK: $HIGHEST_NDK_VERSION"
EXPECTED_NDK_VERSION=25.2.9519653
EXPECTED_NDK_VERSION=26.1.10909125
echo "Expected Android NDK: $EXPECTED_NDK_VERSION"
[[ "$EXPECTED_NDK_VERSION" == "$HIGHEST_NDK_VERSION" ]];
echo "ANDROID_NDK_VERSION=$EXPECTED_NDK_VERSION" >> $GITHUB_ENV
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/.envrc
/keystore.properties
/uniffi/src/main/java/uniffi/ruslin/ruslin.kt
/uniffi/src/main/jniLibs
Expand Down
3 changes: 1 addition & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,7 @@ Example:

```shell
export ANDROID_HOME=$HOME/Android/Sdk
export ANDROID_NDK_VERSION=25.2.9519653
export ANDROID_NDK_ROOT=$ANDROID_HOME/ndk/$ANDROID_NDK_VERSION
export NDK_VERSION=26.1.10909125
```

#### 2. Build the Rust library.
Expand Down
10 changes: 5 additions & 5 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
[versions]
# plugin
androidGradlePlugin = "8.0.2"
androidGradlePlugin = "8.1.2"
hilt = "2.46.1"
kotlin = "1.8.21"
androidxBenchmark = "1.1.1"
androidxCore = "1.10.1"

# sdk
compileSdkVersion = "33"
compileSdkVersion = "34"
minSdkVersion = "28"
targetSdkVersion = "33"
buildToolsVersion = "30.0.3"
ndkVersion = "25.2.9519653"
targetSdkVersion = "34"
buildToolsVersion = "34.0.0"
ndkVersion = "26.1.10909125"

# library
appcompat = "1.6.1"
Expand Down
Loading