Merge pull request #720 from processing/sdkupdater-improvement-testing

Merging SDKUpdater improvements and latest fixes

Author: codeanticode

build.gradle

@@ -136,6 +136,9 @@ task dist {
         FileUtils.copyDirectory(file("mode/languages"), 
                                 file("${root}/languages"))
 
+        FileUtils.copyDirectory(file("mode/resources"), 
+                                file("${root}/resources"))
+
         FileUtils.copyDirectory(file("mode/tools/SDKUpdater/tool"),
                                 file("${root}/tools/SDKUpdater/tool"))
         FileUtils.copyDirectory(file("mode/tools/SDKUpdater/lib"),

mode/.classpath

@@ -6,12 +6,19 @@
 			<attribute name="gradle_used_by_scope" value="main,test"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/processing4-app"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/processing4-core"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/processing4-java"/>
 	<classpathentry kind="var" path="ANDROID_JAR"/>
 	<classpathentry kind="var" path="ANDROID_SDK"/>
+	<classpathentry kind="lib" path="mode/gradle-tooling-api-7.2.jar"/>
+	<classpathentry kind="lib" path="mode/jdi.jar"/>
+	<classpathentry kind="lib" path="mode/jdimodel.jar"/>
 	<classpathentry kind="output" path="bin/default"/>
 </classpath>

mode/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>mode</name>
+	<name>android-mode</name>
 	<comment></comment>
 	<projects>
 	</projects>

mode/.settings/org.eclipse.buildship.core.prefs

@@ -0,0 +1,2 @@
+connection.project.dir=
+eclipse.preferences.version=1

mode/.settings/org.eclipse.jdt.core.prefs

@@ -1,12 +1,15 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.8

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/libraries/vr/libs/sdk-audio-1.180.0.aar

@@ -4,8 +4,8 @@ url = http://android.processing.org
 sentence = This mode lets you use Processing to create Android apps
 paragraph =
 imports=processing.mode.java.JavaMode
-version = 406
-prettyVersion = 4.5.0b2
+version = 407
+prettyVersion = 4.5.0b3
 minRevision = 1283
 maxRevision = 0