Use internal package naming

nhaarman · nhaarman · commit 9ec377509ca7 · 2017-11-30T23:00:21.000+01:00
diff --git a/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/ArgumentCaptor.kt b/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/ArgumentCaptor.kt
@@ -25,7 +25,6 @@
 
 package com.nhaarman.mockitokotlin2
 
-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/CreateInstance.kt b/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/CreateInstance.kt
@@ -23,8 +23,9 @@
  * THE SOFTWARE.
  */
 
-package com.nhaarman.mockitokotlin2.createinstance
+package com.nhaarman.mockitokotlin2
 
+import com.nhaarman.mockitokotlin2.internal.NonNullProvider
 import kotlin.reflect.KClass
 import java.lang.reflect.Array as JavaArray
 
diff --git a/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/Mockito.kt b/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/Mockito.kt
@@ -25,7 +25,6 @@
 
 package com.nhaarman.mockitokotlin2
 
-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/internal/MockMaker.kt b/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/internal/MockMaker.kt
@@ -1,4 +1,4 @@
-package com.nhaarman.mockitokotlin2.createinstance
+package com.nhaarman.mockitokotlin2.internal
 
 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/internal/NonNullProvider.kt b/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/internal/NonNullProvider.kt
@@ -1,9 +1,9 @@
-package com.nhaarman.mockitokotlin2.createinstance
+package com.nhaarman.mockitokotlin2.internal
 
 import kotlin.reflect.KClass
 import java.lang.reflect.Array as JavaArray
 
-interface NonNullProvider {
+internal interface NonNullProvider {
 
     fun <T : Any> createInstance(kClass: KClass<T>): T
 
diff --git a/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/internal/NullCaster.kt b/mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/internal/NullCaster.kt
@@ -1,4 +1,4 @@
-package com.nhaarman.mockitokotlin2.createinstance
+package com.nhaarman.mockitokotlin2.internal
 
 import kotlin.reflect.KClass
 
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.mockitokotlin2.createinstance.mockMakerInlineEnabled
+import com.nhaarman.mockitokotlin2.internal.mockMakerInlineEnabled
 import org.junit.After
 import org.junit.Before
 
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.mockitokotlin2.createinstance.NullCaster
+import com.nhaarman.mockitokotlin2.internal.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
@@ -24,7 +24,7 @@
 
 import com.nhaarman.expect.expect
 import com.nhaarman.mockitokotlin2.any
-import com.nhaarman.mockitokotlin2.createinstance.mockMakerInlineEnabled
+import com.nhaarman.mockitokotlin2.internal.mockMakerInlineEnabled
 import com.nhaarman.mockitokotlin2.doReturn
 import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.verify

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.nhaarman.mockitokotlin2.createinstance`
	`1`	`+package com.nhaarman.mockitokotlin2.internal`
`2`	`2`
`3`	`3`	`import org.mockito.internal.configuration.plugins.Plugins`
`4`	`4`	`import org.mockito.internal.creation.bytebuddy.InlineByteBuddyMockMaker`