Skip to content

Commit 68b6099

Browse files
Merge pull request #60 from InsanusMokrassar/0.24.4
0.24.4
2 parents 5db3318 + 01e9376 commit 68b6099

File tree

5 files changed

+48
-9
lines changed

5 files changed

+48
-9
lines changed

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# Changelog
22

3+
## 0.24.4
4+
5+
* `Versions`:
6+
* `Serialization`: `1.8.1`
7+
* `PlaguBot`: `10.6.0`
8+
* `KSLog`: `1.4.2`
9+
* `MicroUtils`: `0.25.8`
10+
* `TelegramBotAPILibraries`: `0.26.6`
11+
312
## 0.24.3
413

514
* `Versions`:

build.gradle

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,23 @@ buildscript {
1414
}
1515
}
1616

17+
plugins {
18+
alias(libs.plugins.nmcp.aggregation)
19+
}
20+
21+
if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
22+
nmcpAggregation {
23+
centralPortal {
24+
username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
25+
password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
26+
validationTimeout = Duration.ofHours(4)
27+
publishingType = System.getenv('PUBLISHING_TYPE') != "" ? System.getenv('PUBLISHING_TYPE') : "USER_MANAGED"
28+
}
29+
30+
publishAllProjectsProbablyBreakingProjectIsolation()
31+
}
32+
}
33+
1734
allprojects {
1835
repositories {
1936
mavenLocal()

github_release.gradle

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,19 @@ private String getCurrentVersionChangelog() {
1111
return changelogDataOS.toString().trim()
1212
}
1313

14-
if (new File(projectDir, "secret.gradle").exists()) {
15-
apply from: './secret.gradle'
14+
def githubTokenVariableName = "GITHUB_RELEASE_TOKEN"
15+
def githubTokenVariableFromEnv = System.getenv(githubTokenVariableName)
16+
17+
def secretFile = new File(projectDir, "secret.gradle")
18+
if (secretFile.exists() || project.hasProperty(githubTokenVariableName) || (githubTokenVariableFromEnv != "" && githubTokenVariableFromEnv != null)) {
19+
if (secretFile.exists()) {
20+
apply from: './secret.gradle'
21+
}
1622
apply plugin: "com.github.breadmoirai.github-release"
23+
def githubReleaseToken = project.hasProperty(githubTokenVariableName) ? project.property(githubTokenVariableName).toString() : githubTokenVariableFromEnv
1724

1825
githubRelease {
19-
token "${project.property('GITHUB_RELEASE_TOKEN')}"
26+
token githubReleaseToken
2027

2128
owner = "InsanusMokrassar"
2229
repo = "PlaguBotPlugins"

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ kotlin.incremental=true
55
# Project data
66

77
group=dev.inmo
8-
version=0.24.3
8+
version=0.24.4

gradle/libs.versions.toml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
[versions]
22

33
kotlin = "2.1.10"
4-
kotlin-serialization = "1.8.0"
4+
kotlin-serialization = "1.8.1"
55

6-
plagubot = "10.4.0"
7-
kslog = "1.4.1"
8-
microutils = "0.24.6"
6+
plagubot = "10.6.0"
7+
kslog = "1.4.2"
8+
microutils = "0.25.8"
99

10-
tgbotapi-libraries = "0.26.3"
10+
tgbotapi-libraries = "0.26.6"
11+
12+
nmcp="0.2.1"
1113

1214
gh-release = "2.5.2"
1315
dokka = "2.0.0"
@@ -32,3 +34,7 @@ kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", v
3234
kotlin-serialization-plugin = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin" }
3335
kotlin-dokka-plugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka" }
3436
gh-release-plugin = { module = "com.github.breadmoirai:github-release", version.ref = "gh-release" }
37+
38+
[plugins]
39+
40+
nmcp-aggregation = { id = "com.gradleup.nmcp.aggregation", version.ref = "nmcp" }

0 commit comments

Comments
 (0)