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:
Ilya Gorbunov
2020-10-12 06:04:55 +03:00
parent 7d58a5e2f2
commit 997cd35e06
5 changed files with 5 additions and 6 deletions
+1 -1
View File
@@ -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;
@@ -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
@@ -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 {