From 45b3fe31ccfd67a40a6f9899c647c04a5c8159ab Mon Sep 17 00:00:00 2001 From: rafi0101 <43086854+rafi0101@users.noreply.github.com> Date: Sun, 21 Apr 2024 17:23:11 +0200 Subject: [PATCH] update dependencies --- CHANGELOG.md | 4 ++-- README.md | 10 ++++++---- app/build.gradle.kts | 4 ++-- build.gradle.kts | 6 +++--- core/build.gradle.kts | 25 ++---------------------- gradle/wrapper/gradle-wrapper.properties | 2 +- 6 files changed, 16 insertions(+), 35 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 40387a1..a1255b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Android-Room-Database-Backup Changelog -## [v1.0.0-beta14] - 2024-01-06 +## [v1.0.0-beta14] - 2024-01-16 ### - Migrated from Gradle to Kotlin DSL @@ -89,4 +89,4 @@ onClickListener - `.useExternalStorage(false)` is replaced with `.backupLocation(backupLocation: Int)`. - See [README.md](readme.md) + See [README.md](README.md) diff --git a/README.md b/README.md index 0fe757e..81cf699 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Features --------- * Create simple backups of your room database * Encrypt the backup file with AES encryption -* Save the backup to any type of storage +* Save the backup to any type of storage (some types are in beta) * Material design * Written in Kotlin @@ -51,7 +51,8 @@ Add the dependency for `Android-Room-Database-Backup ` to your app-level `build. implementation 'de.raphaelebner:roomdatabasebackup:1.0.0-beta14' ``` -**If this version makes any technical problems please feel free to contact me. I made some changes in Gradle/Kotlin DSL and not sure if everything is working as excepted** +**If the version makes any technical problems please feel free to contact me. I made some changes in +Gradle/Kotlin DSL and not sure if everything is working as excepted** Usage ----------- @@ -69,6 +70,7 @@ Usage **Attention** Must be declared outside of an onClickListener before lifecycle state changes to started + ```kotlin RoomBackup(this) ``` @@ -143,11 +145,11 @@ The following options are optional and the default options * Private, storage not accessible * This files will be deleted, if you uninstall your app * ```RoomBackup.BACKUP_FILE_LOCATION_INTERNAL``` - * Custom Dialog + * Custom Dialog (beta) * You can choose to save or restore where ever you want. A CreateDocument() or OpenDocument() Activity will be launched where you can choose the location * If your backup is encrypted I reccomend you using a custom encrption password else you can't restore your backup * ```RoomBackup.BACKUP_FILE_LOCATION_CUSTOM_DIALOG``` - * Custom File + * Custom File (beta) * You can choose to save or restore to/from a custom File. * If your backup is encrypted I reccomend you using a custom encrption password else you can't restore your backup * Please use ```backupLocationCustomFile(File)``` to set a custom File diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 102c13b..3fca151 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -47,7 +47,7 @@ android { dependencies { implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar")))) - implementation("androidx.core:core-ktx:1.12.0") + implementation("androidx.core:core-ktx:1.13.0") implementation("androidx.appcompat:appcompat:1.6.1") implementation("androidx.constraintlayout:constraintlayout:2.1.4") implementation(project(":core")) @@ -69,7 +69,7 @@ dependencies { implementation("androidx.room:room-rxjava2:$roomVersion") implementation("androidx.lifecycle:lifecycle-extensions:2.2.0") - implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2") + implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0") // optional - Guava support for Room, including Optional and ListenableFuture implementation("androidx.room:room-guava:$roomVersion") diff --git a/build.gradle.kts b/build.gradle.kts index 13d28b8..ac5e0a9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,7 +7,7 @@ buildscript { } dependencies { val kotlinVersion = rootProject.extra.get("kotlin_version") - classpath("com.android.tools.build:gradle:8.2.1") + classpath("com.android.tools.build:gradle:8.3.2") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") // NOTE: Do not place your application dependencies here; they belong @@ -16,7 +16,7 @@ buildscript { } plugins { - id("io.github.gradle-nexus.publish-plugin") version "2.0.0-rc-1" + id("io.github.gradle-nexus.publish-plugin") version "2.0.0" id("org.jetbrains.dokka") version "1.9.10" id("org.jetbrains.kotlin.android") version "1.9.10" apply false id("com.google.devtools.ksp") version "1.9.10-1.0.13" apply false @@ -37,5 +37,5 @@ allprojects { } tasks.register("clean", Delete::class) { - delete(rootProject.buildDir) + delete(rootProject.layout.buildDirectory) } \ No newline at end of file diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 3e6db3c..8661755 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -23,27 +23,6 @@ android { consumerProguardFiles("consumer-rules.pro") } - -// buildFeatures { -// buildConfig = true -// } - -// buildTypes { -// val versionName = properties["VERSION_NAME"] -// val versionCode = properties["VERSION_CODE"] -// getByName("debug"){ -// buildConfigField("long", "VERSION_CODE", "$versionCode") -// buildConfigField("String","VERSION_NAME","\"$versionName\"") -// -// } -// getByName("release") { -// isMinifyEnabled = false -// proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") -// buildConfigField("long", "VERSION_CODE", "$versionCode") -// buildConfigField("String","VERSION_NAME","\"$versionName\"") -// } -// } - buildFeatures { viewBinding = true } @@ -61,7 +40,7 @@ apply { dependencies { implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar")))) - implementation("androidx.core:core-ktx:1.12.0") + implementation("androidx.core:core-ktx:1.13.0") implementation("androidx.appcompat:appcompat:1.6.1") testImplementation("junit:junit:4.13.2") androidTestImplementation("androidx.test.ext:junit:1.1.5") @@ -97,6 +76,6 @@ dependencies { //Apache commons io //https://mvnrepository.com/artifact/commons-io/commons-io //noinspection GradleDependency - implementation("commons-io:commons-io:2.15.1") + implementation("commons-io:commons-io:2.16.1") } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index eead2e3..7bb1776 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-8.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip