From 91a99b4726762ca8d993722a84247dee8700b676 Mon Sep 17 00:00:00 2001 From: Stanislav Erokhin Date: Fri, 15 Sep 2017 15:55:55 +0300 Subject: [PATCH] Migrate impl to actual in libraries projects --- .../kotlin.test/js/src/main/kotlin/kotlin/test/JsImpl.kt | 6 +++--- .../kotlin.test/js/src/main/kotlin/org/junit/junitTest.kt | 2 +- libraries/kotlin.test/jvm/src/main/kotlin/AsserterLookup.kt | 2 +- libraries/kotlin.test/jvm/src/main/kotlin/AssertionsImpl.kt | 4 ++-- .../libJs/src/main/kotlin/PlatformClass.kt | 4 ++-- .../libJs/src/test/kotlin/PlatformTest.kt | 4 ++-- .../libJvm/src/main/kotlin/PlatformClass.kt | 4 ++-- .../libJvm/src/test/kotlin/PlatformTest.kt | 4 ++-- .../js/src/main/kotlin/org/jetbrains/HelloWorld.kt | 2 +- .../jvm/src/main/kotlin/org/jetbrains/HelloWorld.kt | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/libraries/kotlin.test/js/src/main/kotlin/kotlin/test/JsImpl.kt b/libraries/kotlin.test/js/src/main/kotlin/kotlin/test/JsImpl.kt index d9c15b97081..d8f7f1b3bac 100644 --- a/libraries/kotlin.test/js/src/main/kotlin/kotlin/test/JsImpl.kt +++ b/libraries/kotlin.test/js/src/main/kotlin/kotlin/test/JsImpl.kt @@ -22,14 +22,14 @@ import kotlin.reflect.KClass * Comments out a block of test code until it is implemented while keeping a link to the code * to implement in your unit test output */ -impl fun todo(block: () -> Unit) { +actual fun todo(block: () -> Unit) { // println("TODO at " + (Exception() as java.lang.Throwable).getStackTrace()?.get(1) + " for " + block) println("TODO at " + block) } /** Asserts that a [block] fails with a specific exception of type [exceptionClass] being thrown. */ -impl fun assertFailsWith(exceptionClass: KClass, message: String?, block: () -> Unit): T { +actual fun assertFailsWith(exceptionClass: KClass, message: String?, block: () -> Unit): T { val exception = assertFails(message, block) @Suppress("INVISIBLE_MEMBER") assertTrue(exceptionClass.isInstance(exception), messagePrefix(message) + "Expected an exception of $exceptionClass to be thrown, but was $exception") @@ -42,4 +42,4 @@ impl fun assertFailsWith(exceptionClass: KClass, message: Str /** * Provides the JS implementation of asserter */ -internal impl fun lookupAsserter(): Asserter = DefaultJsAsserter \ No newline at end of file +internal actual fun lookupAsserter(): Asserter = DefaultJsAsserter \ No newline at end of file diff --git a/libraries/kotlin.test/js/src/main/kotlin/org/junit/junitTest.kt b/libraries/kotlin.test/js/src/main/kotlin/org/junit/junitTest.kt index e6d8aa6e468..3d35ecd54f4 100644 --- a/libraries/kotlin.test/js/src/main/kotlin/org/junit/junitTest.kt +++ b/libraries/kotlin.test/js/src/main/kotlin/org/junit/junitTest.kt @@ -3,4 +3,4 @@ package org.junit @Deprecated("Use 'Test' from kotlin.test package", replaceWith = ReplaceWith("Test", "kotlin.test.Test"), level = DeprecationLevel.WARNING) -impl typealias Test = kotlin.test.Test +actual typealias Test = kotlin.test.Test diff --git a/libraries/kotlin.test/jvm/src/main/kotlin/AsserterLookup.kt b/libraries/kotlin.test/jvm/src/main/kotlin/AsserterLookup.kt index 3a7573e6871..91eb2424cea 100644 --- a/libraries/kotlin.test/jvm/src/main/kotlin/AsserterLookup.kt +++ b/libraries/kotlin.test/jvm/src/main/kotlin/AsserterLookup.kt @@ -9,7 +9,7 @@ private val inited = AtomicBoolean() private val lock = ReentrantLock() private val contributors = ArrayList() -internal impl fun lookupAsserter(): Asserter = lookup() +internal actual fun lookupAsserter(): Asserter = lookup() private val defaultAsserter = DefaultAsserter() diff --git a/libraries/kotlin.test/jvm/src/main/kotlin/AssertionsImpl.kt b/libraries/kotlin.test/jvm/src/main/kotlin/AssertionsImpl.kt index 45cd80887ca..eb35e9fc415 100644 --- a/libraries/kotlin.test/jvm/src/main/kotlin/AssertionsImpl.kt +++ b/libraries/kotlin.test/jvm/src/main/kotlin/AssertionsImpl.kt @@ -43,7 +43,7 @@ private fun assertFailsWithImpl(exceptionClass: Class, messag /** Asserts that a [block] fails with a specific exception of type [exceptionClass] being thrown. */ -impl fun assertFailsWith(exceptionClass: KClass, message: String?, block: () -> Unit): T = assertFailsWithImpl(exceptionClass.java, message, block) +actual fun assertFailsWith(exceptionClass: KClass, message: String?, block: () -> Unit): T = assertFailsWithImpl(exceptionClass.java, message, block) /** @@ -51,7 +51,7 @@ impl fun assertFailsWith(exceptionClass: KClass, message: Str * to implement in your unit test output */ @InlineOnly -impl inline fun todo(@Suppress("UNUSED_PARAMETER") block: () -> Unit) { +actual inline fun todo(@Suppress("UNUSED_PARAMETER") block: () -> Unit) { System.out.println("TODO at " + currentStackTrace()[0]) } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformProject/libJs/src/main/kotlin/PlatformClass.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformProject/libJs/src/main/kotlin/PlatformClass.kt index c4c8fd17a8f..8b79f4f430f 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformProject/libJs/src/main/kotlin/PlatformClass.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformProject/libJs/src/main/kotlin/PlatformClass.kt @@ -1,5 +1,5 @@ package foo -impl class PlatformClass { - impl val value: String = "JS" +actual class PlatformClass { + actual val value: String = "JS" } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformProject/libJs/src/test/kotlin/PlatformTest.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformProject/libJs/src/test/kotlin/PlatformTest.kt index a6560661def..38a6198f0bd 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformProject/libJs/src/test/kotlin/PlatformTest.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformProject/libJs/src/test/kotlin/PlatformTest.kt @@ -1,5 +1,5 @@ package foo -impl class PlatformTest { - impl val value: PlatformClass = PlatformClass() +actual class PlatformTest { + actual val value: PlatformClass = PlatformClass() } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformProject/libJvm/src/main/kotlin/PlatformClass.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformProject/libJvm/src/main/kotlin/PlatformClass.kt index c615b4ecd12..21783c3a136 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformProject/libJvm/src/main/kotlin/PlatformClass.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformProject/libJvm/src/main/kotlin/PlatformClass.kt @@ -1,5 +1,5 @@ package foo -impl class PlatformClass { - impl val value: String = "JVM" +actual class PlatformClass { + actual val value: String = "JVM" } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformProject/libJvm/src/test/kotlin/PlatformTest.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformProject/libJvm/src/test/kotlin/PlatformTest.kt index a6560661def..38a6198f0bd 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformProject/libJvm/src/test/kotlin/PlatformTest.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformProject/libJvm/src/test/kotlin/PlatformTest.kt @@ -1,5 +1,5 @@ package foo -impl class PlatformTest { - impl val value: PlatformClass = PlatformClass() +actual class PlatformTest { + actual val value: PlatformClass = PlatformClass() } \ No newline at end of file diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/js/src/main/kotlin/org/jetbrains/HelloWorld.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/js/src/main/kotlin/org/jetbrains/HelloWorld.kt index 85ffdd2648e..5e777d6dbb4 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/js/src/main/kotlin/org/jetbrains/HelloWorld.kt +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/js/src/main/kotlin/org/jetbrains/HelloWorld.kt @@ -4,6 +4,6 @@ fun main(args: Array) { doMain() } -impl fun doMain() { +actual fun doMain() { console.info(getGreeting()) } diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/jvm/src/main/kotlin/org/jetbrains/HelloWorld.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/jvm/src/main/kotlin/org/jetbrains/HelloWorld.kt index 1c741f7cd70..6af2f0341d2 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/jvm/src/main/kotlin/org/jetbrains/HelloWorld.kt +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/jvm/src/main/kotlin/org/jetbrains/HelloWorld.kt @@ -4,6 +4,6 @@ fun main(args : Array) { doMain() } -impl fun doMain() { +actual fun doMain() { System.out?.println(getGreeting()) } \ No newline at end of file