Merge all changes

.classpath

@@ -4,7 +4,6 @@
 	<classpathentry kind="src" path="app/test"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="app/lib/apple.jar"/>
-	<classpathentry kind="lib" path="app/lib/ecj.jar"/>
 	<classpathentry kind="lib" path="app/test-lib/junit-4.11.jar"/>
 	<classpathentry kind="lib" path="app/test-lib/fest-assert-1.2.jar"/>
 	<classpathentry kind="lib" path="app/test-lib/fest-reflect-1.2.jar"/>
@@ -16,17 +15,17 @@
 	<classpathentry kind="lib" path="app/lib/commons-httpclient-3.1.jar"/>
 	<classpathentry kind="lib" path="app/lib/commons-logging-1.0.4.jar"/>
 	<classpathentry kind="lib" path="app/lib/commons-net-3.3.jar"/>
-	<classpathentry kind="lib" path="app/lib/jmdns-3.5.1.jar"/>
+	<classpathentry kind="lib" path="app/lib/jmdns-3.5.3.jar"/>
 	<classpathentry kind="lib" path="app/lib/slf4j-api-1.7.22.jar"/>
 	<classpathentry kind="lib" path="app/lib/jsch-0.1.50.jar"/>
-	<classpathentry kind="lib" path="app/lib/jssc-2.8.0.jar"/>
+	<classpathentry kind="lib" path="app/lib/jssc-2.8.0-arduino3.jar"/>
 	<classpathentry kind="lib" path="app/lib/bcpg-jdk15on-152.jar"/>
 	<classpathentry kind="lib" path="app/lib/bcprov-jdk15on-152.jar"/>
-	<classpathentry kind="lib" path="app/lib/jackson-core-2.6.3.jar"/>
-	<classpathentry kind="lib" path="app/lib/jackson-databind-2.6.3.jar"/>
-	<classpathentry kind="lib" path="app/lib/jackson-module-mrbean-2.6.3.jar"/>
-	<classpathentry kind="lib" path="app/lib/jackson-annotations-2.6.3.jar"/>
+	<classpathentry kind="lib" path="app/lib/jackson-core-2.9.5.jar"/>
+	<classpathentry kind="lib" path="app/lib/jackson-databind-2.9.5.jar"/>
+	<classpathentry kind="lib" path="app/lib/jackson-annotations-2.9.5.jar"/>
 	<classpathentry kind="lib" path="app/lib/commons-compress-1.8.jar"/>
+	<classpathentry kind="lib" path="app/lib/commons-lang3-3.8.1.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/arduino-core"/>
 	<classpathentry kind="output" path="app/bin"/>
 </classpath>

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1 @@
+Please read the Issues section of the Contributing Rules at the "Contributing" link to the right before submitting an issue report.

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,17 @@
+### All Submissions:
+
+* [ ] Have you followed the guidelines in our Contributing document?
+* [ ] Have you checked to ensure there aren't other open [Pull Requests](https://github.com/arduino/Arduino/pulls?q=) for the same update/change?
+
+<!-- You can erase any parts of this template not applicable to your Pull Request. -->
+
+### New Feature Submissions:
+
+1. [ ] Does your submission pass tests?
+2. [ ] Have you lint your code locally prior to submission?
+
+### Changes to Core Features:
+
+* [ ] Have you added an explanation of what your changes do and why you'd like us to include them?
+* [ ] Have you written new tests for your core changes, as applicable?
+* [ ] Have you successfully ran tests with your changes

.github/workflows/ant.yml

@@ -0,0 +1,34 @@
+name: Java CI
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - name: Build with Ant
+      working-directory: ./build
+      run: |
+        sed -i 's#<input .*/>##' build.xml
+        ant clean dist
+    - name: Install X virtual framebuffer
+      run: sudo apt-get install -y xvfb
+    - name: Run tests
+      working-directory: ./app
+      run: xvfb-run --auto-servernum --server-args "-screen 0 1024x768x24" ant test -Drunning-from-github-action=1
+    - name: Publish results
+      uses: actions/upload-artifact@v1
+      with:
+        name: html-results
+        path: app/test-bin/results/html/
+    - name: Cleanup xvfb
+      uses: bcomnes/cleanup-xvfb@v1

README.md

@@ -1,40 +1,73 @@
-Arduino
-========
+<p align="center">
+	<img src="http://content.arduino.cc/brand/arduino-color.svg" width="50%" />
+</p>
 
-* Arduino is an open-source physical computing platform based on a simple I/O
+Arduino is an open-source physical computing platform based on a simple I/O
 board and a development environment that implements the Processing/Wiring
 language. Arduino can be used to develop stand-alone interactive objects or
 can be connected to software on your computer (e.g. Flash, Processing and MaxMSP).
 The boards can be assembled by hand or purchased preassembled; the open-source
-IDE can be downloaded for free at https://www.arduino.cc/en/Main/Software
+IDE can be downloaded for free at [https://arduino.cc](https://www.arduino.cc/en/Main/Software)
 
-* For more information, see the website at: https://www.arduino.cc/
-or the forums at: https://forum.arduino.cc/  
-You can also follow Arduino on Twitter at: https://twitter.com/arduino or
-like Arduino on Facebook at: https://www.facebook.com/official.arduino
+## More info at
 
-* To report a *bug* in the software or to request *a simple enhancement* go to:
-https://github.com/arduino/Arduino/issues
+-  [Our website](https://www.arduino.cc/)
 
-* More complex requests and technical discussion should go on the Arduino Developers
-mailing list:
-https://groups.google.com/a/arduino.cc/forum/#!forum/developers
+-  [The forums](https://forum.arduino.cc/)
 
-* If you're interested in modifying or extending the Arduino software, we strongly
-suggest discussing your ideas on the Developers mailing list *before* starting
-to work on them. That way you can coordinate with the Arduino Team and others,
+-  Follow us on [Twitter](https://twitter.com/arduino)
+-  And like us at [Facebook](https://www.facebook.com/official.arduino)
+
+## Bug reports and technical discussions
+
+-  To report a *bug* in the software or to request *a simple enhancement* go to [Github Issues](https://github.com/arduino/Arduino/issues)
+
+-  More complex requests and technical discussion should go on the [Arduino Developers
+mailing list](https://groups.google.com/a/arduino.cc/forum/#!forum/developers)
+
+-  If you're interested in modifying or extending the Arduino software, we strongly
+suggest discussing your ideas on the
+[Developers mailing list](https://groups.google.com/a/arduino.cc/forum/#!forum/developers)
+ *before* starting to work on them.
+That way you can coordinate with the Arduino Team and others,
 giving your work a higher chance of being integrated into the official release
-https://groups.google.com/a/arduino.cc/forum/#!forum/developers
 
-Installation
-------------
-Detailed instructions for installation in popular operating systems.  
-For Linux: https://www.arduino.cc/en/Guide/Linux (see also the Arduino playground page https://playground.arduino.cc/Learning/Linux)   
-For macOS X: https://www.arduino.cc/en/Guide/MacOSX   
-For Windows: https://www.arduino.cc/en/Guide/Windows
+## Installation
+
+Detailed instructions for installation in popular operating systems can be found at:
+
+-  [Linux](https://www.arduino.cc/en/Guide/Linux) (see also the [Arduino playground](https://playground.arduino.cc/Learning/Linux))
+-  [macOS](https://www.arduino.cc/en/Guide/MacOSX)
+-  [Windows](https://www.arduino.cc/en/Guide/Windows)
+
+## Contents of this repository
+
+This repository contains just the code for the Arduino IDE itself.
+Originally, it also contained the AVR and SAM Arduino core and libraries
+(i.e.  the code that is compiled as part of a sketch and runs on the
+actual Arduino device), but those have been moved into their own
+repositories.  They are still automatically downloaded as part of the
+build process and included in built releases, though.
+
+The repositories for these extra parts can be found here:
+-   Non-core specific Libraries are listed under: <https://github.com/arduino-libraries/>
+    (and also a few other places, see `build/build.xml`).
+
+-   The AVR core can be found at: <https://github.com/arduino/ArduinoCore-avr>
+
+-   Other cores are not included by default but installed through the
+    board manager. Their repositories can also be found under
+    <https://github.com/arduino/>.
+
+## Building and testing
+
+Instructions for building the IDE and running unit tests can be found on
+the wiki:
+-   <https://github.com/arduino/Arduino/wiki/Building-Arduino>
+-   <https://github.com/arduino/Arduino/wiki/Testing-Arduino>
+
+## Credits
 
-Credits
---------
 Arduino is an open source project, supported by many.
 
 The Arduino team is composed of Massimo Banzi, David Cuartielles, Tom Igoe
@@ -43,8 +76,8 @@ and David A. Mellis.
 Arduino uses
 [GNU avr-gcc toolchain](https://gcc.gnu.org/wiki/avr-gcc),
 [GCC ARM Embedded toolchain](https://launchpad.net/gcc-arm-embedded),
-[avr-libc](http://www.nongnu.org/avr-libc/),
-[avrdude](http://www.nongnu.org/avrdude/),
+[avr-libc](https://www.nongnu.org/avr-libc/),
+[avrdude](https://www.nongnu.org/avrdude/),
 [bossac](http://www.shumatech.com/web/products/bossa),
 [openOCD](http://openocd.org/)
 and code from [Processing](https://www.processing.org)

app/.classpath

@@ -4,7 +4,6 @@
 	<classpathentry kind="src" path="test"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/arduino-core"/>
-	<classpathentry kind="output" path="bin"/>
 	<classpathentry kind="lib" path="lib/apple.jar"/>
 	<classpathentry kind="lib" path="lib/batik-1.8.jar"/>
 	<classpathentry kind="lib" path="lib/batik-anim-1.8.jar"/>
@@ -30,20 +29,19 @@
 	<classpathentry kind="lib" path="lib/commons-compress-1.8.jar"/>
 	<classpathentry kind="lib" path="lib/commons-exec-1.1.jar"/>
 	<classpathentry kind="lib" path="lib/commons-httpclient-3.1.jar"/>
-	<classpathentry kind="lib" path="lib/commons-lang3-3.3.2.jar"/>
 	<classpathentry kind="lib" path="lib/commons-logging-1.0.4.jar"/>
 	<classpathentry kind="lib" path="lib/commons-net-3.3.jar"/>
-	<classpathentry kind="lib" path="lib/jackson-annotations-2.6.3.jar"/>
-	<classpathentry kind="lib" path="lib/jackson-core-2.6.3.jar"/>
-	<classpathentry kind="lib" path="lib/jackson-databind-2.6.3.jar"/>
-	<classpathentry kind="lib" path="lib/jackson-module-mrbean-2.6.3.jar"/>
+	<classpathentry kind="lib" path="lib/jackson-annotations-2.9.5.jar"/>
+	<classpathentry kind="lib" path="lib/jackson-core-2.9.5.jar"/>
+	<classpathentry kind="lib" path="lib/jackson-databind-2.9.5.jar"/>
 	<classpathentry kind="lib" path="lib/java-semver-0.8.0.jar"/>
-	<classpathentry kind="lib" path="lib/jmdns-3.5.1.jar"/>
+	<classpathentry kind="lib" path="lib/jmdns-3.5.5.jar"/>
 	<classpathentry kind="lib" path="lib/slf4j-api-1.7.22.jar"/>
 	<classpathentry kind="lib" path="lib/slf4j-simple-1.7.22.jar"/>
+	<classpathentry kind="lib" path="lib/log4j-api-2.12.0.jar"/>
+	<classpathentry kind="lib" path="lib/log4j-core-2.12.0.jar"/>
 	<classpathentry kind="lib" path="lib/jsch-0.1.50.jar"/>
-	<classpathentry kind="lib" path="lib/jssc-2.8.0-arduino1.jar"/>
-	<classpathentry kind="lib" path="lib/rsyntaxtextarea-2.6.1.jar"/>
+	<classpathentry kind="lib" path="lib/rsyntaxtextarea-3.0.3-SNAPSHOT.jar"/>
 	<classpathentry kind="lib" path="lib/xml-apis-1.3.04.jar"/>
 	<classpathentry kind="lib" path="lib/xml-apis-ext-1.3.04.jar"/>
 	<classpathentry kind="lib" path="lib/xmlgraphics-commons-2.0.jar"/>
@@ -53,4 +51,8 @@
 	<classpathentry kind="lib" path="test-lib/fest-swing-1.2.jar"/>
 	<classpathentry kind="lib" path="test-lib/fest-util-1.1.2.jar"/>
 	<classpathentry kind="lib" path="test-lib/jcip-annotations-1.0.jar"/>
+	<classpathentry kind="lib" path="lib/jtouchbar-1.0.0.jar"/>
+	<classpathentry kind="lib" path="lib/commons-lang3-3.8.1.jar"/>
+	<classpathentry kind="lib" path="lib/jssc-2.8.0-arduino4.jar"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>

app/build.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<project name="Arduino PDE" default="build">
+<project name="Arduino PDE" xmlns:if="ant:if" xmlns:unless="ant:unless" default="build">
 
   <path id="class.path">
     <fileset dir="lib">
@@ -80,6 +80,10 @@
 	   includeAntRuntime="false"
 	   debug="true"
 	   classpathref="class.path" />
+    <!-- If you want to add files in the jars -->
+    <copy todir="bin" overwrite="true" verbose="true">
+      <fileset dir="src" includes="log4j2.xml" />
+    </copy>
   </target>
 
   <target name="test" depends="compile" description="Runs the test">
@@ -105,7 +109,20 @@
       <fileset dir="test" includes="**/*.pac" />
     </copy>
 
-    <junit printsummary="yes" dir="${work.dir}" fork="true">
+    <!-- XML and TXT reports will be written here -->
+    <property name="test.reportdir" value="test-bin/results"/>
+    <!-- Summary HTML report will be written here -->
+    <property name="test.htmldir" value="test-bin/results/html"/>
+
+    <!-- Remove the reportdir, so the HTML report only includes tests from this run -->
+    <delete dir="${test.reportdir}" />
+    <mkdir dir="${test.reportdir}"/>
+    <mkdir dir="${test.htmldir}"/>
+
+    <!-- Sanity check: when single-test-methods is set, but single-test-class is not, raise an error -->
+    <fail message="Need single-test-class if single-test-methods is set" if="single-test-methods" unless="single-test-class"/>
+
+    <junit printsummary="yes" dir="${work.dir}" fork="true" showoutput="no" failureproperty="test.failed">
       <jvmarg value="-Djava.library.path=${java.additional.library.path}"/>
       <jvmarg value="-DWORK_DIR=."/>
       <jvmarg value="-ea"/>
@@ -117,16 +134,46 @@
         <path refid="class.path.test"/>
       </classpath>
 
+      <!-- Write XML files (for report-generation) and TXT files (for manual review) for every test class -->
+      <formatter type="plain" />
       <formatter type="xml"/>
-
-      <batchtest fork="yes" todir="test-bin">
+      <!-- Print full details to stdout when running a single test -->
+      <formatter type="plain" usefile="false" if="single-test-class"/>
+      <!-- When running all tests, print details for failing tests and a summary for each test class (printsummary=yes above) -->
+      <formatter type="brief" usefile="false" unless="single-test-class"/>
+
+      <!-- When both single-test-class and single-test-methods are specified, pass both to unit -->
+      <test name="${single-test-class}" methods="${single-test-methods}" todir="${test.reportdir}" if="single-test-methods"/>
+      <!-- When just single-test-class is specified, omit methods to run the entire class -->
+      <test name="${single-test-class}" todir="${test.reportdir}" if="single-test-class" unless="single-test-methods"/>
+      <!-- When neither are specified, run *all* testcases -->
+      <batchtest fork="yes" todir="${test.reportdir}" unless="single-test-class">
         <fileset dir="test">
           <include name="**/*Test.java"/>
           <exclude name="**/Abstract*.java"/>
         </fileset>
       </batchtest>
     </junit>
 
+    <!-- Convert generated XML reports to browsable HTML -->
+    <junitreport todir="${test.reportdir}">
+      <fileset dir="${test.reportdir}">
+	<include name="TEST-*.xml" />
+      </fileset>
+      <!-- Create a browsable frame-based HTML -->
+      <report format="frames" todir="${test.htmldir}" />
+      <!-- Also create a single-page version, to use as CI test result -->
+      <report format="noframes" todir="${test.htmldir}" />
+    </junitreport>
+
+    <!-- Make these paths relative to user.dir, which is the current directory when invoking ant (so the resulting paths are relative to the environment of the user. -->
+    <property name="test.htmldir.display" location="${test.htmldir}" relative="true" basedir="${user.dir}"/>
+    <property name="test.reportdir.display" location="${test.reportdir}" relative="true" basedir="${user.dir}"/>
+    <echo unless:set="running-from-github-action" message="Detailed test results can be found in ${test.reportdir.display}"/>
+    <echo unless:set="running-from-github-action" message="A browsable HTML summary is generated in ${test.htmldir.display}/index.html"/>
+    <echo if:set="running-from-github-action" message="Detailed test results can be downloaded as an asset from this github action. Easiest to view is the single-file version in junit-noframes.html. Alternatively, the multi-file version can be viewed from index.html and includes full stdout/stderr output of tests."/>
+
+    <fail if="test.failed"/>
   </target>
 
   <target name="build" depends="compile" description="Build PDE">

app/lib/RSyntaxTextArea.License.txt

@@ -0,0 +1,24 @@
+Copyright (c) 2012, Robert Futrell
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the author nor the names of its contributors may
+      be used to endorse or promote products derived from this software
+      without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

app/lib/jtouchbar.LICENSE.MIT.txt

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018 thizzer.com
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.