jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-03-10 08:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Build: Fix kotlin-stdlib-jvm-minimal-for-test usages

Browse Source 
Name changed after publishing with main artifacts for external usage
This commit is contained in:
Vyacheslav Gerasimov
2021-06-11 22:43:40 +03:00
parent 8baf570ee7
commit 06b4fe1613
7 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java
View File

@@ -32,7 +32,7 @@ public class ForTestCompileRuntime {
@NotNull
public static File minimalRuntimeJarForTests() {
return assertExists(new File("dist/kotlin-stdlib-minimal-for-test.jar"));
return assertExists(new File("dist/kotlin-stdlib-jvm-minimal-for-test.jar"));
}
@NotNull

2
gradle/jps.gradle.kts
View File

@@ -321,7 +321,7 @@ fun NamedDomainObjectContainer<TopLevelArtifact>.dist() {
file("$rootDir/build/build.txt")
// Use output-file-name when fixed https://github.com/JetBrains/gradle-idea-ext-plugin/issues/63
archive("kotlin-stdlib-minimal-for-test.jar") {
archive("kotlin-stdlib-jvm-minimal-for-test.jar") {
extractedDirectory(stdlibMinimal.singleFile)
}

2
gradle/verification-metadata.xml
View File

@@ -41,7 +41,7 @@
<trust group="org.jetbrains.kotlin" name="builtins"/>
<trust group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk7"/>
<trust group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk8"/>
<trust group="org.jetbrains.kotlin" name="kotlin-stdlib-minimal-for-test"/>
<trust group="org.jetbrains.kotlin" name="kotlin-stdlib-jvm-minimal-for-test"/>
<trust group="org.jetbrains.kotlin" name="kotlin-project-model"/>
<trust file="kotlin-native-prebuilt-.*" regex="true"/>
<trust file=".*-javadoc[.]jar" regex="true"/>

2
libraries/stdlib/jps-build/build.gradle.kts
View File

@@ -11,7 +11,7 @@ val commonStdlibSources by configurations.creating
val builtins by configurations.creating
dependencies {
stdlibMinimal("org.jetbrains.kotlin:kotlin-stdlib-minimal-for-test:$bootstrapKotlinVersion")
stdlibMinimal("org.jetbrains.kotlin:kotlin-stdlib-jvm-minimal-for-test:$bootstrapKotlinVersion")
stdlibJS("org.jetbrains.kotlin:kotlin-stdlib-js:$bootstrapKotlinVersion") { isTransitive = false }
stdlibSources("org.jetbrains.kotlin:kotlin-stdlib:$bootstrapKotlinVersion:sources") { isTransitive = false }

2
libraries/stdlib/jvm/runtime/kotlin/TypeAliases.kt
View File

@@ -3,7 +3,7 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
@file:Suppress("ACTUAL_WITHOUT_EXPECT") // for building kotlin-stdlib-minimal-for-test
@file:Suppress("ACTUAL_WITHOUT_EXPECT") // for building kotlin-stdlib-jvm-minimal-for-test
package kotlin

2
libraries/stdlib/jvm/runtime/kotlin/text/TypeAliases.kt
View File

@@ -3,7 +3,7 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
@file:Suppress("ACTUAL_WITHOUT_EXPECT") // for building kotlin-stdlib-minimal-for-test
@file:Suppress("ACTUAL_WITHOUT_EXPECT") // for building kotlin-stdlib-jvm-minimal-for-test
package kotlin.text

2
libraries/stdlib/jvm/src/kotlin/collections/TypeAliases.kt
View File

@@ -3,7 +3,7 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
@file:Suppress("ACTUAL_WITHOUT_EXPECT") // for building kotlin-stdlib-minimal-for-test
@file:Suppress("ACTUAL_WITHOUT_EXPECT") // for building kotlin-stdlib-jvm-minimal-for-test
package kotlin.collections