diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 01fca233..8510b0dc 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -56,15 +56,21 @@ jobs: - name: "Install Linux GNU for x86_64" run: | rm '/usr/local/bin/2to3' + rm '/usr/local/bin/2to3-3.11' + rm '/usr/local/bin/2to3-3.12' rm '/usr/local/bin/python3' rm '/usr/local/bin/python3.11' - rm '/usr/local/bin/2to3-3.11' + rm '/usr/local/bin/python3.12' rm '/usr/local/bin/idle3' rm '/usr/local/bin/idle3.11' + rm '/usr/local/bin/idle3.12' rm '/usr/local/bin/pydoc3' rm '/usr/local/bin/pydoc3.11' + rm '/usr/local/bin/pydoc3.12' rm '/usr/local/bin/python3-config' rm '/usr/local/bin/python3.11-config' + rm '/usr/local/bin/python3.12-config' + rm -r '/usr/local/lib/node_modules' brew install --overwrite x86_64-unknown-linux-gnu - name: "Install Linux GNU for aarch64" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e32ee8d0..26d3cefb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -97,15 +97,21 @@ jobs: - name: "Install Linux GNU for x86_64" run: | rm '/usr/local/bin/2to3' + rm '/usr/local/bin/2to3-3.11' + rm '/usr/local/bin/2to3-3.12' rm '/usr/local/bin/python3' rm '/usr/local/bin/python3.11' - rm '/usr/local/bin/2to3-3.11' + rm '/usr/local/bin/python3.12' rm '/usr/local/bin/idle3' rm '/usr/local/bin/idle3.11' + rm '/usr/local/bin/idle3.12' rm '/usr/local/bin/pydoc3' rm '/usr/local/bin/pydoc3.11' + rm '/usr/local/bin/pydoc3.12' rm '/usr/local/bin/python3-config' rm '/usr/local/bin/python3.11-config' + rm '/usr/local/bin/python3.12-config' + rm -r '/usr/local/lib/node_modules' brew install --overwrite x86_64-unknown-linux-gnu - name: "Install Linux GNU for aarch64" diff --git a/anoncred-kmm/anoncred-wrapper-rust/build.gradle.kts b/anoncred-kmm/anoncred-wrapper-rust/build.gradle.kts index 01d5bc94..0e536b09 100644 --- a/anoncred-kmm/anoncred-wrapper-rust/build.gradle.kts +++ b/anoncred-kmm/anoncred-wrapper-rust/build.gradle.kts @@ -202,10 +202,6 @@ val buildAnonCredWrapperForAndroidArch64 by tasks.register("buildAnonCredW "STRIP" to STRIP ) this.environment = localEnv - println("Show all environment variables") - for (entry in this.environment.entries) { - println("${entry.key} : ${entry.value}") - } inputs.files(fileTree(projectDir.resolve("src"))) outputs.files(fileTree(projectDir.resolve("target").resolve("aarch64-linux-android"))) commandLine("cargo", "ndk", "build", "--release", "--target", "aarch64-linux-android", "--target-dir", "${projectDir.resolve("target")}") diff --git a/uniffi/src/anoncreds.udl b/uniffi/src/anoncreds.udl index eafe7635..d13b260d 100644 --- a/uniffi/src/anoncreds.udl +++ b/uniffi/src/anoncreds.udl @@ -298,7 +298,7 @@ interface Prover { ); [Throws=AnoncredsError] - void process_credential( + Credential process_credential( Credential credential, CredentialRequestMetadata cred_request_metadata, LinkSecret link_secret, diff --git a/uniffi/src/prover/mod.rs b/uniffi/src/prover/mod.rs index e3ddd776..632b3064 100644 --- a/uniffi/src/prover/mod.rs +++ b/uniffi/src/prover/mod.rs @@ -82,7 +82,7 @@ impl Prover { link_secret: Arc, cred_def: Arc, rev_reg_def: Option>, - ) -> Result<(), AnoncredsError> { + ) -> Result, AnoncredsError> { let mut mutable_credential = (*credential) .core .try_clone() @@ -94,7 +94,9 @@ impl Prover { &(*cred_def).core, rev_reg_def.as_ref().map(|def| &(*def).core), ) - .map_err(|err| AnoncredsError::ProcessCredential(format!("Error: {}", err))) + .map_err(|err| AnoncredsError::ProcessCredential(format!("Error: {}", err))); + + return Ok(Arc::new(Credential { core: mutable_credential })) } pub fn create_presentation(