From f73a64acd615a9dc77b38f22f42800ac2ddac96c Mon Sep 17 00:00:00 2001 From: Alexander Bakker Date: Wed, 3 Aug 2022 20:38:10 +0200 Subject: [PATCH] Update gradle and dependencies --- app/build.gradle | 40 ++++++++++--------- .../aegis/ui/AegisActivity.java | 2 +- build.gradle | 6 +-- gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 27 insertions(+), 23 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 0bcc1e6f..f4ff9647 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -123,29 +123,33 @@ protobuf { dependencies { def androidTestVersion = '1.4.0' - def cameraxVersion = '1.0.2' - def glideVersion = '4.13.1' - def guavaVersion = '31.0.1' - def hiltVersion = '2.41' + def cameraxVersion = '1.1.0' + def glideVersion = '4.13.2' + def guavaVersion = '31.1' + def hiltVersion = '2.43.1' def junitVersion = '4.13.2' - def libsuVersion = '4.0.3' + def libsuVersion = '5.0.2' - annotationProcessor 'androidx.annotation:annotation:1.3.0' + annotationProcessor 'androidx.annotation:annotation:1.4.0' annotationProcessor "com.google.dagger:hilt-compiler:$hiltVersion" annotationProcessor "com.github.bumptech.glide:compiler:${glideVersion}" implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.4.1' + implementation 'androidx.appcompat:appcompat:1.4.2' implementation "androidx.biometric:biometric:1.1.0" implementation "androidx.camera:camera-camera2:$cameraxVersion" implementation "androidx.camera:camera-lifecycle:$cameraxVersion" - implementation "androidx.camera:camera-view:1.0.0-alpha32" + implementation "androidx.camera:camera-view:1.1.0" implementation 'androidx.cardview:cardview:1.0.0' - implementation "androidx.core:core:1.7.0" - implementation 'androidx.constraintlayout:constraintlayout:2.1.3' + implementation "androidx.core:core:1.8.0" + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.documentfile:documentfile:1.0.1' - implementation "androidx.lifecycle:lifecycle-process:2.4.1" - implementation 'androidx.preference:preference:1.2.0' + implementation "androidx.lifecycle:lifecycle-process:2.5.1" + implementation ('androidx.preference:preference:1.2.0') { + // See: https://issuetracker.google.com/issues/238425626 + exclude group: 'androidx.lifecycle', module:'lifecycle-viewmodel' + exclude group: 'androidx.lifecycle', module:'lifecycle-viewmodel-ktx' + } implementation 'androidx.recyclerview:recyclerview:1.2.1' implementation "androidx.viewpager2:viewpager2:1.0.0" implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1' @@ -160,17 +164,17 @@ dependencies { implementation "com.github.topjohnwu.libsu:core:${libsuVersion}" implementation "com.github.topjohnwu.libsu:io:${libsuVersion}" implementation "com.google.guava:guava:${guavaVersion}-android" - implementation 'com.google.android.material:material:1.5.0' - implementation 'com.google.protobuf:protobuf-javalite:3.19.4' + implementation 'com.google.android.material:material:1.6.1' + implementation 'com.google.protobuf:protobuf-javalite:3.21.4' implementation 'com.google.zxing:core:3.5.0' implementation "com.mikepenz:iconics-core:3.2.5" implementation 'com.mikepenz:material-design-iconic-typeface:2.2.0.5@aar' - implementation 'com.nulab-inc:zxcvbn:1.6.0' + implementation 'com.nulab-inc:zxcvbn:1.7.0' implementation 'de.hdodenhof:circleimageview:3.1.0' implementation 'de.psdev.licensesdialog:licensesdialog:2.2.0' - implementation 'net.lingala.zip4j:zip4j:2.10.0' + implementation 'net.lingala.zip4j:zip4j:2.11.1' implementation 'info.guardianproject.trustedintents:trustedintents:0.2' - implementation 'org.bouncycastle:bcprov-jdk15on:1.70' + implementation 'org.bouncycastle:bcprov-jdk15to18:1.71' implementation "org.simpleflatmapper:sfm-csv:8.2.3" androidTestAnnotationProcessor "com.google.dagger:hilt-android-compiler:$hiltVersion" @@ -189,7 +193,7 @@ dependencies { testImplementation "com.google.guava:guava:${guavaVersion}-jre" testImplementation "junit:junit:${junitVersion}" testImplementation "org.json:json:20220320" - testImplementation 'org.robolectric:robolectric:4.7.3' + testImplementation 'org.robolectric:robolectric:4.8' coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' } diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/AegisActivity.java b/app/src/main/java/com/beemdevelopment/aegis/ui/AegisActivity.java index e90bc7ba..269a2e8f 100644 --- a/app/src/main/java/com/beemdevelopment/aegis/ui/AegisActivity.java +++ b/app/src/main/java/com/beemdevelopment/aegis/ui/AegisActivity.java @@ -45,7 +45,7 @@ public abstract class AegisActivity extends AppCompatActivity implements VaultMa @Override protected void onCreate(Bundle savedInstanceState) { // set the theme and locale before creating the activity - _prefs = EarlyEntryPoints.get(this, PrefEntryPoint.class).getPreferences(); + _prefs = EarlyEntryPoints.get(getApplicationContext(), PrefEntryPoint.class).getPreferences(); onSetTheme(); setLocale(_prefs.getLocale()); super.onCreate(savedInstanceState); diff --git a/build.gradle b/build.gradle index d33e3504..388d3685 100644 --- a/build.gradle +++ b/build.gradle @@ -6,9 +6,9 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' - classpath 'com.google.dagger:hilt-android-gradle-plugin:2.41' - classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.18' + classpath 'com.android.tools.build:gradle:7.2.2' + classpath 'com.google.dagger:hilt-android-gradle-plugin:2.43.1' + classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.19' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 652d74c3..cab83ee1 100644 --- 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-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip