Merge pull request #3 from InsanusMokrassar/0.0.5

0.0.5
This commit is contained in:
InsanusMokrassar 2020-12-08 15:03:59 +06:00 committed by GitHub
commit 41dade823b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 133 additions and 189 deletions

View File

@ -1,5 +1,13 @@
# Changelog # Changelog
## 0.0.5
* `Versions`
* `kotlin`: `1.4.10` -> `1.4.21`
* `kotlin coroutines`: `1.4.1` -> `1.4.2`
* `tgbotapi`: `0.30.7` -> `0.30.10`
* `microutils`: `0.4.1` -> `0.4.11`
## 0.0.4 ## 0.0.4
* `Versions` * `Versions`

View File

@ -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"
}
}
}
}
}
}

View File

@ -1,43 +1,66 @@
apply plugin: 'com.jfrog.bintray' apply plugin: 'maven-publish'
ext { task sourcesJar(type: Jar) {
projectBintrayDir = "${project.group}/".replace(".", "/") + "${project.name}/${project.version}" from sourceSets.main.allSource
classifier = 'sources'
} }
bintray { task javadocJar(type: Jar) {
user = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER') from javadoc
key = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY') classifier = 'javadoc'
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 publishing {
override = true publications {
maven(MavenPublication) {
from components.java
pkg { artifact sourcesJar
repo = "PlaguBot" artifact javadocJar
name = "${project.name}"
vcsUrl = "https://github.com/InsanusMokrassar/PlaguBot" pom {
licenses = ["Apache-2.0"] resolveStrategy = Closure.DELEGATE_FIRST
version {
name = "${project.version}" description = ""
released = new Date() name = "PlaguBot ${project.name}"
vcsTag = "${project.version}" url = "https://github.com/InsanusMokrassar/PlaguBot"
gpg {
sign = true scm {
passphrase = project.hasProperty('signing.gnupg.passphrase') ? project.property('signing.gnupg.passphrase') : System.getenv('signing.gnupg.passphrase') 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

View File

@ -7,7 +7,6 @@ buildscript {
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.jetbrains.kotlin:kotlin-serialization:$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" classpath "com.github.breadmoirai:github-release:$github_release_plugin_version"
} }
} }

View File

@ -4,17 +4,16 @@ org.gradle.parallel=true
kotlin.js.generate.externals=true kotlin.js.generate.externals=true
kotlin.incremental=true kotlin.incremental=true
kotlin_version=1.4.10 kotlin_version=1.4.21
kotlin_coroutines_version=1.4.1 kotlin_coroutines_version=1.4.2
kotlin_serialisation_runtime_version=1.0.1 kotlin_serialisation_runtime_version=1.0.1
kotlin_exposed_version=0.28.1 kotlin_exposed_version=0.28.1
tgbotapi_version=0.30.7 tgbotapi_version=0.30.10
microutils_version=0.4.1 microutils_version=0.4.11
klassindex_version=4.1.0-rc.1 klassindex_version=4.1.0-rc.1
sqlite_version=3.30.1 sqlite_version=3.30.1
gradle_bintray_plugin_version=1.8.5
github_release_plugin_version=2.2.12 github_release_plugin_version=2.2.12
group=dev.inmo group=dev.inmo
version=0.0.4 version=0.0.5

View File

@ -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"
}
}
}
}
}
}

View File

@ -1,43 +1,66 @@
apply plugin: 'com.jfrog.bintray' apply plugin: 'maven-publish'
ext { task sourcesJar(type: Jar) {
projectBintrayDir = "${project.group}/".replace(".", "/") + "${project.name}/${project.version}" from sourceSets.main.allSource
classifier = 'sources'
} }
bintray { task javadocJar(type: Jar) {
user = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER') from javadoc
key = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY') classifier = 'javadoc'
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 publishing {
override = true publications {
maven(MavenPublication) {
from components.java
pkg { artifact sourcesJar
repo = "PlaguBot" artifact javadocJar
name = "${project.name}"
vcsUrl = "https://github.com/InsanusMokrassar/PlaguBot" pom {
licenses = ["Apache-2.0"] resolveStrategy = Closure.DELEGATE_FIRST
version {
name = "${project.version}" description = ""
released = new Date() name = "PlaguBot ${project.name}"
vcsTag = "${project.version}" url = "https://github.com/InsanusMokrassar/PlaguBot"
gpg {
sign = true scm {
passphrase = project.hasProperty('signing.gnupg.passphrase') ? project.property('signing.gnupg.passphrase') : System.getenv('signing.gnupg.passphrase') 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