From e9e58b9a5ad8c61529d58a850958f4c9ffa00e5b Mon Sep 17 00:00:00 2001 From: Ryan VanderMeulen Date: Thu, 13 Nov 2025 14:58:59 -0500 Subject: [PATCH 1/4] Update DAGP to version 3.4.1 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index dd9b03ffd..5e1d6117e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -41,7 +41,7 @@ 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" From cd6694ce34555fdbf5f7f7fd4c5c19285a28d774 Mon Sep 17 00:00:00 2001 From: Ryan VanderMeulen Date: Thu, 13 Nov 2025 15:03:05 -0500 Subject: [PATCH 2/4] Update OkHttp to version 5.3.0 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5e1d6117e..1e010d356 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -50,7 +50,7 @@ ktlint = "1.7.1" hamcrest = "1.3" jacoco = "0.8.14" junit = "4.13.2" -okhttp = "5.2.1" +okhttp = "5.3.0" okio = "3.16.2" [libraries] From 3c71de50aa2603411ade63377c7aed07a9cff948 Mon Sep 17 00:00:00 2001 From: Ryan VanderMeulen Date: Sat, 15 Nov 2025 16:55:17 -0500 Subject: [PATCH 3/4] Update ktlint to version 1.8.0 --- .../reference/browser/ui/robots/AddToHomeScreenRobot.kt | 1 + .../java/org/mozilla/reference/browser/BrowserActivity.kt | 8 ++++++-- .../reference/browser/ExternalAppBrowserActivity.kt | 1 + .../reference/browser/addons/AddonSettingsActivity.kt | 8 ++++++-- .../browser/addons/WebExtensionActionPopupActivity.kt | 8 ++++++-- .../reference/browser/settings/SettingsActivity.kt | 5 ++++- .../org/mozilla/reference/browser/tabs/TabsToolbar.kt | 1 + gradle/libs.versions.toml | 2 +- 8 files changed, 26 insertions(+), 8 deletions(-) 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 1e010d356..dee1ef87d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -44,7 +44,7 @@ androidx-test-uiautomator = "2.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" From fc2ec8d1472e78083d52218506f77d2ced196372 Mon Sep 17 00:00:00 2001 From: Ryan VanderMeulen Date: Mon, 17 Nov 2025 23:32:25 -0500 Subject: [PATCH 4/4] Update AGP to version 8.13.1 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index dee1ef87d..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"