Merge pull request #122 from velocitycareerlabs/v2.5.1-change-key-store

v2.5.1 change key store
velocitycareerlabs · Jul 25, 2024 · ac0b9c5 · ac0b9c5
2 parents 592b191 + 48ece58
commit ac0b9c5
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 17 deletions.
diff --git a/VCL/build.gradle b/VCL/build.gradle
@@ -6,14 +6,14 @@ plugins {
 }
 
 android {
-    compileSdk 35
+    compileSdk 34
     namespace 'io.velocitycareerlabs'
 
     defaultConfig {
         minSdk 24
-        targetSdk 35
-        versionName "2.5.0"
-        versionCode 142
+        targetSdk 34
+        versionName "2.5.4"
+        versionCode 144
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
     }
@@ -220,8 +220,7 @@ dependencies {
     implementation 'androidx.core:core-ktx:1.13.1'
 
     implementation 'com.nimbusds:nimbus-jose-jwt:9.40'
-    //noinspection GradleDependency
-    implementation "androidx.security:security-crypto:1.0.0"
+    implementation "androidx.security:security-crypto:1.1.0-alpha06"
 
     // Reflection
 //    implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"

diff --git a/VCL/proguard-rules.pro b/VCL/proguard-rules.pro
@@ -20,4 +20,7 @@
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
 
--keep class io.velocitycareerlabs.api.** { *; }
+# Preserve vcl api
+-keep class io.velocitycareerlabs.api.** { *; }
+# Preserve EncryptedSharedPreferences classes
+-keep class androidx.security.crypto.** { *; }
diff --git a/VCL/src/main/AndroidManifest.xml b/VCL/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.INTERNET" />
-<!--    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />-->
 </manifest>
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,
+            context.getApplicationContext(),
             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 35
+    compileSdk 34
 //    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.vcl.wallet"
         minSdk 24
-        targetSdk 35
+        targetSdk 34
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -48,14 +48,18 @@ dependencies {
     implementation 'com.google.android.material:material:1.12.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 
-    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
-//    Must: be added:
+
+//--------- Must: be added:
     implementation 'com.nimbusds:nimbus-jose-jwt:9.40'
-    implementation project(':VCL')
+    implementation "androidx.security:security-crypto:1.1.0-alpha06"
+//-------------------------
 
+    implementation project(':VCL')
 //    implementation "io.velocitycareerlabs:vcl:x.y.z"
 
+    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
+
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
 }
diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.3.2'
+        classpath 'com.android.tools.build:gradle:8.5.1'
         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

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip