Skip to content

Commit 9a542ce

Browse files
author
Francisco Solis
authored
Merge pull request #13 from TheProgramSrc/feat/dependency-update
2 parents 85d1bbe + 01b0858 commit 9a542ce

File tree

2 files changed

+18
-14
lines changed

2 files changed

+18
-14
lines changed

CHANGELOG.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
# v0.1.1 - Snapshot
1+
## v0.1.2 - Snapshot
22
* Updated Dependencies
33

4-
# v0.1.0 - Snapshot
4+
## v0.1.1 - Snapshot
5+
* Updated Dependencies
6+
7+
## v0.1.0 - Snapshot
58
Hello, World!

build.gradle

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
import org.apache.tools.ant.filters.ReplaceTokens
2-
31
plugins {
4-
id 'org.jetbrains.kotlin.jvm' version '1.6.10'
2+
id 'org.jetbrains.kotlin.jvm' version '1.7.0'
53
id 'maven-publish'
64
id 'com.github.johnrengelman.shadow' version '7.1.2'
7-
id 'org.jetbrains.dokka' version '1.6.0'
5+
id 'net.kyori.blossom' version '1.2.0'
6+
id 'org.jetbrains.dokka' version '1.6.21'
87
}
98

10-
def projectVersion = (System.getenv("VERSION") ?: '0.1.0-SNAPSHOT').replaceFirst("v", "").replace('/', '')
9+
def projectVersion = (System.getenv("VERSION") ?: '0.1.2-SNAPSHOT').replaceFirst("v", "").replace('/', '')
1110

1211
group 'xyz.theprogramsrc'
1312
version projectVersion
@@ -27,12 +26,10 @@ repositories {
2726
}
2827

2928
dependencies {
30-
compileOnly 'org.jetbrains.kotlin:kotlin-stdlib:1.6.10'
31-
compileOnly 'org.spigotmc:spigot-api:1.18.1-R0.1-SNAPSHOT'
32-
compileOnly 'net.md-5:bungeecord-api:1.18-R0.1-SNAPSHOT'
33-
compileOnly 'xyz.theprogramsrc:simplecoreapi:0.1.12-SNAPSHOT'
29+
compileOnly 'org.jetbrains.kotlin:kotlin-stdlib:1.7.0'
30+
compileOnly 'xyz.theprogramsrc:simplecoreapi:0.4.0-SNAPSHOT'
3431

35-
implementation 'me.carleslc.Simple-YAML:Simple-Yaml:1.7.2'
32+
implementation 'me.carleslc.Simple-YAML:Simple-Yaml:1.8'
3633

3734
testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2'
3835
}
@@ -59,8 +56,12 @@ java {
5956
withSourcesJar()
6057
}
6158

62-
processResources {
63-
filter ReplaceTokens, tokens: [name: rootProject.name, version: project.version.toString(), description: project.description, git_short: System.getenv("GIT_COMMIT_SHORT_HASH") ?: "unknown", git_full: System.getenv("GIT_COMMIT_LONG_HASH") ?: "unknown"]
59+
blossom {
60+
replaceToken '@name@', rootProject.name
61+
replaceToken '@version@', project.version.toString()
62+
replaceToken '@description@', project.description
63+
replaceToken '@git_short@', System.getenv("GIT_COMMIT_SHORT_HASH") ?: "unknown"
64+
replaceToken '@git_full@', System.getenv("GIT_COMMIT_LONG_HASH") ?: "unknown"
6465
}
6566

6667
tasks.withType(JavaCompile) {

0 commit comments

Comments
 (0)