diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/DownloadTest.java b/app/src/androidTest/java/org/kiwix/kiwixmobile/DownloadTest.java index ed05cfdec..00670e26e 100644 --- a/app/src/androidTest/java/org/kiwix/kiwixmobile/DownloadTest.java +++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/DownloadTest.java @@ -26,8 +26,8 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.LargeTest; import androidx.test.rule.ActivityTestRule; import androidx.test.rule.GrantPermissionRule; -import com.schibsted.spain.barista.interaction.BaristaMenuClickInteractions; -import com.schibsted.spain.barista.interaction.BaristaSleepInteractions; +import com.adevinta.android.barista.interaction.BaristaMenuClickInteractions; +import com.adevinta.android.barista.interaction.BaristaSleepInteractions; import java.util.concurrent.TimeUnit; import org.junit.After; import org.junit.Before; @@ -41,9 +41,9 @@ import org.kiwix.kiwixmobile.utils.KiwixIdlingResource; import static androidx.test.espresso.Espresso.onData; import static androidx.test.espresso.matcher.ViewMatchers.withId; -import static com.schibsted.spain.barista.assertion.BaristaVisibilityAssertions.assertDisplayed; -import static com.schibsted.spain.barista.interaction.BaristaClickInteractions.clickOn; -import static com.schibsted.spain.barista.interaction.BaristaSwipeRefreshInteractions.refresh; +import static com.adevinta.android.barista.assertion.BaristaVisibilityAssertions.assertDisplayed; +import static com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn; +import static com.adevinta.android.barista.interaction.BaristaSwipeRefreshInteractions.refresh; import static junit.framework.Assert.fail; import static org.kiwix.kiwixmobile.testutils.TestUtils.TEST_PAUSE_MS; import static org.kiwix.kiwixmobile.testutils.TestUtils.allowPermissionsIfNeeded; diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/NetworkTest.java b/app/src/androidTest/java/org/kiwix/kiwixmobile/NetworkTest.java index 7beefa3a1..911c05680 100644 --- a/app/src/androidTest/java/org/kiwix/kiwixmobile/NetworkTest.java +++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/NetworkTest.java @@ -25,8 +25,8 @@ import androidx.test.espresso.IdlingRegistry; import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.rule.ActivityTestRule; import androidx.test.rule.GrantPermissionRule; -import com.schibsted.spain.barista.interaction.BaristaMenuClickInteractions; -import com.schibsted.spain.barista.interaction.BaristaSleepInteractions; +import com.adevinta.android.barista.interaction.BaristaMenuClickInteractions; +import com.adevinta.android.barista.interaction.BaristaSleepInteractions; import java.io.InputStream; import java.util.concurrent.TimeUnit; import org.junit.After; @@ -49,10 +49,10 @@ import static androidx.test.espresso.Espresso.onView; import static androidx.test.espresso.action.ViewActions.click; import static androidx.test.espresso.action.ViewActions.longClick; import static androidx.test.espresso.matcher.ViewMatchers.withId; -import static com.schibsted.spain.barista.interaction.BaristaClickInteractions.clickOn; -import static com.schibsted.spain.barista.interaction.BaristaDialogInteractions.clickDialogPositiveButton; -import static com.schibsted.spain.barista.interaction.BaristaMenuClickInteractions.clickMenu; -import static com.schibsted.spain.barista.interaction.BaristaSwipeRefreshInteractions.refresh; +import static com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn; +import static com.adevinta.android.barista.interaction.BaristaDialogInteractions.clickDialogPositiveButton; +import static com.adevinta.android.barista.interaction.BaristaMenuClickInteractions.clickMenu; +import static com.adevinta.android.barista.interaction.BaristaSwipeRefreshInteractions.refresh; import static org.hamcrest.CoreMatchers.allOf; import static org.kiwix.kiwixmobile.testutils.TestUtils.TEST_PAUSE_MS; import static org.kiwix.kiwixmobile.testutils.TestUtils.getResourceString; diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/language/LanguageFragmentTest.java b/app/src/androidTest/java/org/kiwix/kiwixmobile/language/LanguageFragmentTest.java index 61f02011e..5ba50f479 100644 --- a/app/src/androidTest/java/org/kiwix/kiwixmobile/language/LanguageFragmentTest.java +++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/language/LanguageFragmentTest.java @@ -24,7 +24,7 @@ import androidx.test.espresso.intent.Intents; import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.rule.ActivityTestRule; import androidx.test.rule.GrantPermissionRule; -import com.schibsted.spain.barista.interaction.BaristaSleepInteractions; +import com.adevinta.android.barista.interaction.BaristaSleepInteractions; import org.junit.After; import org.junit.Before; import org.junit.Ignore; @@ -44,7 +44,7 @@ import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed; import static androidx.test.espresso.matcher.ViewMatchers.withContentDescription; import static androidx.test.espresso.matcher.ViewMatchers.withId; import static androidx.test.espresso.matcher.ViewMatchers.withText; -import static com.schibsted.spain.barista.interaction.BaristaClickInteractions.clickOn; +import static com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn; import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.core.IsNull.notNullValue; diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/main/TopLevelDestinationRobot.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/main/TopLevelDestinationRobot.kt index 44bbab42c..6a00fb3bd 100644 --- a/app/src/androidTest/java/org/kiwix/kiwixmobile/main/TopLevelDestinationRobot.kt +++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/main/TopLevelDestinationRobot.kt @@ -17,7 +17,7 @@ */ package org.kiwix.kiwixmobile.main -import com.schibsted.spain.barista.interaction.BaristaSleepInteractions +import com.adevinta.android.barista.interaction.BaristaSleepInteractions import applyWithViewHierarchyPrinting import org.kiwix.kiwixmobile.BaseRobot import org.kiwix.kiwixmobile.Findable.StringId.TextId diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/page/bookmarks/BookmarksRobot.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/page/bookmarks/BookmarksRobot.kt index 769cb2062..7a3ce423b 100644 --- a/app/src/androidTest/java/org/kiwix/kiwixmobile/page/bookmarks/BookmarksRobot.kt +++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/page/bookmarks/BookmarksRobot.kt @@ -19,7 +19,7 @@ package org.kiwix.kiwixmobile.page.bookmarks import applyWithViewHierarchyPrinting -import com.schibsted.spain.barista.assertion.BaristaVisibilityAssertions.assertDisplayed +import com.adevinta.android.barista.assertion.BaristaVisibilityAssertions.assertDisplayed import org.kiwix.kiwixmobile.BaseRobot import org.kiwix.kiwixmobile.Findable.StringId.ContentDesc import org.kiwix.kiwixmobile.Findable.StringId.TextId diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/page/history/HistoryRobot.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/page/history/HistoryRobot.kt index ece1534d6..fca27c951 100644 --- a/app/src/androidTest/java/org/kiwix/kiwixmobile/page/history/HistoryRobot.kt +++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/page/history/HistoryRobot.kt @@ -19,7 +19,7 @@ package org.kiwix.kiwixmobile.page.history import applyWithViewHierarchyPrinting -import com.schibsted.spain.barista.assertion.BaristaVisibilityAssertions.assertDisplayed +import com.adevinta.android.barista.assertion.BaristaVisibilityAssertions.assertDisplayed import org.kiwix.kiwixmobile.BaseRobot import org.kiwix.kiwixmobile.Findable.StringId.ContentDesc import org.kiwix.kiwixmobile.Findable.StringId.TextId diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/search/SearchFragmentTest.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/search/SearchFragmentTest.kt index bfeccded1..71bc2df83 100644 --- a/app/src/androidTest/java/org/kiwix/kiwixmobile/search/SearchFragmentTest.kt +++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/search/SearchFragmentTest.kt @@ -18,7 +18,7 @@ package org.kiwix.kiwixmobile.search import androidx.test.internal.runner.junit4.statement.UiThreadStatement -import com.schibsted.spain.barista.assertion.BaristaVisibilityAssertions.assertDisplayed +import com.adevinta.android.barista.assertion.BaristaVisibilityAssertions.assertDisplayed import org.junit.Before import org.junit.Test import org.kiwix.kiwixmobile.BaseActivityTest diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/settings/KiwixSettingsFragmentTest.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/settings/KiwixSettingsFragmentTest.kt index 253b95666..91bd90e4c 100644 --- a/app/src/androidTest/java/org/kiwix/kiwixmobile/settings/KiwixSettingsFragmentTest.kt +++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/settings/KiwixSettingsFragmentTest.kt @@ -21,7 +21,7 @@ import android.Manifest import androidx.test.internal.runner.junit4.statement.UiThreadStatement import androidx.test.rule.ActivityTestRule import androidx.test.rule.GrantPermissionRule -import com.schibsted.spain.barista.interaction.BaristaSleepInteractions +import com.adevinta.android.barista.interaction.BaristaSleepInteractions import org.junit.Before import org.junit.Rule import org.junit.Test diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/settings/SettingsRobot.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/settings/SettingsRobot.kt index f190a36cd..d538219d0 100644 --- a/app/src/androidTest/java/org/kiwix/kiwixmobile/settings/SettingsRobot.kt +++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/settings/SettingsRobot.kt @@ -27,7 +27,7 @@ import androidx.test.espresso.matcher.ViewMatchers.hasDescendant import androidx.test.espresso.matcher.ViewMatchers.withResourceName import androidx.test.espresso.matcher.ViewMatchers.withText import applyWithViewHierarchyPrinting -import com.schibsted.spain.barista.assertion.BaristaVisibilityAssertions.assertDisplayed +import com.adevinta.android.barista.assertion.BaristaVisibilityAssertions.assertDisplayed import org.hamcrest.Matchers import org.kiwix.kiwixmobile.BaseRobot import org.kiwix.kiwixmobile.Findable.Text diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/splash/KiwixSplashActivityTest.java b/app/src/androidTest/java/org/kiwix/kiwixmobile/splash/KiwixSplashActivityTest.java index b36fff66b..27aa65baa 100644 --- a/app/src/androidTest/java/org/kiwix/kiwixmobile/splash/KiwixSplashActivityTest.java +++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/splash/KiwixSplashActivityTest.java @@ -28,7 +28,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.LargeTest; import androidx.test.rule.ActivityTestRule; import androidx.test.rule.GrantPermissionRule; -import com.schibsted.spain.barista.interaction.BaristaSleepInteractions; +import com.adevinta.android.barista.interaction.BaristaSleepInteractions; import org.junit.After; import org.junit.Before; import org.junit.Rule; diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/utils/StandardActions.java b/app/src/androidTest/java/org/kiwix/kiwixmobile/utils/StandardActions.java index 973de67d4..40758c3a5 100644 --- a/app/src/androidTest/java/org/kiwix/kiwixmobile/utils/StandardActions.java +++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/utils/StandardActions.java @@ -18,15 +18,15 @@ package org.kiwix.kiwixmobile.utils; import android.util.Log; -import com.schibsted.spain.barista.interaction.BaristaClickInteractions; -import com.schibsted.spain.barista.interaction.BaristaDrawerInteractions; -import com.schibsted.spain.barista.interaction.BaristaSleepInteractions; +import com.adevinta.android.barista.interaction.BaristaClickInteractions; +import com.adevinta.android.barista.interaction.BaristaDrawerInteractions; +import com.adevinta.android.barista.interaction.BaristaSleepInteractions; import org.kiwix.kiwixmobile.R; import static androidx.test.espresso.Espresso.onData; import static androidx.test.espresso.action.ViewActions.longClick; import static androidx.test.espresso.matcher.ViewMatchers.withId; -import static com.schibsted.spain.barista.interaction.BaristaDialogInteractions.clickDialogPositiveButton; +import static com.adevinta.android.barista.interaction.BaristaDialogInteractions.clickDialogPositiveButton; import static org.kiwix.kiwixmobile.testutils.TestUtils.TEST_PAUSE_MS; import static org.kiwix.kiwixmobile.testutils.TestUtils.getResourceString; import static org.kiwix.kiwixmobile.testutils.TestUtils.withContent; diff --git a/buildSrc/src/main/kotlin/Libs.kt b/buildSrc/src/main/kotlin/Libs.kt index 85306f39d..03c936d8b 100644 --- a/buildSrc/src/main/kotlin/Libs.kt +++ b/buildSrc/src/main/kotlin/Libs.kt @@ -405,7 +405,7 @@ object Libs { const val multidex: String = "androidx.multidex:multidex:" + Versions.multidex - const val barista: String = "com.schibsted.spain:barista:" + Versions.barista + const val barista: String = "com.adevinta.android:barista:" + Versions.barista const val xfetch2: String = "androidx.tonyodev.fetch2:xfetch2:" + Versions.xfetch2 diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 5848041bb..6e174332f 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -94,7 +94,7 @@ object Versions { const val multidex: String = "2.0.1" - const val barista: String = "2.7.1" // available: "3.7.0" + const val barista: String = "4.0.0" const val xfetch2: String = "3.1.6"