From 7a8b8af78dcde1796bd57cc92cad04abce35e9b7 Mon Sep 17 00:00:00 2001 From: Rupesh Kumar <46577873+rupesh-kumar-lpu@users.noreply.github.com> Date: Mon, 25 Apr 2022 05:18:52 +0530 Subject: [PATCH 1/3] Update build.gradle --- core/build.gradle | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/core/build.gradle b/core/build.gradle index 512be73a..caf395c1 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -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 { From c5899428c04743ecc197e8aba4f5d76f2147270b Mon Sep 17 00:00:00 2001 From: Rupesh Kumar <46577873+rupesh-kumar-lpu@users.noreply.github.com> Date: Mon, 25 Apr 2022 05:20:37 +0530 Subject: [PATCH 2/3] Update build.gradle --- mode/libraries/ar/build.gradle | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/mode/libraries/ar/build.gradle b/mode/libraries/ar/build.gradle index 68b337b7..4fa13721 100644 --- a/mode/libraries/ar/build.gradle +++ b/mode/libraries/ar/build.gradle @@ -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 { @@ -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" \ No newline at end of file +apply from: "${rootProject.projectDir}/scripts/publish-module.gradle" From 85d6d7bbc52a584cf34f6900edd32f1396a2170e Mon Sep 17 00:00:00 2001 From: Rupesh Kumar <46577873+rupesh-kumar-lpu@users.noreply.github.com> Date: Mon, 25 Apr 2022 05:22:22 +0530 Subject: [PATCH 3/3] Update build.gradle --- mode/libraries/vr/build.gradle | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/mode/libraries/vr/build.gradle b/mode/libraries/vr/build.gradle index b3bb7aa5..61ccc0da 100644 --- a/mode/libraries/vr/build.gradle +++ b/mode/libraries/vr/build.gradle @@ -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 { @@ -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" \ No newline at end of file +apply from: "${rootProject.projectDir}/scripts/publish-module.gradle"