From 89b7a821a1c8e69a4eefb843854112a03b1667a8 Mon Sep 17 00:00:00 2001 From: Him188 Date: Wed, 19 Aug 2020 22:39:34 +0800 Subject: [PATCH] Fix build and publishing --- .github/workflows/bintray.yml | 17 ++--------------- .../mirai/console/command/CommandManagerImpl.kt | 2 +- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/.github/workflows/bintray.yml b/.github/workflows/bintray.yml index 8ec02b178..c6b5ffd76 100644 --- a/.github/workflows/bintray.yml +++ b/.github/workflows/bintray.yml @@ -30,19 +30,6 @@ jobs: run: ./gradlew :mirai-console:ensureBintrayAvailable -Dbintray_user=${{ secrets.BINTRAY_USER }} -Pbintray_user=${{ secrets.BINTRAY_USER }} -Dbintray_key=${{ secrets.BINTRAY_KEY }} -Pbintray_key=${{ secrets.BINTRAY_KEY }} - name: Gradle :mirai-console:bintrayUpload run: ./gradlew :mirai-console:bintrayUpload -Dbintray_user=${{ secrets.BINTRAY_USER }} -Pbintray_user=${{ secrets.BINTRAY_USER }} -Dbintray_key=${{ secrets.BINTRAY_KEY }} -Pbintray_key=${{ secrets.BINTRAY_KEY }} + - name: Gradle :mirai-console-pure:bintrayUpload + run: ./gradlew :mirai-console-pure: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 -# with: -# # Artifact name -# name: mirai-core -# # Directory containing files to upload -# path: "mirai-core/build/libs/mirai-core-*-all.jar" -# - name: Upload artifact -# uses: actions/upload-artifact@v1.0.0 -# with: -# # Artifact name -# name: mirai-core-qqandroid-all -# # Directory containing files to upload -# path: "mirai-core-qqandroid/build/libs/mirai-core-qqandroid-*-all.jar" diff --git a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/CommandManagerImpl.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/CommandManagerImpl.kt index c37162203..1b0d03e51 100644 --- a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/CommandManagerImpl.kt +++ b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/CommandManagerImpl.kt @@ -70,7 +70,7 @@ internal object CommandManagerImpl : CommandManager, CoroutineScope by Coroutine ///// IMPL - override val CommandOwner.registeredCommands: List get() = registeredCommands.filter { it.owner == this } + override val CommandOwner.registeredCommands: List get() = this@CommandManagerImpl.registeredCommands.filter { it.owner == this } override val allRegisteredCommands: List get() = registeredCommands.toList() // copy override val commandPrefix: String get() = "/" override fun CommandOwner.unregisterAllCommands() {