From 9bfc6ffb4a98ab4f4b06cefd763077db9476baaa Mon Sep 17 00:00:00 2001 From: Him188 Date: Thu, 28 Jan 2021 11:59:15 +0800 Subject: [PATCH] Fix workflows --- .github/workflows/bintray.yml | 18 +++++++++--------- buildSrc/src/main/kotlin/Versions.kt | 5 +++-- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/bintray.yml b/.github/workflows/bintray.yml index e4cfe3365..6e795d7ae 100644 --- a/.github/workflows/bintray.yml +++ b/.github/workflows/bintray.yml @@ -21,15 +21,6 @@ jobs: with: submodules: recursive - - name: Check keys - run: > - ./gradlew :mirai-core-utils:ensureBintrayAvailable - :mirai-core-api:ensureBintrayAvailable - :mirai-core:ensureBintrayAvailable - :mirai-console:ensureBintrayAvailable - -Dbintray_user=${{ secrets.BINTRAY_USER }} -Pbintray_user=${{ secrets.BINTRAY_USER }} - -Dbintray_key=${{ secrets.BINTRAY_KEY }} -Pbintray_key=${{ secrets.BINTRAY_KEY }} - - name: Set up JDK 1.8 uses: actions/setup-java@v1 with: @@ -41,6 +32,15 @@ jobs: - name: Init gradle project run: ./gradlew clean --info + - name: Check keys + run: > + ./gradlew :mirai-core-utils:ensureBintrayAvailable + :mirai-core-api:ensureBintrayAvailable + :mirai-core:ensureBintrayAvailable + :mirai-console:ensureBintrayAvailable + -Dbintray_user=${{ secrets.BINTRAY_USER }} -Pbintray_user=${{ secrets.BINTRAY_USER }} + -Dbintray_key=${{ secrets.BINTRAY_KEY }} -Pbintray_key=${{ secrets.BINTRAY_KEY }} + - name: fillBuildConstants run: > ./gradlew diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 3abb82b4c..efa05dfb6 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -7,12 +7,13 @@ * https://github.com/mamoe/mirai/blob/master/LICENSE */ -@file:Suppress("ObjectPropertyName", "ObjectPropertyName", "unused") +@file:Suppress("ObjectPropertyName", "ObjectPropertyName", "unused", "MemberVisibilityCanBePrivate") import org.gradle.api.attributes.Attribute object Versions { - const val project = "2.2.0-dev-4" + const val project = "2.2.0-dev-5" + const val core = project const val console = project const val consoleTerminal = project