diff --git a/libraries/stdlib/jdk7/java9/module-info.java b/libraries/stdlib/jdk7/java9/module-info.java index 103cb93e9d9..1741813c0c6 100644 --- a/libraries/stdlib/jdk7/java9/module-info.java +++ b/libraries/stdlib/jdk7/java9/module-info.java @@ -3,7 +3,7 @@ module kotlin.stdlib.jdk7 { requires transitive kotlin.stdlib; exports kotlin.jdk7; - exports kotlin.io.jdk7; + exports kotlin.io.path; exports kotlin.internal.jdk7 to kotlin.stdlib.jdk8; opens kotlin.internal.jdk7 to kotlin.stdlib; diff --git a/libraries/stdlib/jdk7/src/kotlin/io/PathReadWrite.kt b/libraries/stdlib/jdk7/src/kotlin/io/path/PathReadWrite.kt similarity index 99% rename from libraries/stdlib/jdk7/src/kotlin/io/PathReadWrite.kt rename to libraries/stdlib/jdk7/src/kotlin/io/path/PathReadWrite.kt index ebd950dd38a..010d53cb01e 100644 --- a/libraries/stdlib/jdk7/src/kotlin/io/PathReadWrite.kt +++ b/libraries/stdlib/jdk7/src/kotlin/io/path/PathReadWrite.kt @@ -6,9 +6,8 @@ @file:Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER", "RedundantVisibilityModifier", "RedundantUnitReturnType", "SameParameterValue") @file:JvmMultifileClass @file:JvmName("PathsKt") -@file:kotlin.jvm.JvmPackageName("kotlin.io.jdk7") -package kotlin.io +package kotlin.io.path import java.io.* import java.nio.charset.Charset diff --git a/libraries/stdlib/jdk7/src/kotlin/io/PathUtils.kt b/libraries/stdlib/jdk7/src/kotlin/io/path/PathUtils.kt similarity index 99% rename from libraries/stdlib/jdk7/src/kotlin/io/PathUtils.kt rename to libraries/stdlib/jdk7/src/kotlin/io/path/PathUtils.kt index bfb666a8bdf..8556f3fdc41 100644 --- a/libraries/stdlib/jdk7/src/kotlin/io/PathUtils.kt +++ b/libraries/stdlib/jdk7/src/kotlin/io/path/PathUtils.kt @@ -6,9 +6,8 @@ @file:Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER", "RedundantVisibilityModifier") @file:JvmMultifileClass @file:JvmName("PathsKt") -@file:kotlin.jvm.JvmPackageName("kotlin.io.jdk7") -package kotlin.io +package kotlin.io.path import java.io.IOException import java.nio.file.* diff --git a/libraries/stdlib/jdk7/test/PathExtensionsTest.kt b/libraries/stdlib/jdk7/test/PathExtensionsTest.kt index 6540f435ff7..254860b1132 100644 --- a/libraries/stdlib/jdk7/test/PathExtensionsTest.kt +++ b/libraries/stdlib/jdk7/test/PathExtensionsTest.kt @@ -7,6 +7,7 @@ package kotlin.jdk7.test import java.io.IOException import java.nio.file.* +import kotlin.io.path.* import kotlin.test.* class PathExtensionsTest { diff --git a/libraries/stdlib/jdk7/test/PathReadWriteTest.kt b/libraries/stdlib/jdk7/test/PathReadWriteTest.kt index bbfa8406486..042f6e16054 100644 --- a/libraries/stdlib/jdk7/test/PathReadWriteTest.kt +++ b/libraries/stdlib/jdk7/test/PathReadWriteTest.kt @@ -7,7 +7,7 @@ package kotlin.jdk7.test import java.nio.file.Files import java.nio.file.StandardOpenOption -import java.util.* +import kotlin.io.path.* import kotlin.test.* class PathReadWriteTest {