Skip to content
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

Jump to bottom

feat(deps): bump androidxFragment from 1.5.7 to 1.6.2 #4355

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

feat(deps): bump androidxFragment from 1.5.7 to 1.6.2 #4355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6ee8f3
feat(deps): bump androidxFragment from 1.5.7 to 1.6.2
dependabot[bot] Apr 4, 2024
ad35faa
feat: changed from launch to launchActivityForResult in a ReleaseNote…
Aitorbp Apr 5, 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 gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ androidxContraintLayout = "2.1.4"
androidxCore = "1.10.1"
androidxEnterpriseFeedback = "1.1.0"
androidxEspresso = "3.5.1"
androidxFragment = "1.5.7"
androidxFragment = "1.6.2"
androidxLegacy = "1.0.0"
androidxLifecycle = "2.5.1"
androidxLifecycleExtensions = "2.2.0"
Expand Down
5 changes: 3 additions & 2 deletions owncloudApp/src/androidTest/java/com/owncloud/android/authentication/LoginActivityTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* @author Abel García de Prada
* @author Juan Carlos Garrote Gascón
* @author Jorge Aguado Recio
* @author Aitor Ballesteros Pavón
*
* Copyright (C) 2024 ownCloud GmbH.
*
Expand Down Expand Up @@ -193,9 +194,9 @@ class LoginActivityTest {
every { ocContextProvider.getString(R.string.app_name) } returns BRANDED_APP_NAME

activityScenario = if (intent == null) {
ActivityScenario.launch(LoginActivity::class.java)
ActivityScenario.launchActivityForResult(LoginActivity::class.java)
} else {
ActivityScenario.launch(intent)
ActivityScenario.launchActivityForResult(intent)
}
}

Expand Down
9 changes: 5 additions & 4 deletions ...udApp/src/androidTest/java/com/owncloud/android/settings/security/PassCodeActivityTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
* @author Christian Schabesberger (@theScrabi)
* @author Juan Carlos Garrote Gascón (@JuancaG05)
* @author David Crespo Ríos (@davcres)
* @author Aitor Ballesteros Pavón (@Aitorbp)
*
* Copyright (C) 2021 ownCloud GmbH.
* Copyright (C) 2024 ownCloud GmbH.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2,
Expand Down Expand Up @@ -38,12 +39,12 @@ import androidx.test.espresso.matcher.ViewMatchers.withText
import com.owncloud.android.R
import com.owncloud.android.db.PreferenceManager
import com.owncloud.android.domain.utils.Event
import com.owncloud.android.presentation.security.biometric.BiometricViewModel
import com.owncloud.android.presentation.security.passcode.PassCodeActivity
import com.owncloud.android.presentation.security.passcode.PassCodeViewModel
import com.owncloud.android.presentation.security.passcode.PasscodeAction
import com.owncloud.android.presentation.security.passcode.PasscodeType
import com.owncloud.android.presentation.security.passcode.Status
import com.owncloud.android.presentation.security.biometric.BiometricViewModel
import com.owncloud.android.presentation.security.passcode.PassCodeViewModel
import com.owncloud.android.testutil.security.OC_PASSCODE_4_DIGITS
import com.owncloud.android.utils.matchers.isDisplayed
import com.owncloud.android.utils.matchers.withChildCountAndId
Expand Down Expand Up @@ -352,6 +353,6 @@ class PassCodeActivityTest {
val intent = Intent(context, PassCodeActivity::class.java).apply {
action = mode
}
activityScenario = ActivityScenario.launch(intent)
activityScenario = ActivityScenario.launchActivityForResult(intent)
}
}
6 changes: 4 additions & 2 deletions ...loudApp/src/androidTest/java/com/owncloud/android/ui/activity/ReleaseNotesActivityTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
* ownCloud Android client application
*
* @author David Crespo Ríos
* Copyright (C) 2022 ownCloud GmbH.
* @author Aitor Ballesteros Pavón
*
* Copyright (C) 2024 ownCloud GmbH.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2,
Expand Down Expand Up @@ -70,7 +72,7 @@ class ReleaseNotesActivityTest {
every { releaseNotesViewModel.getReleaseNotes() } returns releaseNotesList

val intent = Intent(context, ReleaseNotesActivity::class.java)
activityScenario = ActivityScenario.launch(intent)
activityScenario = ActivityScenario.launchActivityForResult(intent)
}

@Test
Expand Down