Skip to content

Update Mockito kotlin package #646

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 1 commit into
base: main
Choose a base branch
from
Open

Update Mockito kotlin package #646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 1 addition & 8 deletions plugins/dependencies/src/main/kotlin/dependencies/Testing.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,8 +242,6 @@ object Testing : IsNotADependency {
*
* [GitHub releases](https://github.com/mockito/mockito/releases)
*
* [Using Mockito with Kotlin](https://github.com/nhaarman/mockito-kotlin) (third party project)
*
* GitHub page: [mockito/mockito](https://github.com/mockito/mockito)
*/
val mockito = Mockito
Expand All @@ -255,12 +253,7 @@ object Testing : IsNotADependency {
val inline = module("mockito-inline")
val errorProne = module("mockito-errorprone")
val junitJupiter = module("mockito-junit-jupiter")

/**
* Using Mockito with Kotlin
* [More info here](https://github.com/nhaarman/mockito-kotlin)
*/
Comment on lines -259 to -262
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suppose that we don't need any additional comment since mockito-kotlin is part of offficial Mockito library now.

val kotlin = DependencyNotation("com.nhaarman.mockitokotlin2", "mockito-kotlin")
val kotlin = DependencyNotation("org.mockito.kotlin", "mockito-kotlin")
}

/**
Expand Down
2 changes: 1 addition & 1 deletion plugins/dependencies/src/test/resources/bundled-dependencies-validated.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,7 +623,6 @@ com.louiscad.splitties:splitties-views-recyclerview
com.louiscad.splitties:splitties-views-selectable
com.louiscad.splitties:splitties-views-selectable-appcompat
com.louiscad.splitties:splitties-views-selectable-constraintlayout
com.nhaarman.mockitokotlin2:mockito-kotlin
com.rickclephas.kmp:kmp-nativecoroutines-annotations
com.rickclephas.kmp:kmp-nativecoroutines-compiler
com.rickclephas.kmp:kmp-nativecoroutines-compiler-embeddable
Expand Down Expand Up @@ -1047,6 +1046,7 @@ org.kodein.di:kodein-di-framework-ktor-server-jvm
org.kodein.di:kodein-di-framework-tornadofx-jvm
org.kodein.di:kodein-di-js
org.kodein.di:kodein-di-jxinject-jvm
org.mockito.kotlin:mockito-kotlin
org.mockito:mockito-android
org.mockito:mockito-core
org.mockito:mockito-errorprone
Expand Down
2 changes: 1 addition & 1 deletion plugins/dependencies/src/test/resources/dependencies-mapping-validated.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,7 +662,6 @@ com.louiscad.splitties..splitties-views-selectable-appcompat=Splitties.viewsSele
com.louiscad.splitties..splitties-views-selectable-constraintlayout=Splitties.viewsSelectableConstraintlayout
com.louiscad.splitties..splitties-views-selectable=Splitties.viewsSelectable
com.louiscad.splitties..splitties-views=Splitties.views
com.nhaarman.mockitokotlin2..mockito-kotlin=Testing.mockito.kotlin
com.rickclephas.kmp..kmp-nativecoroutines-annotations=RickClephas.nativeCoroutines.annotations
com.rickclephas.kmp..kmp-nativecoroutines-compiler-embeddable=RickClephas.nativeCoroutines.compilerEmbeddable
com.rickclephas.kmp..kmp-nativecoroutines-compiler=RickClephas.nativeCoroutines.compiler
Expand Down Expand Up @@ -1193,6 +1192,7 @@ org.mockito..mockito-core=Testing.mockito.core
org.mockito..mockito-errorprone=Testing.mockito.errorProne
org.mockito..mockito-inline=Testing.mockito.inline
org.mockito..mockito-junit-jupiter=Testing.mockito.junitJupiter
org.mockito.kotlin..mockito-kotlin=Testing.mockito.kotlin
org.robolectric..robolectric=Testing.robolectric
org.spekframework.spek2..spek-dsl-js=Testing.spek.dsl.js
org.spekframework.spek2..spek-dsl-jvm=Testing.spek.dsl.jvm
Expand Down
4 changes: 2 additions & 2 deletions plugins/dependencies/src/test/resources/dependencies-versions-key-validated.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ androidx.compose.runtime..runtime-livedata=version.androidx.compose.runtime
androidx.compose.runtime..runtime-rxjava2=version.androidx.compose.runtime
androidx.compose.runtime..runtime-rxjava3=version.androidx.compose.runtime
androidx.compose.runtime..runtime-saveable=version.androidx.compose.runtime
androidx.compose.runtime..runtime-tracing=version.androidx.compose.runtime
androidx.compose.runtime..runtime-tracing=version.androidx.compose.runtime-tracing
androidx.compose.runtime..runtime=version.androidx.compose.runtime
androidx.compose.ui..ui-geometry=version.androidx.compose.ui
androidx.compose.ui..ui-graphics=version.androidx.compose.ui
Expand Down Expand Up @@ -623,7 +623,6 @@ com.louiscad.splitties..splitties-views-selectable-appcompat=version.splitties
com.louiscad.splitties..splitties-views-selectable-constraintlayout=version.splitties
com.louiscad.splitties..splitties-views-selectable=version.splitties
com.louiscad.splitties..splitties-views=version.splitties
com.nhaarman.mockitokotlin2..mockito-kotlin=version.NO-RULE
com.rickclephas.kmp..kmp-nativecoroutines-annotations=version.rickclephas.nativecoroutines
com.rickclephas.kmp..kmp-nativecoroutines-compiler-embeddable=version.rickclephas.nativecoroutines
com.rickclephas.kmp..kmp-nativecoroutines-compiler=version.rickclephas.nativecoroutines
Expand Down Expand Up @@ -1052,6 +1051,7 @@ org.mockito..mockito-core=version.mockito
org.mockito..mockito-errorprone=version.mockito
org.mockito..mockito-inline=version.mockito
org.mockito..mockito-junit-jupiter=version.mockito
org.mockito.kotlin..mockito-kotlin=version.NO-RULE
org.robolectric..robolectric=version.robolectric
org.spekframework.spek2..spek-dsl-js=version.spek
org.spekframework.spek2..spek-dsl-jvm=version.spek
Expand Down