diff --git a/app/build.gradle b/app/build.gradle
index c2d099ea..a35c2023 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -56,8 +56,8 @@ android {
 }
 
 dependencies {
-    implementation 'com.github.SimpleMobileTools:Simple-Commons:7c0a8d628e'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
+    implementation 'com.github.SimpleMobileTools:Simple-Commons:a74ec200da'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
     implementation 'androidx.documentfile:documentfile:1.0.1'
 
     kapt 'androidx.room:room-compiler:2.3.0'
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt
index 06248352..2fa32983 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt
@@ -135,7 +135,7 @@ class ChecklistFragment : NoteFragment(), ChecklistItemsListener {
 
     private fun showNewItemDialog() {
         NewChecklistItemDialog(activity as SimpleActivity) { titles ->
-            var currentMaxId = items.maxBy { item -> item.id }?.id ?: 0
+            var currentMaxId = items.maxByOrNull { item -> item.id }?.id ?: 0
 
             titles.forEach { title ->
                 title.split("\n").map { it.trim() }.filter { it.isNotBlank() }.forEach { row ->
diff --git a/build.gradle b/build.gradle
index 89311c27..1d186814 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.4.32'
+    ext.kotlin_version = '1.5.31'
 
     repositories {
         google()
@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:7.0.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 4cbdda4e..2c23d290 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-6.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip