diff --git a/.gitignore b/.gitignore index 56d647934..e79bca888 100644 --- a/.gitignore +++ b/.gitignore @@ -22,4 +22,5 @@ logs/ lib/ *.bat worldedit-bukkit/src/main/java/ignore/* -todo.txt \ No newline at end of file +todo.txt +mvn/* \ No newline at end of file diff --git a/build.gradle b/build.gradle index 0f4236c7a..20a4aea39 100644 --- a/build.gradle +++ b/build.gradle @@ -39,19 +39,20 @@ ext { date = git.head().date.format("yy.MM.dd") revision = "-${git.head().abbreviatedId}" index = 0; // Offset to match CI + parents = git.head().parentIds; for (; parents != null && !parents.isEmpty(); index++) { commit = git.getResolve().toCommit(parents.get(0)); parents = commit.getParentIds() } buildNumber = "-${index}" } catch (Throwable ignore) { - revision = "unknown"; + revision = "-unknown" } } version = date + revision + buildNumber if ( project.hasProperty("lzNoVersion") ) { // gradle build -PlzNoVersion - version = "unknown"; + version = "unknown" } description = """FastAsyncWorldEdit""" @@ -67,6 +68,7 @@ subprojects { sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 + version = rootProject.version repositories { mavenCentral() diff --git a/worldedit-bukkit/build.gradle b/worldedit-bukkit/build.gradle index f67401fda..2d4c35a46 100644 --- a/worldedit-bukkit/build.gradle +++ b/worldedit-bukkit/build.gradle @@ -43,10 +43,38 @@ processResources { } } -jar { - manifest { - attributes("Class-Path": "truezip.jar WorldEdit/truezip.jar js.jar WorldEdit/js.jar", - "WorldEdit-Version": version) +jar.archiveName="fawe-bukkit-${project.parent.version}.jar" +jar.destinationDir = file '../mvn/com/boydti/fawe-bukkit/' + project.parent.version +task createPom << { + pom { + project { + groupId 'com.boydti' + artifactId 'fawe-bukkit' + version project.parent.version + } + } + .getEffectivePom() + .setDependencies(new ArrayList<>()) + .writeTo("../mvn/com/boydti/fawe-bukkit/${project.parent.version}/fawe-bukkit-${project.parent.version}.pom") + pom { + project { + groupId 'com.boydti' + artifactId 'fawe-bukkit' + version 'latest' + } + } + .getEffectivePom() + .setDependencies(new ArrayList<>()) + .writeTo("../mvn/com/boydti/fawe-bukkit/latest/fawe-bukkit-latest.pom") +} +task copyFiles { + doLast { + copy { + from "../mvn/com/boydti/fawe-bukkit/${project.parent.version}/" + into '../mvn/com/boydti/fawe-bukkit/latest/' + include('*.jar') + rename ("fawe-bukkit-${project.parent.version}.jar", 'fawe-bukkit-latest.jar') + } } } @@ -59,3 +87,5 @@ shadowJar { } build.dependsOn(shadowJar) +build.finalizedBy(copyFiles) +copyFiles.dependsOn(createPom) \ No newline at end of file diff --git a/worldedit-core/build.gradle b/worldedit-core/build.gradle index f1034d1b3..aa6e2da87 100644 --- a/worldedit-core/build.gradle +++ b/worldedit-core/build.gradle @@ -43,4 +43,41 @@ processResources { } } +jar.archiveName="fawe-api-${project.parent.version}.jar" +jar.destinationDir = file '../mvn/com/boydti/fawe-api/' + project.parent.version +task createPom << { + pom { + project { + groupId 'com.boydti' + artifactId 'fawe-api' + version project.parent.version + } + } + .getEffectivePom() + .setDependencies(new ArrayList<>()) + .writeTo("../mvn/com/boydti/fawe-api/${project.parent.version}/fawe-api-${project.parent.version}.pom") + pom { + project { + groupId 'com.boydti' + artifactId 'fawe-api' + version 'latest' + } + } + .getEffectivePom() + .setDependencies(new ArrayList<>()) + .writeTo("../mvn/com/boydti/fawe-api/latest/fawe-api-latest.pom") +} +task copyFiles { + doLast { + copy { + from "../mvn/com/boydti/fawe-api/${project.parent.version}/" + into '../mvn/com/boydti/fawe-api/latest/' + include('*.jar') + rename ("fawe-api-${project.parent.version}.jar", 'fawe-api-latest.jar') + } + } +} + build.dependsOn(shadowJar) +build.finalizedBy(copyFiles) +copyFiles.dependsOn(createPom)