From 8a8097a99dbc4804bc11e7bf3b40290d2422b72a Mon Sep 17 00:00:00 2001
From: benfry <fry@processing.org>
Date: Fri, 10 Feb 2012 23:30:51 +0000
Subject: [PATCH] moving to SDK 10 instead of 9 (or 8) for Android

---
 android/core/build.xml                            | 6 +++---
 android/todo.txt                                  | 7 +++++++
 app/src/processing/mode/android/AndroidBuild.java | 2 +-
 core/todo.txt                                     | 1 +
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/android/core/build.xml b/android/core/build.xml
index 57f2ed4df..6fd06414a 100644
--- a/android/core/build.xml
+++ b/android/core/build.xml
@@ -11,10 +11,10 @@
   </target>
 
   <target name="sdk_whining">
-    <available file="${env.ANDROID_SDK}/platforms/android-9/android.jar"
+    <available file="${env.ANDROID_SDK}/platforms/android-10/android.jar"
 	       property="andoid-jar-present" />
     <fail unless="andoid-jar-present" 
-	  message="Android SDK 9 could not be found in ${env.ANDROID_SDK}/platforms/android-9/android.jar" />
+	  message="Android SDK 10 could not be found in ${env.ANDROID_SDK}/platforms/android-10/android.jar" />
   </target>
 
   <target name="actual_build" if="env.ANDROID_SDK">
@@ -22,7 +22,7 @@
     <javac target="1.5" 
 	   encoding="UTF-8"
 	   includeAntRuntime="false"
-	   bootclasspath="${env.ANDROID_SDK}/platforms/android-9/android.jar"
+	   bootclasspath="${env.ANDROID_SDK}/platforms/android-10/android.jar"
 	   srcdir="src" destdir="bin" />
 
     <!-- Copy the shaders to the bin folder. 
diff --git a/android/todo.txt b/android/todo.txt
index 440f92a0e..cce7d3372 100644
--- a/android/todo.txt
+++ b/android/todo.txt
@@ -5,6 +5,13 @@ X   http://code.google.com/p/processing/issues/detail?id=769
 X /opt/android using version #s again? fix build script (earlier)
 X smooth() is now the default
 
+_ now requiring SDK 10 (2.3.3) because of OpenGL issues
+_   not SDK 9, which is 2.3.1 (and still Gingerbread)
+X   noted on the changes page in the Wiki
+_   make a note of the change on the Android Wiki
+_   modify the .java build to require it
+_   make sure build.xml uses it too
+
 _ lack of registerXxx() implementation is breaking pre() and post() in particles
 
 _ focus handling note:
diff --git a/app/src/processing/mode/android/AndroidBuild.java b/app/src/processing/mode/android/AndroidBuild.java
index 217e0d42e..900e92478 100644
--- a/app/src/processing/mode/android/AndroidBuild.java
+++ b/app/src/processing/mode/android/AndroidBuild.java
@@ -33,7 +33,7 @@ import processing.mode.java.JavaBuild;
 
 class AndroidBuild extends JavaBuild {
   static final String basePackage = "changethispackage.beforesubmitting.tothemarket";
-  static final String sdkVersion = "8";
+  static final String sdkVersion = "10";  // Android 2.3.3 (Gingerbread)
   static final String sdkTarget = "android-" + sdkVersion;
 
 //  private final Editor editor;
diff --git a/core/todo.txt b/core/todo.txt
index 06b62831b..6e30475a4 100644
--- a/core/todo.txt
+++ b/core/todo.txt
@@ -50,6 +50,7 @@ _   http://code.google.com/p/processing/issues/detail?id=904
 _ add loadTable().. 
 
 _ delay() remove or no? (keep adding it back...)
+_   serial and scripting need it. maybe edit the reference further...
 
 _ do we need an option to disable XML whitespace?
 _   should this be the default to be more like old XML?