github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-27 17:00:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix HMPP platform structure

Browse Source
This commit is contained in:
Him188 2020-12-18 15:37:13 +08:00
parent 19e54d16f2
commit 82f24b736c
5 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mirai-core-all/build.gradle.kts
View File

@ -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"))

9
mirai-core-api/build.gradle.kts
View File

@ -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")

8
mirai-core-utils/build.gradle.kts
View File

@ -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")

7
mirai-core/build.gradle.kts
View File

@ -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") {

3
settings.gradle.kts
View File

@ -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")
include(":mirai-core-all")