diff --git a/.idea/runConfigurations/Instrumentation_tests__app.xml b/.idea/runConfigurations/Instrumentation_tests__app.xml index b7b22097..4124cb1d 100644 --- a/.idea/runConfigurations/Instrumentation_tests__app.xml +++ b/.idea/runConfigurations/Instrumentation_tests__app.xml @@ -1,6 +1,6 @@ - + - + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 17e2abd9..675b1dd0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -122,13 +122,13 @@ dependencies { * You can copy these libraries from ~/.gradle/caches/modules-2/files-2.1 */ // later versions than 2.1.1 require newer kotlin version -// implementation "io.insert-koin:koin-core-jvm:3.1.2" -// implementation "io.insert-koin:koin-android:3.1.2" +// implementation "io.insert-koin:koin-core-jvm:3.2.0" +// implementation "io.insert-koin:koin-android:3.2.0" implementation fileTree(include: ['*.jar'], dir: "${rootProject.rootDir}/libs/koin-android") implementation fileTree(include: ['*.aar'], dir: "${rootProject.rootDir}/libs/koin-android") -// implementation "cash.z.ecc.android:kotlin-bip39:1.0.2" - implementation fileTree(include: ['kotlin-bip39-1.0.2.jar'], dir: "${rootProject.rootDir}/libs") +// implementation "cash.z.ecc.android:kotlin-bip39:1.0.4" + implementation fileTree(include: ['kotlin-bip39-jvm-1.0.4.jar'], dir: "${rootProject.rootDir}/libs") /** * Test Dependencies (do not concern the AOSP build) diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 9a0ecb1b..29a1f0aa 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -3,9 +3,11 @@ ext { ext.room_version = "2.4.0-alpha05" // https://android.googlesource.com/platform/external/protobuf/+/refs/tags/android-13.0.0_r3/java/pom.xml#7 ext.protobuf_version = "3.9.1" + + // test dependencies below - these do not care about AOSP and can be freely updated junit4_version = "4.13.2" - junit5_version = "5.5.2" // careful, upgrading this can change a Cipher's IV size in tests!? - mockk_version = "1.12.0" + junit5_version = "5.7.2" // careful, upgrading this can change a Cipher's IV size in tests!? + mockk_version = "1.12.3" espresso_version = "3.4.0" } @@ -93,7 +95,7 @@ ext.std_libs = [ ] ext.lint_libs = [ - exceptions: 'com.github.thirdegg:lint-rules:0.0.6-beta' + exceptions: 'com.github.thirdegg:lint-rules:0.1.0' ] ext.storage_libs = [ @@ -103,7 +105,9 @@ ext.storage_libs = [ com_google_protobuf_javalite: dependencies.create('com.google.protobuf:protobuf-javalite') { version { strictly "$protobuf_version" } }, + // https://github.com/google/tink/releases com_google_crypto_tink_android: dependencies.create('com.google.crypto.tink:tink-android') { - version { strictly '1.6.1' } + // careful with upgrading tink, so old backups continue to be decryptable + version { strictly '1.7.0' } }, ] diff --git a/libs/Android.bp b/libs/Android.bp index 2fa04ce0..15a9fcf2 100644 --- a/libs/Android.bp +++ b/libs/Android.bp @@ -1,5 +1,5 @@ java_import { name: "seedvault-lib-kotlin-bip39", - jars: ["kotlin-bip39-1.0.2.jar"], + jars: ["kotlin-bip39-jvm-1.0.4.jar"], sdk_version: "current", } diff --git a/libs/koin-android/Android.bp b/libs/koin-android/Android.bp index 1df86bba..c3369d9c 100644 --- a/libs/koin-android/Android.bp +++ b/libs/koin-android/Android.bp @@ -1,11 +1,11 @@ android_library_import { name: "seedvault-lib-koin-android", - aars: ["koin-android-3.1.2.aar"], + aars: ["koin-android-3.2.0.aar"], sdk_version: "current", } java_import { name: "seedvault-lib-koin-core-jvm", - jars: ["koin-core-jvm-3.1.2.jar"], + jars: ["koin-core-jvm-3.2.0.jar"], sdk_version: "current", } diff --git a/libs/koin-android/koin-android-3.1.2.aar b/libs/koin-android/koin-android-3.1.2.aar deleted file mode 100644 index be74b755..00000000 Binary files a/libs/koin-android/koin-android-3.1.2.aar and /dev/null differ diff --git a/libs/koin-android/koin-android-3.2.0.aar b/libs/koin-android/koin-android-3.2.0.aar new file mode 100644 index 00000000..3078638b Binary files /dev/null and b/libs/koin-android/koin-android-3.2.0.aar differ diff --git a/libs/koin-android/koin-core-jvm-3.1.2.jar b/libs/koin-android/koin-core-jvm-3.1.2.jar deleted file mode 100644 index 0efd1737..00000000 Binary files a/libs/koin-android/koin-core-jvm-3.1.2.jar and /dev/null differ diff --git a/libs/koin-android/koin-core-jvm-3.2.0.jar b/libs/koin-android/koin-core-jvm-3.2.0.jar new file mode 100644 index 00000000..912fc35f Binary files /dev/null and b/libs/koin-android/koin-core-jvm-3.2.0.jar differ diff --git a/libs/kotlin-bip39-1.0.2.jar b/libs/kotlin-bip39-1.0.2.jar deleted file mode 100644 index c05e1e05..00000000 Binary files a/libs/kotlin-bip39-1.0.2.jar and /dev/null differ diff --git a/libs/kotlin-bip39-jvm-1.0.4.jar b/libs/kotlin-bip39-jvm-1.0.4.jar new file mode 100644 index 00000000..55ff7745 Binary files /dev/null and b/libs/kotlin-bip39-jvm-1.0.4.jar differ diff --git a/storage/lib/Android.bp b/storage/lib/Android.bp index afb15df2..3712d5f0 100644 --- a/storage/lib/Android.bp +++ b/storage/lib/Android.bp @@ -39,6 +39,6 @@ android_library { java_import { name: "seedvault-lib-tink-android", - jars: ["libs/tink-android-1.6.1.jar"], + jars: ["libs/tink-android-1.7.0.jar"], sdk_version: "current", } diff --git a/storage/lib/build.gradle b/storage/lib/build.gradle index ae711395..d820a205 100644 --- a/storage/lib/build.gradle +++ b/storage/lib/build.gradle @@ -4,7 +4,7 @@ plugins { id 'kotlin-android' id 'kotlin-kapt' id "org.jlleitschuh.gradle.ktlint" version "10.2.0" - id 'org.jetbrains.dokka' version '1.4.30' + id 'org.jetbrains.dokka' version "$kotlin_version" } android { diff --git a/storage/lib/libs/tink-android-1.6.1.jar b/storage/lib/libs/tink-android-1.6.1.jar deleted file mode 100644 index 4929a0c7..00000000 Binary files a/storage/lib/libs/tink-android-1.6.1.jar and /dev/null differ diff --git a/storage/lib/libs/tink-android-1.7.0.jar b/storage/lib/libs/tink-android-1.7.0.jar new file mode 100644 index 00000000..5bb1c7d8 Binary files /dev/null and b/storage/lib/libs/tink-android-1.7.0.jar differ