From 5e25c0e25b5812a4f1da21eb65b21649108e4dce Mon Sep 17 00:00:00 2001 From: Him188 Date: Tue, 25 May 2021 12:13:43 +0800 Subject: [PATCH] Remove bintray --- .github/workflows/release.yml | 6 +-- README.md | 1 - build.gradle.kts | 3 -- buildSrc/build.gradle.kts | 1 - buildSrc/src/main/kotlin/JvmPublishing.kt | 54 +------------------ buildSrc/src/main/kotlin/MppPublishing.kt | 22 +------- buildSrc/src/main/kotlin/PublishingHelpers.kt | 7 --- buildSrc/src/main/kotlin/Versions.kt | 1 - buildSrc/src/main/kotlin/upload/Bintray.kt | 42 --------------- docs/ConfiguringProjects.md | 8 +-- mirai-console | 2 +- mirai-core-all/build.gradle.kts | 3 +- mirai-core-api/build.gradle.kts | 1 - mirai-core-utils/build.gradle.kts | 1 - mirai-core/build.gradle.kts | 1 - settings.gradle.kts | 4 -- 16 files changed, 10 insertions(+), 147 deletions(-) delete mode 100644 buildSrc/src/main/kotlin/upload/Bintray.kt diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a142d8a40..af433e4a6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -40,21 +40,17 @@ jobs: mkdir build-secret-keys echo "$SONATYPE_USER" > build-secret-keys/sonatype.key echo "$SONATYPE_KEY" >> build-secret-keys/sonatype.key - echo "$BINTRAY_USER" > build-secret-keys/bintray.key - echo "$BINTRAY_KEY" >> build-secret-keys/bintray.key env: GPG_PRIVATE: ${{ secrets.GPG_PRIVATE_KEY }} GPG_PUBLIC_: ${{ secrets.GPG_PUBLIC_KEY }} SONATYPE_USER: ${{ secrets.SONATYPE_USER }} SONATYPE_KEY: ${{ secrets.SONATYPE_KEY }} - BINTRAY_USER: ${{ secrets.BINTRAY_USER }} - BINTRAY_KEY: ${{ secrets.BINTRAY_KEY }} - name: Init gradle project run: ./gradlew clean --scan - name: Check keys - run: ./gradlew ensureBintrayAvailable ensureMavenCentralAvailable + run: ./gradlew ensureMavenCentralAvailable - name: fillBuildConstants run: > diff --git a/README.md b/README.md index b778801db..3a0015ebe 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,6 @@ ---- ![Gradle CI](https://github.com/mamoe/mirai/workflows/Gradle%20CI/badge.svg?branch=master) -[![Download](https://api.bintray.com/packages/him188moe/mirai/mirai-core/images/download.svg)](https://bintray.com/him188moe/mirai/mirai-core/) [![Maven Central](https://img.shields.io/maven-central/v/net.mamoe/mirai-core-api.svg?label=Maven%20Central)](https://search.maven.org/search?q=net.mamoe%20mirai) [![Gitter](https://badges.gitter.im/mamoe/mirai.svg)](https://gitter.im/mamoe/mirai?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) [![MiraiForum](https://img.shields.io/badge/post-on%20MiraiForum-yellow)](https://mirai.mamoe.net) diff --git a/build.gradle.kts b/build.gradle.kts index 089075c33..69e0523c2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -34,7 +34,6 @@ plugins { kotlin("plugin.serialization") version Versions.kotlinCompiler // id("org.jetbrains.dokka") version Versions.dokka id("net.mamoe.kotlin-jvm-blocking-bridge") version Versions.blockingBridge - id("com.jfrog.bintray") // version Versions.bintray id("com.gradle.plugin-publish") version "0.12.0" apply false } @@ -80,8 +79,6 @@ allprojects { // mavenLocal() // cheching issue cause compiler exception // maven(url = "https://mirrors.huaweicloud.com/repository/maven") jcenter() - maven(url = "https://dl.bintray.com/kotlin/kotlin-eap") - maven(url = "https://kotlin.bintray.com/kotlinx") google() mavenCentral() } diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index a61e5a3e5..14b06406a 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -49,7 +49,6 @@ dependencies { // compileOnly(kotlin("gradle-plugin-api", "1.3.72")) // Gradle's Kotlin is 1.3.72 - api("com.jfrog.bintray.gradle", "gradle-bintray-plugin", version("bintray")) api("com.github.jengelman.gradle.plugins", "shadow", version("shadow")) api("org.jetbrains.kotlin", "kotlin-gradle-plugin", version("kotlinCompiler")) api("org.jetbrains.kotlin", "kotlin-compiler-embeddable", version("kotlinCompiler")) diff --git a/buildSrc/src/main/kotlin/JvmPublishing.kt b/buildSrc/src/main/kotlin/JvmPublishing.kt index ee95e2eea..7f3e37b3b 100644 --- a/buildSrc/src/main/kotlin/JvmPublishing.kt +++ b/buildSrc/src/main/kotlin/JvmPublishing.kt @@ -22,16 +22,7 @@ import org.gradle.kotlin.dsl.get import org.gradle.kotlin.dsl.register import org.gradle.kotlin.dsl.registering -fun Project.configureRemoteRepos( - bintrayPkgName: String = "mirai-core" -) { - tasks.register("ensureBintrayAvailable") { - doLast { - if (!project.isBintrayAvailable()) { - error("bintray isn't available. ") - } - } - } +fun Project.configureRemoteRepos() { tasks.register("ensureMavenCentralAvailable") { doLast { if (GpgSigner.signer == GpgSigner.NoopSigner) { @@ -63,22 +54,6 @@ fun Project.configureRemoteRepos( } else { println("SonaType is not available") } - - - if (isBintrayAvailable()) { - maven { - name = "Bintray" - setUrl("https://api.bintray.com/maven/him188moe/mirai/$bintrayPkgName/;publish=1;override=1") - - credentials { - username = Bintray.getUser(project) - password = Bintray.getKey(project) - } - } - } else { - println("bintray isn't available.") - } - } } } @@ -86,36 +61,11 @@ fun Project.configureRemoteRepos( @Suppress("NOTHING_TO_INLINE") inline fun Project.configurePublishing( artifactId: String, - bintrayRepo: String = "mirai", - bintrayPkgName: String = artifactId, vcs: String = "https://github.com/mamoe/mirai" ) { - configureRemoteRepos( - bintrayPkgName = bintrayPkgName - ) + configureRemoteRepos() apply() - if (project.isBintrayAvailable()) { - bintray { - user = Bintray.getUser(project) - key = Bintray.getKey(project) - - setPublications("mavenJava") - setConfigurations("archives") - - publish = true - override = true - - pkg.apply { - repo = bintrayRepo - name = bintrayPkgName - setLicenses("AGPLv3") - publicDownloadNumbers = true - vcsUrl = vcs - } - } - } - val sourcesJar by tasks.registering(Jar::class) { archiveClassifier.set("sources") from(sourceSets["main"].allSource) diff --git a/buildSrc/src/main/kotlin/MppPublishing.kt b/buildSrc/src/main/kotlin/MppPublishing.kt index f93acf51a..d2b3116cf 100644 --- a/buildSrc/src/main/kotlin/MppPublishing.kt +++ b/buildSrc/src/main/kotlin/MppPublishing.kt @@ -14,7 +14,6 @@ import org.gradle.api.publish.maven.MavenPublication import org.gradle.jvm.tasks.Jar import org.gradle.kotlin.dsl.get import org.gradle.kotlin.dsl.register -import org.gradle.kotlin.dsl.withType fun logPublishing(message: String) { println("[Publishing] Configuring $message") @@ -35,25 +34,6 @@ fun Project.configureMppPublishing() { // tasks.findByName("generateMetadataFileForKotlinMultiplatformPublication")?.enabled = false // FIXME: 2021/1/21 } - tasks.withType { - doFirst { - publications - .filterIsInstance() - .forEach { publication -> - val moduleFile = buildDir.resolve("publications/${publication.name}/module.json") - if (moduleFile.exists()) { - val artifact = (object : - org.gradle.api.publish.maven.internal.artifact.FileBasedMavenArtifact(moduleFile) { - override fun getDefaultExtension() = "module" - }) - publication.artifact(artifact) - GpgSigner.signer.doSign(moduleFile) - publication.artifact(GPGSignMavenArtifact(artifact)) - } - } - } - } - val stubJavadoc = tasks.register("javadocJar", Jar::class) { @Suppress("NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS") archiveClassifier.set("javadoc") @@ -134,6 +114,6 @@ val publishPlatformArtifactsInRootModule: Project.(MavenPublication) -> Unit = { } } -public fun MavenArtifact.smartToString(): String { +fun MavenArtifact.smartToString(): String { return "${file.path}, classifier=${classifier}, ext=${extension}" } diff --git a/buildSrc/src/main/kotlin/PublishingHelpers.kt b/buildSrc/src/main/kotlin/PublishingHelpers.kt index 226b0325b..66cf9e9b4 100644 --- a/buildSrc/src/main/kotlin/PublishingHelpers.kt +++ b/buildSrc/src/main/kotlin/PublishingHelpers.kt @@ -33,13 +33,6 @@ import kotlin.reflect.KProperty * https://github.com/mamoe/mirai/blob/master/LICENSE */ -/** - * Configures the [bintray][com.jfrog.bintray.gradle.BintrayExtension] extension. - */ -@PublishedApi -internal fun Project.`bintray`(configure: com.jfrog.bintray.gradle.BintrayExtension.() -> Unit): Unit = - (this as org.gradle.api.plugins.ExtensionAware).extensions.configure("bintray", configure) - @PublishedApi internal operator fun RegisteringDomainObjectDelegateProviderWithTypeAndAction.provideDelegate( receiver: Any?, diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 02007060c..330536860 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -37,7 +37,6 @@ object Versions { const val androidGradlePlugin = "4.1.1" const val android = "4.1.1.4" - const val bintray = "1.8.5" const val shadow = "6.1.0" const val slf4j = "1.7.30" diff --git a/buildSrc/src/main/kotlin/upload/Bintray.kt b/buildSrc/src/main/kotlin/upload/Bintray.kt deleted file mode 100644 index 615c330b1..000000000 --- a/buildSrc/src/main/kotlin/upload/Bintray.kt +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2019-2021 Mamoe Technologies and contributors. - * - * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. - * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. - * - * https://github.com/mamoe/mirai/blob/master/LICENSE - */ - -import keys.SecretKeys -import org.gradle.api.Project - -fun Project.isBintrayAvailable() = Bintray.isBintrayAvailable(project) - -@Suppress("DuplicatedCode") -object Bintray { - - @JvmStatic - fun isBintrayAvailable(project: Project): Boolean { - return kotlin.runCatching { - getUser(project) - getKey(project) - }.isSuccess - } - - @JvmStatic - fun getUser(project: Project): String { - return SecretKeys.getCache(project) - .loadKey("bintray") - .requireNotInvalid() - .user - } - - @JvmStatic - fun getKey(project: Project): String { - return SecretKeys.getCache(project) - .loadKey("bintray") - .requireNotInvalid() - .password - } - -} \ No newline at end of file diff --git a/docs/ConfiguringProjects.md b/docs/ConfiguringProjects.md index c7320a3e5..2d9420c0c 100644 --- a/docs/ConfiguringProjects.md +++ b/docs/ConfiguringProjects.md @@ -8,14 +8,14 @@ 有关各类版本的区别，参考 [版本规范](Evolution.md#版本规范)。通常建议选择最新稳定版本。 -[Version]: https://api.bintray.com/packages/him188moe/mirai/mirai-core/images/download.svg? -[Bintray Download]: https://bintray.com/him188moe/mirai/mirai-core/ +[Version]: https://img.shields.io/maven-central/v/net.mamoe/mirai-core-api.svg?label=Maven%20Central +[Central Download]: https://search.maven.org/search?q=net.mamoe%20mirai | 版本类型 | 版本号 | |:------:|:------------------------------:| | 稳定 | 2.6.4 | | 预览 | - | -| 开发 | [![Version]][Bintray Download] | +| 开发 | [![Version]][Central Download] | ### 配置项目 @@ -121,6 +121,6 @@ dependencies { 非常不推荐这种方法，请尽可能使用构建工具。 -在 [Jcenter](https://jcenter.bintray.com/net/mamoe/mirai-core-all/) 或 [阿里云代理仓库](https://maven.aliyun.com/repository/public/net/mamoe/mirai-core-all/) 下载指定版本的 `-all.jar` 文件，即包含 `mirai-core`，`mirai-core-api`，`mirai-core-utils` 和其他依赖。 +在 [Maven Central](https://repo.maven.apache.org/maven2/net/mamoe/mirai-core-all/) 或 [阿里云代理仓库](https://maven.aliyun.com/repository/public/net/mamoe/mirai-core-all/) 下载指定版本的 `-all.jar` 文件，即包含 `mirai-core`，`mirai-core-api`，`mirai-core-utils` 和其他依赖。 > [回到 Mirai 文档索引](README.md#jvm-平台-mirai-开发) diff --git a/mirai-console b/mirai-console index 94f54b7c6..410cdd02e 160000 --- a/mirai-console +++ b/mirai-console @@ -1 +1 @@ -Subproject commit 94f54b7c6d5b44ba47d2a8a4f306f1c2ecc3956f +Subproject commit 410cdd02efaa70ed5a64603d121c44fd4f952985 diff --git a/mirai-core-all/build.gradle.kts b/mirai-core-all/build.gradle.kts index 28bcd31b5..3d2215701 100644 --- a/mirai-core-all/build.gradle.kts +++ b/mirai-core-all/build.gradle.kts @@ -1,5 +1,5 @@ /* - * Copyright 2019-2020 Mamoe Technologies and contributors. + * Copyright 2019-2021 Mamoe Technologies and contributors. * * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. @@ -13,7 +13,6 @@ plugins { kotlin("jvm") kotlin("plugin.serialization") `maven-publish` - id("com.jfrog.bintray") id("net.mamoe.kotlin-jvm-blocking-bridge") } diff --git a/mirai-core-api/build.gradle.kts b/mirai-core-api/build.gradle.kts index 93088cb09..c3956a086 100644 --- a/mirai-core-api/build.gradle.kts +++ b/mirai-core-api/build.gradle.kts @@ -19,7 +19,6 @@ plugins { id("net.mamoe.kotlin-jvm-blocking-bridge") `maven-publish` - id("com.jfrog.bintray") } description = "Mirai API module" diff --git a/mirai-core-utils/build.gradle.kts b/mirai-core-utils/build.gradle.kts index 2f7ee3652..37caa8d6d 100644 --- a/mirai-core-utils/build.gradle.kts +++ b/mirai-core-utils/build.gradle.kts @@ -18,7 +18,6 @@ plugins { id("kotlinx-atomicfu") id("net.mamoe.kotlin-jvm-blocking-bridge") `maven-publish` - id("com.jfrog.bintray") } description = "mirai-core utilities" diff --git a/mirai-core/build.gradle.kts b/mirai-core/build.gradle.kts index 3822dde36..25a94da76 100644 --- a/mirai-core/build.gradle.kts +++ b/mirai-core/build.gradle.kts @@ -17,7 +17,6 @@ plugins { kotlin("plugin.serialization") id("net.mamoe.kotlin-jvm-blocking-bridge") `maven-publish` - id("com.jfrog.bintray") } description = "Mirai Protocol implementation for QQ Android" diff --git a/settings.gradle.kts b/settings.gradle.kts index d138a4c6f..0be3a2bf0 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -14,10 +14,6 @@ pluginManagement { mavenCentral() jcenter() google() - maven(url = "https://dl.bintray.com/kotlin/kotlin-eap") - maven(url = "https://dl.bintray.com/kotlin/kotlin-dev") - maven(url = "https://dl.bintray.com/jetbrains/kotlin-native-dependencies") - maven(url = "https://kotlin.bintray.com/kotlinx") } }