Update package and artifact info to mockitokotlin2

nhaarman · nhaarman · commit 8b3cacbbac04 · 2017-11-30T22:55:59.000+01:00
This follows Jake Wharton's guide for interoperability between major versions: http://jakewharton.com/java-interoperability-policy-for-major-version-updates/
diff --git a/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/ArgumentCaptor.kt b/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/ArgumentCaptor.kt
@@ -23,9 +23,9 @@
  * THE SOFTWARE.
  */
 
-package com.nhaarman.mockito_kotlin
+package com.nhaarman.mockitokotlin2
 
-import com.nhaarman.mockito_kotlin.createinstance.createInstance
+import com.nhaarman.mockitokotlin2.createinstance.createInstance
 import org.mockito.ArgumentCaptor
 import kotlin.reflect.KClass
 
diff --git a/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/BDDMockito.kt b/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/BDDMockito.kt
@@ -1,4 +1,4 @@
-package com.nhaarman.mockito_kotlin
+package com.nhaarman.mockitokotlin2
 
 import org.mockito.BDDMockito
 
diff --git a/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/Mockito.kt b/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/Mockito.kt
@@ -23,9 +23,9 @@
  * THE SOFTWARE.
  */
 
-package com.nhaarman.mockito_kotlin
+package com.nhaarman.mockitokotlin2
 
-import com.nhaarman.mockito_kotlin.createinstance.createInstance
+import com.nhaarman.mockitokotlin2.createinstance.createInstance
 import org.mockito.InOrder
 import org.mockito.Incubating
 import org.mockito.MockSettings
diff --git a/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/MockitoKotlinException.kt b/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/MockitoKotlinException.kt
@@ -23,6 +23,6 @@
  * THE SOFTWARE.
  */
 
-package com.nhaarman.mockito_kotlin
+package com.nhaarman.mockitokotlin2
 
 class MockitoKotlinException(message: String?, cause: Throwable?) : RuntimeException(message, cause)
diff --git a/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/Stubber.kt b/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/Stubber.kt
@@ -23,7 +23,7 @@
  * THE SOFTWARE.
  */
 
-package com.nhaarman.mockito_kotlin
+package com.nhaarman.mockitokotlin2
 
 import org.mockito.stubbing.Stubber
 
diff --git a/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/VerifyScope.kt b/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/VerifyScope.kt
@@ -1,7 +1,7 @@
-package com.nhaarman.mockito_kotlin
+package com.nhaarman.mockitokotlin2
 
 class VerifyScope<T>(val mock: T) {
     operator inline fun Int.times(call: T.() -> Unit) {
-        verify(mock, com.nhaarman.mockito_kotlin.times(this)).call()
+        verify(mock, com.nhaarman.mockitokotlin2.times(this)).call()
     }
 }
diff --git a/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/createinstance/CreateInstance.kt b/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/createinstance/CreateInstance.kt
@@ -23,7 +23,7 @@
  * THE SOFTWARE.
  */
 
-package com.nhaarman.mockito_kotlin.createinstance
+package com.nhaarman.mockitokotlin2.createinstance
 
 import kotlin.reflect.KClass
 import java.lang.reflect.Array as JavaArray
diff --git a/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/createinstance/MockMaker.kt b/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/createinstance/MockMaker.kt
@@ -1,4 +1,4 @@
-package com.nhaarman.mockito_kotlin.createinstance
+package com.nhaarman.mockitokotlin2.createinstance
 
 import org.mockito.internal.configuration.plugins.Plugins
 import org.mockito.internal.creation.bytebuddy.InlineByteBuddyMockMaker
diff --git a/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/createinstance/NonNullProvider.kt b/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/createinstance/NonNullProvider.kt
@@ -1,4 +1,4 @@
-package com.nhaarman.mockito_kotlin.createinstance
+package com.nhaarman.mockitokotlin2.createinstance
 
 import kotlin.reflect.KClass
 import java.lang.reflect.Array as JavaArray
diff --git a/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/createinstance/NullCaster.kt b/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/createinstance/NullCaster.kt
@@ -1,4 +1,4 @@
-package com.nhaarman.mockito_kotlin.createinstance
+package com.nhaarman.mockitokotlin2.createinstance
 
 import kotlin.reflect.KClass
 
diff --git a/mockito-kotlin/src/test/kotlin/test/ArgumentCaptorTest.kt b/mockito-kotlin/src/test/kotlin/test/ArgumentCaptorTest.kt
@@ -1,7 +1,7 @@
 package test
 
 import com.nhaarman.expect.expect
-import com.nhaarman.mockito_kotlin.*
+import com.nhaarman.mockitokotlin2.*
 import org.junit.Test
 import java.util.*
 
diff --git a/mockito-kotlin/src/test/kotlin/test/BDDMockitoTest.kt b/mockito-kotlin/src/test/kotlin/test/BDDMockitoTest.kt
@@ -1,7 +1,7 @@
 package test
 
 import com.nhaarman.expect.expect
-import com.nhaarman.mockito_kotlin.*
+import com.nhaarman.mockitokotlin2.*
 import org.junit.Test
 
 class BDDMockitoTest {
diff --git a/mockito-kotlin/src/test/kotlin/test/EqTest.kt b/mockito-kotlin/src/test/kotlin/test/EqTest.kt
@@ -24,8 +24,8 @@ package test/*
  */
 
 import com.nhaarman.expect.expect
-import com.nhaarman.mockito_kotlin.eq
-import com.nhaarman.mockito_kotlin.mock
+import com.nhaarman.mockitokotlin2.eq
+import com.nhaarman.mockitokotlin2.mock
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
diff --git a/mockito-kotlin/src/test/kotlin/test/MockTest.kt b/mockito-kotlin/src/test/kotlin/test/MockTest.kt
@@ -24,8 +24,8 @@ package test/*
  */
 
 import com.nhaarman.expect.expect
-import com.nhaarman.mockito_kotlin.mock
-import com.nhaarman.mockito_kotlin.whenever
+import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.whenever
 import org.junit.Test
 import org.mockito.Mockito.RETURNS_DEEP_STUBS
 import java.util.*
diff --git a/mockito-kotlin/src/test/kotlin/test/MockitoTest.kt b/mockito-kotlin/src/test/kotlin/test/MockitoTest.kt
@@ -3,7 +3,7 @@ package test
 import com.nhaarman.expect.expect
 import com.nhaarman.expect.expectErrorWithMessage
 import com.nhaarman.expect.fail
-import com.nhaarman.mockito_kotlin.*
+import com.nhaarman.mockitokotlin2.*
 import org.junit.Test
 import org.mockito.Mockito
 import org.mockito.Mockito.RETURNS_MOCKS
diff --git a/mockito-kotlin/src/test/kotlin/test/SpyTest.kt b/mockito-kotlin/src/test/kotlin/test/SpyTest.kt
@@ -24,11 +24,10 @@ package test/*
  */
 
 import com.nhaarman.expect.expect
-import com.nhaarman.mockito_kotlin.*
+import com.nhaarman.mockitokotlin2.*
 import org.junit.After
 import org.junit.Test
 import org.mockito.Mockito
-import org.mockito.exceptions.base.MockitoException
 import java.util.*
 
 class SpyTest : TestBase() {
diff --git a/mockito-kotlin/src/test/kotlin/test/TestBase.kt b/mockito-kotlin/src/test/kotlin/test/TestBase.kt
@@ -1,6 +1,6 @@
 package test
 
-import com.nhaarman.mockito_kotlin.createinstance.mockMakerInlineEnabled
+import com.nhaarman.mockitokotlin2.createinstance.mockMakerInlineEnabled
 import org.junit.After
 import org.junit.Before
 
diff --git a/mockito-kotlin/src/test/kotlin/test/VerifyTest.kt b/mockito-kotlin/src/test/kotlin/test/VerifyTest.kt
@@ -1,8 +1,8 @@
 package test
 
-import com.nhaarman.mockito_kotlin.any
-import com.nhaarman.mockito_kotlin.mock
-import com.nhaarman.mockito_kotlin.verify
+import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.verify
 import org.junit.Test
 import org.mockito.exceptions.verification.TooLittleActualInvocations
 import org.mockito.exceptions.verification.junit.ArgumentsAreDifferent
diff --git a/mockito-kotlin/src/test/kotlin/test/createinstance/NullCasterTest.kt b/mockito-kotlin/src/test/kotlin/test/createinstance/NullCasterTest.kt
@@ -1,7 +1,7 @@
 package test.createinstance
 
 import com.nhaarman.expect.expect
-import com.nhaarman.mockito_kotlin.createinstance.NullCaster
+import com.nhaarman.mockitokotlin2.createinstance.NullCaster
 import org.junit.Test
 import test.TestBase
 
diff --git a/mockito-kotlin/src/test/kotlin/test/inline/UsingMockMakerInlineTest.kt b/mockito-kotlin/src/test/kotlin/test/inline/UsingMockMakerInlineTest.kt
@@ -23,12 +23,12 @@
  */
 
 import com.nhaarman.expect.expect
-import com.nhaarman.mockito_kotlin.any
-import com.nhaarman.mockito_kotlin.createinstance.mockMakerInlineEnabled
-import com.nhaarman.mockito_kotlin.doReturn
-import com.nhaarman.mockito_kotlin.mock
-import com.nhaarman.mockito_kotlin.verify
-import com.nhaarman.mockito_kotlin.whenever
+import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.createinstance.mockMakerInlineEnabled
+import com.nhaarman.mockitokotlin2.doReturn
+import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.verify
+import com.nhaarman.mockitokotlin2.whenever
 import org.junit.Assume.assumeTrue
 import org.junit.Before
 import org.junit.Test
diff --git a/publishing.gradle b/publishing.gradle
@@ -25,13 +25,13 @@ task sourceJar(type: Jar) {
     from sourceSets.main.allSource
 }
 
-group = 'com.nhaarman'
+group = 'com.nhaarman.mockito-kotlin2'
 version = rootProject.ext.versionName
 
 publishing {
     publications {
         mavenJava(MavenPublication) {
-            groupId 'com.nhaarman'
+            groupId 'com.nhaarman.mockitokotlin2'
             artifactId 'mockito-kotlin'
 
             from components.java

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.nhaarman.mockito_kotlin`
	`1`	`+package com.nhaarman.mockitokotlin2`
`2`	`2`
`3`	`3`	`import org.mockito.BDDMockito`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`		`-package com.nhaarman.mockito_kotlin`
	`1`	`+package com.nhaarman.mockitokotlin2`
`2`	`2`
`3`	`3`	`class VerifyScope<T>(val mock: T) {`
`4`	`4`	`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()`
`6`	`6`	`}`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.nhaarman.mockito_kotlin.createinstance`
	`1`	`+package com.nhaarman.mockitokotlin2.createinstance`
`2`	`2`
`3`	`3`	`import org.mockito.internal.configuration.plugins.Plugins`
`4`	`4`	`import org.mockito.internal.creation.bytebuddy.InlineByteBuddyMockMaker`