From c5c64bcd2d515a4a2f596fa217c6f612f49c791c Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Tue, 8 Dec 2020 15:00:54 +0600 Subject: [PATCH] update publication scripts --- bot/maven.publish.gradle | 54 --------------------- bot/publish.gradle | 97 +++++++++++++++++++++++-------------- build.gradle | 1 - gradle.properties | 1 - plugin/maven.publish.gradle | 54 --------------------- plugin/publish.gradle | 97 +++++++++++++++++++++++-------------- 6 files changed, 120 insertions(+), 184 deletions(-) delete mode 100644 bot/maven.publish.gradle delete mode 100644 plugin/maven.publish.gradle diff --git a/bot/maven.publish.gradle b/bot/maven.publish.gradle deleted file mode 100644 index 6e01cf9..0000000 --- a/bot/maven.publish.gradle +++ /dev/null @@ -1,54 +0,0 @@ -apply plugin: 'maven-publish' - -task sourcesJar(type: Jar) { - from sourceSets.main.allSource - classifier = 'sources' -} - -task javadocJar(type: Jar) { - from javadoc - classifier = 'javadoc' -} - -publishing { - publications { - maven(MavenPublication) { - from components.java - - artifact sourcesJar - artifact javadocJar - - pom { - resolveStrategy = Closure.DELEGATE_FIRST - - description = "" - name = "PlaguBot ${project.name}" - url = "https://github.com/InsanusMokrassar/PlaguBot" - - scm { - developerConnection = "scm:git:[fetch=]ssh://git@github.com/InsanusMokrassar/PlaguBot.git[push=]ssh://git@github.com/InsanusMokrassar/PlaguBot.git" - url = "ssh://git@github.com/InsanusMokrassar/PlaguBot.git" - } - - developers { - - developer { - id = "InsanusMokrassar" - name = "Aleksei Ovsiannikov" - email = "ovsyannikov.alexey95@gmail.com" - } - - } - - licenses { - - license { - name = "Apache Software License 2.0" - url = "https://github.com/InsanusMokrassar/PlaguBot/LICENSE" - } - - } - } - } - } -} \ No newline at end of file diff --git a/bot/publish.gradle b/bot/publish.gradle index 967b63e..30acc17 100644 --- a/bot/publish.gradle +++ b/bot/publish.gradle @@ -1,43 +1,66 @@ -apply plugin: 'com.jfrog.bintray' +apply plugin: 'maven-publish' -ext { - projectBintrayDir = "${project.group}/".replace(".", "/") + "${project.name}/${project.version}" +task sourcesJar(type: Jar) { + from sourceSets.main.allSource + classifier = 'sources' } -bintray { - user = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER') - key = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY') - publications = ["maven"] - filesSpec { - into "$projectBintrayDir" - from("build/libs") { - include "**/*.asc" - } - from("build/publications/maven") { - rename 'pom-default.xml(.*)', "${project.name}-${project.version}.pom\$1" - } - } - - publish = true - override = true - - pkg { - repo = "PlaguBot" - name = "${project.name}" - vcsUrl = "https://github.com/InsanusMokrassar/PlaguBot" - licenses = ["Apache-2.0"] - version { - name = "${project.version}" - released = new Date() - vcsTag = "${project.version}" - gpg { - sign = true - passphrase = project.hasProperty('signing.gnupg.passphrase') ? project.property('signing.gnupg.passphrase') : System.getenv('signing.gnupg.passphrase') +task javadocJar(type: Jar) { + from javadoc + classifier = 'javadoc' +} + +publishing { + publications { + maven(MavenPublication) { + from components.java + + artifact sourcesJar + artifact javadocJar + + pom { + resolveStrategy = Closure.DELEGATE_FIRST + + description = "" + name = "PlaguBot ${project.name}" + url = "https://github.com/InsanusMokrassar/PlaguBot" + + scm { + developerConnection = "scm:git:[fetch=]ssh://git@github.com/InsanusMokrassar/PlaguBot.git[push=]ssh://git@github.com/InsanusMokrassar/PlaguBot.git" + url = "ssh://git@github.com/InsanusMokrassar/PlaguBot.git" + } + + developers { + + developer { + id = "InsanusMokrassar" + name = "Aleksei Ovsiannikov" + email = "ovsyannikov.alexey95@gmail.com" + } + + } + + licenses { + + license { + name = "Apache Software License 2.0" + url = "https://github.com/InsanusMokrassar/PlaguBot/LICENSE" + } + + } } + + repositories { + maven { + name = "bintray" + url = uri("https://api.bintray.com/maven/${project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')}/PlaguBot/${project.name}/;publish=1;override=1") + credentials { + username = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER') + password = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY') + } + } + } + } } -} - -apply from: "maven.publish.gradle" - -bintrayUpload.dependsOn publishToMavenLocal \ No newline at end of file +} \ No newline at end of file diff --git a/build.gradle b/build.gradle index b88bf61..e5c7d9c 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,6 @@ buildscript { dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version" - classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:$gradle_bintray_plugin_version" classpath "com.github.breadmoirai:github-release:$github_release_plugin_version" } } diff --git a/gradle.properties b/gradle.properties index 1ccb9c5..d2a56f9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,7 +13,6 @@ microutils_version=0.4.11 klassindex_version=4.1.0-rc.1 sqlite_version=3.30.1 -gradle_bintray_plugin_version=1.8.5 github_release_plugin_version=2.2.12 group=dev.inmo diff --git a/plugin/maven.publish.gradle b/plugin/maven.publish.gradle deleted file mode 100644 index 6e01cf9..0000000 --- a/plugin/maven.publish.gradle +++ /dev/null @@ -1,54 +0,0 @@ -apply plugin: 'maven-publish' - -task sourcesJar(type: Jar) { - from sourceSets.main.allSource - classifier = 'sources' -} - -task javadocJar(type: Jar) { - from javadoc - classifier = 'javadoc' -} - -publishing { - publications { - maven(MavenPublication) { - from components.java - - artifact sourcesJar - artifact javadocJar - - pom { - resolveStrategy = Closure.DELEGATE_FIRST - - description = "" - name = "PlaguBot ${project.name}" - url = "https://github.com/InsanusMokrassar/PlaguBot" - - scm { - developerConnection = "scm:git:[fetch=]ssh://git@github.com/InsanusMokrassar/PlaguBot.git[push=]ssh://git@github.com/InsanusMokrassar/PlaguBot.git" - url = "ssh://git@github.com/InsanusMokrassar/PlaguBot.git" - } - - developers { - - developer { - id = "InsanusMokrassar" - name = "Aleksei Ovsiannikov" - email = "ovsyannikov.alexey95@gmail.com" - } - - } - - licenses { - - license { - name = "Apache Software License 2.0" - url = "https://github.com/InsanusMokrassar/PlaguBot/LICENSE" - } - - } - } - } - } -} \ No newline at end of file diff --git a/plugin/publish.gradle b/plugin/publish.gradle index 967b63e..30acc17 100644 --- a/plugin/publish.gradle +++ b/plugin/publish.gradle @@ -1,43 +1,66 @@ -apply plugin: 'com.jfrog.bintray' +apply plugin: 'maven-publish' -ext { - projectBintrayDir = "${project.group}/".replace(".", "/") + "${project.name}/${project.version}" +task sourcesJar(type: Jar) { + from sourceSets.main.allSource + classifier = 'sources' } -bintray { - user = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER') - key = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY') - publications = ["maven"] - filesSpec { - into "$projectBintrayDir" - from("build/libs") { - include "**/*.asc" - } - from("build/publications/maven") { - rename 'pom-default.xml(.*)', "${project.name}-${project.version}.pom\$1" - } - } - - publish = true - override = true - - pkg { - repo = "PlaguBot" - name = "${project.name}" - vcsUrl = "https://github.com/InsanusMokrassar/PlaguBot" - licenses = ["Apache-2.0"] - version { - name = "${project.version}" - released = new Date() - vcsTag = "${project.version}" - gpg { - sign = true - passphrase = project.hasProperty('signing.gnupg.passphrase') ? project.property('signing.gnupg.passphrase') : System.getenv('signing.gnupg.passphrase') +task javadocJar(type: Jar) { + from javadoc + classifier = 'javadoc' +} + +publishing { + publications { + maven(MavenPublication) { + from components.java + + artifact sourcesJar + artifact javadocJar + + pom { + resolveStrategy = Closure.DELEGATE_FIRST + + description = "" + name = "PlaguBot ${project.name}" + url = "https://github.com/InsanusMokrassar/PlaguBot" + + scm { + developerConnection = "scm:git:[fetch=]ssh://git@github.com/InsanusMokrassar/PlaguBot.git[push=]ssh://git@github.com/InsanusMokrassar/PlaguBot.git" + url = "ssh://git@github.com/InsanusMokrassar/PlaguBot.git" + } + + developers { + + developer { + id = "InsanusMokrassar" + name = "Aleksei Ovsiannikov" + email = "ovsyannikov.alexey95@gmail.com" + } + + } + + licenses { + + license { + name = "Apache Software License 2.0" + url = "https://github.com/InsanusMokrassar/PlaguBot/LICENSE" + } + + } } + + repositories { + maven { + name = "bintray" + url = uri("https://api.bintray.com/maven/${project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')}/PlaguBot/${project.name}/;publish=1;override=1") + credentials { + username = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER') + password = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY') + } + } + } + } } -} - -apply from: "maven.publish.gradle" - -bintrayUpload.dependsOn publishToMavenLocal \ No newline at end of file +} \ No newline at end of file