Merge branch 'main' into gm/1226-didexchange-signature-checks

Signed-off-by: George Mulhearn <gmulhearn@anonyome.com>
hyperledger · Jun 26, 2024 · 83e89dc · 83e89dc
2 parents 8838804 + 1a52699
commit 83e89dc
Show file tree

Hide file tree

Showing 17 changed files with 76 additions and 105 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/aries/agents/aath-backchannel/Dockerfile.aries-vcx b/aries/agents/aath-backchannel/Dockerfile.aries-vcx
@@ -1,4 +1,4 @@
-FROM alpine:3.15.4 AS builder
+FROM alpine:3.20.0 AS builder
 
 ARG UID=1000
 ARG GID=1000
@@ -26,7 +26,7 @@ COPY --chown=aries:aries . vcx
 WORKDIR /home/aries/vcx
 RUN cargo build --bin aries-vcx-backchannel
 
-FROM alpine:3.15.4
+FROM alpine:3.20.0
 
 ARG UID=1000
 ARG GID=1000

diff --git a/aries/agents/mobile_demo/app/build.gradle b/aries/agents/mobile_demo/app/build.gradle
@@ -49,24 +49,24 @@ android {
 dependencies {
 
     implementation 'androidx.core:core-ktx:1.8.0'
-    implementation platform('org.jetbrains.kotlin:kotlin-bom:1.8.0')
+    implementation platform('org.jetbrains.kotlin:kotlin-bom:1.9.24')
     implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
-    implementation 'androidx.activity:activity-compose:1.5.1'
-    implementation platform('androidx.compose:compose-bom:2022.10.00')
+    implementation 'androidx.activity:activity-compose:1.9.0'
+    implementation platform('androidx.compose:compose-bom:2022.12.00')
     implementation 'androidx.compose.ui:ui'
     implementation 'androidx.compose.ui:ui-graphics'
     implementation 'androidx.compose.ui:ui-tooling-preview'
     implementation 'androidx.compose.material3:material3'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
-    androidTestImplementation platform('androidx.compose:compose-bom:2022.10.00')
+    androidTestImplementation platform('androidx.compose:compose-bom:2022.12.00')
     androidTestImplementation 'androidx.compose.ui:ui-test-junit4'
     debugImplementation 'androidx.compose.ui:ui-tooling'
     debugImplementation 'androidx.compose.ui:ui-test-manifest'
 
     // JNA
-    implementation "net.java.dev.jna:jna:5.13.0@aar"
+    implementation "net.java.dev.jna:jna:5.14.0@aar"
 
     // Navigation
     implementation "androidx.navigation:navigation-compose:2.7.1"
@@ -80,8 +80,8 @@ dependencies {
     implementation 'com.google.zxing:core:3.5.2'
 
     // HTTP requests
-    implementation("com.squareup.okhttp3:okhttp:4.11.0")
+    implementation("com.squareup.okhttp3:okhttp:4.12.0")
 
     // JSON
-    implementation "com.google.code.gson:gson:2.8.9"
+    implementation "com.google.code.gson:gson:2.11.0"
 }
diff --git a/aries/agents/mobile_demo/build.gradle b/aries/agents/mobile_demo/build.gradle
@@ -2,5 +2,5 @@
 plugins {
     id 'com.android.application' version '8.1.1' apply false
     id 'com.android.library' version '8.1.1' apply false
-    id 'org.jetbrains.kotlin.android' version '1.7.20' apply false
+    id 'org.jetbrains.kotlin.android' version '1.9.24' apply false
 }
diff --git a/aries/aries_vcx/Cargo.toml b/aries/aries_vcx/Cargo.toml
@@ -65,13 +65,13 @@ serde_derive = "1.0.97"
 regex = "1.1.0"
 base64 = "0.21.4"
 sha2 = "0.10.7"
-num-bigint = "0.4.3"
+num-bigint = "0.4.5"
 futures = { version = "0.3", default-features = false }
 uuid = { version = "1.4.1", default-features = false, features = ["v4"] }
 strum = "0.25.0"
 strum_macros = "0.25.2"
 derive_builder = "0.12.0"
-tokio = { version = "1.20.4" }
+tokio = { version = "1.38.0" }
 thiserror = "1.0.37"
 url = { version = "2.3", features = ["serde"] }
 backtrace = { optional = true, version = "0.3" }
@@ -80,6 +80,6 @@ backtrace = { optional = true, version = "0.3" }
 test_utils = { path = "../misc/test_utils" }
 wallet_migrator = { path = "../misc/wallet_migrator" }
 async-channel = "1.7.1"
-tokio = { version = "1.20", features = ["rt", "macros", "rt-multi-thread"] }
+tokio = { version = "1.38", features = ["rt", "macros", "rt-multi-thread"] }
 pretty_assertions = "1.4.0"
 did_resolver_sov = { path = "../../did_core/did_methods/did_resolver_sov" }
diff --git a/aries/aries_vcx_ledger/Cargo.toml b/aries/aries_vcx_ledger/Cargo.toml
@@ -25,4 +25,4 @@ indy-ledger-response-parser = { path = "../misc/indy_ledger_response_parser" }
 log = "0.4.17"
 serde = { version = "1.0.159", features = ["derive"] }
 lru = { version = "0.12.0"  }
-tokio = { version = "1.20" }
+tokio = { version = "1.38" }