Merge branch 'main' into km/cose-signatures

Author: quexten

.vscode/settings.json

@@ -8,6 +8,8 @@
     "cloc",
     "COSE",
     "dealloc",
+    "Decapsulates",
+    "decapsulation",
     "decryptable",
     "dylib",
     "encryptable",
@@ -20,7 +22,9 @@
     "repr",
     "reprompt",
     "reqwest",
+    "rotateable",
     "schemars",
+    "spki",
     "totp",
     "uniffi",
     "wordlist",

Cargo.lock

@@ -50,7 +50,7 @@ reqwest = { version = ">=0.12.5, <0.13", features = [
 schemars = { version = ">=0.8.9, <0.9", features = ["uuid1", "chrono"] }
 serde = { version = ">=1.0, <2.0", features = ["derive"] }
 serde_json = ">=1.0.96, <2.0"
-serde_qs = ">=0.12.0, <0.15"
+serde_qs = ">=0.12.0, <0.16"
 serde_repr = ">=0.1.12, <0.2"
 thiserror = ">=1.0.40, <3"
 tokio = { version = "1.36.0", features = ["macros"] }

Cargo.toml

@@ -6,40 +6,40 @@ plugins {
 }
 
 android {
-    namespace 'com.bitwarden.myapplication'
-    compileSdk 35
+    namespace = 'com.bitwarden.myapplication'
+    compileSdk = 35
 
     defaultConfig {
-        applicationId "com.bitwarden.myapplication"
-        minSdk 28
-        targetSdk 35
-        versionCode 1
-        versionName "1.0"
+        applicationId = "com.bitwarden.myapplication"
+        minSdk = 28
+        targetSdk = 35
+        versionCode = 1
+        versionName = "1.0"
 
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
-            useSupportLibrary true
+            useSupportLibrary = true
         }
     }
 
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled = false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
     kotlinOptions {
         jvmTarget = '1.8'
     }
     buildFeatures {
-        compose true
+        compose = true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion '1.5.12'
+        kotlinCompilerExtensionVersion = '1.5.12'
     }
     packagingOptions {
         resources {

crates/bitwarden-uniffi/kotlin/app/build.gradle

@@ -5,27 +5,27 @@ plugins {
 }
 
 android {
-    namespace 'com.bitwarden.sdk'
-    compileSdk 35
+    namespace = 'com.bitwarden.sdk'
+    compileSdk = 35
 
     defaultConfig {
-        minSdk 28
-        targetSdk 35
+        minSdk = 28
+        targetSdk = 35
 
-        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
+        testInstrumentationRunner = 'androidx.test.runner.AndroidJUnitRunner'
         consumerProguardFiles 'consumer-rules.pro'
     }
 
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled = false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
 
     kotlinOptions {