Merge pull request #21 from rafi0101/feature/dependency-update_and_codecoverage

rafi0101 · web-flow · commit 5eae0d325276 · 2022-10-30T11:09:43.000+01:00
dependency update
diff --git a/README.md b/README.md
@@ -7,6 +7,7 @@
 [![API](https://img.shields.io/badge/API-21%2B-brightgreen.svg?style=flat)](https://android-arsenal.com/api?level=21)
 ![Language](https://img.shields.io/badge/language-Kotlin-orange.svg)
 [![PRWelcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/rafi0101/Android-Room-Database-Backup/pulls)
+[![License](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/rafi0101/Android-Room-Database-Backu/blob/master/LICENSE)
 
 <div align="center">
   <sub>Built with ❤︎ by
diff --git a/app/build.gradle b/app/build.gradle
@@ -5,8 +5,8 @@ plugins {
 }
 
 android {
-    compileSdkVersion 31
-    buildToolsVersion "30.0.2"
+    compileSdkVersion 33
+    buildToolsVersion "30.0.3"
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -16,7 +16,7 @@ android {
     defaultConfig {
         applicationId "de.raphaelebner.roomdatabasebackup.sample"
         minSdkVersion 21
-        targetSdkVersion 31
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0.3"
 
@@ -45,21 +45,22 @@ android {
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_1_8.toString()
     }
+    namespace 'de.raphaelebner.roomdatabasebackup.sample'
 }
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'androidx.appcompat:appcompat:1.4.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
+    implementation 'androidx.core:core-ktx:1.9.0'
+    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation project(path: ':core')
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 
     //ROOM SQLite
-    def room_version = "2.4.0"
+    def room_version = "2.4.3"
 
     implementation "androidx.room:room-runtime:$room_version"
     kapt "androidx.room:room-compiler:$room_version"
@@ -71,7 +72,7 @@ dependencies {
     implementation "androidx.room:room-rxjava2:$room_version"
 
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1"
 
     // optional - Guava support for Room, including Optional and ListenableFuture
     implementation "androidx.room:room-guava:$room_version"
@@ -83,6 +84,6 @@ dependencies {
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
 
     //Material Design Implementation
-    implementation 'com.google.android.material:material:1.4.0'
+    implementation 'com.google.android.material:material:1.7.0'
 
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.raphaelebner.roomdatabasebackup.sample">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
diff --git a/app/src/main/java/de/raphaelebner/roomdatabasebackup/sample/ActivityAddEditFruit.kt b/app/src/main/java/de/raphaelebner/roomdatabasebackup/sample/ActivityAddEditFruit.kt
@@ -83,7 +83,7 @@ class ActivityAddEditFruit : AppCompatActivity() {
                 deleteFruit = true
                 saveFruit()
             } else {
-                super.onBackPressed()
+                onBackPressedDispatcher.onBackPressed()
             }
         }
 
@@ -128,7 +128,7 @@ class ActivityAddEditFruit : AppCompatActivity() {
             }
             //Back Button
             android.R.id.home -> {
-                super.onBackPressed()
+                onBackPressedDispatcher.onBackPressed()
                 true
 
             }
diff --git a/app/src/main/java/de/raphaelebner/roomdatabasebackup/sample/MainActivity.kt b/app/src/main/java/de/raphaelebner/roomdatabasebackup/sample/MainActivity.kt
@@ -185,7 +185,7 @@ class MainActivity : AppCompatActivity(), FruitListAdapter.OnItemClickListener {
                 .show()
         }
 
-        val backup = RoomBackup(this)
+        val backup = RoomBackup(this@MainActivity)
         /*---------------------Backup and Restore Database--------------------------*/
         btnBackup.setOnClickListener {
             backup
diff --git a/build.gradle b/build.gradle
@@ -1,12 +1,12 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = '1.6.10'
+    ext.kotlin_version = '1.7.10'
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.4'
+        classpath 'com.android.tools.build:gradle:7.3.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -16,8 +16,8 @@ buildscript {
 
 plugins {
     id('io.github.gradle-nexus.publish-plugin') version "1.1.0"
-    id("org.jetbrains.dokka") version "1.6.10"
-    id 'org.jetbrains.kotlin.android' version '1.6.10' apply false
+    id("org.jetbrains.dokka") version "1.7.10"
+    id 'org.jetbrains.kotlin.android' version '1.7.10' apply false
 }
 
 apply from: "${rootDir}/scripts/publish-root.gradle"
diff --git a/core/build.gradle b/core/build.gradle
@@ -7,8 +7,8 @@ plugins {
 }
 
 android {
-    compileSdkVersion 31
-    buildToolsVersion "30.0.2"
+    compileSdkVersion 33
+    buildToolsVersion "30.0.3"
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -17,7 +17,7 @@ android {
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 31
+        targetSdkVersion 33
         versionCode 1
         versionName '1.0.0-beta10'
 
@@ -47,6 +47,7 @@ android {
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_1_8.toString()
     }
+    namespace 'de.raphaelebner.roomdatabasebackup.core'
 
 }
 
@@ -60,14 +61,14 @@ apply from: "${rootProject.projectDir}/scripts/publish-module.gradle"
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'androidx.appcompat:appcompat:1.4.0'
+    implementation 'androidx.core:core-ktx:1.9.0'
+    implementation 'androidx.appcompat:appcompat:1.5.1'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 
     //ROOM SQLite
-    def room_version = "2.4.0"
+    def room_version = "2.4.3"
 
     implementation "androidx.room:room-runtime:$room_version"
     kapt "androidx.room:room-compiler:$room_version"
@@ -85,7 +86,7 @@ dependencies {
     testImplementation "androidx.room:room-testing:$room_version"
 
     //Material Design Implementation
-    implementation 'com.google.android.material:material:1.4.0'
+    implementation 'com.google.android.material:material:1.6.1'
 
     //Androidx Security
     implementation "androidx.security:security-crypto:1.1.0-alpha03"
diff --git a/core/src/main/AndroidManifest.xml b/core/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="de.raphaelebner.roomdatabasebackup.core"
     tools:ignore="ExtraText">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
diff --git a/core/src/main/java/de/raphaelebner/roomdatabasebackup/core/RoomBackup.kt b/core/src/main/java/de/raphaelebner/roomdatabasebackup/core/RoomBackup.kt
@@ -11,6 +11,7 @@ import android.util.Log
 import android.widget.Toast
 import androidx.activity.ComponentActivity
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.activity.result.contract.ActivityResultContracts.CreateDocument
 import androidx.fragment.app.FragmentActivity
 import androidx.room.RoomDatabase
 import androidx.security.crypto.EncryptedSharedPreferences
@@ -330,11 +331,10 @@ class RoomBackup(var context: Context) : FragmentActivity() {
      */
     private fun restartApp() {
         restartIntent!!.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-        context.startActivity(restartIntent)
         if (context is Activity) {
             (context as Activity).finish()
         }
-        Runtime.getRuntime().exit(0)
+        context.startActivity(restartIntent)
     }
 
     /**
@@ -734,16 +734,14 @@ class RoomBackup(var context: Context) : FragmentActivity() {
     /**
      * Opens the [ActivityResultContracts.CreateDocument] and prompts the user to select a path for creating the new backup file
      */
-    private val openBackupfileCreator = (context as ComponentActivity).registerForActivityResult(ActivityResultContracts.CreateDocument()) { result ->
+    private val openBackupfileCreator = (context as ComponentActivity).registerForActivityResult(CreateDocument("todo/todo")) { result ->
         if (result != null) {
             val out = context.contentResolver.openOutputStream(result)!!
             doBackup(out)
             return@registerForActivityResult
         }
         onCompleteListener?.onComplete(
-            false,
-            "failure",
-            OnCompleteListener.EXIT_CODE_ERROR_BACKUP_FILE_CREATOR
+            false, "failure", OnCompleteListener.EXIT_CODE_ERROR_BACKUP_FILE_CREATOR
         )
     }
 
diff --git 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.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ class ActivityAddEditFruit : AppCompatActivity() {`
`83`	`83`	`deleteFruit = true`
`84`	`84`	`saveFruit()`
`85`	`85`	`} else {`
`86`		`- super.onBackPressed()`
	`86`	`+ onBackPressedDispatcher.onBackPressed()`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`
`@@ -128,7 +128,7 @@ class ActivityAddEditFruit : AppCompatActivity() {`
`128`	`128`	`}`
`129`	`129`	`//Back Button`
`130`	`130`	`android.R.id.home -> {`
`131`		`- super.onBackPressed()`
	`131`	`+ onBackPressedDispatcher.onBackPressed()`
`132`	`132`	`true`
`133`	`133`
`134`	`134`	`}`
Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ class MainActivity : AppCompatActivity(), FruitListAdapter.OnItemClickListener {`
`185`	`185`	`.show()`
`186`	`186`	`}`
`187`	`187`
`188`		`- val backup = RoomBackup(this)`
	`188`	`+ val backup = RoomBackup(this@MainActivity)`
`189`	`189`	`/---------------------Backup and Restore Database--------------------------/`
`190`	`190`	`btnBackup.setOnClickListener {`
`191`	`191`	`backup`