Move Path extensions to the new package kotlin.io.path
This avoids the conflict with the existing top-level functions in kotlin.io package. #KT-19192
This commit is contained in:
@@ -3,7 +3,7 @@ module kotlin.stdlib.jdk7 {
|
|||||||
requires transitive kotlin.stdlib;
|
requires transitive kotlin.stdlib;
|
||||||
|
|
||||||
exports kotlin.jdk7;
|
exports kotlin.jdk7;
|
||||||
exports kotlin.io.jdk7;
|
exports kotlin.io.path;
|
||||||
|
|
||||||
exports kotlin.internal.jdk7 to kotlin.stdlib.jdk8;
|
exports kotlin.internal.jdk7 to kotlin.stdlib.jdk8;
|
||||||
opens kotlin.internal.jdk7 to kotlin.stdlib;
|
opens kotlin.internal.jdk7 to kotlin.stdlib;
|
||||||
|
|||||||
+1
-2
@@ -6,9 +6,8 @@
|
|||||||
@file:Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER", "RedundantVisibilityModifier", "RedundantUnitReturnType", "SameParameterValue")
|
@file:Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER", "RedundantVisibilityModifier", "RedundantUnitReturnType", "SameParameterValue")
|
||||||
@file:JvmMultifileClass
|
@file:JvmMultifileClass
|
||||||
@file:JvmName("PathsKt")
|
@file:JvmName("PathsKt")
|
||||||
@file:kotlin.jvm.JvmPackageName("kotlin.io.jdk7")
|
|
||||||
|
|
||||||
package kotlin.io
|
package kotlin.io.path
|
||||||
|
|
||||||
import java.io.*
|
import java.io.*
|
||||||
import java.nio.charset.Charset
|
import java.nio.charset.Charset
|
||||||
+1
-2
@@ -6,9 +6,8 @@
|
|||||||
@file:Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER", "RedundantVisibilityModifier")
|
@file:Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER", "RedundantVisibilityModifier")
|
||||||
@file:JvmMultifileClass
|
@file:JvmMultifileClass
|
||||||
@file:JvmName("PathsKt")
|
@file:JvmName("PathsKt")
|
||||||
@file:kotlin.jvm.JvmPackageName("kotlin.io.jdk7")
|
|
||||||
|
|
||||||
package kotlin.io
|
package kotlin.io.path
|
||||||
|
|
||||||
import java.io.IOException
|
import java.io.IOException
|
||||||
import java.nio.file.*
|
import java.nio.file.*
|
||||||
@@ -7,6 +7,7 @@ package kotlin.jdk7.test
|
|||||||
|
|
||||||
import java.io.IOException
|
import java.io.IOException
|
||||||
import java.nio.file.*
|
import java.nio.file.*
|
||||||
|
import kotlin.io.path.*
|
||||||
import kotlin.test.*
|
import kotlin.test.*
|
||||||
|
|
||||||
class PathExtensionsTest {
|
class PathExtensionsTest {
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ package kotlin.jdk7.test
|
|||||||
|
|
||||||
import java.nio.file.Files
|
import java.nio.file.Files
|
||||||
import java.nio.file.StandardOpenOption
|
import java.nio.file.StandardOpenOption
|
||||||
import java.util.*
|
import kotlin.io.path.*
|
||||||
import kotlin.test.*
|
import kotlin.test.*
|
||||||
|
|
||||||
class PathReadWriteTest {
|
class PathReadWriteTest {
|
||||||
|
|||||||
Reference in New Issue
Block a user