From 1147e2486b67fe0bd31f24294b624a2c6952d39e Mon Sep 17 00:00:00 2001
From: RumitPatel <rumit.patel5@gmail.com>
Date: Tue, 20 Jun 2023 10:14:16 +0530
Subject: [PATCH 1/7] Dependencies and AGP upgraded

---
 .idea/compiler.xml                            |  2 +-
 .idea/deploymentTargetDropDown.xml            | 10 ++++
 .idea/gradle.xml                              |  2 +-
 .idea/kotlinc.xml                             |  6 ++
 .idea/misc.xml                                |  3 +-
 app/build.gradle                              | 55 +++++++++----------
 .../java/com/raghav/mynotes/db/TasksDao.kt    |  2 +-
 build.gradle                                  |  8 +--
 gradle.properties                             |  5 +-
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 10 files changed, 56 insertions(+), 39 deletions(-)
 create mode 100644 .idea/deploymentTargetDropDown.xml
 create mode 100644 .idea/kotlinc.xml

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index fb7f4a8..b589d56 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
+    <bytecodeTargetLevel target="17" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
new file mode 100644
index 0000000..0c0c338
--- /dev/null
+++ b/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <value>
+      <entry key="app">
+        <State />
+      </entry>
+    </value>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a2d7c21..f01eec3 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,8 +5,8 @@
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
new file mode 100644
index 0000000..69e8615
--- /dev/null
+++ b/.idea/kotlinc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinJpsPluginSettings">
+    <option name="version" value="1.8.20" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 4c74df4..57da15c 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
@@ -14,7 +13,7 @@
       </map>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index f98a44f..9c7c37f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,10 +2,9 @@ plugins {
     id 'com.android.application'
     id 'kotlin-android'
     id "androidx.navigation.safeargs.kotlin"
-    id 'kotlin-kapt'
     id 'kotlin-parcelize'
-    // hilt plugin
-    id 'dagger.hilt.android.plugin'
+    id 'dagger.hilt.android.plugin' // hilt plugin
+    id 'kotlin-kapt'
 }
 
 android {
@@ -39,11 +38,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '11'
+        jvmTarget = '17'
     }
     buildFeatures{
         viewBinding true
@@ -58,42 +57,42 @@ android {
 
 dependencies {
 
-    implementation 'androidx.core:core-ktx:1.9.0'
-    implementation 'androidx.appcompat:appcompat:1.5.1'
-    implementation 'com.google.android.material:material:1.6.1'
+    implementation 'androidx.core:core-ktx:1.10.1'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'com.google.android.material:material:1.9.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    testImplementation 'junit:junit:4.+'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    testImplementation 'junit:junit:'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 
-    implementation "androidx.activity:activity-ktx:1.6.0"
-    implementation "androidx.fragment:fragment-ktx:1.5.3"
+    implementation "androidx.activity:activity-ktx:1.7.2"
+    implementation "androidx.fragment:fragment-ktx:1.6.0"
 
     def lottieVersion = "3.4.0"
     implementation "com.airbnb.android:lottie:$lottieVersion"
 
     //Room
-    implementation "androidx.room:room-runtime:2.4.3"
-    kapt "androidx.room:room-compiler:2.4.3"
-    implementation("androidx.room:room-ktx:2.4.3")
+    implementation "androidx.room:room-runtime:2.5.1"
+    kapt "androidx.room:room-compiler:2.5.1"
+    implementation("androidx.room:room-ktx:2.5.1")
 
     // Coroutines
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
 
     // Coroutine Lifecycle Scopes
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1"
-    implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.5.1"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1"
+    implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.1"
 
     //Navigation Components
-    implementation "androidx.navigation:navigation-fragment-ktx:2.5.2"
-    implementation "androidx.navigation:navigation-ui-ktx:2.5.2"
+    implementation "androidx.navigation:navigation-fragment-ktx:2.6.0"
+    implementation "androidx.navigation:navigation-ui-ktx:2.6.0"
 
     //Dagger-Hilt Dependencies
-    implementation 'com.google.dagger:hilt-android:2.42'
-    kapt 'com.google.dagger:hilt-android-compiler:2.42'
+    implementation 'com.google.dagger:hilt-android:2.46.1'
+    kapt 'com.google.dagger:hilt-android-compiler:2.46.1'
 
     //room-testing
-    androidTestImplementation("androidx.room:room-testing:2.4.3")
+    androidTestImplementation("androidx.room:room-testing:2.5.1")
 
     //Library for making assertions in Test Cases
     androidTestImplementation "com.google.truth:truth:1.1.3"
@@ -115,10 +114,10 @@ dependencies {
     androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4"
 
     // AndroidX
-    androidTestImplementation "androidx.test:core-ktx:1.4.0"
-    testImplementation "androidx.arch.core:core-testing:2.1.0"
-    androidTestImplementation "androidx.test.ext:junit-ktx:1.1.3"
-    testImplementation "androidx.test.ext:junit-ktx:1.1.3"
+    androidTestImplementation "androidx.test:core-ktx:1.5.0"
+    testImplementation "androidx.arch.core:core-testing:2.2.0"
+    androidTestImplementation "androidx.test.ext:junit-ktx:1.1.5"
+    testImplementation "androidx.test.ext:junit-ktx:1.1.5"
     androidTestImplementation 'org.robolectric:robolectric:4.6'
     testImplementation 'org.robolectric:robolectric:4.6'
 
diff --git a/app/src/main/java/com/raghav/mynotes/db/TasksDao.kt b/app/src/main/java/com/raghav/mynotes/db/TasksDao.kt
index 746b810..9c02132 100644
--- a/app/src/main/java/com/raghav/mynotes/db/TasksDao.kt
+++ b/app/src/main/java/com/raghav/mynotes/db/TasksDao.kt
@@ -3,7 +3,7 @@ package com.raghav.mynotes.db
 import androidx.room.Dao
 import androidx.room.Delete
 import androidx.room.Insert
-import androidx.room.OnConflictStrategy.REPLACE
+import androidx.room.OnConflictStrategy.Companion.REPLACE
 import androidx.room.Query
 import com.raghav.mynotes.models.TaskEntity
 import kotlinx.coroutines.flow.Flow
diff --git a/build.gradle b/build.gradle
index 36495fa..f032752 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,11 +5,11 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10"
-        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.5.2"
+        classpath 'com.android.tools.build:gradle:8.0.2'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20"
+        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.6.0"
         // hilt-android-gradle-plugin
-        classpath "com.google.dagger:hilt-android-gradle-plugin:2.42"
+        classpath "com.google.dagger:hilt-android-gradle-plugin:2.46.1"
 
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle.properties b/gradle.properties
index 98bed16..8145fa7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,4 +18,7 @@ android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
-kotlin.code.style=official
\ No newline at end of file
+kotlin.code.style=official
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 4da94e4..c889b4c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Thu Jan 06 16:04:56 IST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

From b5b10e8534a81cb96531524b5b168bdf40dbf494 Mon Sep 17 00:00:00 2001
From: RumitPatel <rumit.patel5@gmail.com>
Date: Tue, 20 Jun 2023 10:49:16 +0530
Subject: [PATCH 2/7] Versions managed in ext variables.

---
 app/build.gradle | 12 ++++++------
 build.gradle     |  7 +++++--
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 9c7c37f..7e06880 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -72,9 +72,9 @@ dependencies {
     implementation "com.airbnb.android:lottie:$lottieVersion"
 
     //Room
-    implementation "androidx.room:room-runtime:2.5.1"
-    kapt "androidx.room:room-compiler:2.5.1"
-    implementation("androidx.room:room-ktx:2.5.1")
+    implementation "androidx.room:room-runtime:$room_version"
+    kapt "androidx.room:room-compiler:$room_version"
+    implementation("androidx.room:room-ktx:$room_version")
 
     // Coroutines
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
@@ -88,11 +88,11 @@ dependencies {
     implementation "androidx.navigation:navigation-ui-ktx:2.6.0"
 
     //Dagger-Hilt Dependencies
-    implementation 'com.google.dagger:hilt-android:2.46.1'
-    kapt 'com.google.dagger:hilt-android-compiler:2.46.1'
+    implementation "com.google.dagger:hilt-android:$hilt_version"
+    kapt "com.google.dagger:hilt-android-compiler:$hilt_version"
 
     //room-testing
-    androidTestImplementation("androidx.room:room-testing:2.5.1")
+    androidTestImplementation("androidx.room:room-testing:$room_version")
 
     //Library for making assertions in Test Cases
     androidTestImplementation "com.google.truth:truth:1.1.3"
diff --git a/build.gradle b/build.gradle
index f032752..6b241ab 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,15 +1,18 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
+    ext.kotlin_version = '1.8.20'
+    ext.hilt_version = '2.46.1'
+    ext.room_version = '2.5.1'
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:8.0.2'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.6.0"
         // hilt-android-gradle-plugin
-        classpath "com.google.dagger:hilt-android-gradle-plugin:2.46.1"
+        classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
 
 
         // NOTE: Do not place your application dependencies here; they belong

From 2e0b5cc453df3f52c757101e4b43258819659e7b Mon Sep 17 00:00:00 2001
From: RumitPatel <rumit.patel5@gmail.com>
Date: Tue, 20 Jun 2023 11:17:01 +0530
Subject: [PATCH 3/7] signature and params updated for "Observer" in
 .getOrAwaitValueTest in LiveDataTestUtil.kt.

---
 .../test/java/com/raghav/mynotes/utils/LiveDataTestUtil.kt    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/test/java/com/raghav/mynotes/utils/LiveDataTestUtil.kt b/app/src/test/java/com/raghav/mynotes/utils/LiveDataTestUtil.kt
index 9128162..055a77b 100644
--- a/app/src/test/java/com/raghav/mynotes/utils/LiveDataTestUtil.kt
+++ b/app/src/test/java/com/raghav/mynotes/utils/LiveDataTestUtil.kt
@@ -17,8 +17,8 @@ fun <T> LiveData<T>.getOrAwaitValueTest(
     var data: T? = null
     val latch = CountDownLatch(1)
     val observer = object : Observer<T> {
-        override fun onChanged(o: T?) {
-            data = o
+        override fun onChanged(value: T) {
+            data = value
             latch.countDown()
             this@getOrAwaitValueTest.removeObserver(this)
         }

From d7084256e752656ee21d2a805306245a116ad35d Mon Sep 17 00:00:00 2001
From: RumitPatel <rumit.patel5@gmail.com>
Date: Tue, 20 Jun 2023 11:32:25 +0530
Subject: [PATCH 4/7] Typo mistakes in README.md file.

---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 2ce6d88..2d0284a 100644
--- a/README.md
+++ b/README.md
@@ -5,10 +5,10 @@
 ![GitHub forks](https://img.shields.io/github/forks/avidraghav/MyNotes?style=social)
 ![Twitter Follow](https://img.shields.io/twitter/follow/avidRaghav?label=Follow&style=social)
 
-[![Hactoberfest 2022](https://img.shields.io/badge/-HACKTOBERFEST--ACCEPTED-brightgreen)](https://hacktoberfest.com/participation/)
+[![Hacktoberfest 2022](https://img.shields.io/badge/-HACKTOBERFEST--ACCEPTED-brightgreen)](https://hacktoberfest.com/participation/)
 [![Android Weekly](https://img.shields.io/badge/Android%20Weekly-%23515-blue)](https://androidweekly.net/issues/issue-515)
 [![Contributions Highly Welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](https://github.com/avidraghav/MyNotes/issues)
-[![Availble issues to contribute](https://img.shields.io/github/issues/avidRaghav/MyNotes?style=social)](https://github.com/avidraghav/MyNotes/issues)
+[![Available issues to contribute](https://img.shields.io/github/issues/avidRaghav/MyNotes?style=social)](https://github.com/avidraghav/MyNotes/issues)
 
 
 
@@ -31,8 +31,8 @@ I highly recommend to start with Manual Dependency injection method and then mov
 - [Flow](https://kotlinlang.org/docs/reference/coroutines/flow.html) - In the simplest of ways consider this as a pipe through which the data flows in the app, by using flow
    a developer doesn't need to refresh variables which contain data.  
 - [LiveData](https://developer.android.com/topic/libraries/architecture/livedata) - Used to observe the data on the UI layer
-- [ViewModel](https://developer.android.com/topic/libraries/architecture/viewmodel) - To Store UI-related data that isnt destroyed on UI changes.
-- [RecylerView](https://developer.android.com/guide/topics/ui/layout/recyclerview) - To Display data in a list format.
+- [ViewModel](https://developer.android.com/topic/libraries/architecture/viewmodel) - To Store UI-related data that isn't destroyed on UI changes.
+- [RecyclerView](https://developer.android.com/guide/topics/ui/layout/recyclerview) - To Display data in a list format.
 - [Hilt](https://developer.android.com/training/dependency-injection/hilt-android) - For Dependency Injection
 - [Datastore](https://developer.android.com/topic/libraries/architecture/datastore) - For Storing Data
 
@@ -49,7 +49,7 @@ I highly recommend to start with Manual Dependency injection method and then mov
 
 <img width="658" alt="Screenshot 2022-01-18 at 1 31 48 PM" src="https://user-images.githubusercontent.com/49483235/149895306-79dd64bb-7629-42f3-97dd-1796f4a65b40.png">
 
-## 🦸‍♂️ Contribtors
+## 🦸‍♂️ Contributors
 
 <a href="https://github.com/avidraghav/MyNotes/graphs/contributors">
   <img src="https://contrib.rocks/image?repo=avidraghav/MyNotes" />
@@ -57,7 +57,7 @@ I highly recommend to start with Manual Dependency injection method and then mov
 
 Made with [contrib.rocks](https://contrib.rocks).
 
-# This project is made for educational purposes so don't be shy of asking any questions about any concept from the app or about android developement. 
+# This project is made for educational purposes so don't be shy of asking any questions about any concept from the app or about android development. 
 Do open <a href ="https://github.com/avidraghav/MVVM-TodoApp/issues" target="_blank">issues</a>
   and raise PRs to I'll try my best to assist you. If this project helps you then do leave a 🌟 :smiley:
 

From 92b496b0548b17b3ee16642676ad01a6703d39e0 Mon Sep 17 00:00:00 2001
From: RumitPatel <rumit.patel5@gmail.com>
Date: Tue, 20 Jun 2023 15:03:27 +0530
Subject: [PATCH 5/7] navigation-safe-args-gradle-plugin set to 2.5.2

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 6b241ab..74ccaba 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:8.0.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.6.0"
+        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.5.2"
         // hilt-android-gradle-plugin
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
 

From c7b5111a5dd5018155f854d8820b3b8caeae1ae6 Mon Sep 17 00:00:00 2001
From: RumitPatel <rumit.patel5@gmail.com>
Date: Tue, 20 Jun 2023 15:55:19 +0530
Subject: [PATCH 6/7] Updated JDK to 17.

---
 .github/workflows/Android-CI.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/Android-CI.yml b/.github/workflows/Android-CI.yml
index 97ea8c5..699103c 100644
--- a/.github/workflows/Android-CI.yml
+++ b/.github/workflows/Android-CI.yml
@@ -13,10 +13,10 @@ jobs:
     steps:
       - name: Checkout current repository in macos' file system
         uses: actions/checkout@v2
-      - name: Setup JDK 11
+      - name: Setup JDK 17
         uses: actions/setup-java@v2
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           cache: gradle
 
@@ -42,10 +42,10 @@ jobs:
       - build-and-test
     steps:
       - uses: actions/checkout@v2
-      - name: Setup JDK 11
+      - name: Setup JDK 17
         uses: actions/setup-java@v2
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           cache: gradle
 

From 699c1b43c79c822f0ed9712f21bd95a098d15dd5 Mon Sep 17 00:00:00 2001
From: RumitPatel <rumit.patel5@gmail.com>
Date: Tue, 20 Jun 2023 16:51:59 +0530
Subject: [PATCH 7/7] MigrationUtil compatibility updates.

---
 .../androidTest/java/com/raghav/mynotes/utils/MigrationUtil.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/androidTest/java/com/raghav/mynotes/utils/MigrationUtil.kt b/app/src/androidTest/java/com/raghav/mynotes/utils/MigrationUtil.kt
index 1efe949..3f6f98e 100644
--- a/app/src/androidTest/java/com/raghav/mynotes/utils/MigrationUtil.kt
+++ b/app/src/androidTest/java/com/raghav/mynotes/utils/MigrationUtil.kt
@@ -16,7 +16,7 @@ object MigrationUtil {
         migrationTestHelper: MigrationTestHelper,
         databaseClass: Class<TasksDatabase>,
         databaseName: String,
-        vararg migrations: Migration?
+        vararg migrations: Migration
     ): RoomDatabase {
         val roomDatabase: RoomDatabase = Room.databaseBuilder(
             ApplicationProvider.getApplicationContext(),