Changed minimum mac osx version to 10.10.

sampottinger · sampottinger · commit eb6a9f73cf90 · 2020-04-27T16:56:55.000-07:00
Per @benfry's feedback on #88, moved to 10.10 minimum mac os x version enforced in Info.plist.
diff --git a/app/src/processing/app/platform/DefaultPlatform.java b/app/src/processing/app/platform/DefaultPlatform.java
@@ -80,7 +80,8 @@ public void initBase(Base base) {
   public void setLookAndFeel() throws Exception {
     String laf = Preferences.get("editor.laf");
     if (laf == null || laf.length() == 0) {  // normal situation
-      if (shouldUseVaqua()) {
+      boolean isMac = System.getProperty("os.name", "").startsWith("Mac OS");
+      if (isMac) {
         UIManager.setLookAndFeel("org.violetlib.aqua.AquaLookAndFeel");
 
         Icon collapse = new MacTreeIcon(true);
@@ -282,29 +283,4 @@ public void paintIcon(Component c, Graphics g, int x, int y) {
     }
   }
 
-  /**
-   * Determine if Vaqua swing modifications for OS X should be used.
-   *
-   * @return True if the system is compatible with Vaqua and it is preferred. False otherwise.
-   */
-  private boolean shouldUseVaqua() {
-    boolean isMac = System.getProperty("os.name", "").startsWith("Mac OS");
-    if (!isMac) {
-      return false;
-    }
-
-    String fullMacVersion = System.getProperty("os.version", "NOT_AVAILABLE");
-    if ("NOT_AVAILABLE".equals(fullMacVersion)) {
-      return false;
-    }
-
-    String[] components = fullMacVersion.split("\\.");
-    if (components.length < 2) {
-      return false;
-    }
-
-    int macTrain = Integer.parseInt(components[1]);
-    return macTrain >= 10;
-  }
-
 }
diff --git a/build/build.xml b/build/build.xml
@@ -705,7 +705,8 @@
                copyright="© The Processing Foundation"
                shortVersion="${version}"
                version="${revision}"
-               mainClassName="processing.app.BaseSplash">
+               mainClassName="processing.app.BaseSplash"
+               minimumSystemVersion="10.10.0">
 
       <!-- The appbundler task needs a couple files (the Info.plist and
            anything else outside /jdk) from the full JDK, even though
diff --git a/java/application/Info.plist.tmpl b/java/application/Info.plist.tmpl
@@ -38,7 +38,7 @@
     <string>@@sketch@@</string>
 
     <key>LSMinimumSystemVersion</key>
-    <string>10.8.5</string>
+    <string>10.10.0</string>
 
     <key>NSHighResolutionCapable</key>
     <true/>
@@ -61,7 +61,7 @@
     <array>
 @@jvm_options_list@@
       <string>-Xdock:icon=$APP_ROOT/Contents/Resources/sketch.icns</string>
-      <string>-Djava.library.path=$APP_ROOT/Contents/Java</string>   
+      <string>-Djava.library.path=$APP_ROOT/Contents/Java</string>
       <string>-Dapple.laf.useScreenMenuBar=true</string>
       <string>-Dcom.apple.macos.use-file-dialog-packages=true</string>
       <string>-Dcom.apple.macos.useScreenMenuBar=true</string>
