diff --git a/app/build.gradle b/app/build.gradle index df7759bec4..4476e015d0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -194,8 +194,6 @@ dependencies { implementation "com.github.bumptech.glide:glide:$glide_version" implementation "com.github.bumptech.glide:okhttp3-integration:$glide_version" kapt "com.github.bumptech.glide:compiler:$glide_version" - - // Transformations implementation 'jp.wasabeef:glide-transformations:4.0.0' // Logging @@ -213,7 +211,7 @@ dependencies { implementation 'com.github.amulyakhare:TextDrawable:558677e' implementation 'com.afollestad.material-dialogs:core:0.9.6.0' implementation 'com.nightlynexus.viewstatepageradapter:viewstatepageradapter:1.1.0' - implementation 'com.github.mthli:Slice:v1.2' + implementation 'com.github.mthli:Slice:v1.3' implementation 'me.gujun.android.taggroup:library:1.4@aar' implementation 'com.github.chrisbanes:PhotoView:2.3.0' implementation 'com.github.carlosesco:DirectionalViewPager:a844dbca0a' @@ -234,7 +232,7 @@ dependencies { // Tests testImplementation 'junit:junit:4.13' - testImplementation 'org.assertj:assertj-core:1.7.1' + testImplementation 'org.assertj:assertj-core:3.12.2' testImplementation 'org.mockito:mockito-core:1.10.19' final robolectric_version = '3.1.4' diff --git a/app/src/test/java/eu/kanade/tachiyomi/data/backup/BackupTest.kt b/app/src/test/java/eu/kanade/tachiyomi/data/backup/BackupTest.kt index a166f39387..7fc8c269ef 100644 --- a/app/src/test/java/eu/kanade/tachiyomi/data/backup/BackupTest.kt +++ b/app/src/test/java/eu/kanade/tachiyomi/data/backup/BackupTest.kt @@ -23,7 +23,6 @@ import org.assertj.core.api.Assertions.assertThat import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.mockito.Mockito import org.mockito.Mockito.RETURNS_DEEP_STUBS import org.mockito.Mockito.`when` import org.mockito.Mockito.anyLong @@ -74,7 +73,7 @@ class BackupTest { // Mock the source manager val module = object : InjektModule { override fun InjektRegistrar.registerInjectables() { - addSingleton(Mockito.mock(SourceManager::class.java, RETURNS_DEEP_STUBS)) + addSingleton(mock(SourceManager::class.java, RETURNS_DEEP_STUBS)) } } Injekt.importModule(module) diff --git a/app/src/test/java/eu/kanade/tachiyomi/data/database/CategoryTest.kt b/app/src/test/java/eu/kanade/tachiyomi/data/database/CategoryTest.kt index 6e12314eae..d4c2a11059 100644 --- a/app/src/test/java/eu/kanade/tachiyomi/data/database/CategoryTest.kt +++ b/app/src/test/java/eu/kanade/tachiyomi/data/database/CategoryTest.kt @@ -13,7 +13,7 @@ import org.junit.runner.RunWith import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config -@Config(constants = BuildConfig::class, sdk = intArrayOf(Build.VERSION_CODES.LOLLIPOP)) +@Config(constants = BuildConfig::class, sdk = [Build.VERSION_CODES.LOLLIPOP]) @RunWith(CustomRobolectricGradleTestRunner::class) class CategoryTest { diff --git a/app/src/test/java/eu/kanade/tachiyomi/data/library/LibraryUpdateServiceTest.kt b/app/src/test/java/eu/kanade/tachiyomi/data/library/LibraryUpdateServiceTest.kt index e6774bc65d..4d28a25a6c 100644 --- a/app/src/test/java/eu/kanade/tachiyomi/data/library/LibraryUpdateServiceTest.kt +++ b/app/src/test/java/eu/kanade/tachiyomi/data/library/LibraryUpdateServiceTest.kt @@ -17,7 +17,6 @@ import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.mockito.Matchers.anyLong -import org.mockito.Mockito import org.mockito.Mockito.RETURNS_DEEP_STUBS import org.mockito.Mockito.`when` import org.mockito.Mockito.mock @@ -30,7 +29,7 @@ import uy.kohesive.injekt.api.InjektModule import uy.kohesive.injekt.api.InjektRegistrar import uy.kohesive.injekt.api.addSingleton -@Config(constants = BuildConfig::class, sdk = intArrayOf(Build.VERSION_CODES.LOLLIPOP)) +@Config(constants = BuildConfig::class, sdk = [Build.VERSION_CODES.LOLLIPOP]) @RunWith(CustomRobolectricGradleTestRunner::class) class LibraryUpdateServiceTest { @@ -47,7 +46,7 @@ class LibraryUpdateServiceTest { // Mock the source manager val module = object : InjektModule { override fun InjektRegistrar.registerInjectables() { - addSingleton(Mockito.mock(SourceManager::class.java, RETURNS_DEEP_STUBS)) + addSingleton(mock(SourceManager::class.java, RETURNS_DEEP_STUBS)) } } Injekt.importModule(module)