Merge pull request arduino#10357 from cmaglie/jre-fix-2

Updated appbundler to 1.0ea-arduino8 (fix crash on Macosx Catalina + multi monitor setup)
funnyflowerpot · Jun 12, 2020 · 02d844d · 02d844d
2 parents bd0e743 + 38c9ed4
commit 02d844d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/build/build.xml b/build/build.xml
@@ -387,13 +387,13 @@
     <mkdir dir="${staging_folder}/work" />
 
     <antcall target="unzip">
-      <param name="archive_file" value="${staging_folder}/appbundler-1.0ea-arduino5.jar.zip" />
-      <param name="archive_url" value="https://downloads.arduino.cc/appbundler-1.0ea-arduino5.jar.zip" />
-      <param name="final_folder" value="${staging_folder}/appbundler-1.0ea-arduino5" />
-      <param name="dest_folder" value="${staging_folder}/appbundler-1.0ea-arduino5" />
+      <param name="archive_file" value="${staging_folder}/appbundler-1.0ea-arduino8.jar.zip" />
+      <param name="archive_url" value="https://downloads.arduino.cc/appbundler-1.0ea-arduino8.jar.zip" />
+      <param name="final_folder" value="${staging_folder}/appbundler-1.0ea-arduino8" />
+      <param name="dest_folder" value="${staging_folder}/appbundler-1.0ea-arduino8" />
     </antcall>
 
-    <taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask" classpath="${staging_folder}/appbundler-1.0ea-arduino5/appbundler-1.0ea-arduino5.jar"/>
+    <taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask" classpath="${staging_folder}/appbundler-1.0ea-arduino8/appbundler-1.0ea-arduino8.jar"/>
 
     <bundleapp
             jvmRequired="1.8"

diff --git a/build/macosx/appbundler-1.0ea-arduino5.jar.zip.sha b/build/macosx/appbundler-1.0ea-arduino5.jar.zip.sha
diff --git a/build/macosx/appbundler-1.0ea-arduino8.jar.zip.sha b/build/macosx/appbundler-1.0ea-arduino8.jar.zip.sha
@@ -0,0 +1 @@
+5e947cc988e82bcca71c60d57121529ee6ff770d