From 1b6a462057509667790c5a3899cb5ac49e55faab Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Thu, 1 Sep 2022 22:09:34 +0200 Subject: [PATCH] Move contents of stdlib-jdk7/8 into stdlib #KT-51907 --- libraries/stdlib/jdk7/build.gradle | 1 - libraries/stdlib/jdk7/java9/module-info.java | 6 -- libraries/stdlib/jdk8/build.gradle | 1 - libraries/stdlib/jdk8/java9/module-info.java | 9 --- .../moduleTest/NonExportedPackagesTest.kt | 14 ++-- libraries/stdlib/jvm/build.gradle | 48 +++++++++++- libraries/stdlib/jvm/java9/module-info.java | 12 +++ .../kotlin-stdlib-jdk7.txt | 50 ------------ .../kotlin-stdlib-jdk8.txt | 25 ------ .../kotlin-stdlib-runtime-merged.txt | 77 +++++++++++++++++++ 10 files changed, 142 insertions(+), 101 deletions(-) diff --git a/libraries/stdlib/jdk7/build.gradle b/libraries/stdlib/jdk7/build.gradle index 80ee2f80936..ad70bc4264e 100644 --- a/libraries/stdlib/jdk7/build.gradle +++ b/libraries/stdlib/jdk7/build.gradle @@ -11,7 +11,6 @@ configureJavadocJar() sourceSets { main { kotlin { - srcDir 'src' } } test { diff --git a/libraries/stdlib/jdk7/java9/module-info.java b/libraries/stdlib/jdk7/java9/module-info.java index 1741813c0c6..de625ccb07c 100644 --- a/libraries/stdlib/jdk7/java9/module-info.java +++ b/libraries/stdlib/jdk7/java9/module-info.java @@ -1,10 +1,4 @@ @SuppressWarnings("module") // suppress warnings about terminal digit and exporting packages to not-yet-built kotlin-stdlib-jdk8 module kotlin.stdlib.jdk7 { requires transitive kotlin.stdlib; - - exports kotlin.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/jdk8/build.gradle b/libraries/stdlib/jdk8/build.gradle index a5c69ff54fe..43b3e2c5b6b 100644 --- a/libraries/stdlib/jdk8/build.gradle +++ b/libraries/stdlib/jdk8/build.gradle @@ -15,7 +15,6 @@ dependencies { sourceSets { main { kotlin { - srcDir 'src' } } test { diff --git a/libraries/stdlib/jdk8/java9/module-info.java b/libraries/stdlib/jdk8/java9/module-info.java index dedc66a8f20..d3e4a704cb8 100644 --- a/libraries/stdlib/jdk8/java9/module-info.java +++ b/libraries/stdlib/jdk8/java9/module-info.java @@ -2,13 +2,4 @@ module kotlin.stdlib.jdk8 { requires transitive kotlin.stdlib; requires kotlin.stdlib.jdk7; - - exports kotlin.jvm.optionals; - exports kotlin.jvm.jdk8; - exports kotlin.collections.jdk8; - exports kotlin.streams.jdk8; - exports kotlin.text.jdk8; - exports kotlin.time.jdk8; - - opens kotlin.internal.jdk8 to kotlin.stdlib; } diff --git a/libraries/stdlib/jdk8/moduleTest/NonExportedPackagesTest.kt b/libraries/stdlib/jdk8/moduleTest/NonExportedPackagesTest.kt index a1f20459ada..b4085e40b82 100644 --- a/libraries/stdlib/jdk8/moduleTest/NonExportedPackagesTest.kt +++ b/libraries/stdlib/jdk8/moduleTest/NonExportedPackagesTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ package test.jdk9 @@ -18,22 +18,20 @@ class NonExportedPackagesTest { "kotlin.collections.builders", "kotlin.js", "kotlin.jvm.internal.unsafe", + "kotlin.internal.jdk7", + "kotlin.internal.jdk8", + "kotlin.random.jdk8", )) } @Test fun stdlibJdk7() { - checkNonExportedPackages("kotlin-stdlib-jdk7", setOf( - "kotlin.internal.jdk7", - )) + checkNonExportedPackages("kotlin-stdlib-jdk7", setOf()) } @Test fun stdlibJdk8() { - checkNonExportedPackages("kotlin-stdlib-jdk8", setOf( - "kotlin.internal.jdk8", - "kotlin.random.jdk8", - )) + checkNonExportedPackages("kotlin-stdlib-jdk8", setOf()) } private fun checkNonExportedPackages(jarShortName: String, expectedPackages: Set) { diff --git a/libraries/stdlib/jvm/build.gradle b/libraries/stdlib/jvm/build.gradle index aebc2d29fc8..fd289b89464 100644 --- a/libraries/stdlib/jvm/build.gradle +++ b/libraries/stdlib/jvm/build.gradle @@ -22,6 +22,16 @@ sourceSets { srcDir 'src' } } + mainJdk7 { + kotlin { + srcDir '../jdk7/src' + } + } + mainJdk8 { + kotlin { + srcDir '../jdk8/src' + } + } test { kotlin { srcDir 'test' @@ -39,7 +49,7 @@ sourceSets { } } -LibrariesCommon.configureJava9Compilation(project, 'kotlin.stdlib', [sourceSets.main.output]) +LibrariesCommon.configureJava9Compilation(project, 'kotlin.stdlib', [sourceSets.main.output, sourceSets.mainJdk7.output, sourceSets.mainJdk8.output]) configurations { commonSources @@ -50,6 +60,8 @@ configurations { } } compileOnly.extendsFrom(builtins) + mainJdk7CompileOnly.extendsFrom(builtins) + mainJdk8CompileOnly.extendsFrom(builtins) testCompileOnly.extendsFrom(builtins) } @@ -60,6 +72,10 @@ dependencies { api group: 'org.jetbrains', name: 'annotations', version:'13.0' + mainJdk7Api sourceSets.main.output + mainJdk8Api sourceSets.main.output + mainJdk8Api sourceSets.mainJdk7.output + testApi project(':kotlin-test:kotlin-test-junit') builtins project(':core:builtins') @@ -71,11 +87,19 @@ jar { from { zipTree(configurations.builtins.singleFile) } + from sourceSets.mainJdk7.output + from sourceSets.mainJdk8.output from sourceSets.java9.output } sourcesJar { from "${rootDir}/core/builtins/native" + from(sourceSets.mainJdk7.allSource) { + into 'jdk7' + } + from(sourceSets.mainJdk8.allSource) { + into 'jdk8' + } } task distSourcesJar(type: Jar) { @@ -124,6 +148,28 @@ compileKotlin { } } +compileMainJdk7Kotlin { + kotlinJavaToolchain.toolchain.use(JvmToolchain.getToolchainLauncherFor(project, JdkMajorVersion.JDK_1_7)) + kotlinOptions.jvmTarget = "1.8" + kotlinOptions.freeCompilerArgs = [ + "-Xallow-kotlin-package", + "-Xmultifile-parts-inherit", + "-Xno-new-java-annotation-targets", + "-opt-in=kotlin.RequiresOptIn", + "-opt-in=kotlin.contracts.ExperimentalContracts", + ] + kotlinOptions.moduleName = "kotlin-stdlib-jdk7" +} + +compileMainJdk8Kotlin { + kotlinOptions.freeCompilerArgs = [ + "-Xallow-kotlin-package", + "-Xmultifile-parts-inherit", + "-Xno-new-java-annotation-targets", + ] + kotlinOptions.moduleName = "kotlin-stdlib-jdk8" +} + compileTestKotlin { kotlinOptions { freeCompilerArgs += [ diff --git a/libraries/stdlib/jvm/java9/module-info.java b/libraries/stdlib/jvm/java9/module-info.java index a4c8105fd84..b083bd95918 100644 --- a/libraries/stdlib/jvm/java9/module-info.java +++ b/libraries/stdlib/jvm/java9/module-info.java @@ -31,6 +31,18 @@ module kotlin.stdlib { exports kotlin.jvm.internal; exports kotlin.jvm.internal.markers; + // JDK 7 + exports kotlin.jdk7; + exports kotlin.io.path; + + // JDK 8 + exports kotlin.jvm.optionals; + exports kotlin.jvm.jdk8; + exports kotlin.collections.jdk8; + exports kotlin.streams.jdk8; + exports kotlin.text.jdk8; + exports kotlin.time.jdk8; + // Open packages with .kotlin_builtins files to kotlin-reflect, to allow reflection to load built-in declarations from there opens kotlin to kotlin.reflect; opens kotlin.annotation to kotlin.reflect; diff --git a/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-jdk7.txt b/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-jdk7.txt index 9d6d0316fc0..8b137891791 100644 --- a/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-jdk7.txt +++ b/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-jdk7.txt @@ -1,51 +1 @@ -public abstract interface annotation class kotlin/io/path/ExperimentalPathApi : java/lang/annotation/Annotation { -} - -public abstract interface class kotlin/io/path/FileVisitorBuilder { - public abstract fun onPostVisitDirectory (Lkotlin/jvm/functions/Function2;)V - public abstract fun onPreVisitDirectory (Lkotlin/jvm/functions/Function2;)V - public abstract fun onVisitFile (Lkotlin/jvm/functions/Function2;)V - public abstract fun onVisitFileFailed (Lkotlin/jvm/functions/Function2;)V -} - -public final class kotlin/io/path/PathWalkOption : java/lang/Enum { - public static final field BREADTH_FIRST Lkotlin/io/path/PathWalkOption; - public static final field FOLLOW_LINKS Lkotlin/io/path/PathWalkOption; - public static final field INCLUDE_DIRECTORIES Lkotlin/io/path/PathWalkOption; - public static fun valueOf (Ljava/lang/String;)Lkotlin/io/path/PathWalkOption; - public static fun values ()[Lkotlin/io/path/PathWalkOption; -} - -public final class kotlin/io/path/PathsKt { - public static final fun appendText (Ljava/nio/file/Path;Ljava/lang/CharSequence;Ljava/nio/charset/Charset;)V - public static synthetic fun appendText$default (Ljava/nio/file/Path;Ljava/lang/CharSequence;Ljava/nio/charset/Charset;ILjava/lang/Object;)V - public static final fun createTempDirectory (Ljava/nio/file/Path;Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute;)Ljava/nio/file/Path; - public static synthetic fun createTempDirectory$default (Ljava/nio/file/Path;Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute;ILjava/lang/Object;)Ljava/nio/file/Path; - public static final fun createTempFile (Ljava/nio/file/Path;Ljava/lang/String;Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute;)Ljava/nio/file/Path; - public static synthetic fun createTempFile$default (Ljava/nio/file/Path;Ljava/lang/String;Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute;ILjava/lang/Object;)Ljava/nio/file/Path; - public static final fun fileAttributeViewNotAvailable (Ljava/nio/file/Path;Ljava/lang/Class;)Ljava/lang/Void; - public static final fun fileVisitor (Lkotlin/jvm/functions/Function1;)Ljava/nio/file/FileVisitor; - public static final fun getExtension (Ljava/nio/file/Path;)Ljava/lang/String; - public static final fun getInvariantSeparatorsPathString (Ljava/nio/file/Path;)Ljava/lang/String; - public static final fun getName (Ljava/nio/file/Path;)Ljava/lang/String; - public static final fun getNameWithoutExtension (Ljava/nio/file/Path;)Ljava/lang/String; - public static final fun listDirectoryEntries (Ljava/nio/file/Path;Ljava/lang/String;)Ljava/util/List; - public static synthetic fun listDirectoryEntries$default (Ljava/nio/file/Path;Ljava/lang/String;ILjava/lang/Object;)Ljava/util/List; - public static final fun readText (Ljava/nio/file/Path;Ljava/nio/charset/Charset;)Ljava/lang/String; - public static synthetic fun readText$default (Ljava/nio/file/Path;Ljava/nio/charset/Charset;ILjava/lang/Object;)Ljava/lang/String; - public static final fun relativeTo (Ljava/nio/file/Path;Ljava/nio/file/Path;)Ljava/nio/file/Path; - public static final fun relativeToOrNull (Ljava/nio/file/Path;Ljava/nio/file/Path;)Ljava/nio/file/Path; - public static final fun relativeToOrSelf (Ljava/nio/file/Path;Ljava/nio/file/Path;)Ljava/nio/file/Path; - public static final fun visitFileTree (Ljava/nio/file/Path;IZLkotlin/jvm/functions/Function1;)V - public static final fun visitFileTree (Ljava/nio/file/Path;Ljava/nio/file/FileVisitor;IZ)V - public static synthetic fun visitFileTree$default (Ljava/nio/file/Path;IZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)V - public static synthetic fun visitFileTree$default (Ljava/nio/file/Path;Ljava/nio/file/FileVisitor;IZILjava/lang/Object;)V - public static final fun walk (Ljava/nio/file/Path;[Lkotlin/io/path/PathWalkOption;)Lkotlin/sequences/Sequence; - public static final fun writeText (Ljava/nio/file/Path;Ljava/lang/CharSequence;Ljava/nio/charset/Charset;[Ljava/nio/file/OpenOption;)V - public static synthetic fun writeText$default (Ljava/nio/file/Path;Ljava/lang/CharSequence;Ljava/nio/charset/Charset;[Ljava/nio/file/OpenOption;ILjava/lang/Object;)V -} - -public final class kotlin/jdk7/AutoCloseableKt { - public static final fun closeFinally (Ljava/lang/AutoCloseable;Ljava/lang/Throwable;)V -} diff --git a/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-jdk8.txt b/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-jdk8.txt index 0933ac146cb..8b137891791 100644 --- a/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-jdk8.txt +++ b/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-jdk8.txt @@ -1,26 +1 @@ -public final class kotlin/jvm/optionals/OptionalsKt { - public static final fun asSequence (Ljava/util/Optional;)Lkotlin/sequences/Sequence; - public static final fun getOrDefault (Ljava/util/Optional;Ljava/lang/Object;)Ljava/lang/Object; - public static final fun getOrElse (Ljava/util/Optional;Lkotlin/jvm/functions/Function0;)Ljava/lang/Object; - public static final fun getOrNull (Ljava/util/Optional;)Ljava/lang/Object; - public static final fun toCollection (Ljava/util/Optional;Ljava/util/Collection;)Ljava/util/Collection; - public static final fun toList (Ljava/util/Optional;)Ljava/util/List; - public static final fun toSet (Ljava/util/Optional;)Ljava/util/Set; -} - -public final class kotlin/streams/jdk8/StreamsKt { - public static final fun asSequence (Ljava/util/stream/DoubleStream;)Lkotlin/sequences/Sequence; - public static final fun asSequence (Ljava/util/stream/IntStream;)Lkotlin/sequences/Sequence; - public static final fun asSequence (Ljava/util/stream/LongStream;)Lkotlin/sequences/Sequence; - public static final fun asSequence (Ljava/util/stream/Stream;)Lkotlin/sequences/Sequence; - public static final fun asStream (Lkotlin/sequences/Sequence;)Ljava/util/stream/Stream; - public static final fun toList (Ljava/util/stream/DoubleStream;)Ljava/util/List; - public static final fun toList (Ljava/util/stream/IntStream;)Ljava/util/List; - public static final fun toList (Ljava/util/stream/LongStream;)Ljava/util/List; - public static final fun toList (Ljava/util/stream/Stream;)Ljava/util/List; -} - -public final class kotlin/text/jdk8/RegexExtensionsJDK8Kt { - public static final fun get (Lkotlin/text/MatchGroupCollection;Ljava/lang/String;)Lkotlin/text/MatchGroup; -} diff --git a/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt b/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt index 937b420a623..438a58f990f 100644 --- a/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt +++ b/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt @@ -3267,6 +3267,57 @@ public final class kotlin/io/TextStreamsKt { public static final fun useLines (Ljava/io/Reader;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object; } +public abstract interface annotation class kotlin/io/path/ExperimentalPathApi : java/lang/annotation/Annotation { +} + +public abstract interface class kotlin/io/path/FileVisitorBuilder { + public abstract fun onPostVisitDirectory (Lkotlin/jvm/functions/Function2;)V + public abstract fun onPreVisitDirectory (Lkotlin/jvm/functions/Function2;)V + public abstract fun onVisitFile (Lkotlin/jvm/functions/Function2;)V + public abstract fun onVisitFileFailed (Lkotlin/jvm/functions/Function2;)V +} + +public final class kotlin/io/path/PathWalkOption : java/lang/Enum { + public static final field BREADTH_FIRST Lkotlin/io/path/PathWalkOption; + public static final field FOLLOW_LINKS Lkotlin/io/path/PathWalkOption; + public static final field INCLUDE_DIRECTORIES Lkotlin/io/path/PathWalkOption; + public static fun valueOf (Ljava/lang/String;)Lkotlin/io/path/PathWalkOption; + public static fun values ()[Lkotlin/io/path/PathWalkOption; +} + +public final class kotlin/io/path/PathsKt { + public static final fun appendText (Ljava/nio/file/Path;Ljava/lang/CharSequence;Ljava/nio/charset/Charset;)V + public static synthetic fun appendText$default (Ljava/nio/file/Path;Ljava/lang/CharSequence;Ljava/nio/charset/Charset;ILjava/lang/Object;)V + public static final fun createTempDirectory (Ljava/nio/file/Path;Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute;)Ljava/nio/file/Path; + public static synthetic fun createTempDirectory$default (Ljava/nio/file/Path;Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute;ILjava/lang/Object;)Ljava/nio/file/Path; + public static final fun createTempFile (Ljava/nio/file/Path;Ljava/lang/String;Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute;)Ljava/nio/file/Path; + public static synthetic fun createTempFile$default (Ljava/nio/file/Path;Ljava/lang/String;Ljava/lang/String;[Ljava/nio/file/attribute/FileAttribute;ILjava/lang/Object;)Ljava/nio/file/Path; + public static final fun fileAttributeViewNotAvailable (Ljava/nio/file/Path;Ljava/lang/Class;)Ljava/lang/Void; + public static final fun fileVisitor (Lkotlin/jvm/functions/Function1;)Ljava/nio/file/FileVisitor; + public static final fun getExtension (Ljava/nio/file/Path;)Ljava/lang/String; + public static final fun getInvariantSeparatorsPathString (Ljava/nio/file/Path;)Ljava/lang/String; + public static final fun getName (Ljava/nio/file/Path;)Ljava/lang/String; + public static final fun getNameWithoutExtension (Ljava/nio/file/Path;)Ljava/lang/String; + public static final fun listDirectoryEntries (Ljava/nio/file/Path;Ljava/lang/String;)Ljava/util/List; + public static synthetic fun listDirectoryEntries$default (Ljava/nio/file/Path;Ljava/lang/String;ILjava/lang/Object;)Ljava/util/List; + public static final fun readText (Ljava/nio/file/Path;Ljava/nio/charset/Charset;)Ljava/lang/String; + public static synthetic fun readText$default (Ljava/nio/file/Path;Ljava/nio/charset/Charset;ILjava/lang/Object;)Ljava/lang/String; + public static final fun relativeTo (Ljava/nio/file/Path;Ljava/nio/file/Path;)Ljava/nio/file/Path; + public static final fun relativeToOrNull (Ljava/nio/file/Path;Ljava/nio/file/Path;)Ljava/nio/file/Path; + public static final fun relativeToOrSelf (Ljava/nio/file/Path;Ljava/nio/file/Path;)Ljava/nio/file/Path; + public static final fun visitFileTree (Ljava/nio/file/Path;IZLkotlin/jvm/functions/Function1;)V + public static final fun visitFileTree (Ljava/nio/file/Path;Ljava/nio/file/FileVisitor;IZ)V + public static synthetic fun visitFileTree$default (Ljava/nio/file/Path;IZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)V + public static synthetic fun visitFileTree$default (Ljava/nio/file/Path;Ljava/nio/file/FileVisitor;IZILjava/lang/Object;)V + public static final fun walk (Ljava/nio/file/Path;[Lkotlin/io/path/PathWalkOption;)Lkotlin/sequences/Sequence; + public static final fun writeText (Ljava/nio/file/Path;Ljava/lang/CharSequence;Ljava/nio/charset/Charset;[Ljava/nio/file/OpenOption;)V + public static synthetic fun writeText$default (Ljava/nio/file/Path;Ljava/lang/CharSequence;Ljava/nio/charset/Charset;[Ljava/nio/file/OpenOption;ILjava/lang/Object;)V +} + +public final class kotlin/jdk7/AutoCloseableKt { + public static final fun closeFinally (Ljava/lang/AutoCloseable;Ljava/lang/Throwable;)V +} + public abstract interface annotation class kotlin/js/ExperimentalJsExport : java/lang/annotation/Annotation { } @@ -4256,6 +4307,16 @@ public abstract interface class kotlin/jvm/internal/markers/KMutableMap$Entry : public abstract interface class kotlin/jvm/internal/markers/KMutableSet : kotlin/jvm/internal/markers/KMutableCollection { } +public final class kotlin/jvm/optionals/OptionalsKt { + public static final fun asSequence (Ljava/util/Optional;)Lkotlin/sequences/Sequence; + public static final fun getOrDefault (Ljava/util/Optional;Ljava/lang/Object;)Ljava/lang/Object; + public static final fun getOrElse (Ljava/util/Optional;Lkotlin/jvm/functions/Function0;)Ljava/lang/Object; + public static final fun getOrNull (Ljava/util/Optional;)Ljava/lang/Object; + public static final fun toCollection (Ljava/util/Optional;Ljava/util/Collection;)Ljava/util/Collection; + public static final fun toList (Ljava/util/Optional;)Ljava/util/List; + public static final fun toSet (Ljava/util/Optional;)Ljava/util/Set; +} + public final class kotlin/math/MathKt { public static final field E D public static final field PI D @@ -5189,6 +5250,18 @@ public final class kotlin/sequences/USequencesKt { public static final fun sumOfUShort (Lkotlin/sequences/Sequence;)I } +public final class kotlin/streams/jdk8/StreamsKt { + public static final fun asSequence (Ljava/util/stream/DoubleStream;)Lkotlin/sequences/Sequence; + public static final fun asSequence (Ljava/util/stream/IntStream;)Lkotlin/sequences/Sequence; + public static final fun asSequence (Ljava/util/stream/LongStream;)Lkotlin/sequences/Sequence; + public static final fun asSequence (Ljava/util/stream/Stream;)Lkotlin/sequences/Sequence; + public static final fun asStream (Lkotlin/sequences/Sequence;)Ljava/util/stream/Stream; + public static final fun toList (Ljava/util/stream/DoubleStream;)Ljava/util/List; + public static final fun toList (Ljava/util/stream/IntStream;)Ljava/util/List; + public static final fun toList (Ljava/util/stream/LongStream;)Ljava/util/List; + public static final fun toList (Ljava/util/stream/Stream;)Ljava/util/List; +} + public final class kotlin/system/TimingKt { public static final fun measureNanoTime (Lkotlin/jvm/functions/Function0;)J public static final fun measureTimeMillis (Lkotlin/jvm/functions/Function0;)J @@ -5801,6 +5874,10 @@ public final class kotlin/text/UStringsKt { public static final fun toUShortOrNull (Ljava/lang/String;I)Lkotlin/UShort; } +public final class kotlin/text/jdk8/RegexExtensionsJDK8Kt { + public static final fun get (Lkotlin/text/MatchGroupCollection;Ljava/lang/String;)Lkotlin/text/MatchGroup; +} + public abstract class kotlin/time/AbstractDoubleTimeSource : kotlin/time/TimeSource { public fun (Lkotlin/time/DurationUnit;)V protected final fun getUnit ()Lkotlin/time/DurationUnit;