Build kotlin-test after kotlin-stdlib, build kotlin-test sources with kotlin-stdlib tests again

libraries/kotlin.test/jvm/pom.xml

@@ -14,7 +14,7 @@
     <dependencies>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-runtime</artifactId>
+            <artifactId>kotlin-stdlib</artifactId>
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>

libraries/kotlin.test/jvm/src/main/kotlin/AssertionsImpl.kt

@@ -16,6 +16,7 @@
 
 @file:kotlin.jvm.JvmMultifileClass
 @file:kotlin.jvm.JvmName("AssertionsKt")
+@file:Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER")
 package kotlin.test
 
 import kotlin.internal.*

libraries/kotlin.test/jvm/src/main/kotlin/annotations.kt

@@ -1,16 +0,0 @@
-package kotlin.internal
-
-
-/**
- * The value of this type parameter should be mentioned in input types (argument types, receiver type or expected type).
- */
-@Target(AnnotationTarget.TYPE_PARAMETER)
-@Retention(AnnotationRetention.BINARY)
-internal annotation class OnlyInputTypes
-
-/**
- * Specifies that this function should not be called directly without inlining
- */
-@Target(AnnotationTarget.FUNCTION)
-@Retention(AnnotationRetention.BINARY)
-internal annotation class InlineOnly

libraries/stdlib/pom.xml

@@ -20,9 +20,9 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-test-junit</artifactId>
-            <version>${project.version}</version>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -65,6 +65,16 @@
                         <goals>
                             <goal>test-compile</goal>
                         </goals>
+                        <configuration>
+                            <args combine.children="append">
+                                <arg>-Xmulti-platform</arg>
+                            </args>
+                            <sourceDirs>
+                                <dir>${project.basedir}/../kotlin.test/common/src/main/kotlin</dir>
+                                <dir>${project.basedir}/../kotlin.test/jvm/src/main/kotlin</dir>
+                                <dir>${project.basedir}/../kotlin.test/junit/src/main/kotlin</dir>
+                            </sourceDirs>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>