◐ Shell
reader mode source ↗
Skip to content
Merged
Hide file tree
Changes from all commits
File filter
Conversations
Jump to
Diff view
Apply and reload
Show whitespace
Diff view
Apply and reload
3 changes: 3 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -136,6 +136,9 @@ task dist {
FileUtils.copyDirectory(file("mode/languages"),
file("${root}/languages"))

FileUtils.copyDirectory(file("mode/tools/SDKUpdater/tool"),
file("${root}/tools/SDKUpdater/tool"))
FileUtils.copyDirectory(file("mode/tools/SDKUpdater/lib"),
Expand Down
9 changes: 8 additions & 1 deletion mode/.classpath
Original file line number Diff line number Diff line change
Expand Up @@ -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.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="output" path="bin/default"/>
</classpath>
2 changes: 1 addition & 1 deletion mode/.project
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>mode</name>
<comment></comment>
<projects>
</projects>
Expand Down
2 changes: 2 additions & 0 deletions mode/.settings/org.eclipse.buildship.core.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
9 changes: 6 additions & 3 deletions mode/.settings/org.eclipse.jdt.core.prefs
Original file line number Diff line number Diff line change
@@ -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.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=17
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.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=17
23 changes: 14 additions & 9 deletions mode/libraries/vr/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
}

task sourceJar(type: Jar, dependsOn: classes) {
Expand Down Expand Up @@ -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);
}
}

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);
}
// 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);
}
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);
}
}

Expand Down
Binary file added mode/libraries/vr/libs/sdk-audio-1.180.0.aar
Binary file not shown.
Binary file added mode/libraries/vr/libs/sdk-base-1.180.0.aar
Binary file not shown.
Binary file added mode/libraries/vr/libs/sdk-common-1.180.0.aar
Binary file not shown.
4 changes: 2 additions & 2 deletions mode/mode.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
minRevision = 1283
maxRevision = 0

154 changes: 154 additions & 0 deletions mode/resources/device-art-resources/device-art.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,154 @@
38 changes: 38 additions & 0 deletions mode/resources/device-art-resources/pixel_3/layout
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
36 changes: 36 additions & 0 deletions mode/resources/device-art-resources/pixel_6/layout
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Toggle all file notes Toggle all file annotations