Skip to content

Commit 584841e

Browse files
Update vr/build.gradle
1 parent a878696 commit 584841e

File tree

1 file changed

+14
-9
lines changed

1 file changed

+14
-9
lines changed

mode/libraries/vr/build.gradle

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,13 @@ plugins {
88
dependencies {
99
compileOnly name: "android"
1010
compileOnly "org.p5android:processing-core:${modeVersion}"
11-
implementationAar "com.google.vr:sdk-audio:${gvrVersion}"
12-
implementationAar "com.google.vr:sdk-base:${gvrVersion}"
11+
12+
// commenting due to issue #718
13+
// implementationAar "com.google.vr:sdk-audio:${gvrVersion}"
14+
// implementationAar "com.google.vr:sdk-base:${gvrVersion}"
15+
16+
// fix for Issue #718
17+
implementationAar fileTree(dir: "libs", include: ["*.aar"])
1318
}
1419

1520
task sourceJar(type: Jar, dependsOn: classes) {
@@ -53,35 +58,35 @@ compileJava.doFirst {
5358
libFolder.mkdirs()
5459
for (String fn : deps) {
5560
Files.copy(file("${rootDir}/build/libs/" + fn).toPath(),
56-
file("library/" + fn).toPath(), REPLACE_EXISTING);
61+
file("library/" + fn).toPath(), REPLACE_EXISTING);
5762
}
5863
}
5964

6065
build.doLast {
6166
// Copying vr jar to library folder
6267
File vrJar = file("library/vr.jar")
6368
vrJar.mkdirs();
64-
69+
6570
// Need to check the existance of the files before using as the files
6671
// will get generated only if Task ':mode:libraries:vr:jar' is not being skipped
6772
// Task ':mode:libraries:vr:jar' will be skipped if source files are unchanged or jar task is UP-TO-DATE
68-
73+
6974
if (file("$buildDir/libs/vr.jar").exists()) {
7075
Files.copy(file("$buildDir/libs/vr.jar").toPath(),
71-
vrJar.toPath(), REPLACE_EXISTING);
76+
vrJar.toPath(), REPLACE_EXISTING);
7277
}
7378
// Renaming artifacts for maven publishing
7479
if (file("$buildDir/libs/vr.jar").exists()) {
7580
Files.move(file("$buildDir/libs/vr.jar").toPath(),
76-
file("$buildDir/libs/processing-vr-${vrLibVersion}.jar").toPath(), REPLACE_EXISTING);
81+
file("$buildDir/libs/processing-vr-${vrLibVersion}.jar").toPath(), REPLACE_EXISTING);
7782
}
7883
if (file("$buildDir/libs/vr-sources.jar").exists()) {
7984
Files.move(file("$buildDir/libs/vr-sources.jar").toPath(),
80-
file("$buildDir/libs/processing-vr-${vrLibVersion}-sources.jar").toPath(), REPLACE_EXISTING);
85+
file("$buildDir/libs/processing-vr-${vrLibVersion}-sources.jar").toPath(), REPLACE_EXISTING);
8186
}
8287
if (file("$buildDir/libs/vr.jar.MD5").exists()) {
8388
Files.move(file("$buildDir/libs/vr.jar.MD5").toPath(),
84-
file("$buildDir/libs/processing-vr-${vrLibVersion}.jar.md5").toPath(), REPLACE_EXISTING);
89+
file("$buildDir/libs/processing-vr-${vrLibVersion}.jar.md5").toPath(), REPLACE_EXISTING);
8590
}
8691
}
8792

0 commit comments

Comments
 (0)