Merge pull request #152 from velocitycareerlabs/deps-upgrade

deps upgrade
velocitycareerlabs · Jan 12, 2025 · 31958df · 31958df
2 parents ecc765e + 1d461ce
commit 31958df
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 12 deletions.
diff --git a/VCL/build.gradle b/VCL/build.gradle
@@ -6,12 +6,12 @@ plugins {
 }
 
 android {
-    compileSdk 34
+    compileSdk 35
     namespace 'io.velocitycareerlabs'
 
     defaultConfig {
         minSdk 24
-        targetSdk 34
+        targetSdk 35
         versionName "2.6.12"
         versionCode 156
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -217,7 +217,7 @@ repositories {
 */
 
 dependencies {
-    implementation 'androidx.core:core-ktx:1.13.1'
+    implementation 'androidx.core:core-ktx:1.15.0'
 
     implementation 'com.nimbusds:nimbus-jose-jwt:9.45'
     implementation "androidx.security:security-crypto:1.1.0-alpha06"

diff --git a/VCL/src/main/java/io/velocitycareerlabs/api/entities/VCLCredentialManifestDescriptor.kt b/VCL/src/main/java/io/velocitycareerlabs/api/entities/VCLCredentialManifestDescriptor.kt
@@ -36,13 +36,13 @@ interface VCLCredentialManifestDescriptor {
 
     fun generateQueryParams(): String? {
         val pCredentialTypes: String? = credentialTypes?.joinToString("&") { type ->
-            "${CredentialManifestDescriptorCodingKeys.KeyCredentialTypes}=${type.encode() ?: ""}"
+            "${CredentialManifestDescriptorCodingKeys.KeyCredentialTypes}=${type.encode()}"
         }
         val pPushDelegate: String? = pushDelegate?.pushUrl?.let {
-            "${CredentialManifestDescriptorCodingKeys.KeyPushDelegatePushUrl}=${it.encode() ?: ""}"
+            "${CredentialManifestDescriptorCodingKeys.KeyPushDelegatePushUrl}=${it.encode()}"
         }
         val pPushToken: String? = pushDelegate?.pushToken?.let {
-            "${CredentialManifestDescriptorCodingKeys.KeyPushDelegatePushToken}=${it.encode() ?: ""}"
+            "${CredentialManifestDescriptorCodingKeys.KeyPushDelegatePushToken}=${it.encode()}"
         }
 
         val qParams =

diff --git a/...src/main/java/io/velocitycareerlabs/impl/data/infrastructure/db/SecretStoreServiceImpl.kt b/...src/main/java/io/velocitycareerlabs/impl/data/infrastructure/db/SecretStoreServiceImpl.kt
@@ -32,7 +32,7 @@ class SecretStoreServiceImpl(
         return EncryptedSharedPreferences.create(
             FILE_NAME,
             masterKeyAlias,
-            context.getApplicationContext(),
+            context.applicationContext,
             EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
             EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM
         )

diff --git a/app/build.gradle b/app/build.gradle
@@ -5,13 +5,13 @@ plugins {
 }
 
 android {
-    compileSdk 34
+    compileSdk 35
 //    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.vcl.wallet"
         minSdk 24
-        targetSdk 34
+        targetSdk 35
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -43,12 +43,11 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.core:core-ktx:1.13.1'
+    implementation 'androidx.core:core-ktx:1.15.0'
     implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'com.google.android.material:material:1.12.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
 
-
 //--------- Must: be added:
     implementation 'com.nimbusds:nimbus-jose-jwt:9.45'
     implementation "androidx.security:security-crypto:1.1.0-alpha06"

diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.7.3'
+        classpath 'com.android.tools.build:gradle:8.8.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong