Merge pull request #85 from asebak/feature/fix-travis

few fixes in code
asebak · Mar 26, 2022 · 98cdc0f · 98cdc0f
2 parents 42b5fdb + d6dd589
commit 98cdc0f
Show file tree

Hide file tree

Showing 27 changed files with 108 additions and 284 deletions.
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/README.md b/README.md
@@ -1,6 +1,5 @@
 ![alt text][overviewlogo]
 =============================
-[![Build Status](https://travis-ci.org/asebak/embeddedlinux-jvmdebugger-intellij.svg?branch=master)](https://travis-ci.org/asebak/embeddedlinux-jvmdebugger-intellij)
 
 ```
 https://plugins.jetbrains.com/plugin/7738
@@ -10,7 +9,7 @@ https://plugins.jetbrains.com/plugin/7738
 
 Embedded Linux JVM Debugger is a Plugin for IntelliJ IDEA that makes it easier to develop Embedded Java applications for embedded systems running on any variant of embedded linux.  It easily integrates any embedded system such as the raspberry pi or beaglebone black. As long as java can run on the embedded device and ssh protocol is enabled than it's never been simpler to develop embedded java applications.
 
-  - Supports Java 6+ with Virtual Machine and Program Arguments.
+  - Supports Java 11+ with Virtual Machine and Program Arguments.
   - Supports Multi-Module projects in IntelliJ.
   - Custom Run and Debug configurations for your hardware board.
   - Works cross platforms on the host machine whether that is Windows, Linux or Mac platforms.
@@ -43,17 +42,17 @@ $ sudo sh ./ci-build.sh
 * Mockito/PowerMockito/JUnit
 * Jsch
 * Commons Compress
-* IntelliJ SDK 2016 + Java 8 (since release 1.20)
+* IntelliJ SDK 2019 + Java 11 (since release 1.24)
 
 ### Development
 
 If you want to contribute and add functionality, make sure to add unit tests if they are needed.
 
-[overviewlogo]: https://raw.githubusercontent.com/asebak/embeddedlinux-jvmdebugger-intellij/master/Resources/documentation/embeddedlinuxjvm.png
+[overviewlogo]: https://raw.githubusercontent.com/asebak/embeddedlinux-jvmdebugger-intellij/master/src/main/resources/documentation/embeddedlinuxjvm.png
 "Overview"
 
-[logo]: https://raw.githubusercontent.com/asebak/embeddedlinux-jvmdebugger-intellij/master/Resources/documentation/sample1.png
+[logo]: https://raw.githubusercontent.com/asebak/embeddedlinux-jvmdebugger-intellij/master/src/main/resources/documentation/sample1.png
 "Sample Build Output"
 
-[config]: https://raw.githubusercontent.com/asebak/embeddedlinux-jvmdebugger-intellij/master/Resources/documentation/sample2.png
+[config]: https://raw.githubusercontent.com/asebak/embeddedlinux-jvmdebugger-intellij/master/src/main/resources/documentation/sample2.png
 "Sample Run Configuration"
diff --git a/Resources/bbb.png b/Resources/bbb.png
diff --git a/Resources/bbbmain.ftl b/Resources/bbbmain.ftl
diff --git a/Resources/pi4j.zip b/Resources/pi4j.zip
diff --git a/Resources/rpimain.ftl b/Resources/rpimain.ftl
diff --git a/build.gradle b/build.gradle
@@ -17,19 +17,23 @@ repositories {
 }
 
 dependencies {
-    compileOnly files('lib/lombok.jar')
-    annotationProcessor files('lib/lombok.jar')
 
-    compile files('lib/commons-compress-1.8.jar')
-    compile files('lib/freemarker.jar')
-    compile files('lib/jsch-0.1.55.jar')
+    compileOnly 'org.projectlombok:lombok:1.18.22'
+    annotationProcessor 'org.projectlombok:lombok:1.18.22'
+
+    compile 'org.apache.commons:commons-compress:1.21'
+    compile 'org.freemarker:freemarker:2.3.31'
+    compile 'com.jcraft:jsch:0.1.55'
+
+    testCompile 'junit:junit:4.13.2'
+    testCompile 'org.mockito:mockito-all:1.10.19'
+    testCompile 'org.powermock:powermock-module-junit4:2.0.9'
+    testCompile 'org.powermock:powermock-api-mockito:1.7.4'
+
 
-    testCompile files('lib/junit-4.11.jar')
-    testCompile files('lib/mockito-all-1.9.5.jar')
-    testCompile files('lib/powermock-mockito-1.5.5-full.jar')
 }
 
-def intellijVersion = System.getenv().getOrDefault("IDEA_VERSION", "2019.3.5")
+def intellijVersion = System.getenv().getOrDefault("IDEA_VERSION", "213.7172.25")
 
 intellij {
     version = intellijVersion

diff --git a/lib/commons-compress-1.8.jar b/lib/commons-compress-1.8.jar
diff --git a/lib/freemarker.jar b/lib/freemarker.jar
diff --git a/lib/jsch-0.1.55.jar b/lib/jsch-0.1.55.jar
diff --git a/lib/junit-4.11.jar b/lib/junit-4.11.jar
diff --git a/lib/lombok.jar b/lib/lombok.jar
diff --git a/lib/mockito-all-1.9.5.jar b/lib/mockito-all-1.9.5.jar
diff --git a/lib/powermock-mockito-1.5.5-full.jar b/lib/powermock-mockito-1.5.5-full.jar
diff --git a/src/main/java/com/atsebak/embeddedlinuxjvm/console/EmbeddedLinuxJVMConsoleView.java b/src/main/java/com/atsebak/embeddedlinuxjvm/console/EmbeddedLinuxJVMConsoleView.java
@@ -124,7 +124,7 @@ public void clear() {
         if (consoleView.isShowing()) {
             consoleView.clear();
         } else {
-            ApplicationManager.getApplication().invokeAndWait(new Runnable() {
+            ApplicationManager.getApplication().invokeLater(new Runnable() {
                 @Override
                 public void run() {
                     consoleView.flushDeferredText();

diff --git a/src/main/java/com/atsebak/embeddedlinuxjvm/project/BeagleBoneBlackJavaModuleBuilder.java b/src/main/java/com/atsebak/embeddedlinuxjvm/project/BeagleBoneBlackJavaModuleBuilder.java