diff --git a/.cargo/config b/.cargo/config index 8f2b0338..8fb9b987 100644 --- a/.cargo/config +++ b/.cargo/config @@ -1,8 +1,8 @@ [target.i686-linux-android] -linker = "i686-linux-android16-clang" +linker = "i686-linux-android19-clang" [target.armv7-linux-androideabi] -linker = "armv7a-linux-androideabi16-clang" +linker = "armv7a-linux-androideabi19-clang" [target.aarch64-linux-android] linker = "aarch64-linux-android21-clang" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b17c483d..e2328bf7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -45,7 +45,7 @@ jobs: - name: Install Rust old stable with incremental compilation uses: actions-rs/toolchain@v1 with: - toolchain: 1.66.0 + toolchain: 1.70.0 profile: minimal default: true @@ -117,13 +117,13 @@ jobs: - name: Setup Android SDK uses: android-actions/setup-android@v2 - name: Install NDK - run: sdkmanager --install "build-tools;29.0.3" "ndk;22.0.7026061" "cmdline-tools;latest" + run: sdkmanager --install "build-tools;33.0.2" "ndk;25.2.9519653" "cmdline-tools;latest" - name: Install gcc-multilib run: | sudo apt update sudo apt install gcc-multilib -y - name: Build Android Archive - run: AR_i686_linux_android=$ANDROID_SDK_ROOT/ndk/22.0.7026061/toolchains/llvm/prebuilt/linux-x86_64/i686-linux-android/bin/ar PATH=$ANDROID_SDK_ROOT/ndk/22.0.7026061/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH TARGET_CC=$(which clang) cargo build --lib --target i686-linux-android + run: AR=$ANDROID_SDK_ROOT/ndk/25.2.9519653/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar RANLIB=$ANDROID_SDK_ROOT/ndk/25.2.9519653/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ranlib TARGET_CC=$ANDROID_SDK_ROOT/ndk/25.2.9519653/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android19-clang PATH=$ANDROID_SDK_ROOT/ndk/25.2.9519653/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH cargo build --lib --target i686-linux-android test_http: runs-on: ubuntu-latest diff --git a/README.md b/README.md index 78b3e5af..e60b6188 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ - -[![](https://img.shields.io/github/actions/workflow/status/spruceid/didkit/build.yml?branch=main)](https://github.com/spruceid/didkit/actions?query=workflow%3Aci+branch%3Amain) [![](https://img.shields.io/badge/Docker-19.03.x-blue)](https://www.docker.com/) [![](https://img.shields.io/badge/Rust-v1.51.0-orange)](https://www.rust-lang.org/) [![](https://img.shields.io/badge/ssi-v0.1-green)](https://www.github.com/spruceid/ssi) [![](https://img.shields.io/badge/License-Apache--2.0-green)](https://github.com/spruceid/didkit/blob/main/LICENSE) [![](https://img.shields.io/twitter/follow/spruceid?label=Follow&style=social)](https://twitter.com/spruceid) +[![](https://img.shields.io/github/workflow/status/spruceid/didkit/ci)](https://github.com/spruceid/didkit/actions?query=workflow%3Aci+branch%3Amain) [![](https://img.shields.io/badge/Docker-19.03.x-blue)](https://www.docker.com/) [![](https://img.shields.io/badge/ssi-v0.1-green)](https://www.github.com/spruceid/ssi) [![](https://img.shields.io/badge/License-Apache--2.0-green)](https://github.com/spruceid/didkit/blob/main/LICENSE) [![](https://img.shields.io/twitter/follow/spruceid?label=Follow&style=social)](https://twitter.com/spruceid) Check out the DIDKit documentation [here](https://spruceid.dev/didkit/didkit/). diff --git a/http/src/credentials.rs b/http/src/credentials.rs index b163e6ef..f05009c3 100644 --- a/http/src/credentials.rs +++ b/http/src/credentials.rs @@ -1,7 +1,7 @@ use anyhow::Context; use axum::{http::StatusCode, Extension, Json}; use didkit::{ - ssi::ldp::{now_ms, Error as LdpError}, + ssi::ldp::{now_ns, Error as LdpError}, ContextLoader, CredentialOrJWT, JWTOrLDPOptions, ProofFormat, VerifiableCredential, VerificationResult, DID_METHODS, }; @@ -42,7 +42,7 @@ pub async fn issue( None => return Err((StatusCode::NOT_FOUND, "Missing key".to_string()).into()), }; if credential.issuance_date.is_none() { - credential.issuance_date = Some(now_ms().into()); + credential.issuance_date = Some(now_ns().into()); } if let Err(e) = credential.validate_unsigned() { return Err((StatusCode::BAD_REQUEST, e.to_string()).into());