diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 20b04c0..7bded7f 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -16,8 +16,7 @@ jobs: uses: actions/setup-java@v1 with: java-version: 1.8 - - name: Upload to Bintray - run: ./gradlew bintrayUpload + - name: Upload to Maven + run: ./gradlew publish env: - BINTRAY_USER: shedaniel - BINTRAY_KEY: ${{ secrets.BINTRAY_KEY }} \ No newline at end of file + MAVEN_PASS: ${{ secrets.MAVEN_PASS }} \ No newline at end of file diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 6646d0c..df999a1 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -14,9 +14,8 @@ jobs: uses: actions/setup-java@v1 with: java-version: 1.8 - - name: Upload to Bintray - run: ./gradlew bintrayUpload + - name: Upload to Maven + run: ./gradlew publish env: - BINTRAY_USER: shedaniel - BINTRAY_KEY: ${{ secrets.BINTRAY_KEY }} + MAVEN_PASS: ${{ secrets.MAVEN_PASS }} PR_NUM: ${{github.event.number}} \ No newline at end of file diff --git a/build.gradle b/build.gradle index a983981..500217f 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,8 @@ plugins { id "org.jetbrains.kotlin.jvm" version "1.3.72" - id "com.jfrog.bintray" version "1.8.5" id "java" id "idea" id "eclipse" - id "maven" id "maven-publish" } @@ -97,25 +95,6 @@ task sourcesJar(type: Jar, dependsOn: classes) { from sourceSets.main.allSource } -bintray { - user = project.hasProperty('bintrayUser') ? project.property('bintrayUser') : System.getenv('BINTRAY_USER') - key = project.hasProperty('bintrayApiKey') ? project.property('bintrayApiKey') : System.getenv('BINTRAY_KEY') - publications = ["MyPublication"] - publish = true - pkg { - repo = "cloth" - name = "architect-plugin" - userOrg = "shedaniel" - licenses = ["MIT"] - version { - name = project.version - vcsTag = project.version - released = new Date() - vcsUrl = 'https://github.com/shedaniel/architect-plugin.git' - } - } -} - publishing { publications { MyPublication(MavenPublication) { @@ -128,5 +107,14 @@ publishing { } repositories { + if (System.getenv("MAVEN_PASS") != null) { + maven { + url = "https://deploy.shedaniel.me/" + credentials { + username = "shedaniel" + password = System.getenv("MAVEN_PASS") + } + } + } } } \ No newline at end of file