diff --git a/app/src/androidTest/java/org/mozilla/reference/browser/ui/robots/AddToHomeScreenRobot.kt b/app/src/androidTest/java/org/mozilla/reference/browser/ui/robots/AddToHomeScreenRobot.kt
index 690ee7cb5..9687dbb31 100644
--- a/app/src/androidTest/java/org/mozilla/reference/browser/ui/robots/AddToHomeScreenRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/reference/browser/ui/robots/AddToHomeScreenRobot.kt
@@ -22,6 +22,7 @@ class AddToHomeScreenRobot {
         when (Build.VERSION.SDK_INT) {
             // For Android Oreo(API 26) to Android 11(API 30), click the "Add Automatically" button
             in Build.VERSION_CODES.O..Build.VERSION_CODES.R -> clickAddAutomaticallyButton()
+
             // For Android 12(API 31) to Vanilla Ice Cream(API 35), click the "Add to Home Screen" button
             in Build.VERSION_CODES.S..Build.VERSION_CODES.VANILLA_ICE_CREAM -> clickAddToHomeScreenButton()
         }
diff --git a/app/src/main/java/org/mozilla/reference/browser/BrowserActivity.kt b/app/src/main/java/org/mozilla/reference/browser/BrowserActivity.kt
index c97dd23f9..2cc406d71 100644
--- a/app/src/main/java/org/mozilla/reference/browser/BrowserActivity.kt
+++ b/app/src/main/java/org/mozilla/reference/browser/BrowserActivity.kt
@@ -125,11 +125,15 @@ open class BrowserActivity : AppCompatActivity() {
         attrs: AttributeSet,
     ): View? =
         when (name) {
-            EngineView::class.java.name ->
+            EngineView::class.java.name -> {
                 components.core.engine
                 .createView(context, attrs)
                 .asView()
-            else -> super.onCreateView(parent, name, context, attrs)
+            }
+
+            else -> {
+                super.onCreateView(parent, name, context, attrs)
+            }
         }
 
     private fun onNonFatalCrash(crash: Crash) {
diff --git a/app/src/main/java/org/mozilla/reference/browser/ExternalAppBrowserActivity.kt b/app/src/main/java/org/mozilla/reference/browser/ExternalAppBrowserActivity.kt
index 0558430bf..744f39aad 100644
--- a/app/src/main/java/org/mozilla/reference/browser/ExternalAppBrowserActivity.kt
+++ b/app/src/main/java/org/mozilla/reference/browser/ExternalAppBrowserActivity.kt
@@ -26,6 +26,7 @@ class ExternalAppBrowserActivity : BrowserActivity() {
                 WebAppManifest.DisplayMode.MINIMAL_UI,
                 WebAppManifest.DisplayMode.BROWSER,
                 -> null
+
                 else -> null
             }
 
diff --git a/app/src/main/java/org/mozilla/reference/browser/addons/AddonSettingsActivity.kt b/app/src/main/java/org/mozilla/reference/browser/addons/AddonSettingsActivity.kt
index 4490a9d80..246b2eac6 100644
--- a/app/src/main/java/org/mozilla/reference/browser/addons/AddonSettingsActivity.kt
+++ b/app/src/main/java/org/mozilla/reference/browser/addons/AddonSettingsActivity.kt
@@ -54,11 +54,15 @@ class AddonSettingsActivity : AppCompatActivity() {
         attrs: AttributeSet,
     ): View? =
         when (name) {
-            EngineView::class.java.name ->
+            EngineView::class.java.name -> {
                 components.core.engine
                 .createView(context, attrs)
                 .asView()
-            else -> super.onCreateView(parent, name, context, attrs)
+            }
+
+            else -> {
+                super.onCreateView(parent, name, context, attrs)
+            }
         }
 
     /**
diff --git a/app/src/main/java/org/mozilla/reference/browser/addons/WebExtensionActionPopupActivity.kt b/app/src/main/java/org/mozilla/reference/browser/addons/WebExtensionActionPopupActivity.kt
index 23ba89eb6..2b1537e5d 100644
--- a/app/src/main/java/org/mozilla/reference/browser/addons/WebExtensionActionPopupActivity.kt
+++ b/app/src/main/java/org/mozilla/reference/browser/addons/WebExtensionActionPopupActivity.kt
@@ -54,11 +54,15 @@ class WebExtensionActionPopupActivity : AppCompatActivity() {
         attrs: AttributeSet,
     ): View? =
         when (name) {
-            EngineView::class.java.name ->
+            EngineView::class.java.name -> {
                 components.core.engine
                 .createView(context, attrs)
                 .asView()
-            else -> super.onCreateView(parent, name, context, attrs)
+            }
+
+            else -> {
+                super.onCreateView(parent, name, context, attrs)
+            }
         }
 
     /**
diff --git a/app/src/main/java/org/mozilla/reference/browser/settings/SettingsActivity.kt b/app/src/main/java/org/mozilla/reference/browser/settings/SettingsActivity.kt
index a41aa8b94..d655c7681 100644
--- a/app/src/main/java/org/mozilla/reference/browser/settings/SettingsActivity.kt
+++ b/app/src/main/java/org/mozilla/reference/browser/settings/SettingsActivity.kt
@@ -37,7 +37,10 @@ class SettingsActivity :
             onBackPressedDispatcher.onBackPressed()
             true
         }
-        else -> super.onOptionsItemSelected(item)
+
+        else -> {
+            super.onOptionsItemSelected(item)
+        }
     }
 
     override fun updateTitle(titleResId: Int) {
diff --git a/app/src/main/java/org/mozilla/reference/browser/tabs/TabsToolbar.kt b/app/src/main/java/org/mozilla/reference/browser/tabs/TabsToolbar.kt
index 22a0af0a6..28f07214d 100644
--- a/app/src/main/java/org/mozilla/reference/browser/tabs/TabsToolbar.kt
+++ b/app/src/main/java/org/mozilla/reference/browser/tabs/TabsToolbar.kt
@@ -38,6 +38,7 @@ class TabsToolbar
                     }
                     closeTabsTray?.invoke()
                 }
+
                 R.id.closeTab -> {
                     when (isPrivateTray) {
                         true -> tabsUseCases.removePrivateTabs.invoke()
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index dd9b03ffd..e60c1bd32 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,7 +3,7 @@
 android-components = "147.0.20251117215621"
 
 # AGP
-android-gradle-plugin = "8.13.0"
+android-gradle-plugin = "8.13.1"
 
 # Kotlin
 kotlin = "2.2.21"
@@ -41,16 +41,16 @@ androidx-test-runner = "1.7.0"
 androidx-test-uiautomator = "2.3.0"
 
 # Third Party Linting & Static Code Analysis
-dependency-analysis = "3.3.0"
+dependency-analysis = "3.4.1"
 detekt = "1.23.8"
 jspecify = "1.0.0"
-ktlint = "1.7.1"
+ktlint = "1.8.0"
 
 # Third Party Testing
 hamcrest = "1.3"
 jacoco = "0.8.14"
 junit = "4.13.2"
-okhttp = "5.2.1"
+okhttp = "5.3.0"
 okio = "3.16.2"
 
 [libraries]