From bf88731086ebc4d42df51172826c5f2329a33053 Mon Sep 17 00:00:00 2001 From: Him188 Date: Thu, 17 Dec 2020 12:41:44 +0800 Subject: [PATCH] Fix publishing and add mirai-core-all --- .github/workflows/bintray.yml | 29 +++++++++++++++++++++++----- buildSrc/src/main/kotlin/Versions.kt | 4 ++-- gradle/publish.gradle | 2 +- mirai-core-all/build.gradle.kts | 3 +++ mirai-core-api/build.gradle.kts | 4 ++-- settings.gradle.kts | 1 + 6 files changed, 33 insertions(+), 10 deletions(-) diff --git a/.github/workflows/bintray.yml b/.github/workflows/bintray.yml index b2931e402..5e762cea4 100644 --- a/.github/workflows/bintray.yml +++ b/.github/workflows/bintray.yml @@ -26,14 +26,33 @@ jobs: run: ./gradlew clean - name: Gradle build run: ./gradlew build # if test's failed, don't publish + - name: Check keys - run: ./gradlew :mirai-core:ensureBintrayAvailable :mirai-core-qqandroid:ensureBintrayAvailable -Dbintray_user=${{ secrets.BINTRAY_USER }} -Pbintray_user=${{ secrets.BINTRAY_USER }} -Dbintray_key=${{ secrets.BINTRAY_KEY }} -Pbintray_key=${{ secrets.BINTRAY_KEY }} + run: ./gradlew :mirai-core-utils:ensureBintrayAvailable + :mirai-core-api:ensureBintrayAvailable + :mirai-core:ensureBintrayAvailable + -Dbintray_user=${{ secrets.BINTRAY_USER }} -Pbintray_user=${{ secrets.BINTRAY_USER }} + -Dbintray_key=${{ secrets.BINTRAY_KEY }} -Pbintray_key=${{ secrets.BINTRAY_KEY }} + + - name: Gradle :mirai-core-utils:publish + run: ./gradlew :mirai-core-utils:publish + -Dbintray_user=${{ secrets.BINTRAY_USER }} -Pbintray_user=${{ secrets.BINTRAY_USER }} + -Dbintray_key=${{ secrets.BINTRAY_KEY }} -Pbintray_key=${{ secrets.BINTRAY_KEY }} + + - name: Gradle :mirai-core-api:publish + run: ./gradlew :mirai-core-api:publish + -Dbintray_user=${{ secrets.BINTRAY_USER }} -Pbintray_user=${{ secrets.BINTRAY_USER }} + -Dbintray_key=${{ secrets.BINTRAY_KEY }} -Pbintray_key=${{ secrets.BINTRAY_KEY }} + - name: Gradle :mirai-core:publish - run: ./gradlew :mirai-core:publish -Dbintray_user=${{ secrets.BINTRAY_USER }} -Pbintray_user=${{ secrets.BINTRAY_USER }} -Dbintray_key=${{ secrets.BINTRAY_KEY }} -Pbintray_key=${{ secrets.BINTRAY_KEY }} - - name: Gradle :mirai-core-qqandroid:publish - run: ./gradlew :mirai-core-qqandroid:publish -Dbintray_user=${{ secrets.BINTRAY_USER }} -Pbintray_user=${{ secrets.BINTRAY_USER }} -Dbintray_key=${{ secrets.BINTRAY_KEY }} -Pbintray_key=${{ secrets.BINTRAY_KEY }} + run: ./gradlew :mirai-core:publish + -Dbintray_user=${{ secrets.BINTRAY_USER }} -Pbintray_user=${{ secrets.BINTRAY_USER }} + -Dbintray_key=${{ secrets.BINTRAY_KEY }} -Pbintray_key=${{ secrets.BINTRAY_KEY }} + - name: Gradle :mirai-core-all:bintrayUpload - run: ./gradlew :mirai-core-all:bintrayUpload -Dbintray_user=${{ secrets.BINTRAY_USER }} -Pbintray_user=${{ secrets.BINTRAY_USER }} -Dbintray_key=${{ secrets.BINTRAY_KEY }} -Pbintray_key=${{ secrets.BINTRAY_KEY }} + run: ./gradlew :mirai-core-all:bintrayUpload + -Dbintray_user=${{ secrets.BINTRAY_USER }} -Pbintray_user=${{ secrets.BINTRAY_USER }} + -Dbintray_key=${{ secrets.BINTRAY_KEY }} -Pbintray_key=${{ secrets.BINTRAY_KEY }} # - name: Upload artifact # uses: actions/upload-artifact@v1.0.0 diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 17e20f1a3..f9cd2a1c5 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -21,14 +21,14 @@ import org.gradle.api.attributes.Attribute */ object Versions { - const val project = "2.0-M1" + const val project = "2.0-M1-dev-1" const val kotlinCompiler = "1.4.21" const val kotlinStdlib = "1.4.21" const val coroutines = "1.4.1" const val atomicFU = "0.14.4" const val serialization = "1.0.1" - const val ktor = "1.4.2" + const val ktor = "1.4.3" const val binaryValidator = "0.2.3" diff --git a/gradle/publish.gradle b/gradle/publish.gradle index db32312c2..a188ad921 100644 --- a/gradle/publish.gradle +++ b/gradle/publish.gradle @@ -122,7 +122,7 @@ afterEvaluate { // With Kotlin 1.4.0, the root module ID has no suffix, but for compatibility with // the consumers who can't read Gradle module metadata, we publish the JVM artifacts in it it.artifactId = variantName - publishPlatformArtifactsInRootModule(publications["jvm"]) + // publishPlatformArtifactsInRootModule(publications["jvm"]) } break diff --git a/mirai-core-all/build.gradle.kts b/mirai-core-all/build.gradle.kts index 92edf6fbf..341022fd5 100644 --- a/mirai-core-all/build.gradle.kts +++ b/mirai-core-all/build.gradle.kts @@ -32,6 +32,9 @@ tasks.withType(JavaCompile::class.java) { kotlin { explicitApi() + target { + attributes.attribute(ATTRIBUTE_MIRAI_TARGET_PLATFORM, "jvm") + } } dependencies { diff --git a/mirai-core-api/build.gradle.kts b/mirai-core-api/build.gradle.kts index 07598321d..3fa0b0d55 100644 --- a/mirai-core-api/build.gradle.kts +++ b/mirai-core-api/build.gradle.kts @@ -55,11 +55,11 @@ kotlin { } jvm("common") { - attributes.attribute(Attribute.of("mirai.target.platform", String::class.java), "common") + attributes.attribute(ATTRIBUTE_MIRAI_TARGET_PLATFORM, "common") } jvm("jvm") { - attributes.attribute(Attribute.of("mirai.target.platform", String::class.java), "jvm") + attributes.attribute(ATTRIBUTE_MIRAI_TARGET_PLATFORM, "jvm") } // jvm("android") { diff --git a/settings.gradle.kts b/settings.gradle.kts index 5e4ec6d80..aba8abd51 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -24,4 +24,5 @@ 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