From 743e9a2a8d0f2be36072a292c590f039acd133f5 Mon Sep 17 00:00:00 2001 From: soywiz Date: Thu, 11 Mar 2021 03:29:22 +0100 Subject: [PATCH] Prepare to deploy to central --- .github/workflows/DEPLOY.yml | 12 ++++++++---- build.gradle.kts | 4 ---- gradle.properties | 8 ++++++-- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/.github/workflows/DEPLOY.yml b/.github/workflows/DEPLOY.yml index 87a53f6..5547819 100644 --- a/.github/workflows/DEPLOY.yml +++ b/.github/workflows/DEPLOY.yml @@ -9,6 +9,10 @@ env: FORCED_VERSION: ${{ github.ref }} BINTRAY_USER: ${{ secrets.BINTRAY_USER }} BINTRAY_KEY: ${{ secrets.BINTRAY_KEY }} + ORG_GRADLE_PROJECT_signingKey: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGKEY }} + ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGPASSWORD }} + SONATYPE_USERNAME: ${{ secrets.SONATYPEUSERNAME }} + SONATYPE_PASSWORD: ${{ secrets.SONATYPEPASSWORD }} jobs: publish-windows: @@ -33,13 +37,13 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 - - run: ./gradlew - - run: ./gradlew assemble check lint testDebugUnitTest publishKotlinMultiplatformPublicationToMavenRepository publishLinuxX64PublicationToMavenRepository + - run: sudo apt-get install xvfb + - run: xvfb-run --auto-servernum ./gradlew --no-daemon + - run: xvfb-run --auto-servernum ./gradlew --no-daemon assemble check lint testDebugUnitTest publishKotlinMultiplatformPublicationToMavenRepository publishLinuxX64PublicationToMavenRepository publish-finalize: needs: [publish-windows, publish-mac, publish-linux] runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 - - run: ./gradlew actuallyPublishBintray - + - run: ./gradlew releaseMavenCentral diff --git a/build.gradle.kts b/build.gradle.kts index 79bd881..15d377f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,12 +4,8 @@ buildscript { repositories { mavenLocal() mavenCentral() - jcenter() google() - maven { url = uri("https://dl.bintray.com/korlibs/korlibs/") } maven { url = uri("https://plugins.gradle.org/m2/") } - maven { url = uri("https://dl.bintray.com/kotlin/kotlin-eap") } - maven { url = uri("https://dl.bintray.com/kotlin/kotlin-dev") } } dependencies { diff --git a/gradle.properties b/gradle.properties index 38af799..4309d6a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,8 @@ # sytleguide kotlin.code.style=official -# Kotlin 1.4.30: https://github.com/korlibs/easy-kotlin-mpp-gradle-plugin -easyPluginVersion=0.13.0 +# Kotlin 1.4.31: https://github.com/korlibs/easy-kotlin-mpp-gradle-plugin +easyPluginVersion=0.14.2 # version group=com.soywiz.korlibs.krypto @@ -20,6 +20,10 @@ project.description=Pure Kotlin cryptography library project.license.name=MIT License project.license.url=https://raw.githubusercontent.com/korlibs/krypto/master/LICENSE +project.author.id=soywiz +project.author.name=Carlos Ballesteros Velasco +project.author.email=soywiz@gmail.com + # gradle org.gradle.jvmargs=-Xmx3g kotlin.incremental.multiplatform=true