Bump target SDK version and update dependencies

This commit is contained in:
Alexander Bakker 2023-11-07 20:29:45 +01:00
parent e1f4696115
commit 60e93559c3
2 changed files with 20 additions and 23 deletions

View File

@ -19,14 +19,14 @@ def fileProviderAuthority = "${packageName}.fileprovider"
def fileProviderAuthorityDebug = "${packageName}.debug.fileprovider" def fileProviderAuthorityDebug = "${packageName}.debug.fileprovider"
android { android {
compileSdk 33 compileSdk 34
namespace packageName namespace packageName
defaultConfig { defaultConfig {
applicationId "${packageName}" applicationId "${packageName}"
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 33 targetSdkVersion 34
versionCode 62 versionCode 62
versionName "2.2.2" versionName "2.2.2"
multiDexEnabled true multiDexEnabled true
@ -107,7 +107,7 @@ android {
protobuf { protobuf {
protoc { protoc {
artifact = 'com.google.protobuf:protoc:3.8.0' artifact = 'com.google.protobuf:protoc:3.25.0'
} }
generateProtoTasks { generateProtoTasks {
all().each { task -> all().each { task ->
@ -121,34 +121,31 @@ protobuf {
} }
dependencies { dependencies {
def cameraxVersion = '1.2.3' def cameraxVersion = '1.3.0'
def glideVersion = '4.16.0' def glideVersion = '4.16.0'
def guavaVersion = '32.1.2' def guavaVersion = '32.1.3'
def hiltVersion = '2.47' def hiltVersion = '2.48.1'
def junitVersion = '4.13.2' def junitVersion = '4.13.2'
def libsuVersion = '5.2.0' def libsuVersion = '5.2.1'
annotationProcessor 'androidx.annotation:annotation:1.6.0' annotationProcessor 'androidx.annotation:annotation:1.7.0'
annotationProcessor "com.google.dagger:hilt-compiler:$hiltVersion" annotationProcessor "com.google.dagger:hilt-compiler:$hiltVersion"
annotationProcessor "com.github.bumptech.glide:compiler:${glideVersion}" 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.8.0"))
implementation fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'androidx.activity:activity:1.7.2' implementation 'androidx.activity:activity:1.8.0'
implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.appcompat:appcompat:1.6.1'
implementation "androidx.biometric:biometric:1.1.0" implementation "androidx.biometric:biometric:1.1.0"
implementation "androidx.camera:camera-camera2:$cameraxVersion" implementation "androidx.camera:camera-camera2:$cameraxVersion"
implementation "androidx.camera:camera-lifecycle:$cameraxVersion" implementation "androidx.camera:camera-lifecycle:$cameraxVersion"
implementation 'androidx.camera:camera-view:1.2.3' implementation "androidx.camera:camera-view:$cameraxVersion"
implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.cardview:cardview:1.0.0'
implementation "androidx.core:core:1.10.1" implementation "androidx.core:core:1.12.0"
implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.documentfile:documentfile:1.0.1' implementation 'androidx.documentfile:documentfile:1.0.1'
implementation "androidx.lifecycle:lifecycle-process:2.6.1" implementation "androidx.lifecycle:lifecycle-process:2.6.2"
implementation "androidx.preference:preference:1.2.1" implementation "androidx.preference:preference:1.2.1"
implementation 'androidx.recyclerview:recyclerview:1.3.1' implementation 'androidx.recyclerview:recyclerview:1.3.2'
implementation "androidx.viewpager2:viewpager2:1.0.0" implementation "androidx.viewpager2:viewpager2:1.0.0"
implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1' implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
implementation 'com.caverock:androidsvg-aar:1.4' implementation 'com.caverock:androidsvg-aar:1.4'
@ -162,8 +159,8 @@ dependencies {
implementation "com.github.topjohnwu.libsu:core:${libsuVersion}" implementation "com.github.topjohnwu.libsu:core:${libsuVersion}"
implementation "com.github.topjohnwu.libsu:io:${libsuVersion}" implementation "com.github.topjohnwu.libsu:io:${libsuVersion}"
implementation "com.google.guava:guava:${guavaVersion}-android" implementation "com.google.guava:guava:${guavaVersion}-android"
implementation 'com.google.android.material:material:1.9.0' implementation 'com.google.android.material:material:1.10.0'
implementation 'com.google.protobuf:protobuf-javalite:3.22.0' implementation 'com.google.protobuf:protobuf-javalite:3.25.0'
implementation 'com.google.zxing:core:3.5.2' implementation 'com.google.zxing:core:3.5.2'
implementation "com.mikepenz:iconics-core:3.2.5" implementation "com.mikepenz:iconics-core:3.2.5"
implementation 'com.mikepenz:material-design-iconic-typeface:2.2.0.5@aar' implementation 'com.mikepenz:material-design-iconic-typeface:2.2.0.5@aar'
@ -190,8 +187,8 @@ dependencies {
testImplementation 'androidx.test:core:1.5.0' testImplementation 'androidx.test:core:1.5.0'
testImplementation "com.google.guava:guava:${guavaVersion}-jre" testImplementation "com.google.guava:guava:${guavaVersion}-jre"
testImplementation "junit:junit:${junitVersion}" testImplementation "junit:junit:${junitVersion}"
testImplementation 'org.json:json:20230618' testImplementation 'org.json:json:20231013'
testImplementation 'org.robolectric:robolectric:4.10.3' testImplementation 'org.robolectric:robolectric:4.11.1'
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3' coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
} }

View File

@ -6,8 +6,8 @@ buildscript {
google() google()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:8.1.1' classpath 'com.android.tools.build:gradle:8.1.2'
classpath 'com.google.dagger:hilt-android-gradle-plugin:2.47' classpath 'com.google.dagger:hilt-android-gradle-plugin:2.48.1'
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.9.4' classpath 'com.google.protobuf:protobuf-gradle-plugin:0.9.4'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong