SDKUpdater Improvements

mode/libraries/vr/build.gradle

@@ -8,8 +8,13 @@ plugins {
 dependencies {
     compileOnly name: "android"
     compileOnly "org.p5android:processing-core:${modeVersion}"
-    implementationAar "com.google.vr:sdk-audio:${gvrVersion}"
-    implementationAar "com.google.vr:sdk-base:${gvrVersion}" 
+
+// commenting due to issue #718
+//    implementationAar "com.google.vr:sdk-audio:${gvrVersion}"
+//    implementationAar "com.google.vr:sdk-base:${gvrVersion}"
+
+// fix for Issue #718
+    implementationAar fileTree(dir: "libs", include: ["*.aar"])
 }
 
 task sourceJar(type: Jar, dependsOn: classes) {
@@ -53,35 +58,35 @@ compileJava.doFirst {
     libFolder.mkdirs()
     for (String fn : deps) {
         Files.copy(file("${rootDir}/build/libs/" + fn).toPath(),
-                   file("library/" + fn).toPath(), REPLACE_EXISTING);
+                file("library/" + fn).toPath(), REPLACE_EXISTING);
     }
 }
 
 build.doLast {
     // Copying vr jar to library folder
     File vrJar = file("library/vr.jar")
     vrJar.mkdirs();
-    
+
     // 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);
+                vrJar.toPath(), REPLACE_EXISTING);
     }
     // Renaming artifacts for maven publishing
     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);
+                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);
+                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);
+                file("$buildDir/libs/processing-vr-${vrLibVersion}.jar.md5").toPath(), REPLACE_EXISTING);
     }
 }
 

mode/tools/SDKUpdater/build.gradle

@@ -12,21 +12,28 @@ dependencies {
 
     implementationCopy group: "com.android.tools", name: "sdklib", version: "${toolsLibVersion}"
     implementationCopy group: "com.android.tools", name: "repository", version: "${toolsLibVersion}"
+    implementationCopy group: "com.android.tools", name: "common", version: "${toolsLibVersion}"
 }
 
 // This task copies the gradle tooling jar into the mode folder
 task copyToLib(type: Copy) {
   from configurations.implementationCopy.files {
-    include '**/annotations-*'
-    include '**/common-*'
-    include '**/dvlib-*'
-    include '**/gson-*'
-    include '**/guava-*'
-    include '**/httpcore-*'
-    include '**/kotlin-stdlib-*'
-    include '**/layoutlib-api-*'
-    include '**/repository-*'
-    include '**/sdklib-*'
+
+          include '**/common-*jar'
+          include '**/commons-compress-*jar'
+          include '**/guava-*jar'
+          include '**/httpcore-*jar'
+          include '**/istack-*jar'
+          include '**/jakarta.activation-api-*jar'
+          include '**/jakarta.xml.bind-api-*jar'
+          include '**/jaxb-runtime-*jar'
+          include '**/kotlin-stdlib-1*jar'
+          include '**/shared-*jar'
+          include '**/protos-*jar'
+          include '**/protob*jar'
+          include '**/sdklib-*jar'
+          include '**/repository-*jar'
+
   }
   into "lib"
 }