Move kotlin.internal.jdk8.JDK8PlatformImplementations to kotlin-stdlib. (#265)

Author: Corneil du Plessis

metadata/index.json

@@ -109,6 +109,10 @@
     "directory": "com.github.ben-manes.caffeine/caffeine",
     "module": "com.github.ben-manes.caffeine:caffeine"
   },
+  {
+    "directory": "org.jetbrains.kotlin/kotlin-stdlib",
+    "module": "org.jetbrains.kotlin:kotlin-stdlib"
+  },
   {
     "directory": "org.jetbrains.kotlin/kotlin-reflect",
     "module": "org.jetbrains.kotlin:kotlin-reflect"

metadata/org.jetbrains.kotlin/kotlin-reflect/1.7.10/reflect-config.json

@@ -89,17 +89,5 @@
     },
     "name": "kotlin.reflect.jvm.internal.impl.resolve.scopes.DescriptorKindFilter",
     "allPublicFields": true
-  },
-  {
-    "condition": {
-      "typeReachable": "kotlin.internal.jdk8.JDK8PlatformImplementations"
-    },
-    "name": "kotlin.internal.jdk8.JDK8PlatformImplementations",
-    "methods": [
-      {
-        "name": "<init>",
-        "parameterTypes": []
-      }
-    ]
   }
 ]

metadata/org.jetbrains.kotlin/kotlin-stdlib/1.7.10/index.json

@@ -0,0 +1,3 @@
+[
+  "reflect-config.json"
+]

metadata/org.jetbrains.kotlin/kotlin-stdlib/1.7.10/reflect-config.json

@@ -0,0 +1,14 @@
+[
+  {
+    "condition": {
+      "typeReachable": "kotlin.internal.jdk8.JDK8PlatformImplementations"
+    },
+    "name": "kotlin.internal.jdk8.JDK8PlatformImplementations",
+    "methods": [
+      {
+        "name": "<init>",
+        "parameterTypes": []
+      }
+    ]
+  }
+]

metadata/org.jetbrains.kotlin/kotlin-stdlib/index.json

@@ -0,0 +1,10 @@
+[
+  {
+    "latest": true,
+    "metadata-version": "1.7.10",
+    "module": "org.jetbrains.kotlin:kotlin-stdlib",
+    "tested-versions": [
+      "1.7.10"
+    ]
+  }
+]

tests/src/index.json

@@ -285,6 +285,17 @@
       }
     ]
   },
+  {
+    "test-project-path": "org.jetbrains.kotlin/kotlin-stdlib/1.7.10",
+    "libraries": [
+      {
+        "name": "org.jetbrains.kotlin:kotlin-stdlib",
+        "versions": [
+          "1.7.10"
+        ]
+      }
+    ]
+  },
   {
     "test-project-path": "org.jetbrains.kotlin/kotlin-reflect/1.7.10",
     "libraries": [

tests/src/org.jetbrains.kotlin/kotlin-reflect/1.7.10/build.gradle

@@ -13,8 +13,6 @@ String libraryVersion = tck.testedLibraryVersion.get()
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-reflect:$libraryVersion"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4"
-
     testImplementation 'org.assertj:assertj-core:3.22.0'
 }
 
@@ -23,17 +21,9 @@ compileTestKotlin {
 }
 
 graalvmNative {
-    agent {
-        defaultMode = "conditional"
-        modes {
-            conditional {
-                userCodeFilterPath = "user-code-filter.json"
-            }
-        }
-        metadataCopy {
-            mergeWithExisting = true
-            inputTaskNames.add("test")
-            outputDirectories.add("src/test/resources/META-INF/native-image/org.jetbrains.kotlin/kotlin-reflect")
+    binaries {
+        test {
+            buildArgs.add('--no-fallback')
         }
     }
 }

tests/src/org.jetbrains.kotlin/kotlin-reflect/1.7.10/src/test/kotlin/kotlinreflect/KotlinReflectTests.kt

@@ -1,13 +1,7 @@
 package kotlinreflect
 
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
-import java.util.concurrent.atomic.AtomicBoolean
-import kotlin.random.Random
 import kotlin.reflect.KParameter
 import kotlin.reflect.full.createType
 import kotlin.reflect.full.memberProperties
@@ -46,22 +40,6 @@ class KotlinReflectTests {
         assertThat(annotatedProperty.annotations[0]).isInstanceOf(TestAnnotation::class.java)
         assertThat((annotatedProperty.annotations[0] as TestAnnotation).value).isEqualTo("annotation-on-field")
     }
-    @Test
-    fun testCoroutine() {
-        val updated = AtomicBoolean(false)
-        assertThat(updated.get()).isFalse
-        CoroutineScope(Dispatchers.Default).launch {
-            delay(500)
-            updated.set(true)
-        }
-        Thread.sleep(1000)
-        assertThat(updated.get()).isTrue
-    }
-    @Test
-    fun testKotlinRandom() {
-        val randomValue = Random.nextInt(0, 10)
-        assertThat(randomValue).isBetween(0, 10)
-    }
 }
 
 class Foo {

tests/src/org.jetbrains.kotlin/kotlin-stdlib/1.7.10/build.gradle

@@ -0,0 +1,32 @@
+/*
+ * Copyright and related rights waived via CC0
+ *
+ * You should have received a copy of the CC0 legalcode along with this
+ * work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
+ */
+plugins {
+    id "org.graalvm.internal.tck"
+    id "org.jetbrains.kotlin.jvm" version "1.7.10"
+}
+
+String libraryVersion = tck.testedLibraryVersion.get()
+
+dependencies {
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$libraryVersion"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4"
+
+    implementation 'org.jetbrains.kotlin:kotlin-test-junit:1.7.10'
+
+}
+
+compileTestKotlin {
+    kotlinOptions.jvmTarget = "17"
+}
+
+graalvmNative {
+    binaries {
+        test {
+            buildArgs.add('--no-fallback')
+        }
+    }
+}

tests/src/org.jetbrains.kotlin/kotlin-stdlib/1.7.10/gradle.properties

@@ -0,0 +1,2 @@
+library.version = 1.7.10
+metadata.dir = org.jetbrains.kotlin/kotlin-stdlib/1.7.10