diff --git a/app/build.gradle b/app/build.gradle index dbaaa9dd..cd58971c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,7 +19,7 @@ def fileProviderAuthority = "${packageName}.fileprovider" def fileProviderAuthorityDebug = "${packageName}.debug.fileprovider" android { - compileSdkVersion 33 + compileSdk 33 namespace packageName @@ -121,31 +121,34 @@ protobuf { } dependencies { - def cameraxVersion = '1.2.1' - def glideVersion = '4.15.0' - def guavaVersion = '31.1' - def hiltVersion = '2.45' + def cameraxVersion = '1.2.3' + def glideVersion = '4.16.0' + def guavaVersion = '32.1.2' + def hiltVersion = '2.47' def junitVersion = '4.13.2' - def libsuVersion = '5.0.4' + def libsuVersion = '5.2.0' annotationProcessor 'androidx.annotation:annotation:1.6.0' annotationProcessor "com.google.dagger:hilt-compiler:$hiltVersion" annotationProcessor "com.github.bumptech.glide:compiler:${glideVersion}" + // Ridiculous fix for a bunch of "Duplicate class" build errors: + implementation (platform("org.jetbrains.kotlin:kotlin-bom:1.9.10")) + implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.activity:activity:1.6.1' + implementation 'androidx.activity:activity:1.7.2' implementation 'androidx.appcompat:appcompat:1.6.1' 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.2.1' + implementation 'androidx.camera:camera-view:1.2.3' implementation 'androidx.cardview:cardview:1.0.0' - implementation "androidx.core:core:1.9.0" + implementation "androidx.core:core:1.10.1" implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.documentfile:documentfile:1.0.1' - implementation "androidx.lifecycle:lifecycle-process:2.5.1" - implementation "androidx.preference:preference:1.2.0" - implementation 'androidx.recyclerview:recyclerview:1.2.1' + implementation "androidx.lifecycle:lifecycle-process:2.6.1" + implementation "androidx.preference:preference:1.2.1" + implementation 'androidx.recyclerview:recyclerview:1.3.1' implementation "androidx.viewpager2:viewpager2:1.0.0" implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1' implementation 'com.caverock:androidsvg-aar:1.4' @@ -159,17 +162,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.8.0' + implementation 'com.google.android.material:material:1.9.0' implementation 'com.google.protobuf:protobuf-javalite:3.22.0' - implementation 'com.google.zxing:core:3.5.1' + implementation 'com.google.zxing:core:3.5.2' 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.7.0' + implementation 'com.nulab-inc:zxcvbn:1.8.2' implementation 'de.hdodenhof:circleimageview:3.1.0' implementation 'de.psdev.licensesdialog:licensesdialog:2.2.0' implementation 'net.lingala.zip4j:zip4j:2.11.5' implementation 'info.guardianproject.trustedintents:trustedintents:0.2' - implementation 'org.bouncycastle:bcprov-jdk18on:1.72' + implementation 'org.bouncycastle:bcprov-jdk18on:1.76' implementation "org.simpleflatmapper:sfm-csv:8.2.3" androidTestAnnotationProcessor "com.google.dagger:hilt-android-compiler:$hiltVersion" @@ -187,8 +190,8 @@ dependencies { testImplementation 'androidx.test:core:1.5.0' testImplementation "com.google.guava:guava:${guavaVersion}-jre" testImplementation "junit:junit:${junitVersion}" - testImplementation 'org.json:json:20230227' - testImplementation 'org.robolectric:robolectric:4.9.2' + testImplementation 'org.json:json:20230618' + testImplementation 'org.robolectric:robolectric:4.10.3' - coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.2' + coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3' } diff --git a/build.gradle b/build.gradle index 6df60375..ec555792 100644 --- a/build.gradle +++ b/build.gradle @@ -6,9 +6,9 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.1' - classpath 'com.google.dagger:hilt-android-gradle-plugin:2.45' - classpath 'com.google.protobuf:protobuf-gradle-plugin:0.9.2' + classpath 'com.android.tools.build:gradle:8.1.1' + classpath 'com.google.dagger:hilt-android-gradle-plugin:2.47' + classpath 'com.google.protobuf:protobuf-gradle-plugin:0.9.4' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -24,6 +24,6 @@ allprojects { } } -task clean(type: Delete) { +tasks.register('clean', Delete) { delete rootProject.buildDir } diff --git a/gradle.properties b/gradle.properties index 2a4361c0..8d8636ec 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,6 +17,9 @@ # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true +android.defaults.buildfeatures.buildconfig=true android.enableJetifier=false +android.nonFinalResIds=false +android.nonTransitiveRClass=false android.useAndroidX=true org.gradle.jvmargs=-Xmx4g -XX:MaxPermSize=512m diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3af1c2f7..482c29a8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Tue Aug 15 23:01:16 CEST 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists