Merge branch 'dev' into master

This commit is contained in:
okx-code
2019-08-17 10:01:04 +01:00
27 changed files with 471 additions and 267 deletions
+25 -4
View File
@@ -1,9 +1,11 @@
plugins {
id 'java'
id "io.freefair.lombok" version "3.8.0"
id 'maven-publish'
}
group 'sh.okx'
version '3.5.4'
version '3.5.6'
repositories {
mavenCentral()
@@ -26,9 +28,6 @@ repositories {
}
dependencies {
compileOnly 'org.projectlombok:lombok:1.18.6'
annotationProcessor 'org.projectlombok:lombok:1.18.6'
testCompile group: 'junit', name: 'junit', version: '4.12'
compile 'org.spigotmc:spigot-api:1.13.2-R0.1-SNAPSHOT'
@@ -43,3 +42,25 @@ dependencies {
compile 'com.github.Ben12345rocks:VotingPlugin:5.18.2'
compile 'com.github.LlmDl:Towny:25fc18a'
}
// automatically copy the version to plugin.yml
processResources {
inputs.property 'version', project.version
from(sourceSets.main.resources.srcDirs) {
include 'plugin.yml'
expand 'version':project.version
}
from(sourceSets.main.resources.srcDirs) {
exclude 'plugin.yml'
}
}
publishing {
publications {
maven(MavenPublication) {
from components.java
}
}
}