From db4c738c8f85dda512f5c1e48d74d4f76b03db50 Mon Sep 17 00:00:00 2001 From: Alexander Bakker Date: Fri, 9 Aug 2024 19:49:08 +0200 Subject: [PATCH] Update dependencies --- app/build.gradle | 70 +++++++++++-------- .../1.json | 52 ++++++++++++++ build.gradle | 6 +- gradle.properties | 1 - gradle/wrapper/gradle-wrapper.properties | 2 +- 5 files changed, 95 insertions(+), 36 deletions(-) create mode 100644 app/schemas/com.beemdevelopment.aegis.database.AppDatabase/1.json diff --git a/app/build.gradle b/app/build.gradle index d85b698236..0fb2de6264 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -35,6 +35,12 @@ android { buildConfigField "String", "GIT_BRANCH", "\"${getGitBranch()}\"" buildConfigField "java.util.concurrent.atomic.AtomicBoolean", "TEST", "new java.util.concurrent.atomic.AtomicBoolean(false)" + javaCompileOptions { + annotationProcessorOptions { + arguments = ["room.schemaLocation": "$projectDir/schemas"] + } + } + testInstrumentationRunner "com.beemdevelopment.aegis.AegisTestRunner" testInstrumentationRunnerArguments clearPackageData: 'true' } @@ -104,6 +110,9 @@ android { checkDependencies true disable 'MissingQuantity', 'MissingTranslation' } + buildFeatures { + buildConfig true + } } protobuf { @@ -133,35 +142,34 @@ aboutLibraries { } dependencies { - def cameraxVersion = '1.3.1' + def cameraxVersion = '1.3.4' def glideVersion = '4.16.0' - def guavaVersion = '33.0.0' - def hiltVersion = '2.50' + def guavaVersion = '33.2.1' + def hiltVersion = '2.52' def junitVersion = '4.13.2' - def libsuVersion = '5.2.2' + def libsuVersion = '6.0.0' def roomVersion = "2.6.1" - - annotationProcessor 'androidx.annotation:annotation:1.7.1' + annotationProcessor 'androidx.annotation:annotation:1.8.2' + annotationProcessor "androidx.room:room-compiler:$roomVersion" annotationProcessor "com.google.dagger:hilt-compiler:$hiltVersion" annotationProcessor "com.github.bumptech.glide:compiler:${glideVersion}" - annotationProcessor "androidx.room:room-compiler:$roomVersion" implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.activity:activity:1.8.2' - implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'androidx.activity:activity:1.9.1' + implementation 'androidx.appcompat:appcompat:1.7.0' implementation "androidx.biometric:biometric:1.1.0" implementation "androidx.camera:camera-camera2:$cameraxVersion" implementation "androidx.camera:camera-lifecycle:$cameraxVersion" implementation "androidx.camera:camera-view:$cameraxVersion" - implementation "androidx.core:core:1.12.0" + implementation 'androidx.core:core:1.13.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.documentfile:documentfile:1.0.1' - implementation "androidx.lifecycle:lifecycle-process:2.6.2" + implementation 'androidx.lifecycle:lifecycle-process:2.8.4' implementation "androidx.preference:preference:1.2.1" implementation 'androidx.recyclerview:recyclerview:1.3.2' implementation "androidx.room:room-runtime:$roomVersion" - implementation "androidx.viewpager2:viewpager2:1.0.0" + implementation 'androidx.viewpager2:viewpager2:1.1.0' implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1' implementation 'com.caverock:androidsvg-aar:1.4' implementation "com.google.dagger:hilt-android:$hiltVersion" @@ -174,37 +182,37 @@ 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.11.0' - implementation 'com.google.protobuf:protobuf-javalite:3.25.1' - implementation 'com.google.zxing:core:3.5.2' - implementation("com.mikepenz:aboutlibraries:11.1.0") { + implementation 'com.google.android.material:material:1.12.0' + implementation 'com.google.protobuf:protobuf-javalite:4.27.3' + implementation 'com.google.zxing:core:3.5.3' + implementation('com.mikepenz:aboutlibraries:11.2.2') { exclude group: 'com.mikepenz', module: 'aboutlibraries-core' } - implementation "com.mikepenz:aboutlibraries-core-android:11.1.0" - implementation 'com.nulab-inc:zxcvbn:1.8.2' + implementation 'com.mikepenz:aboutlibraries-core-android:11.2.2' + implementation 'com.nulab-inc:zxcvbn:1.9.0' implementation 'de.hdodenhof:circleimageview:3.1.0' implementation 'net.lingala.zip4j:zip4j:2.11.5' implementation 'info.guardianproject.trustedintents:trustedintents:0.2' - implementation 'org.bouncycastle:bcprov-jdk18on:1.77' - implementation "org.simpleflatmapper:sfm-csv:8.2.3" + implementation 'org.bouncycastle:bcprov-jdk18on:1.78.1' + implementation 'org.simpleflatmapper:sfm-csv:8.2.3' androidTestAnnotationProcessor "com.google.dagger:hilt-android-compiler:$hiltVersion" androidTestImplementation "com.google.dagger:hilt-android-testing:$hiltVersion" - androidTestImplementation 'androidx.test:core:1.5.0' - androidTestImplementation 'androidx.test:runner:1.5.2' - androidTestImplementation 'androidx.test:rules:1.5.0' - androidTestImplementation 'androidx.test.ext:junit:1.1.5' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' - androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.5.1' - androidTestImplementation 'androidx.test.espresso:espresso-intents:3.5.1' + androidTestImplementation 'androidx.test:core:1.6.1' + androidTestImplementation 'androidx.test:runner:1.6.1' + androidTestImplementation 'androidx.test:rules:1.6.1' + androidTestImplementation 'androidx.test.ext:junit:1.2.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1' + androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.6.1' + androidTestImplementation 'androidx.test.espresso:espresso-intents:3.6.1' androidTestImplementation "junit:junit:${junitVersion}" - androidTestUtil 'androidx.test:orchestrator:1.4.2' + androidTestUtil 'androidx.test:orchestrator:1.5.0' - testImplementation 'androidx.test:core:1.5.0' + testImplementation 'androidx.test:core:1.6.1' testImplementation "com.google.guava:guava:${guavaVersion}-jre" testImplementation "junit:junit:${junitVersion}" - testImplementation 'org.json:json:20231013' - testImplementation 'org.robolectric:robolectric:4.11.1' + testImplementation 'org.json:json:20240303' + testImplementation 'org.robolectric:robolectric:4.13' coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4' } diff --git a/app/schemas/com.beemdevelopment.aegis.database.AppDatabase/1.json b/app/schemas/com.beemdevelopment.aegis.database.AppDatabase/1.json new file mode 100644 index 0000000000..811e430c33 --- /dev/null +++ b/app/schemas/com.beemdevelopment.aegis.database.AppDatabase/1.json @@ -0,0 +1,52 @@ +{ + "formatVersion": 1, + "database": { + "version": 1, + "identityHash": "392278bdb797d013cb2ada67a3b1cc60", + "entities": [ + { + "tableName": "audit_logs", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `event_type` TEXT NOT NULL, `reference` TEXT, `timestamp` INTEGER NOT NULL)", + "fields": [ + { + "fieldPath": "id", + "columnName": "id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "_eventType", + "columnName": "event_type", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "_reference", + "columnName": "reference", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "_timestamp", + "columnName": "timestamp", + "affinity": "INTEGER", + "notNull": true + } + ], + "primaryKey": { + "autoGenerate": true, + "columnNames": [ + "id" + ] + }, + "indices": [], + "foreignKeys": [] + } + ], + "views": [], + "setupQueries": [ + "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)", + "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '392278bdb797d013cb2ada67a3b1cc60')" + ] + } +} \ No newline at end of file diff --git a/build.gradle b/build.gradle index 2272bfc54c..3574bb41c1 100644 --- a/build.gradle +++ b/build.gradle @@ -6,8 +6,8 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:8.2.0' - classpath 'com.google.dagger:hilt-android-gradle-plugin:2.50' + classpath 'com.android.tools.build:gradle:8.5.2' + classpath 'com.google.dagger:hilt-android-gradle-plugin:2.52' classpath 'com.google.protobuf:protobuf-gradle-plugin:0.9.4' // NOTE: Do not place your application dependencies here; they belong @@ -16,7 +16,7 @@ buildscript { } plugins { - id 'com.mikepenz.aboutlibraries.plugin' version '11.1.0' + id 'com.mikepenz.aboutlibraries.plugin' version '11.2.2' } allprojects { diff --git a/gradle.properties b/gradle.properties index 5eacb8fef1..09f934662b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,7 +17,6 @@ # 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.useAndroidX=true org.gradle.jvmargs=-Xmx8g diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 39c4f8b694..ef80139b7b 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-8.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists