diff --git a/library/.gitignore b/barista/.gitignore similarity index 100% rename from library/.gitignore rename to barista/.gitignore diff --git a/library/build.gradle.kts b/barista/build.gradle.kts similarity index 100% rename from library/build.gradle.kts rename to barista/build.gradle.kts diff --git a/library/src/androidTest/res/drawable-hdpi/ic_barista.png b/barista/src/androidTest/res/drawable-hdpi/ic_barista.png similarity index 100% rename from library/src/androidTest/res/drawable-hdpi/ic_barista.png rename to barista/src/androidTest/res/drawable-hdpi/ic_barista.png diff --git a/library/src/androidTest/res/drawable-hdpi/ic_launcher.png b/barista/src/androidTest/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from library/src/androidTest/res/drawable-hdpi/ic_launcher.png rename to barista/src/androidTest/res/drawable-hdpi/ic_launcher.png diff --git a/library/src/androidTest/res/drawable-mdpi/ic_barista.png b/barista/src/androidTest/res/drawable-mdpi/ic_barista.png similarity index 100% rename from library/src/androidTest/res/drawable-mdpi/ic_barista.png rename to barista/src/androidTest/res/drawable-mdpi/ic_barista.png diff --git a/library/src/androidTest/res/drawable-mdpi/ic_launcher.png b/barista/src/androidTest/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from library/src/androidTest/res/drawable-mdpi/ic_launcher.png rename to barista/src/androidTest/res/drawable-mdpi/ic_launcher.png diff --git a/library/src/androidTest/res/drawable-xhdpi/ic_barista.png b/barista/src/androidTest/res/drawable-xhdpi/ic_barista.png similarity index 100% rename from library/src/androidTest/res/drawable-xhdpi/ic_barista.png rename to barista/src/androidTest/res/drawable-xhdpi/ic_barista.png diff --git a/library/src/androidTest/res/drawable-xhdpi/ic_launcher.png b/barista/src/androidTest/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from library/src/androidTest/res/drawable-xhdpi/ic_launcher.png rename to barista/src/androidTest/res/drawable-xhdpi/ic_launcher.png diff --git a/library/src/androidTest/res/drawable-xxhdpi/ic_barista.png b/barista/src/androidTest/res/drawable-xxhdpi/ic_barista.png similarity index 100% rename from library/src/androidTest/res/drawable-xxhdpi/ic_barista.png rename to barista/src/androidTest/res/drawable-xxhdpi/ic_barista.png diff --git a/library/src/androidTest/res/drawable-xxhdpi/ic_launcher.png b/barista/src/androidTest/res/drawable-xxhdpi/ic_launcher.png similarity index 100% rename from library/src/androidTest/res/drawable-xxhdpi/ic_launcher.png rename to barista/src/androidTest/res/drawable-xxhdpi/ic_launcher.png diff --git a/library/src/androidTest/res/drawable-xxxhdpi/ic_barista.png b/barista/src/androidTest/res/drawable-xxxhdpi/ic_barista.png similarity index 100% rename from library/src/androidTest/res/drawable-xxxhdpi/ic_barista.png rename to barista/src/androidTest/res/drawable-xxxhdpi/ic_barista.png diff --git a/library/src/androidTest/res/drawable-xxxhdpi/ic_launcher.png b/barista/src/androidTest/res/drawable-xxxhdpi/ic_launcher.png similarity index 100% rename from library/src/androidTest/res/drawable-xxxhdpi/ic_launcher.png rename to barista/src/androidTest/res/drawable-xxxhdpi/ic_launcher.png diff --git a/library/src/main/AndroidManifest.xml b/barista/src/main/AndroidManifest.xml similarity index 100% rename from library/src/main/AndroidManifest.xml rename to barista/src/main/AndroidManifest.xml diff --git a/library/src/main/java/com/adevinta/android/barista/assertion/BaristaAssertions.kt b/barista/src/main/java/com/adevinta/android/barista/assertion/BaristaAssertions.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/assertion/BaristaAssertions.kt rename to barista/src/main/java/com/adevinta/android/barista/assertion/BaristaAssertions.kt diff --git a/library/src/main/java/com/adevinta/android/barista/assertion/BaristaAssistiveTextAssertions.kt b/barista/src/main/java/com/adevinta/android/barista/assertion/BaristaAssistiveTextAssertions.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/assertion/BaristaAssistiveTextAssertions.kt rename to barista/src/main/java/com/adevinta/android/barista/assertion/BaristaAssistiveTextAssertions.kt diff --git a/library/src/main/java/com/adevinta/android/barista/assertion/BaristaBackgroundAssertions.kt b/barista/src/main/java/com/adevinta/android/barista/assertion/BaristaBackgroundAssertions.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/assertion/BaristaBackgroundAssertions.kt rename to barista/src/main/java/com/adevinta/android/barista/assertion/BaristaBackgroundAssertions.kt diff --git a/library/src/main/java/com/adevinta/android/barista/assertion/BaristaCheckedAssertions.kt b/barista/src/main/java/com/adevinta/android/barista/assertion/BaristaCheckedAssertions.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/assertion/BaristaCheckedAssertions.kt rename to barista/src/main/java/com/adevinta/android/barista/assertion/BaristaCheckedAssertions.kt diff --git a/library/src/main/java/com/adevinta/android/barista/assertion/BaristaChipAssertions.kt b/barista/src/main/java/com/adevinta/android/barista/assertion/BaristaChipAssertions.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/assertion/BaristaChipAssertions.kt rename to barista/src/main/java/com/adevinta/android/barista/assertion/BaristaChipAssertions.kt diff --git a/library/src/main/java/com/adevinta/android/barista/assertion/BaristaClickableAssertions.kt b/barista/src/main/java/com/adevinta/android/barista/assertion/BaristaClickableAssertions.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/assertion/BaristaClickableAssertions.kt rename to barista/src/main/java/com/adevinta/android/barista/assertion/BaristaClickableAssertions.kt diff --git a/library/src/main/java/com/adevinta/android/barista/assertion/BaristaContentDescriptionAssertions.kt b/barista/src/main/java/com/adevinta/android/barista/assertion/BaristaContentDescriptionAssertions.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/assertion/BaristaContentDescriptionAssertions.kt rename to barista/src/main/java/com/adevinta/android/barista/assertion/BaristaContentDescriptionAssertions.kt diff --git a/library/src/main/java/com/adevinta/android/barista/assertion/BaristaDrawerAssertions.kt b/barista/src/main/java/com/adevinta/android/barista/assertion/BaristaDrawerAssertions.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/assertion/BaristaDrawerAssertions.kt rename to barista/src/main/java/com/adevinta/android/barista/assertion/BaristaDrawerAssertions.kt diff --git a/library/src/main/java/com/adevinta/android/barista/assertion/BaristaEnabledAssertions.kt b/barista/src/main/java/com/adevinta/android/barista/assertion/BaristaEnabledAssertions.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/assertion/BaristaEnabledAssertions.kt rename to barista/src/main/java/com/adevinta/android/barista/assertion/BaristaEnabledAssertions.kt diff --git a/library/src/main/java/com/adevinta/android/barista/assertion/BaristaErrorAssertions.kt b/barista/src/main/java/com/adevinta/android/barista/assertion/BaristaErrorAssertions.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/assertion/BaristaErrorAssertions.kt rename to barista/src/main/java/com/adevinta/android/barista/assertion/BaristaErrorAssertions.kt diff --git a/library/src/main/java/com/adevinta/android/barista/assertion/BaristaFocusedAssertions.kt b/barista/src/main/java/com/adevinta/android/barista/assertion/BaristaFocusedAssertions.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/assertion/BaristaFocusedAssertions.kt rename to barista/src/main/java/com/adevinta/android/barista/assertion/BaristaFocusedAssertions.kt diff --git a/library/src/main/java/com/adevinta/android/barista/assertion/BaristaHintAssertions.kt b/barista/src/main/java/com/adevinta/android/barista/assertion/BaristaHintAssertions.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/assertion/BaristaHintAssertions.kt rename to barista/src/main/java/com/adevinta/android/barista/assertion/BaristaHintAssertions.kt diff --git a/library/src/main/java/com/adevinta/android/barista/assertion/BaristaImageViewAssertions.kt b/barista/src/main/java/com/adevinta/android/barista/assertion/BaristaImageViewAssertions.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/assertion/BaristaImageViewAssertions.kt rename to barista/src/main/java/com/adevinta/android/barista/assertion/BaristaImageViewAssertions.kt diff --git a/library/src/main/java/com/adevinta/android/barista/assertion/BaristaListAssertions.kt b/barista/src/main/java/com/adevinta/android/barista/assertion/BaristaListAssertions.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/assertion/BaristaListAssertions.kt rename to barista/src/main/java/com/adevinta/android/barista/assertion/BaristaListAssertions.kt diff --git a/library/src/main/java/com/adevinta/android/barista/assertion/BaristaProgressBarAssertions.kt b/barista/src/main/java/com/adevinta/android/barista/assertion/BaristaProgressBarAssertions.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/assertion/BaristaProgressBarAssertions.kt rename to barista/src/main/java/com/adevinta/android/barista/assertion/BaristaProgressBarAssertions.kt diff --git a/library/src/main/java/com/adevinta/android/barista/assertion/BaristaRecyclerViewAssertions.kt b/barista/src/main/java/com/adevinta/android/barista/assertion/BaristaRecyclerViewAssertions.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/assertion/BaristaRecyclerViewAssertions.kt rename to barista/src/main/java/com/adevinta/android/barista/assertion/BaristaRecyclerViewAssertions.kt diff --git a/library/src/main/java/com/adevinta/android/barista/assertion/BaristaVisibilityAssertions.kt b/barista/src/main/java/com/adevinta/android/barista/assertion/BaristaVisibilityAssertions.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/assertion/BaristaVisibilityAssertions.kt rename to barista/src/main/java/com/adevinta/android/barista/assertion/BaristaVisibilityAssertions.kt diff --git a/library/src/main/java/com/adevinta/android/barista/intents/BaristaIntentMatchers.kt b/barista/src/main/java/com/adevinta/android/barista/intents/BaristaIntentMatchers.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/intents/BaristaIntentMatchers.kt rename to barista/src/main/java/com/adevinta/android/barista/intents/BaristaIntentMatchers.kt diff --git a/library/src/main/java/com/adevinta/android/barista/intents/BaristaIntents.kt b/barista/src/main/java/com/adevinta/android/barista/intents/BaristaIntents.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/intents/BaristaIntents.kt rename to barista/src/main/java/com/adevinta/android/barista/intents/BaristaIntents.kt diff --git a/library/src/main/java/com/adevinta/android/barista/interaction/BaristaAutoCompleteTextViewInteractions.kt b/barista/src/main/java/com/adevinta/android/barista/interaction/BaristaAutoCompleteTextViewInteractions.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/interaction/BaristaAutoCompleteTextViewInteractions.kt rename to barista/src/main/java/com/adevinta/android/barista/interaction/BaristaAutoCompleteTextViewInteractions.kt diff --git a/library/src/main/java/com/adevinta/android/barista/interaction/BaristaCheckboxInteractions.kt b/barista/src/main/java/com/adevinta/android/barista/interaction/BaristaCheckboxInteractions.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/interaction/BaristaCheckboxInteractions.kt rename to barista/src/main/java/com/adevinta/android/barista/interaction/BaristaCheckboxInteractions.kt diff --git a/library/src/main/java/com/adevinta/android/barista/interaction/BaristaChipInteractions.kt b/barista/src/main/java/com/adevinta/android/barista/interaction/BaristaChipInteractions.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/interaction/BaristaChipInteractions.kt rename to barista/src/main/java/com/adevinta/android/barista/interaction/BaristaChipInteractions.kt diff --git a/library/src/main/java/com/adevinta/android/barista/interaction/BaristaClickInteractions.kt b/barista/src/main/java/com/adevinta/android/barista/interaction/BaristaClickInteractions.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/interaction/BaristaClickInteractions.kt rename to barista/src/main/java/com/adevinta/android/barista/interaction/BaristaClickInteractions.kt diff --git a/library/src/main/java/com/adevinta/android/barista/interaction/BaristaDialogInteractions.java b/barista/src/main/java/com/adevinta/android/barista/interaction/BaristaDialogInteractions.java similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/interaction/BaristaDialogInteractions.java rename to barista/src/main/java/com/adevinta/android/barista/interaction/BaristaDialogInteractions.java diff --git a/library/src/main/java/com/adevinta/android/barista/interaction/BaristaDrawerInteractions.kt b/barista/src/main/java/com/adevinta/android/barista/interaction/BaristaDrawerInteractions.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/interaction/BaristaDrawerInteractions.kt rename to barista/src/main/java/com/adevinta/android/barista/interaction/BaristaDrawerInteractions.kt diff --git a/library/src/main/java/com/adevinta/android/barista/interaction/BaristaEditTextInteractions.kt b/barista/src/main/java/com/adevinta/android/barista/interaction/BaristaEditTextInteractions.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/interaction/BaristaEditTextInteractions.kt rename to barista/src/main/java/com/adevinta/android/barista/interaction/BaristaEditTextInteractions.kt diff --git a/library/src/main/java/com/adevinta/android/barista/interaction/BaristaKeyboardInteractions.kt b/barista/src/main/java/com/adevinta/android/barista/interaction/BaristaKeyboardInteractions.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/interaction/BaristaKeyboardInteractions.kt rename to barista/src/main/java/com/adevinta/android/barista/interaction/BaristaKeyboardInteractions.kt diff --git a/library/src/main/java/com/adevinta/android/barista/interaction/BaristaListInteractions.kt b/barista/src/main/java/com/adevinta/android/barista/interaction/BaristaListInteractions.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/interaction/BaristaListInteractions.kt rename to barista/src/main/java/com/adevinta/android/barista/interaction/BaristaListInteractions.kt diff --git a/library/src/main/java/com/adevinta/android/barista/interaction/BaristaMenuClickInteractions.kt b/barista/src/main/java/com/adevinta/android/barista/interaction/BaristaMenuClickInteractions.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/interaction/BaristaMenuClickInteractions.kt rename to barista/src/main/java/com/adevinta/android/barista/interaction/BaristaMenuClickInteractions.kt diff --git a/library/src/main/java/com/adevinta/android/barista/interaction/BaristaPickerInteractions.java b/barista/src/main/java/com/adevinta/android/barista/interaction/BaristaPickerInteractions.java similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/interaction/BaristaPickerInteractions.java rename to barista/src/main/java/com/adevinta/android/barista/interaction/BaristaPickerInteractions.java diff --git a/library/src/main/java/com/adevinta/android/barista/interaction/BaristaRadioButtonInteractions.kt b/barista/src/main/java/com/adevinta/android/barista/interaction/BaristaRadioButtonInteractions.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/interaction/BaristaRadioButtonInteractions.kt rename to barista/src/main/java/com/adevinta/android/barista/interaction/BaristaRadioButtonInteractions.kt diff --git a/library/src/main/java/com/adevinta/android/barista/interaction/BaristaRatingBarViewInteractions.kt b/barista/src/main/java/com/adevinta/android/barista/interaction/BaristaRatingBarViewInteractions.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/interaction/BaristaRatingBarViewInteractions.kt rename to barista/src/main/java/com/adevinta/android/barista/interaction/BaristaRatingBarViewInteractions.kt diff --git a/library/src/main/java/com/adevinta/android/barista/interaction/BaristaScrollInteractions.kt b/barista/src/main/java/com/adevinta/android/barista/interaction/BaristaScrollInteractions.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/interaction/BaristaScrollInteractions.kt rename to barista/src/main/java/com/adevinta/android/barista/interaction/BaristaScrollInteractions.kt diff --git a/library/src/main/java/com/adevinta/android/barista/interaction/BaristaSeekBarViewInteractions.kt b/barista/src/main/java/com/adevinta/android/barista/interaction/BaristaSeekBarViewInteractions.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/interaction/BaristaSeekBarViewInteractions.kt rename to barista/src/main/java/com/adevinta/android/barista/interaction/BaristaSeekBarViewInteractions.kt diff --git a/library/src/main/java/com/adevinta/android/barista/interaction/BaristaSleepInteractions.java b/barista/src/main/java/com/adevinta/android/barista/interaction/BaristaSleepInteractions.java similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/interaction/BaristaSleepInteractions.java rename to barista/src/main/java/com/adevinta/android/barista/interaction/BaristaSleepInteractions.java diff --git a/library/src/main/java/com/adevinta/android/barista/interaction/BaristaSpinnerInteractions.kt b/barista/src/main/java/com/adevinta/android/barista/interaction/BaristaSpinnerInteractions.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/interaction/BaristaSpinnerInteractions.kt rename to barista/src/main/java/com/adevinta/android/barista/interaction/BaristaSpinnerInteractions.kt diff --git a/library/src/main/java/com/adevinta/android/barista/interaction/BaristaSwipeRefreshInteractions.kt b/barista/src/main/java/com/adevinta/android/barista/interaction/BaristaSwipeRefreshInteractions.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/interaction/BaristaSwipeRefreshInteractions.kt rename to barista/src/main/java/com/adevinta/android/barista/interaction/BaristaSwipeRefreshInteractions.kt diff --git a/library/src/main/java/com/adevinta/android/barista/interaction/BaristaViewPagerInteractions.kt b/barista/src/main/java/com/adevinta/android/barista/interaction/BaristaViewPagerInteractions.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/interaction/BaristaViewPagerInteractions.kt rename to barista/src/main/java/com/adevinta/android/barista/interaction/BaristaViewPagerInteractions.kt diff --git a/library/src/main/java/com/adevinta/android/barista/interaction/PermissionGranter.kt b/barista/src/main/java/com/adevinta/android/barista/interaction/PermissionGranter.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/interaction/PermissionGranter.kt rename to barista/src/main/java/com/adevinta/android/barista/interaction/PermissionGranter.kt diff --git a/library/src/main/java/com/adevinta/android/barista/internal/AssertAny.kt b/barista/src/main/java/com/adevinta/android/barista/internal/AssertAny.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/internal/AssertAny.kt rename to barista/src/main/java/com/adevinta/android/barista/internal/AssertAny.kt diff --git a/library/src/main/java/com/adevinta/android/barista/internal/PerformAction.kt b/barista/src/main/java/com/adevinta/android/barista/internal/PerformAction.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/internal/PerformAction.kt rename to barista/src/main/java/com/adevinta/android/barista/internal/PerformAction.kt diff --git a/library/src/main/java/com/adevinta/android/barista/internal/failurehandler/BaristaException.kt b/barista/src/main/java/com/adevinta/android/barista/internal/failurehandler/BaristaException.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/internal/failurehandler/BaristaException.kt rename to barista/src/main/java/com/adevinta/android/barista/internal/failurehandler/BaristaException.kt diff --git a/library/src/main/java/com/adevinta/android/barista/internal/failurehandler/EspressoFailure.kt b/barista/src/main/java/com/adevinta/android/barista/internal/failurehandler/EspressoFailure.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/internal/failurehandler/EspressoFailure.kt rename to barista/src/main/java/com/adevinta/android/barista/internal/failurehandler/EspressoFailure.kt diff --git a/library/src/main/java/com/adevinta/android/barista/internal/failurehandler/EspressoFailureHandlerGetter.kt b/barista/src/main/java/com/adevinta/android/barista/internal/failurehandler/EspressoFailureHandlerGetter.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/internal/failurehandler/EspressoFailureHandlerGetter.kt rename to barista/src/main/java/com/adevinta/android/barista/internal/failurehandler/EspressoFailureHandlerGetter.kt diff --git a/library/src/main/java/com/adevinta/android/barista/internal/failurehandler/HelperFunctions.kt b/barista/src/main/java/com/adevinta/android/barista/internal/failurehandler/HelperFunctions.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/internal/failurehandler/HelperFunctions.kt rename to barista/src/main/java/com/adevinta/android/barista/internal/failurehandler/HelperFunctions.kt diff --git a/library/src/main/java/com/adevinta/android/barista/internal/failurehandler/RethrowingFailureHandler.kt b/barista/src/main/java/com/adevinta/android/barista/internal/failurehandler/RethrowingFailureHandler.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/internal/failurehandler/RethrowingFailureHandler.kt rename to barista/src/main/java/com/adevinta/android/barista/internal/failurehandler/RethrowingFailureHandler.kt diff --git a/library/src/main/java/com/adevinta/android/barista/internal/failurehandler/SpyFailureHandler.kt b/barista/src/main/java/com/adevinta/android/barista/internal/failurehandler/SpyFailureHandler.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/internal/failurehandler/SpyFailureHandler.kt rename to barista/src/main/java/com/adevinta/android/barista/internal/failurehandler/SpyFailureHandler.kt diff --git a/library/src/main/java/com/adevinta/android/barista/internal/matcher/BackgroundMatcher.kt b/barista/src/main/java/com/adevinta/android/barista/internal/matcher/BackgroundMatcher.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/internal/matcher/BackgroundMatcher.kt rename to barista/src/main/java/com/adevinta/android/barista/internal/matcher/BackgroundMatcher.kt diff --git a/library/src/main/java/com/adevinta/android/barista/internal/matcher/BooleanMatcher.kt b/barista/src/main/java/com/adevinta/android/barista/internal/matcher/BooleanMatcher.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/internal/matcher/BooleanMatcher.kt rename to barista/src/main/java/com/adevinta/android/barista/internal/matcher/BooleanMatcher.kt diff --git a/library/src/main/java/com/adevinta/android/barista/internal/matcher/DisplayedMatchers.java b/barista/src/main/java/com/adevinta/android/barista/internal/matcher/DisplayedMatchers.java similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/internal/matcher/DisplayedMatchers.java rename to barista/src/main/java/com/adevinta/android/barista/internal/matcher/DisplayedMatchers.java diff --git a/library/src/main/java/com/adevinta/android/barista/internal/matcher/DrawableMatcher.kt b/barista/src/main/java/com/adevinta/android/barista/internal/matcher/DrawableMatcher.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/internal/matcher/DrawableMatcher.kt rename to barista/src/main/java/com/adevinta/android/barista/internal/matcher/DrawableMatcher.kt diff --git a/library/src/main/java/com/adevinta/android/barista/internal/matcher/HelperMatchers.java b/barista/src/main/java/com/adevinta/android/barista/internal/matcher/HelperMatchers.java similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/internal/matcher/HelperMatchers.java rename to barista/src/main/java/com/adevinta/android/barista/internal/matcher/HelperMatchers.java diff --git a/library/src/main/java/com/adevinta/android/barista/internal/matcher/ListViewItemCountAssertion.kt b/barista/src/main/java/com/adevinta/android/barista/internal/matcher/ListViewItemCountAssertion.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/internal/matcher/ListViewItemCountAssertion.kt rename to barista/src/main/java/com/adevinta/android/barista/internal/matcher/ListViewItemCountAssertion.kt diff --git a/library/src/main/java/com/adevinta/android/barista/internal/matcher/ListViewNotEmptyAssertion.kt b/barista/src/main/java/com/adevinta/android/barista/internal/matcher/ListViewNotEmptyAssertion.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/internal/matcher/ListViewNotEmptyAssertion.kt rename to barista/src/main/java/com/adevinta/android/barista/internal/matcher/ListViewNotEmptyAssertion.kt diff --git a/library/src/main/java/com/adevinta/android/barista/internal/matcher/ProgressBarMatchers.kt b/barista/src/main/java/com/adevinta/android/barista/internal/matcher/ProgressBarMatchers.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/internal/matcher/ProgressBarMatchers.kt rename to barista/src/main/java/com/adevinta/android/barista/internal/matcher/ProgressBarMatchers.kt diff --git a/library/src/main/java/com/adevinta/android/barista/internal/matcher/RecyclerViewItemCountAssertion.java b/barista/src/main/java/com/adevinta/android/barista/internal/matcher/RecyclerViewItemCountAssertion.java similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/internal/matcher/RecyclerViewItemCountAssertion.java rename to barista/src/main/java/com/adevinta/android/barista/internal/matcher/RecyclerViewItemCountAssertion.java diff --git a/library/src/main/java/com/adevinta/android/barista/internal/matcher/RecyclerViewNotEmptyAssertion.kt b/barista/src/main/java/com/adevinta/android/barista/internal/matcher/RecyclerViewNotEmptyAssertion.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/internal/matcher/RecyclerViewNotEmptyAssertion.kt rename to barista/src/main/java/com/adevinta/android/barista/internal/matcher/RecyclerViewNotEmptyAssertion.kt diff --git a/library/src/main/java/com/adevinta/android/barista/internal/matcher/TextColorMatcher.kt b/barista/src/main/java/com/adevinta/android/barista/internal/matcher/TextColorMatcher.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/internal/matcher/TextColorMatcher.kt rename to barista/src/main/java/com/adevinta/android/barista/internal/matcher/TextColorMatcher.kt diff --git a/library/src/main/java/com/adevinta/android/barista/internal/matcher/TextMatcher.kt b/barista/src/main/java/com/adevinta/android/barista/internal/matcher/TextMatcher.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/internal/matcher/TextMatcher.kt rename to barista/src/main/java/com/adevinta/android/barista/internal/matcher/TextMatcher.kt diff --git a/library/src/main/java/com/adevinta/android/barista/internal/matcher/TextStyleableColorMatcher.kt b/barista/src/main/java/com/adevinta/android/barista/internal/matcher/TextStyleableColorMatcher.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/internal/matcher/TextStyleableColorMatcher.kt rename to barista/src/main/java/com/adevinta/android/barista/internal/matcher/TextStyleableColorMatcher.kt diff --git a/library/src/main/java/com/adevinta/android/barista/internal/util/DrawableToBitmapConverter.kt b/barista/src/main/java/com/adevinta/android/barista/internal/util/DrawableToBitmapConverter.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/internal/util/DrawableToBitmapConverter.kt rename to barista/src/main/java/com/adevinta/android/barista/internal/util/DrawableToBitmapConverter.kt diff --git a/library/src/main/java/com/adevinta/android/barista/internal/util/ResourceType.kt b/barista/src/main/java/com/adevinta/android/barista/internal/util/ResourceType.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/internal/util/ResourceType.kt rename to barista/src/main/java/com/adevinta/android/barista/internal/util/ResourceType.kt diff --git a/library/src/main/java/com/adevinta/android/barista/internal/util/ViewTreeAnalyzer.java b/barista/src/main/java/com/adevinta/android/barista/internal/util/ViewTreeAnalyzer.java similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/internal/util/ViewTreeAnalyzer.java rename to barista/src/main/java/com/adevinta/android/barista/internal/util/ViewTreeAnalyzer.java diff --git a/library/src/main/java/com/adevinta/android/barista/internal/viewaction/AutoCompleteViewActions.java b/barista/src/main/java/com/adevinta/android/barista/internal/viewaction/AutoCompleteViewActions.java similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/internal/viewaction/AutoCompleteViewActions.java rename to barista/src/main/java/com/adevinta/android/barista/internal/viewaction/AutoCompleteViewActions.java diff --git a/library/src/main/java/com/adevinta/android/barista/internal/viewaction/CheckableViewActions.kt b/barista/src/main/java/com/adevinta/android/barista/internal/viewaction/CheckableViewActions.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/internal/viewaction/CheckableViewActions.kt rename to barista/src/main/java/com/adevinta/android/barista/internal/viewaction/CheckableViewActions.kt diff --git a/library/src/main/java/com/adevinta/android/barista/internal/viewaction/ChipViewActions.kt b/barista/src/main/java/com/adevinta/android/barista/internal/viewaction/ChipViewActions.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/internal/viewaction/ChipViewActions.kt rename to barista/src/main/java/com/adevinta/android/barista/internal/viewaction/ChipViewActions.kt diff --git a/library/src/main/java/com/adevinta/android/barista/internal/viewaction/ClickChildAction.java b/barista/src/main/java/com/adevinta/android/barista/internal/viewaction/ClickChildAction.java similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/internal/viewaction/ClickChildAction.java rename to barista/src/main/java/com/adevinta/android/barista/internal/viewaction/ClickChildAction.java diff --git a/library/src/main/java/com/adevinta/android/barista/internal/viewaction/NestedEnabledScrollToAction.java b/barista/src/main/java/com/adevinta/android/barista/internal/viewaction/NestedEnabledScrollToAction.java similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/internal/viewaction/NestedEnabledScrollToAction.java rename to barista/src/main/java/com/adevinta/android/barista/internal/viewaction/NestedEnabledScrollToAction.java diff --git a/library/src/main/java/com/adevinta/android/barista/internal/viewaction/PerformClickAction.java b/barista/src/main/java/com/adevinta/android/barista/internal/viewaction/PerformClickAction.java similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/internal/viewaction/PerformClickAction.java rename to barista/src/main/java/com/adevinta/android/barista/internal/viewaction/PerformClickAction.java diff --git a/library/src/main/java/com/adevinta/android/barista/internal/viewaction/RatingBarActions.kt b/barista/src/main/java/com/adevinta/android/barista/internal/viewaction/RatingBarActions.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/internal/viewaction/RatingBarActions.kt rename to barista/src/main/java/com/adevinta/android/barista/internal/viewaction/RatingBarActions.kt diff --git a/library/src/main/java/com/adevinta/android/barista/internal/viewaction/SeekBarActions.kt b/barista/src/main/java/com/adevinta/android/barista/internal/viewaction/SeekBarActions.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/internal/viewaction/SeekBarActions.kt rename to barista/src/main/java/com/adevinta/android/barista/internal/viewaction/SeekBarActions.kt diff --git a/library/src/main/java/com/adevinta/android/barista/internal/viewaction/SleepViewAction.java b/barista/src/main/java/com/adevinta/android/barista/internal/viewaction/SleepViewAction.java similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/internal/viewaction/SleepViewAction.java rename to barista/src/main/java/com/adevinta/android/barista/internal/viewaction/SleepViewAction.java diff --git a/library/src/main/java/com/adevinta/android/barista/internal/viewaction/SwipeActions.kt b/barista/src/main/java/com/adevinta/android/barista/internal/viewaction/SwipeActions.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/internal/viewaction/SwipeActions.kt rename to barista/src/main/java/com/adevinta/android/barista/internal/viewaction/SwipeActions.kt diff --git a/library/src/main/java/com/adevinta/android/barista/internal/viewaction/SwipeRefreshActions.java b/barista/src/main/java/com/adevinta/android/barista/internal/viewaction/SwipeRefreshActions.java similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/internal/viewaction/SwipeRefreshActions.java rename to barista/src/main/java/com/adevinta/android/barista/internal/viewaction/SwipeRefreshActions.java diff --git a/library/src/main/java/com/adevinta/android/barista/rule/BaristaRule.kt b/barista/src/main/java/com/adevinta/android/barista/rule/BaristaRule.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/rule/BaristaRule.kt rename to barista/src/main/java/com/adevinta/android/barista/rule/BaristaRule.kt diff --git a/library/src/main/java/com/adevinta/android/barista/rule/cleardata/ClearDatabaseRule.kt b/barista/src/main/java/com/adevinta/android/barista/rule/cleardata/ClearDatabaseRule.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/rule/cleardata/ClearDatabaseRule.kt rename to barista/src/main/java/com/adevinta/android/barista/rule/cleardata/ClearDatabaseRule.kt diff --git a/library/src/main/java/com/adevinta/android/barista/rule/cleardata/ClearFilesRule.kt b/barista/src/main/java/com/adevinta/android/barista/rule/cleardata/ClearFilesRule.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/rule/cleardata/ClearFilesRule.kt rename to barista/src/main/java/com/adevinta/android/barista/rule/cleardata/ClearFilesRule.kt diff --git a/library/src/main/java/com/adevinta/android/barista/rule/cleardata/ClearPreferencesRule.java b/barista/src/main/java/com/adevinta/android/barista/rule/cleardata/ClearPreferencesRule.java similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/rule/cleardata/ClearPreferencesRule.java rename to barista/src/main/java/com/adevinta/android/barista/rule/cleardata/ClearPreferencesRule.java diff --git a/library/src/main/java/com/adevinta/android/barista/rule/cleardata/internal/DatabaseOperations.kt b/barista/src/main/java/com/adevinta/android/barista/rule/cleardata/internal/DatabaseOperations.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/rule/cleardata/internal/DatabaseOperations.kt rename to barista/src/main/java/com/adevinta/android/barista/rule/cleardata/internal/DatabaseOperations.kt diff --git a/library/src/main/java/com/adevinta/android/barista/rule/cleardata/internal/FileOperations.kt b/barista/src/main/java/com/adevinta/android/barista/rule/cleardata/internal/FileOperations.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/rule/cleardata/internal/FileOperations.kt rename to barista/src/main/java/com/adevinta/android/barista/rule/cleardata/internal/FileOperations.kt diff --git a/library/src/main/java/com/adevinta/android/barista/rule/flaky/AllowFlaky.java b/barista/src/main/java/com/adevinta/android/barista/rule/flaky/AllowFlaky.java similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/rule/flaky/AllowFlaky.java rename to barista/src/main/java/com/adevinta/android/barista/rule/flaky/AllowFlaky.java diff --git a/library/src/main/java/com/adevinta/android/barista/rule/flaky/FlakyActivityTestRule.java b/barista/src/main/java/com/adevinta/android/barista/rule/flaky/FlakyActivityTestRule.java similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/rule/flaky/FlakyActivityTestRule.java rename to barista/src/main/java/com/adevinta/android/barista/rule/flaky/FlakyActivityTestRule.java diff --git a/library/src/main/java/com/adevinta/android/barista/rule/flaky/FlakyTestRule.kt b/barista/src/main/java/com/adevinta/android/barista/rule/flaky/FlakyTestRule.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/rule/flaky/FlakyTestRule.kt rename to barista/src/main/java/com/adevinta/android/barista/rule/flaky/FlakyTestRule.kt diff --git a/library/src/main/java/com/adevinta/android/barista/rule/flaky/Repeat.java b/barista/src/main/java/com/adevinta/android/barista/rule/flaky/Repeat.java similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/rule/flaky/Repeat.java rename to barista/src/main/java/com/adevinta/android/barista/rule/flaky/Repeat.java diff --git a/library/src/main/java/com/adevinta/android/barista/rule/flaky/internal/AllowFlakyStatement.java b/barista/src/main/java/com/adevinta/android/barista/rule/flaky/internal/AllowFlakyStatement.java similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/rule/flaky/internal/AllowFlakyStatement.java rename to barista/src/main/java/com/adevinta/android/barista/rule/flaky/internal/AllowFlakyStatement.java diff --git a/library/src/main/java/com/adevinta/android/barista/rule/flaky/internal/FlakyStatementBuilder.java b/barista/src/main/java/com/adevinta/android/barista/rule/flaky/internal/FlakyStatementBuilder.java similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/rule/flaky/internal/FlakyStatementBuilder.java rename to barista/src/main/java/com/adevinta/android/barista/rule/flaky/internal/FlakyStatementBuilder.java diff --git a/library/src/main/java/com/adevinta/android/barista/rule/flaky/internal/FlakyUtil.java b/barista/src/main/java/com/adevinta/android/barista/rule/flaky/internal/FlakyUtil.java similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/rule/flaky/internal/FlakyUtil.java rename to barista/src/main/java/com/adevinta/android/barista/rule/flaky/internal/FlakyUtil.java diff --git a/library/src/main/java/com/adevinta/android/barista/rule/flaky/internal/RepeatStatement.java b/barista/src/main/java/com/adevinta/android/barista/rule/flaky/internal/RepeatStatement.java similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/rule/flaky/internal/RepeatStatement.java rename to barista/src/main/java/com/adevinta/android/barista/rule/flaky/internal/RepeatStatement.java diff --git a/library/src/main/java/com/adevinta/android/barista/rule/theme/DayNightRule.kt b/barista/src/main/java/com/adevinta/android/barista/rule/theme/DayNightRule.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/rule/theme/DayNightRule.kt rename to barista/src/main/java/com/adevinta/android/barista/rule/theme/DayNightRule.kt diff --git a/library/src/main/java/com/adevinta/android/barista/rule/theme/DayNightStatement.kt b/barista/src/main/java/com/adevinta/android/barista/rule/theme/DayNightStatement.kt similarity index 100% rename from library/src/main/java/com/adevinta/android/barista/rule/theme/DayNightStatement.kt rename to barista/src/main/java/com/adevinta/android/barista/rule/theme/DayNightStatement.kt diff --git a/library/src/test/java/com/adevinta/android/barista/cleardata/ClearDatabaseRuleTest.java b/barista/src/test/java/com/adevinta/android/barista/cleardata/ClearDatabaseRuleTest.java similarity index 100% rename from library/src/test/java/com/adevinta/android/barista/cleardata/ClearDatabaseRuleTest.java rename to barista/src/test/java/com/adevinta/android/barista/cleardata/ClearDatabaseRuleTest.java diff --git a/library/src/test/java/com/adevinta/android/barista/rule/cleardata/ClearFilesRuleTest.kt b/barista/src/test/java/com/adevinta/android/barista/rule/cleardata/ClearFilesRuleTest.kt similarity index 100% rename from library/src/test/java/com/adevinta/android/barista/rule/cleardata/ClearFilesRuleTest.kt rename to barista/src/test/java/com/adevinta/android/barista/rule/cleardata/ClearFilesRuleTest.kt diff --git a/library/src/test/java/com/adevinta/android/barista/rule/flaky/FlakyStatementBuilderTest.java b/barista/src/test/java/com/adevinta/android/barista/rule/flaky/FlakyStatementBuilderTest.java similarity index 100% rename from library/src/test/java/com/adevinta/android/barista/rule/flaky/FlakyStatementBuilderTest.java rename to barista/src/test/java/com/adevinta/android/barista/rule/flaky/FlakyStatementBuilderTest.java diff --git a/library/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/barista/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker similarity index 100% rename from library/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker rename to barista/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts index de35733ec..1e306bfad 100644 --- a/sample/build.gradle.kts +++ b/sample/build.gradle.kts @@ -40,8 +40,8 @@ dependencies { implementation("androidx.core:core-ktx:1.0.1") androidTestUtil("androidx.test:orchestrator:1.4.1") + androidTestImplementation(project(":barista")) - androidTestImplementation(project(":library")) androidTestImplementation("org.assertj:assertj-core:2.9.1") androidTestImplementation("com.nhaarman:mockito-kotlin:1.5.0") androidTestImplementation("org.mockito:mockito-android:2.28.2") diff --git a/settings.gradle b/settings.gradle index eef892578..51fbdcd45 100644 --- a/settings.gradle +++ b/settings.gradle @@ -8,5 +8,5 @@ gradleEnterprise { publishAlways() } } -include ':sample', ':library' +include ':sample', ':barista' include ':barista-compose'