Skip to content

Commit 8b3cacb

Browse files
nhaarmannhaarman
committed
Update package and artifact info to mockitokotlin2
This follows Jake Wharton's guide for interoperability between major versions: http://jakewharton.com/java-interoperability-policy-for-major-version-updates/
1 parent 2de53c6 commit 8b3cacb

21 files changed

+34
-35
lines changed

‎mockito-kotlin/src/main/kotlin/com/nhaarman/mockito_kotlin/ArgumentCaptor.kt renamed to ‎mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/ArgumentCaptor.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
* THE SOFTWARE.
2424
*/
2525

26-
package com.nhaarman.mockito_kotlin
26+
package com.nhaarman.mockitokotlin2
2727

28-
import com.nhaarman.mockito_kotlin.createinstance.createInstance
28+
import com.nhaarman.mockitokotlin2.createinstance.createInstance
2929
import org.mockito.ArgumentCaptor
3030
import kotlin.reflect.KClass
3131

‎mockito-kotlin/src/main/kotlin/com/nhaarman/mockito_kotlin/BDDMockito.kt renamed to ‎mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/BDDMockito.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.nhaarman.mockito_kotlin
1+
package com.nhaarman.mockitokotlin2
22

33
import org.mockito.BDDMockito
44

‎mockito-kotlin/src/main/kotlin/com/nhaarman/mockito_kotlin/Mockito.kt renamed to ‎mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/Mockito.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
* THE SOFTWARE.
2424
*/
2525

26-
package com.nhaarman.mockito_kotlin
26+
package com.nhaarman.mockitokotlin2
2727

28-
import com.nhaarman.mockito_kotlin.createinstance.createInstance
28+
import com.nhaarman.mockitokotlin2.createinstance.createInstance
2929
import org.mockito.InOrder
3030
import org.mockito.Incubating
3131
import org.mockito.MockSettings

‎mockito-kotlin/src/main/kotlin/com/nhaarman/mockito_kotlin/MockitoKotlinException.kt renamed to ‎mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/MockitoKotlinException.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@
2323
* THE SOFTWARE.
2424
*/
2525

26-
package com.nhaarman.mockito_kotlin
26+
package com.nhaarman.mockitokotlin2
2727

2828
class MockitoKotlinException(message: String?, cause: Throwable?) : RuntimeException(message, cause)

‎mockito-kotlin/src/main/kotlin/com/nhaarman/mockito_kotlin/Stubber.kt renamed to ‎mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/Stubber.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* THE SOFTWARE.
2424
*/
2525

26-
package com.nhaarman.mockito_kotlin
26+
package com.nhaarman.mockitokotlin2
2727

2828
import org.mockito.stubbing.Stubber
2929

‎mockito-kotlin/src/main/kotlin/com/nhaarman/mockito_kotlin/VerifyScope.kt renamed to ‎mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/VerifyScope.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.nhaarman.mockito_kotlin
1+
package com.nhaarman.mockitokotlin2
22

33
class VerifyScope<T>(val mock: T) {
44
operator inline fun Int.times(call: T.() -> Unit) {
5-
verify(mock, com.nhaarman.mockito_kotlin.times(this)).call()
5+
verify(mock, com.nhaarman.mockitokotlin2.times(this)).call()
66
}
77
}

‎mockito-kotlin/src/main/kotlin/com/nhaarman/mockito_kotlin/createinstance/CreateInstance.kt renamed to ‎mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/createinstance/CreateInstance.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* THE SOFTWARE.
2424
*/
2525

26-
package com.nhaarman.mockito_kotlin.createinstance
26+
package com.nhaarman.mockitokotlin2.createinstance
2727

2828
import kotlin.reflect.KClass
2929
import java.lang.reflect.Array as JavaArray

‎mockito-kotlin/src/main/kotlin/com/nhaarman/mockito_kotlin/createinstance/MockMaker.kt renamed to ‎mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/createinstance/MockMaker.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.nhaarman.mockito_kotlin.createinstance
1+
package com.nhaarman.mockitokotlin2.createinstance
22

33
import org.mockito.internal.configuration.plugins.Plugins
44
import org.mockito.internal.creation.bytebuddy.InlineByteBuddyMockMaker

‎mockito-kotlin/src/main/kotlin/com/nhaarman/mockito_kotlin/createinstance/NonNullProvider.kt renamed to ‎mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/createinstance/NonNullProvider.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.nhaarman.mockito_kotlin.createinstance
1+
package com.nhaarman.mockitokotlin2.createinstance
22

33
import kotlin.reflect.KClass
44
import java.lang.reflect.Array as JavaArray

‎mockito-kotlin/src/main/kotlin/com/nhaarman/mockito_kotlin/createinstance/NullCaster.kt renamed to ‎mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/createinstance/NullCaster.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.nhaarman.mockito_kotlin.createinstance
1+
package com.nhaarman.mockitokotlin2.createinstance
22

33
import kotlin.reflect.KClass
44

‎mockito-kotlin/src/test/kotlin/test/ArgumentCaptorTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package test
22

33
import com.nhaarman.expect.expect
4-
import com.nhaarman.mockito_kotlin.*
4+
import com.nhaarman.mockitokotlin2.*
55
import org.junit.Test
66
import java.util.*
77

‎mockito-kotlin/src/test/kotlin/test/BDDMockitoTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package test
22

33
import com.nhaarman.expect.expect
4-
import com.nhaarman.mockito_kotlin.*
4+
import com.nhaarman.mockitokotlin2.*
55
import org.junit.Test
66

77
class BDDMockitoTest {

‎mockito-kotlin/src/test/kotlin/test/EqTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ package test/*
2424
*/
2525

2626
import com.nhaarman.expect.expect
27-
import com.nhaarman.mockito_kotlin.eq
28-
import com.nhaarman.mockito_kotlin.mock
27+
import com.nhaarman.mockitokotlin2.eq
28+
import com.nhaarman.mockitokotlin2.mock
2929
import org.junit.After
3030
import org.junit.Before
3131
import org.junit.Test

‎mockito-kotlin/src/test/kotlin/test/MockTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ package test/*
2424
*/
2525

2626
import com.nhaarman.expect.expect
27-
import com.nhaarman.mockito_kotlin.mock
28-
import com.nhaarman.mockito_kotlin.whenever
27+
import com.nhaarman.mockitokotlin2.mock
28+
import com.nhaarman.mockitokotlin2.whenever
2929
import org.junit.Test
3030
import org.mockito.Mockito.RETURNS_DEEP_STUBS
3131
import java.util.*

‎mockito-kotlin/src/test/kotlin/test/MockitoTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package test
33
import com.nhaarman.expect.expect
44
import com.nhaarman.expect.expectErrorWithMessage
55
import com.nhaarman.expect.fail
6-
import com.nhaarman.mockito_kotlin.*
6+
import com.nhaarman.mockitokotlin2.*
77
import org.junit.Test
88
import org.mockito.Mockito
99
import org.mockito.Mockito.RETURNS_MOCKS

‎mockito-kotlin/src/test/kotlin/test/SpyTest.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,10 @@ package test/*
2424
*/
2525

2626
import com.nhaarman.expect.expect
27-
import com.nhaarman.mockito_kotlin.*
27+
import com.nhaarman.mockitokotlin2.*
2828
import org.junit.After
2929
import org.junit.Test
3030
import org.mockito.Mockito
31-
import org.mockito.exceptions.base.MockitoException
3231
import java.util.*
3332

3433
class SpyTest : TestBase() {

‎mockito-kotlin/src/test/kotlin/test/TestBase.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package test
22

3-
import com.nhaarman.mockito_kotlin.createinstance.mockMakerInlineEnabled
3+
import com.nhaarman.mockitokotlin2.createinstance.mockMakerInlineEnabled
44
import org.junit.After
55
import org.junit.Before
66

‎mockito-kotlin/src/test/kotlin/test/VerifyTest.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package test
22

3-
import com.nhaarman.mockito_kotlin.any
4-
import com.nhaarman.mockito_kotlin.mock
5-
import com.nhaarman.mockito_kotlin.verify
3+
import com.nhaarman.mockitokotlin2.any
4+
import com.nhaarman.mockitokotlin2.mock
5+
import com.nhaarman.mockitokotlin2.verify
66
import org.junit.Test
77
import org.mockito.exceptions.verification.TooLittleActualInvocations
88
import org.mockito.exceptions.verification.junit.ArgumentsAreDifferent

‎mockito-kotlin/src/test/kotlin/test/createinstance/NullCasterTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package test.createinstance
22

33
import com.nhaarman.expect.expect
4-
import com.nhaarman.mockito_kotlin.createinstance.NullCaster
4+
import com.nhaarman.mockitokotlin2.createinstance.NullCaster
55
import org.junit.Test
66
import test.TestBase
77

‎mockito-kotlin/src/test/kotlin/test/inline/UsingMockMakerInlineTest.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
*/
2424

2525
import com.nhaarman.expect.expect
26-
import com.nhaarman.mockito_kotlin.any
27-
import com.nhaarman.mockito_kotlin.createinstance.mockMakerInlineEnabled
28-
import com.nhaarman.mockito_kotlin.doReturn
29-
import com.nhaarman.mockito_kotlin.mock
30-
import com.nhaarman.mockito_kotlin.verify
31-
import com.nhaarman.mockito_kotlin.whenever
26+
import com.nhaarman.mockitokotlin2.any
27+
import com.nhaarman.mockitokotlin2.createinstance.mockMakerInlineEnabled
28+
import com.nhaarman.mockitokotlin2.doReturn
29+
import com.nhaarman.mockitokotlin2.mock
30+
import com.nhaarman.mockitokotlin2.verify
31+
import com.nhaarman.mockitokotlin2.whenever
3232
import org.junit.Assume.assumeTrue
3333
import org.junit.Before
3434
import org.junit.Test

‎publishing.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ task sourceJar(type: Jar) {
2525
from sourceSets.main.allSource
2626
}
2727

28-
group = 'com.nhaarman'
28+
group = 'com.nhaarman.mockito-kotlin2'
2929
version = rootProject.ext.versionName
3030

3131
publishing {
3232
publications {
3333
mavenJava(MavenPublication) {
34-
groupId 'com.nhaarman'
34+
groupId 'com.nhaarman.mockitokotlin2'
3535
artifactId 'mockito-kotlin'
3636

3737
from components.java

0 commit comments

Comments
 (0)