diff --git a/.github/workflows/release-to-bintray.yml b/.github/workflows/release-to-bintray.yml index 76ebb95c..8b6cc767 100644 --- a/.github/workflows/release-to-bintray.yml +++ b/.github/workflows/release-to-bintray.yml @@ -9,11 +9,22 @@ jobs: runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v2 + - name: Get the version + id: get_version + run: export RELEASE_VERSION=${GITHUB_REF/refs\/tags\/v/} - uses: actions/setup-java@v1 with: java-version: 8 - - name: Build and release to Bintray - env: - BINTRAY_USER: ${{ secrets.BINTRAY_USER }} - BINTRAY_KEY: ${{ secrets.BINTRAY_KEY }} - run: ./gradlew -Prelease.useLastTag=true candidate publishNebulaPublicationToBintrayRepository --info \ No newline at end of file + - name: Build and publish to local maven + run: ./gradlew -Prelease.useLastTag=true candidate publishToMavenLocal --info + - name: Zip and publish to Bintray + run: | + cd ~/.m2 + zip release.zip org/openrndr/extra/*/${RELEASE_VERSION}/* + curl -u ${{ secrets.BINTRAY_USER }}:${{ secrets.BINTRAY_KEY }} -X PUT https://api.bintray.com/content/openrndr/openrndr/ \ + -H "X-Bintray-Package:orx" \ + -H "X-Bintray-Version:${RELEASE_VERSION}" \ + -H "X-Bintray-Publish:1" \ + -H "X-Bintray-Override:1" \ + -H "X-Bintray-Explode:1" \ + -T release.zip \ No newline at end of file diff --git a/build.gradle b/build.gradle index aae3d8bc..1c2521ec 100644 --- a/build.gradle +++ b/build.gradle @@ -2,13 +2,11 @@ buildscript { repositories { jcenter() } - dependencies { classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.9.17" classpath "com.netflix.nebula:nebula-kotlin-plugin:1.3.72" classpath "com.netflix.nebula:nebula-publishing-plugin:17.0.5" classpath "com.netflix.nebula:nebula-release-plugin:14.1.0" - classpath "com.netflix.nebula:nebula-bintray-plugin:8.3.0" classpath "com.github.ben-manes:gradle-versions-plugin:0.28.0" } } @@ -55,10 +53,8 @@ allprojects { apply plugin: 'nebula.source-jar' apply plugin: 'nebula.javadoc-jar' - apply plugin: 'nebula.nebula-bintray-publishing' apply plugin: "com.github.ben-manes.versions" - group 'org.openrndr.extra' repositories { @@ -103,21 +99,6 @@ allprojects { } } - bintray { - user = findProperty('bintrayUser') ?: System.getenv('BINTRAY_USER') - apiKey = findProperty('bintrayKey') ?: System.getenv('BINTRAY_KEY') - userOrg = 'openrndr' - repo = 'openrndr' - pkgName = 'orx' - gppSign = false - syncToMavenCentral = false - licenses = ['BSD-2-Clause'] - vcsUrl = 'https://github.com/openrndr/orx.git' - websiteUrl = 'https://www.openrndr.org' - issueTrackerUrl = 'https://github.com/openrndr/orx/issues' - labels = ['creative-coding', 'realtime-rendering', 'opengl'] - } - test { useJUnitPlatform { includeEngines 'spek2'