Skip to content

Resolves 'gradlew dist' Errors on execution of command consecutively #688

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
merged 3 commits into from
Apr 25, 2022
Merged

Resolves 'gradlew dist' Errors on execution of command consecutively #688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7a8b8af
Update build.gradle
rupeshkumar22 Apr 24, 2022
c589942
Update build.gradle
rupeshkumar22 Apr 24, 2022
85d6d7b
Update build.gradle
rupeshkumar22 Apr 24, 2022
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
29 changes: 21 additions & 8 deletions core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,16 +58,29 @@ compileJava.doFirst {
}

build.doLast {
// Copying core jar as zip inside the mode folder
Files.copy(file("${buildDir}/libs/core.jar").toPath(),

// Need to check the existance of the files before using as the files
// will get generated only if Task :core:jar is not being skipped
// Task :core:jar will be skipped if source files are unchanged or jar task is UP-TO-DATE

if(file("${buildDir}/libs/core.jar").exists()){
// Copying core jar as zip inside the mode folder
Files.copy(file("${buildDir}/libs/core.jar").toPath(),
file("${coreZipPath}").toPath(), REPLACE_EXISTING)
}
// Renaming artifacts for maven publishing
Files.move(file("${buildDir}/libs/core.jar").toPath(),
file("$buildDir/libs/processing-core-${modeVersion}.jar").toPath(), REPLACE_EXISTING);
Files.move(file("${buildDir}/libs/core-sources.jar").toPath(),
file("$buildDir/libs/processing-core-${modeVersion}-sources.jar").toPath(), REPLACE_EXISTING);
Files.move(file("${buildDir}/libs/core.jar.MD5").toPath(),
file("$buildDir/libs/processing-core-${modeVersion}.jar.md5").toPath(), REPLACE_EXISTING);
if(file("${buildDir}/libs/core.jar").exists()){
Files.move(file("${buildDir}/libs/core.jar").toPath(),
file("$buildDir/libs/processing-core-${modeVersion}.jar").toPath(), REPLACE_EXISTING);
}
if(file("${buildDir}/libs/core-sources.jar").exists()){
Files.move(file("${buildDir}/libs/core-sources.jar").toPath(),
file("$buildDir/libs/processing-core-${modeVersion}-sources.jar").toPath(), REPLACE_EXISTING);
}
if(file("${buildDir}/libs/core.jar.MD5").exists()){
Files.move(file("${buildDir}/libs/core.jar.MD5").toPath(),
file("$buildDir/libs/processing-core-${modeVersion}.jar.md5").toPath(), REPLACE_EXISTING);
}
}

ext {
Expand Down
31 changes: 22 additions & 9 deletions mode/libraries/ar/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,28 @@ build.doLast {
// Copying ar jar to library folder
File arJar = file("library/ar.jar")
arJar.mkdirs();
Files.copy(file("$buildDir/libs/ar.jar").toPath(),
arJar.toPath(), REPLACE_EXISTING);

// Need to check the existance of the files before using as the files
// will get generated only if Task ':mode:libraries:ar:jar' is not being skipped
// Task ':mode:libraries:ar:jar' will be skipped if source files are unchanged or jar task is UP-TO-DATE

if(file("$buildDir/libs/ar.jar").exists()){
Files.copy(file("$buildDir/libs/ar.jar").toPath(),
arJar.toPath(), REPLACE_EXISTING);
}
// Renaming artifacts for maven publishing
Files.move(file("$buildDir/libs/ar.jar").toPath(),
file("$buildDir/libs/processing-ar-${arLibVersion}.jar").toPath(), REPLACE_EXISTING);
Files.move(file("$buildDir/libs/ar-sources.jar").toPath(),
file("$buildDir/libs/processing-ar-${arLibVersion}-sources.jar").toPath(), REPLACE_EXISTING);
Files.move(file("$buildDir/libs/ar.jar.MD5").toPath(),
file("$buildDir/libs/processing-ar-${arLibVersion}.jar.md5").toPath(), REPLACE_EXISTING);
if(file("$buildDir/libs/ar.jar").exists()){
Files.move(file("$buildDir/libs/ar.jar").toPath(),
file("$buildDir/libs/processing-ar-${arLibVersion}.jar").toPath(), REPLACE_EXISTING);
}
if(file("$buildDir/libs/ar-sources.jar").exists()){
Files.move(file("$buildDir/libs/ar-sources.jar").toPath(),
file("$buildDir/libs/processing-ar-${arLibVersion}-sources.jar").toPath(), REPLACE_EXISTING);
}
if(file("$buildDir/libs/ar.jar.MD5").exists()){
Files.move(file("$buildDir/libs/ar.jar.MD5").toPath(),
file("$buildDir/libs/processing-ar-${arLibVersion}.jar.md5").toPath(), REPLACE_EXISTING);
}
}

ext {
Expand All @@ -81,4 +94,4 @@ ext {
libDependencies = [[group: 'org.p5android', name: 'processing-core', version: modeVersion],
[group: 'com.google.ar', name: 'core', version: garVersion]]
}
apply from: "${rootProject.projectDir}/scripts/publish-module.gradle"
apply from: "${rootProject.projectDir}/scripts/publish-module.gradle"
31 changes: 22 additions & 9 deletions mode/libraries/vr/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,28 @@ build.doLast {
// Copying vr jar to library folder
File vrJar = file("library/vr.jar")
vrJar.mkdirs();
Files.copy(file("$buildDir/libs/vr.jar").toPath(),
vrJar.toPath(), REPLACE_EXISTING);

// Need to check the existance of the files before using as the files
// will get generated only if Task ':mode:libraries:vr:jar' is not being skipped
// Task ':mode:libraries:vr:jar' will be skipped if source files are unchanged or jar task is UP-TO-DATE

if(file("$buildDir/libs/vr.jar").exists()){
Files.copy(file("$buildDir/libs/vr.jar").toPath(),
vrJar.toPath(), REPLACE_EXISTING);
}
// Renaming artifacts for maven publishing
Files.move(file("$buildDir/libs/vr.jar").toPath(),
file("$buildDir/libs/processing-vr-${vrLibVersion}.jar").toPath(), REPLACE_EXISTING);
Files.move(file("$buildDir/libs/vr-sources.jar").toPath(),
file("$buildDir/libs/processing-vr-${vrLibVersion}-sources.jar").toPath(), REPLACE_EXISTING);
Files.move(file("$buildDir/libs/vr.jar.MD5").toPath(),
file("$buildDir/libs/processing-vr-${vrLibVersion}.jar.md5").toPath(), REPLACE_EXISTING);
if(file("$buildDir/libs/vr.jar").exists()){
Files.move(file("$buildDir/libs/vr.jar").toPath(),
file("$buildDir/libs/processing-vr-${vrLibVersion}.jar").toPath(), REPLACE_EXISTING);
}
if(file("$buildDir/libs/vr-sources.jar").exists()){
Files.move(file("$buildDir/libs/vr-sources.jar").toPath(),
file("$buildDir/libs/processing-vr-${vrLibVersion}-sources.jar").toPath(), REPLACE_EXISTING);
}
if(file("$buildDir/libs/vr.jar.MD5").exists()){
Files.move(file("$buildDir/libs/vr.jar.MD5").toPath(),
file("$buildDir/libs/processing-vr-${vrLibVersion}.jar.md5").toPath(), REPLACE_EXISTING);
}
}

ext {
Expand All @@ -82,4 +95,4 @@ ext {
[group: 'com.google.vr', name: 'sdk-base', version: gvrVersion],
[group: 'com.google.vr', name: 'sdk-audio', version: gvrVersion]]
}
apply from: "${rootProject.projectDir}/scripts/publish-module.gradle"
apply from: "${rootProject.projectDir}/scripts/publish-module.gradle"