Adjust for new path of -dev jar

This commit is contained in:
Johannes Frohnmeyer 2022-01-23 14:49:17 +00:00
parent ad7540358b
commit 0d0b4a728c
2 changed files with 5 additions and 4 deletions

View File

@ -100,8 +100,8 @@ if (grgit != null) {
break
}
def commits = new ArrayList<>(tagList.size() >= 2
? grgit.log{range(tagList.get(1).fullName, tagList.get(0).fullName)}
: grgit.log(includes: [grgit.tag.list().get(0).fullName]))
? grgit.log{range(tagList.get(1).fullName, tagList.get(0).fullName)}
: grgit.log(includes: [grgit.tag.list().get(0).fullName]))
Collections.reverse(commits)
changelogStr += "Commits in " + ext.currentType.toString().toLowerCase() + " " + ext.currentVer + ":\n"
for (def commit : commits) {
@ -182,12 +182,12 @@ allprojects {
afterEvaluate {
remapJar {
input = file("${project.buildDir}/libs/$archivesBaseName-${project.version}-dev.jar")
input = file("${project.buildDir}/devlibs/$archivesBaseName-${project.version}-dev.jar")
archiveFileName = "${archivesBaseName}-${project.version}.jar"
}
artifacts {
dev file: file("${project.buildDir}/libs/$archivesBaseName-${project.version}-dev.jar"), type: "jar", builtBy: jar
dev file: file("${project.buildDir}/devlibs/$archivesBaseName-${project.version}-dev.jar"), type: "jar", builtBy: jar
}
processResources {

View File

@ -15,6 +15,7 @@ build_test:
script:
- gradle --build-cache build publish -Pmaven="$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/maven"
- cp build/libs/* ./
- cp build/devlibs/*-dev.jar ./
- rm *-maven.jar *-sources.jar *-sources-dev.jar
- mv *-dev.jar dev.zip
- mv *.jar latest.jar