renamed android-core to processing-core.jar

Author: codeanticode

.gitignore

@@ -11,3 +11,4 @@ release
 
 build/**
 .gradle
+/processing-core.zip

build.gradle

@@ -14,7 +14,7 @@ allprojects {
     apply plugin: 'java'
 
     ext.android_platform = "$sdkdir/platforms/android-$sdkver"
-    ext.core_jar_path = "$rootDir/android-core.zip"
+    ext.core_jar_path = "$rootDir/processing-core.zip"
 
     repositories {
         jcenter()
@@ -66,8 +66,8 @@ task dist {
         Files.copy(file("$buildDir/libs/processing-android.jar").toPath(),
                    file("mode/AndroidMode.jar").toPath(), REPLACE_EXISTING);
 
-        Files.copy(file("core/build/libs/android-core.zip").toPath(),
-                   file("$root/android-core.zip").toPath(), REPLACE_EXISTING);
+        Files.copy(file("core/build/libs/processing-core.zip").toPath(),
+                   file("$root/processing-core.zip").toPath(), REPLACE_EXISTING);
 
         Files.copy(file("mode.properties").toPath(),
                    file("$root/mode.properties").toPath(), REPLACE_EXISTING);

build.xml

@@ -5,7 +5,7 @@
   <!-- path to the main processing repo --> 
   <property name="processing.dir" value="../processing" />
 
-  <property name="core.jar.path" value="android-core.zip" />
+  <property name="core.jar.path" value="processing-core.zip" />
   <property name="mode.jar.path" value="mode/AndroidMode.jar" />
   <property name="mode.dist.path" value="release/AndroidMode.zip" />
   <property name="tools.jar.path" value="mode/tools.jar" />
@@ -58,15 +58,15 @@
 <!--
   <target name="android-dist-check">
 -->
-    <!-- ensure that the android-core.zip file has been built -->
+    <!-- ensure that the processing-core.zip file has been built -->
 <!--
     <available file="${core.jar.path}" 
 	       property="android-core-present" />
 -->
-    <!--<echo message="${target.path}/modes/android/android-core.zip" />-->
+    <!--<echo message="${target.path}/modes/android/processing-core.zip" />-->
 <!--
     <fail unless="android-core-present" 
-	  message="android-core.zip was not built, but is required for dist. Install the Android tools, set ANDROID_SDK, and try again." />
+	  message="processing-core.zip was not built, but is required for dist. Install the Android tools, set ANDROID_SDK, and try again." />
   </target>
 -->
 
@@ -85,7 +85,7 @@
 
     <zip destfile="${mode.dist.path}">
       <zipfileset dir="." prefix="AndroidMode">
-	      <include name="android-core.zip" />
+	      <include name="processing-core.zip" />
         <include name="mode.properties" />	
         <include name="mode/**" />
         <include name="templates/**" />	

core/build.gradle

@@ -48,7 +48,7 @@ task dist {
     doLast {
         // make copy of jar file as zip
         Files.copy(file("$buildDir/libs/core.jar").toPath(),
-                   file("$buildDir/libs/android-core.zip").toPath(), REPLACE_EXISTING);
+                   file("$buildDir/libs/processing-core.zip").toPath(), REPLACE_EXISTING);
 
         // and copy it to root
         Files.copy(file("$buildDir/libs/core.jar").toPath(),

core/build.xml

@@ -7,7 +7,7 @@
   <property name="processing.dir" value="../../processing" />
 
   <!-- path to the core library -->
-  <property name="core.jar.path" value="../android-core.zip" />
+  <property name="core.jar.path" value="../processing-core.zip" />
 
   <!-- Android platform to build the core library -->
   <property name="android.platform" value="android-25" />
@@ -22,7 +22,7 @@
   <target name="build" depends="sdk_chatter,actual_build" />
 
   <target name="sdk_chatter" unless="env.ANDROID_SDK">
-    <echo message="ANDROID_SDK not set, skipping build of android-core.zip" />
+    <echo message="ANDROID_SDK not set, skipping build of processing-core.zip" />
   </target>
 
   <target name="sdk_whining">

libraries/cardboard/build.xml

@@ -20,9 +20,9 @@
 
   <target name="compile" description="Compile sources">
     <condition property="core-built">
-      <available file="../../android-core.zip" />
+      <available file="../../processing-core.zip" />
     </condition>
-    <fail unless="core-built" message="Please build the core library first and make sure it sits in ../../android-core.zip" />
+    <fail unless="core-built" message="Please build the core library first and make sure it sits in ../../processing-core.zip" />
 
     <mkdir dir="bin" />
     <javac source="1.7"
@@ -33,7 +33,7 @@
 	   classpath="lib/gvr-base.jar;
                   lib/gvr-common.jar;
                   lib/gvr-audio.jar;
-	              ../../android-core.zip;
+	              ../../processing-core.zip;
 	              ${env.ANDROID_SDK}/platforms/android-25/android.jar"
 	   nowarn="true"
 	   compiler="org.eclipse.jdt.core.JDTCompilerAdapter">

src/processing/mode/android/AndroidBuild.java

@@ -266,8 +266,6 @@ public File createProject(boolean wear) throws IOException, SketchException {
       final File libsFolder = mkdirs(tmpFolder, "libs");
       final File assetsFolder = mkdirs(tmpFolder, "assets");
 
-//      InputStream input = PApplet.createInput(getCoreZipLocation());
-//      PApplet.saveStream(new File(libsFolder, "processing-core.jar"), input);
       Util.copyFile(coreZipFile, new File(libsFolder, "processing-core.jar"));
 
       ////////////////////////////////////////////////////////////////////////
@@ -1660,7 +1658,8 @@ private void createMobileModule(File projectFolder, File exportFolder, String bu
     replaceMap.put("@@build_tools@@", buildToolsVer);
     replaceMap.put("@@package_name@@", getPackageName());    
     replaceMap.put("@@min_sdk@@", min_sdk_handheld);    
-    replaceMap.put("@@target_sdk@@", target_sdk);    
+    replaceMap.put("@@target_sdk@@", target_sdk);
+    replaceMap.put("@@support_version@@", support_version);
     replaceMap.put("@@play_services_version@@", play_services_version);
     replaceMap.put("@@wear_version@@", wear_version);
     replaceMap.put("@@version_code@@", manifest.getVersionCode());
@@ -1691,6 +1690,7 @@ private void createWearModule(File projectFolder, File exportFolder, String buil
     replaceMap.put("@@package_name@@", getPackageName());    
     replaceMap.put("@@min_sdk@@", min_sdk_watchface);    
     replaceMap.put("@@target_sdk@@", target_sdk);
+    replaceMap.put("@@support_version@@", support_version);
     replaceMap.put("@@play_services_version@@", play_services_version);
     replaceMap.put("@@wear_version@@", wear_version);
     replaceMap.put("@@version_code@@", manifest.getVersionCode());

src/processing/mode/android/AndroidMode.java

@@ -3,7 +3,7 @@
 /*
  Part of the Processing project - http://processing.org
 
- Copyright (c) 2012-16 The Processing Foundation
+ Copyright (c) 2012-17 The Processing Foundation
  Copyright (c) 2011-12 Ben Fry and Casey Reas
 
  This program is free software; you can redistribute it and/or modify
@@ -152,7 +152,7 @@ protected File getCoreZipLocation() {
 
       // otherwise do the usual
       //    return new File(base.getSketchbookFolder(), ANDROID_CORE_FILENAME);
-      coreZipLocation = getContentFile("android-core.zip");
+      coreZipLocation = getContentFile("processing-core.zip");
     }
     return coreZipLocation;
   }
@@ -232,7 +232,7 @@ public String getSearchPath() {
       return "";
     }
 
-    String coreJarPath = new File(getFolder(), "android-core.zip").getAbsolutePath();
+    String coreJarPath = new File(getFolder(), "processing-core.zip").getAbsolutePath();
     return sdk.getAndroidJarPath().getAbsolutePath() + File.pathSeparatorChar + coreJarPath;
   }