Skip to content

build.gradle: use get() to convert Jar-task properties to strings #2336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stephengold merged 2 commits into from
Dec 6, 2024
Merged

build.gradle: use get() to convert Jar-task properties to strings #2336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6077c13
build.gradle: use get() to convert Jar-task properties to strings
stephengold Dec 5, 2024
dea5621
main.yml: test 2 deployment tasks across all OSes, not just LInux
stephengold Dec 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,18 +130,16 @@ jobs:
- name: Build Engine
shell: bash
run: |
# Build
./gradlew -PuseCommitHashAsVersionName=true -PskipPrebuildLibraries=true build
# Normal build plus ZIP distribution and merged javadoc
./gradlew -PuseCommitHashAsVersionName=true -PskipPrebuildLibraries=true \
build createZipDistribution mergedJavadoc

if [ "${{ matrix.deploy }}" = "true" ];
then
# We are going to need "zip"
sudo apt-get update
sudo apt-get install -y zip

# Create the zip release and the javadoc
./gradlew -PuseCommitHashAsVersionName=true -PskipPrebuildLibraries=true mergedJavadoc createZipDistribution

# We prepare the release for deploy
mkdir -p ./dist/release/
mv build/distributions/*.zip dist/release/
Expand Down
12 changes: 7 additions & 5 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,23 +75,25 @@ task libDist(dependsOn: subprojects.build, description: 'Builds and copies the e
subprojects.each {project ->
if(!project.hasProperty('mainClassName')){
project.tasks.withType(Jar).each {archiveTask ->
if(archiveTask.archiveClassifier == "sources"){
String classifier = archiveTask.archiveClassifier.get()
String ext = archiveTask.archiveExtension.get()
if (classifier == "sources") {
copy {
from archiveTask.archivePath
into sourceFolder
rename {project.name + '-' + archiveTask.archiveClassifier +'.'+ archiveTask.archiveExtension}
rename {project.name + '-' + classifier + '.' + ext}
}
} else if(archiveTask.archiveClassifier == "javadoc"){
} else if (classifier == "javadoc") {
copy {
from archiveTask.archivePath
into javadocFolder
rename {project.name + '-' + archiveTask.archiveClassifier +'.'+ archiveTask.archiveExtension}
rename {project.name + '-' + classifier + '.' + ext}
}
} else{
copy {
from archiveTask.archivePath
into libFolder
rename {project.name + '.' + archiveTask.archiveExtension}
rename {project.name + '.' + ext}
}
}
}
Expand Down
Loading