target SDK is hard-coded, removed SDK menu

codeanticode · codeanticode · commit 0fe7f502d4a5 · 2016-05-18T14:31:07.000+09:00
diff --git a/src/processing/mode/android/AVD.java b/src/processing/mode/android/AVD.java
@@ -79,7 +79,7 @@ public class AVD {
   /** Default virtual device used by Processing. */
   static public final AVD defaultAVD =
     new AVD("Processing-0" + Base.getRevision(),
-            "android-" + AndroidBuild.sdkVersion);
+            AndroidBuild.target_platform);
 //            "Google Inc.:Google APIs:" + AndroidBuild.sdkVersion);
 
   public AVD(final String name, final String target) {
@@ -203,7 +203,7 @@ protected boolean create(final AndroidSDK sdk) throws IOException {
 	  }
 	} catch (InterruptedException e) {}
 
-	if (preferredAbi.get(AndroidBuild.sdkVersion) == null) {
+	if (preferredAbi.get(AndroidBuild.target_api_level) == null) {
 	  return false;
 	}
 
@@ -214,7 +214,7 @@ protected boolean create(final AndroidSDK sdk) throws IOException {
       "-t", target,
       "-c", DEFAULT_SDCARD_SIZE,
       "-s", DEFAULT_SKIN,
-      "--abi", preferredAbi.get(AndroidBuild.sdkVersion)
+      "--abi", preferredAbi.get(AndroidBuild.target_api_level)
     };
 
     // Set the list to null so that exists() will check again
@@ -267,7 +267,7 @@ static public boolean ensureProperAVD(final AndroidSDK sdk) {
 //      Base.showWarning("Android Error", AVD_CREATE_ERROR, e);
       Messages.showWarningTiered("Android Error", AVD_CREATE_PRIMARY,
                                  String.format(AVD_CREATE_SECONDARY,
-                                               AndroidBuild.sdkVersion), null);
+                                               AndroidBuild.target_api_level), null);
     }
     return false;
   }
diff --git a/src/processing/mode/android/AndroidBuild.java b/src/processing/mode/android/AndroidBuild.java
@@ -39,38 +39,39 @@
 import processing.app.exec.ProcessResult;
 import processing.core.PApplet;
 import processing.mode.java.JavaBuild;
-import processing.mode.java.preproc.SurfaceInfo;
-
 import java.io.*;
 import java.security.Permission;
 
-
 class AndroidBuild extends JavaBuild {
   static public final int FRAGMENT  = 0;
   static public final int WALLPAPER = 1;
   static public final int WATCHFACE = 2;
   static public final int CARDBOARD = 3;
   
-  // TODO: make package parameter in the config file, as well as the SDK version
-  // to download (latest, specific number)
+  // TODO: ask base package name when exporting signed apk
   //  static final String basePackage = "changethispackage.beforesubmitting.tothemarket";
-  // We should start with either 16 (4.1) or 17 (4.2) because combined usage of
-  // all previous versions is less than 5%:
+  static final String basePackage = "processing.test";
+  
+  // Minimum SDK levels required for each app component
+  // https://source.android.com/source/build-numbers.html
+  // We should use 17 (4.2) as minimum for fragment and wallpaper at some point, 
+  // once combined usage of all previous versions is falls below 5%:
   // http://developer.android.com/about/dashboards/index.html
-  // With 17, we have getRealSize and getRealMetrics:
+  // because 17 give us getRealSize and getRealMetrics:
   // http://developer.android.com/reference/android/view/Display.html#getRealSize(android.graphics.Point)
   // http://developer.android.com/reference/android/view/Display.html#getRealMetrics(android.util.DisplayMetrics)
-  static final String basePackage = "processing.test";
-  static public final int min_sdk_fragment = 14; // Ice Cream Sandwich
-  static public final int min_sdk_wallpaper = 14;  
-  static public final int min_sdk_watchface = 21; // Lillipop
-  static public final int min_sdk_cardboard = 19; // Kitkat
+  // which allows us to exactly determine the size of the screen.
+  static public final String min_sdk_fragment  = "16"; // Jelly Bean (4.1)
+  static public final String min_sdk_wallpaper = "16"; // 
+  static public final String min_sdk_cardboard = "19"; // KitKat (4.4)
+  static public final String min_sdk_watchface = "21"; // Lollipop (5.0)
   
-  static String sdkName = "5.0";
-  static String sdkVersion = "21";  // Android 5.0 (Lollipop)
-  static String sdkTarget = "android-" + sdkVersion;
+  // Hard-coded target SDK, no longer user-selected.
+  static public final String target_sdk_version = "5.1"; // Lollipop
+  static public final String target_api_level   = "22";  
+  static public final String target_platform    = "android-" + target_api_level;
 
-  static int publishOption = FRAGMENT;
+  static int appComponent = FRAGMENT;
   static boolean forceNewManifest = false;
   
   private final AndroidSDK sdk;
@@ -95,21 +96,21 @@ public AndroidBuild(final Sketch sketch, final AndroidMode mode) {
   }
 
   public static void setPublishOption(int opt, Sketch sketch) {
-    if (publishOption != opt) {
-      publishOption = opt;
+    if (appComponent != opt) {
+      appComponent = opt;
       forceNewManifest = true;
     } else {
       forceNewManifest = false;
     }
   }
   
   public static void setSdkTarget(AndroidSDK.SDKTarget target, Sketch sketch) {
-    sdkName = target.name;
-    sdkVersion = Integer.toString(target.version);
-    sdkTarget = "android-" + sdkVersion;
-
-    Preferences.set("android.sdk.version", sdkVersion);
-    Preferences.set("android.sdk.name", target.name);
+//    sdkName = target.name;
+//    sdkVersion = Integer.toString(target.version);
+//    sdkTarget = "android-" + sdkVersion;
+//
+//    Preferences.set("android.sdk.version", target_);
+//    Preferences.set("android.sdk.name", target.name);
   }
 
   /**
@@ -173,7 +174,7 @@ public File createProject() throws IOException, SketchException {
     }
 
     manifest = new Manifest(sketch);
-    manifest.setSdkTarget(sdkVersion);
+    manifest.setSdkTarget(target_api_level);
     forceNewManifest = false;
     
     // grab code from current editing window (GUI only)
@@ -220,7 +221,7 @@ public File createProject() throws IOException, SketchException {
       copyLibraries(libsFolder, assetsFolder);
       copyCodeFolder(libsFolder);
       
-      if (publishOption == WATCHFACE) {
+      if (appComponent == WATCHFACE) {
         // TODO: temporary hack until I find a better way to include the wearable aar
         // package included in the SDK:
         
@@ -229,7 +230,7 @@ public File createProject() throws IOException, SketchException {
         Util.copyFile(wearJarFile, new File(libsFolder, "wearable-1.3.0-classes.jar"));
       }
 
-      if (publishOption == CARDBOARD) {
+      if (appComponent == CARDBOARD) {
         // TODO: temporary hack until I find a better way to include the cardboard aar
         // packages included in the cardboard SDK:
         
@@ -279,16 +280,14 @@ public File createProject() throws IOException, SketchException {
 //              System.out.println("API: " + api);
             }
             
-            if (platform != null && platform.equals(sdkTarget) &&
-                api != null && api.equals(sdkVersion)) {
+            if (platform != null && platform.equals(target_platform) &&
+                api != null && api.equals(target_api_level)) {
               targetID = id;
               break;
             }            
           }
         } catch (InterruptedException e) {}
         
-        System.out.println("TARGET ID: " + targetID);
-        
         ////////////////////////////////////////////////////////////////////////
         // third step: create library projects
         boolean audioRes = createLibraryProject("cardboard_audio", targetID, 
@@ -773,13 +772,13 @@ void antBuildProblems(String outPile, String errPile) throws SketchException {
 
     // Try to parse anything else we might know about
     for (final String line : errLines) {
-      if (line.contains("Unable to resolve target '" + sdkTarget + "'")) {
+      if (line.contains("Unable to resolve target '" + target_platform + "'")) {
         System.err.println("Use the Android SDK Manager (under the Android");
         System.err.println("menu) to install the SDK platform and ");
-        System.err.println("Google APIs for Android " + sdkName +
-                           " (API " + sdkVersion + ")");
+        System.err.println("Google APIs for Android " + target_sdk_version +
+                           " (API " + target_api_level + ")");
         skex = new SketchException("Please install the SDK platform and " +
-                                   "Google APIs for API " + sdkVersion);
+                                   "Google APIs for API " + target_api_level);
       }
     }
     // Stack trace is not relevant, just the message.
@@ -925,7 +924,7 @@ private void writeBuildXML(final File file, final String projectName) {
 
   private void writeProjectProps(final File file) {
     final PrintWriter writer = PApplet.createWriter(file);
-    writer.println("target=" + sdkTarget);
+    writer.println("target=" + target_platform);
     writer.println();
     // http://stackoverflow.com/questions/4821043/includeantruntime-was-not-set-for-android-ant-script
     writer.println("# Suppress the javac task warnings about \"includeAntRuntime\"");
@@ -964,7 +963,7 @@ private void writeRes(File resFolder,
     File mainActivityLayoutFile = new File(layoutFolder, "main.xml");
     writeResLayoutMainActivity(mainActivityLayoutFile);
 
-    if (publishOption == WALLPAPER) {
+    if (appComponent == WALLPAPER) {
       File xmlFolder = mkdirs(resFolder, "xml");
       File mainServiceWallpaperFile = new File(xmlFolder, "wallpaper.xml");
       writeResXMLWallpaper(mainServiceWallpaperFile);
@@ -1051,7 +1050,7 @@ private void writeRes(File resFolder,
     }
 
     
-    if (publishOption == WATCHFACE) {
+    if (appComponent == WATCHFACE) {
       File xmlFolder = mkdirs(resFolder, "xml");
       File mainServiceWatchFaceFile = new File(xmlFolder, "watch_face.xml");
       writeResXMLWatchFace(mainServiceWatchFaceFile);      
@@ -1126,17 +1125,17 @@ private File mkdirs(final File parent, final String name) throws SketchException
 
 
   private void writeMainClass(final File srcDirectory, String renderer) {
-    if (publishOption == FRAGMENT) {
+    if (appComponent == FRAGMENT) {
       writeFragmentActivity(srcDirectory);
-    } else if (publishOption == WALLPAPER) {
+    } else if (appComponent == WALLPAPER) {
       writeWallpaperService(srcDirectory);
-    } else if (publishOption == WATCHFACE) {
+    } else if (appComponent == WATCHFACE) {
       if (renderer != null && (renderer.equals("P2D") || renderer.equals("P3D"))) {
         writeWatchFaceGLESService(srcDirectory);  
       } else {
         writeWatchFaceCanvasService(srcDirectory);  
       }      
-    } else if (publishOption == CARDBOARD) {
+    } else if (appComponent == CARDBOARD) {
       writeCardboardActivity(srcDirectory);
     }
   }
diff --git a/src/processing/mode/android/AndroidEditor.java b/src/processing/mode/android/AndroidEditor.java
@@ -44,7 +44,6 @@
 import java.awt.event.ActionListener;
 import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.TimerTask;
 
 
@@ -79,7 +78,7 @@ public UpdateDeviceListTask(JMenu deviceMenu) {
     public void run() {
       if (androidMode == null || androidMode.getSDK() == null) return;
       
-      if (AndroidBuild.publishOption == AndroidBuild.WATCHFACE) {
+      if (AndroidBuild.appComponent == AndroidBuild.WATCHFACE) {
         Devices.enableBlueToothDebugging();
       }
 
@@ -297,6 +296,7 @@ public void actionPerformed(ActionEvent e) {
     
     menu.addSeparator();
     
+    /*
     // TODO: The SDK selection menu will be removed once app publishing is fully
     // functional: correct minimum SDK level can be inferred from app type 
     // (fragment, wallpaper, etc), and target SDK from the highest available in
@@ -322,8 +322,9 @@ public void run() {
     }.start();
 
     menu.add(sdkMenu);
-
+    
     menu.addSeparator();
+    */
     
     item = new JMenuItem("SDK Manager");
     item.addActionListener(new ActionListener() {
@@ -359,6 +360,7 @@ public void actionPerformed(ActionEvent e) {
     return menu;
   }
 
+  /*
   private void updateSdkMenu(final JMenu sdkMenu) {
     try {
       ArrayList<AndroidSDK.SDKTarget> targets = androidMode.getSDK().getAvailableSdkTargets();
@@ -394,7 +396,7 @@ private void updateSdkMenu(final JMenu sdkMenu) {
         item.addChangeListener(new ChangeListener() {
           @Override
           public void stateChanged(ChangeEvent e) {
-            if (target.name.equals(AndroidBuild.sdkName)) item.setState(true);
+            if (target.name.equals(AndroidBuild.target_sdk_version)) item.setState(true);
             else item.setState(false);
           }
         });
@@ -423,7 +425,7 @@ public void actionPerformed(ActionEvent e) {
       e.printStackTrace();
     }
   }
-
+*/
 
   /**
    * Uses the main help menu, and adds a few extra options. If/when there's
diff --git a/src/processing/mode/android/AndroidMode.java b/src/processing/mode/android/AndroidMode.java
@@ -200,9 +200,9 @@ public String getSearchPath() {
 
     String path = sdk.getSdkFolder().getAbsolutePath() + File.separator + 
                   "platforms" + File.separator + "android-";
-    String ver = AndroidBuild.sdkVersion;
-    String name = AndroidBuild.sdkName;
-    String androidJarPath = path + ver + File.separator + "android.jar";    
+    String level = AndroidBuild.target_api_level;
+    String name = AndroidBuild.target_sdk_version;
+    String androidJarPath = path + level + File.separator + "android.jar";    
     if (!new File(androidJarPath).exists()) {
       // Try again using SDK name, I have seen the SDK stored as platforms/android-x.y.z
       androidJarPath = path + name + File.separator + "android.jar";
diff --git a/src/processing/mode/android/AndroidSDK.java b/src/processing/mode/android/AndroidSDK.java
@@ -44,6 +44,7 @@ class AndroidSDK {
   private final File folder;
   private final File tools;
   private final File platforms;
+  private final File targetPlatform;
   private final File platformTools;
   private final File androidTool;
 
@@ -59,7 +60,8 @@ class AndroidSDK {
     "If you want to download the SDK manually, you can visit <br>"+
     "http://developer.android.com/sdk/installing/index.html <br>" +
     "and select the stand-alone SDK tools. Make sure to install <br>"+
-    "the SDK platform for API 21 (Android 5.0) or higher.";
+    "the SDK platform for Android " + AndroidBuild.target_sdk_version + 
+    " (API level " + AndroidBuild.target_api_level + ") or higher.";
     
   private static final String SELECT_ANDROID_SDK_FOLDER =
     "Choose the location of the Android SDK";
@@ -84,6 +86,12 @@ public AndroidSDK(File folder) throws BadSDKException, IOException {
     if (!platforms.exists()) {
       throw new BadSDKException("There is no platforms folder in " + folder);
     }
+    
+    targetPlatform = new File(platforms, AndroidBuild.target_platform);
+    if (!targetPlatform.exists()) {
+      throw new BadSDKException("There is no Android " + 
+                                AndroidBuild.target_sdk_version + " in " + platforms.getAbsolutePath());
+    }
 
     androidTool = findAndroidTool(tools);
 
diff --git a/src/processing/mode/android/Manifest.java b/src/processing/mode/android/Manifest.java
diff --git a/src/processing/mode/android/SDKDownloader.java b/src/processing/mode/android/SDKDownloader.java
