From 82f24b736c574e101d8945709456e681ff1c2029 Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Fri, 18 Dec 2020 15:37:13 +0800
Subject: [PATCH] Fix HMPP platform structure

---
 mirai-core-all/build.gradle.kts   | 4 ----
 mirai-core-api/build.gradle.kts   | 9 ++++-----
 mirai-core-utils/build.gradle.kts | 8 ++++----
 mirai-core/build.gradle.kts       | 7 +++----
 settings.gradle.kts               | 3 +--
 5 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/mirai-core-all/build.gradle.kts b/mirai-core-all/build.gradle.kts
index d8939f91b..40b26b4e0 100644
--- a/mirai-core-all/build.gradle.kts
+++ b/mirai-core-all/build.gradle.kts
@@ -21,10 +21,6 @@ plugins {
 version = Versions.project
 description = "Mirai core shadowed"
 
-kotlin {
-    target.attributes.attribute(Attribute.of("mirai.target.platform", String::class.java), "jvm")
-}
-
 dependencies {
     api(project(":mirai-core"))
     api(project(":mirai-core-api"))
diff --git a/mirai-core-api/build.gradle.kts b/mirai-core-api/build.gradle.kts
index 3fa0b0d55..9d67f6abc 100644
--- a/mirai-core-api/build.gradle.kts
+++ b/mirai-core-api/build.gradle.kts
@@ -6,9 +6,10 @@
  *
  *  https://github.com/mamoe/mirai/blob/master/LICENSE
  */
-
 @file:Suppress("UNUSED_VARIABLE")
 
+import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
+
 plugins {
     kotlin("multiplatform")
     id("kotlinx-atomicfu")
@@ -55,12 +56,10 @@ kotlin {
     }
 
     jvm("common") {
-        attributes.attribute(ATTRIBUTE_MIRAI_TARGET_PLATFORM, "common")
+        attributes.attribute(KotlinPlatformType.attribute, KotlinPlatformType.common)
     }
 
-    jvm("jvm") {
-        attributes.attribute(ATTRIBUTE_MIRAI_TARGET_PLATFORM, "jvm")
-    }
+    jvm("jvm")
 
 //    jvm("android") {
 //        attributes.attribute(Attribute.of("mirai.target.platform", String::class.java), "android")
diff --git a/mirai-core-utils/build.gradle.kts b/mirai-core-utils/build.gradle.kts
index 0a564059b..30ac9e01f 100644
--- a/mirai-core-utils/build.gradle.kts
+++ b/mirai-core-utils/build.gradle.kts
@@ -9,6 +9,8 @@
 
 @file:Suppress("UNUSED_VARIABLE")
 
+import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
+
 plugins {
     kotlin("multiplatform")
     id("kotlinx-atomicfu")
@@ -54,12 +56,10 @@ kotlin {
     }
 
     jvm("common") {
-        attributes.attribute(ATTRIBUTE_MIRAI_TARGET_PLATFORM, "common")
+        attributes.attribute(KotlinPlatformType.attribute, KotlinPlatformType.common)
     }
 
-    jvm("jvm") {
-        attributes.attribute(ATTRIBUTE_MIRAI_TARGET_PLATFORM, "jvm")
-    }
+    jvm("jvm")
 
 //    jvm("android") {
 //        attributes.attribute(Attribute.of("mirai.target.platform", String::class.java), "android")
diff --git a/mirai-core/build.gradle.kts b/mirai-core/build.gradle.kts
index b6b21d5a7..3e0919f2f 100644
--- a/mirai-core/build.gradle.kts
+++ b/mirai-core/build.gradle.kts
@@ -9,6 +9,7 @@
 
 @file:Suppress("UNUSED_VARIABLE")
 
+import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
 import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
 
 plugins {
@@ -55,12 +56,10 @@ kotlin {
     }
 
     jvm("common") {
-        attributes.attribute(ATTRIBUTE_MIRAI_TARGET_PLATFORM, "common")
+        attributes.attribute(KotlinPlatformType.attribute, KotlinPlatformType.common)
     }
 
-    jvm("jvm") {
-        attributes.attribute(ATTRIBUTE_MIRAI_TARGET_PLATFORM, "jvm")
-    }
+    jvm("jvm")
 
     /*
     jvm("android") {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index aba8abd51..68cef83ab 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -24,5 +24,4 @@ rootProject.name = "mirai"
 include(":mirai-core-utils")
 include(":mirai-core-api")
 include(":mirai-core")
-include(":mirai-core-all")
-// include(":mirai-core-all")
\ No newline at end of file
+include(":mirai-core-all")
\ No newline at end of file