Skip to content

Update Gradle dependencies #3949

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 18, 2025
Merged

Update Gradle dependencies #3949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e9e58b9
Update DAGP to version 3.4.1
rvandermeulen Nov 13, 2025
cd6694c
Update OkHttp to version 5.3.0
rvandermeulen Nov 13, 2025
3c71de5
Update ktlint to version 1.8.0
rvandermeulen Nov 15, 2025
fc2ec8d
Update AGP to version 8.13.1
rvandermeulen Nov 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/src/androidTest/java/org/mozilla/reference/browser/ui/robots/AddToHomeScreenRobot.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down
8 changes: 6 additions & 2 deletions app/src/main/java/org/mozilla/reference/browser/BrowserActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/org/mozilla/reference/browser/ExternalAppBrowserActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ class ExternalAppBrowserActivity : BrowserActivity() {
WebAppManifest.DisplayMode.MINIMAL_UI,
WebAppManifest.DisplayMode.BROWSER,
-> null

else -> null
}

Expand Down
8 changes: 6 additions & 2 deletions app/src/main/java/org/mozilla/reference/browser/addons/AddonSettingsActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}

/**
Expand Down
8 changes: 6 additions & 2 deletions app/src/main/java/org/mozilla/reference/browser/addons/WebExtensionActionPopupActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}

/**
Expand Down
5 changes: 4 additions & 1 deletion app/src/main/java/org/mozilla/reference/browser/settings/SettingsActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,10 @@ class SettingsActivity :
onBackPressedDispatcher.onBackPressed()
true
}
else -> super.onOptionsItemSelected(item)

else -> {
super.onOptionsItemSelected(item)
}
}

override fun updateTitle(titleResId: Int) {
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/org/mozilla/reference/browser/tabs/TabsToolbar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ class TabsToolbar
}
closeTabsTray?.invoke()
}

R.id.closeTab -> {
when (isPrivateTray) {
true -> tabsUseCases.removePrivateTabs.invoke()
Expand Down
8 changes: 4 additions & 4 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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]
Expand Down