Skip to content

Update AndroidX dependencies #5315

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

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Update AndroidX dependencies #5315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
92a9289
Update AndroidX dependencies
joshliebe Nov 25, 2024
959cfbd
Undo version.androidx.webkit update
joshliebe Dec 5, 2024
27fcbb2
Set compile_sdk to 35
joshliebe Dec 6, 2024
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
2 changes: 1 addition & 1 deletion app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2017,7 +2017,7 @@ class BrowserTabFragment :

private fun launchDialogForIntent(
context: Context,
pm: PackageManager?,
pm: PackageManager,
intent: Intent,
activities: List<ResolveInfo>,
useFirstActivityFound: Boolean,
Expand Down
94 changes: 0 additions & 94 deletions app/src/main/java/com/duckduckgo/app/global/view/ViewChildrenSequences.kt
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions app/src/test/java/com/duckduckgo/app/bookmarks/model/SyncSavedSitesRepositoryTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ class SyncSavedSitesRepositoryTest {
savedSitesRelationsDao.insertList(relation)

val removedEntities = entities.toMutableList()
val removedEntity = removedEntities.removeFirst()
val removedEntity = removedEntities.removeAt(0)

val removedEntitiesIds = removedEntities.map { it.entityId }
val childrenJSON = stringListAdapter.toJson(removedEntitiesIds)
Expand Down Expand Up @@ -320,7 +320,7 @@ class SyncSavedSitesRepositoryTest {
savedSitesRelationsDao.insertList(folderRelation)

val updatedChildren = bookmarks.toMutableList()
val removedChildren = updatedChildren.removeFirst()
val removedChildren = updatedChildren.removeAt(0)

repository.replaceBookmarkFolder(folder, updatedChildren.map { it.entityId })

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
ext {
min_sdk = 26
target_sdk = 34
compile_sdk = 34
compile_sdk = 35

// Calculate lint_version (must always be gradle_plugin + 23)
def gradle_plugin_version = versionFor(project, Android.tools.build.gradlePlugin)
Expand Down
14 changes: 6 additions & 8 deletions ...n/java/com/duckduckgo/verifiedinstallation/certificate/SigningCertificateHashExtractor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,13 @@ class SigningCertificateHashExtractorImpl @Inject constructor(
@RequiresApi(Build.VERSION_CODES.P)
private fun getSigningCertHashesModern(): String? {
val info: PackageInfo? = context.packageManager.getPackageInfo(appBuildConfig.applicationId, PackageManager.GET_SIGNING_CERTIFICATES)
if (info?.signingInfo == null) {
return null
}

if (info.signingInfo.signingCertificateHistory.size != 1) {
return null
return info?.signingInfo?.let { signingInfo ->
if (signingInfo.signingCertificateHistory.size != 1) {
null
} else {
signingInfo.signingCertificateHistory.lastOrNull()?.sha256()
}
}

return info.signingInfo.signingCertificateHistory?.lastOrNull()?.sha256()
}

private fun Signature.sha256(): String {
Expand Down
12 changes: 6 additions & 6 deletions versions.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ version.androidx.arch.core=2.2.0

version.androidx.browser=1.8.0

version.androidx.constraintlayout=2.1.4
version.androidx.constraintlayout=2.2.0

version.androidx.biometric=1.1.0

Expand All @@ -45,17 +45,17 @@ version.androidx.recyclerview=1.3.2

version.androidx.core=1.13.1

version.androidx.fragment=1.8.3
version.androidx.fragment=1.8.5

version.androidx.legacy=1.0.0

version.androidx.lifecycle=2.8.5
version.androidx.lifecycle=2.8.7

version.androidx.room=2.6.1

version.androidx.swiperefreshlayout=1.1.0

version.androidx.test.orchestrator=1.5.0
version.androidx.test.orchestrator=1.5.1

version.androidx.test.espresso=3.6.1

Expand Down Expand Up @@ -125,7 +125,7 @@ version.okhttp3=4.12.0

version.net.zetetic..android-database-sqlcipher=4.5.4

version.okio=3.9.0
version.okio=3.9.0

version.org.apache.commons..commons-math3=3.6.1

Expand Down Expand Up @@ -161,4 +161,4 @@ version.com.google.zxing..core=3.5.3

version.android.tools.desugar_jdk_libs=2.1.2

version.de.siegmar..fastcsv=2.2.2
version.de.siegmar..fastcsv=2.2.2
Loading