Kh/add cadoodle

.github/workflows/release.yml

@@ -53,15 +53,8 @@ jobs:
     - name: After JDK download, list directory contnts
       run: pwd; ls -la
 
-    - name: Set Java
-      uses: actions/setup-java@v1
-      with:
-        java-version: 1.8
-        jdkFile: ./zulu8.44.0.13-ca-fx-jdk8.0.242-linux_x64.tar.gz
-
-
     - name: Build with Gradle 
-      run: ./gradlew shadowJar
+      run: bash makeJar.sh
 
     - name: release
       uses: actions/create-release@v1

.github/workflows/verify.yml

@@ -35,17 +35,5 @@ jobs:
     - name: After checkout, list directory contnts
       run: pwd; ls -la        
 
-    - name: Pull a JavaFX JDK
-      run: wget http://static.azul.com/zulu/bin/zulu8.44.0.13-ca-fx-jdk8.0.242-linux_x64.tar.gz
-
-    - name: After JDK download, list directory contnts
-      run: pwd; ls -la
-
-    - name: Set Java
-      uses: actions/setup-java@v1
-      with:
-        java-version: 1.8
-        jdkFile: ./zulu8.44.0.13-ca-fx-jdk8.0.242-linux_x64.tar.gz
-
     - name: Build with Gradle 
-      run: ./gradlew shadowJar
+      run: bash makeJar.sh

.gitignore

@@ -28,3 +28,4 @@
 /deps.txt
 /MUJOCO_LOG.TXT
 /physicsTest/
+/zulu8.*.tar.gz

build.gradle

@@ -1,12 +1,14 @@
 buildscript {
 	repositories {
 		[
-			//jcenter(),
 			mavenCentral(),
 			maven {
 				url "https://plugins.gradle.org/m2/"
 			},
-			mavenLocal()
+			mavenLocal(),
+			maven {
+				url "https://repo.jenkins-ci.org/releases/"
+			}
 		]
 	}
 	dependencies {
@@ -154,48 +156,57 @@ props.load(new FileInputStream(buildDir.getAbsolutePath()+"/src/main/resources/c
 
 
 repositories {
-	mavenCentral()
 	maven {
-		url 'https://mlt.jfrog.io/artifactory/mlt-mvn-releases-local/'
+		url "https://repo.jenkins-ci.org/public/"
 	}
-	maven { url 'https://repo.maven.apache.org/maven2/' }
+	mavenCentral()
 
 	maven { url 'https://repo1.maven.org/maven2/'}
 
-	maven { url 'https://jcenter.bintray.com/'}
-	//jcenter()
 	maven { url 'https://oss.sonatype.org/content/repositories/snapshots/'  }
 	//maven { url 'https://oss.sonatype.org/service/local/staging/deploy/maven2/'  }
 	maven { url 'https://oss.sonatype.org/content/repositories/releases/'  }
 	//com.neuronrobotics hosting point
 	maven { url 'https://oss.sonatype.org/content/repositories/staging/' }
 
-	    maven {
-	        url "https://repo.myrobotlab.org/artifactory/myrobotlab/"
-	        content {
-	            includeGroup("de.dfki.mary")
-	        }
-	    }
+//	    maven {
+//	        url "https://repo.myrobotlab.org/artifactory/myrobotlab/"
+//	        content {
+//	            includeGroup("de.dfki.mary")
+//	        }
+//	    }
 	maven { url 'https://maven-central.storage-download.googleapis.com/repos/central/data/'}
 	maven {url 'https://repo.jenkins-ci.org/public/'}
-	//jcenter()
 	maven { url 'https://clojars.org/repo' }
 	maven { url 'https://jline.sourceforge.net/m2repo' }
 	maven { url 'https://repo.spring.io/milestone'}
 	maven { url 'https://jenkinsci.artifactoryonline.com/jenkinsci/public/' }
 
 	maven { url 'https://plugins.gradle.org/m2/' }
 	//maven { url 'https://dl.bintray.com/clearcontrol/ClearControl' }
-	maven { url "https://jitpack.io" }
-
-	//maven { url 'https://dl.bintray.com/commonwealthrobotics/maven-artifacts'  }
 
+	maven { url '	https://repo.spring.io/plugins-release/'  }
 
+	maven { url "https://jitpack.io" }
+	maven { url "https://repo.eclipse.org/content/groups/releases/" }
+	maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
+	maven { url "https://dl.bintray.com/dfki-lt/maven/" }
+	maven { url "https://raw.github.com/marytts/marytts/master/repository/" }
+	maven { url "https://repo.jenkins-ci.org/public/" }
+	maven { url "https://raw.githubusercontent.com/DFKI-MLT/DFKI-LT-MAVEN/master/repository" }
+
+	maven {
+		url 'https://commonwealthrobotics.com/jcenter-mirror/'
+		allowInsecureProtocol = true
+	}
 }
 
 dependencies {
 
-
+	implementation 'org.kohsuke.stapler:stapler:1.263'
+	// https://mvnrepository.com/artifact/org.kohsuke.stapler/stapler
+	//implementation group: 'org.kohsuke.stapler', name: 'stapler', version: '1881.vd39f3ee5c629'
+
 	implementation group: 'org.json', name: 'json', version: '20180813'
 	implementation 'com.google.crypto.tink:tink:1.3.0-rc1'
 
@@ -352,7 +363,7 @@ dependencies {
 
 	//compile fileTree (dir: 'libraries/java-bowler/libs/', includes: ['*.jar'])
 	implementation 'com.google.guava:guava:19+'
-	implementation 'org.kohsuke.stapler:stapler:1.263'
+
 	implementation group: 'org.kohsuke', name: 'wordnet-random-name', version: '1.2'
 
 

jvm.json

@@ -4,35 +4,37 @@
 			  ,
 			  "type":"tar.gz",
 			  "name":"zulu8.78.0.19-ca-fx-jdk8.0.412-linux_x64",
-			  "jvmargs":["-Dprism.forceGPU=true"]
+			  "jvmargs":["-Dprism.forceGPU=true","-XX:MaxRAMPercentage=90.0"]
 			  },
 "Linux-aarch64":{
 				"url":"https://cdn.azul.com/zulu/bin/"
 			 ,
 			  "type":"tar.gz",
 			  "name":"zulu8.78.0.19-ca-fx-jdk8.0.412-linux_aarch64",
-			  "jvmargs":["-Dprism.forceGPU=true"]
+			  "jvmargs":["-Dprism.forceGPU=true","-XX:MaxRAMPercentage=90.0"]
 
 			  },
 "Windows-x64":{
 				"url":"https://cdn.azul.com/zulu/bin/"
 			  ,
 			  "type":"zip",
-			  "name":"zulu8.78.0.19-ca-fx-jdk8.0.412-win_x64"
+			  "name":"zulu8.78.0.19-ca-fx-jdk8.0.412-win_x64",
+			  "jvmargs":["-XX:MaxRAMPercentage=90.0"]
+
 			  },
 "Mac-x64":{
 				"url":"https://cdn.azul.com/zulu/bin/"
 			  ,
 			  "type":"zip",
 			  "name":"zulu8.78.0.19-ca-fx-jdk8.0.412-macosx_x64",
-			  "jvmargs":["-Dprism.forceGPU=true"]
+			  "jvmargs":["-Dprism.forceGPU=true","-XX:MaxRAMPercentage=90.0"]
 			  },
 "Mac-aarch64":{
 				"url":"https://cdn.azul.com/zulu/bin/"
 			  ,
 			  "type":"zip",
 			  "name":"zulu8.78.0.19-ca-fx-jdk8.0.412-macosx_aarch64",
-			  "jvmargs":["-Dprism.forceGPU=true"]
+			  "jvmargs":["-Dprism.forceGPU=true","-XX:MaxRAMPercentage=90.0"]
 			  }			  
 
 }

makeJar.sh

@@ -0,0 +1,19 @@
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
+export ARCH=x86_64
+JVM=zulu8.78.0.19-ca-fx-jdk8.0.412-linux_x64
+set -e
+ZIP=$JVM.tar.gz
+export JAVA_HOME=$HOME/bin/java8/
+if test -d $JAVA_HOME/$JVM/; then
+  echo "$JAVA_HOME exists."
+else
+	rm -rf $JAVA_HOME
+	mkdir -p $JAVA_HOME
+	wget https://cdn.azul.com/zulu/bin/$ZIP 
+	tar -xvzf $ZIP -C $JAVA_HOME
+	mv $JAVA_HOME/$JVM/* $JAVA_HOME/
+fi
+echo "Java home set to $JAVA_HOME"
+
+./gradlew clean shadowJar

runMac.sh

@@ -0,0 +1,40 @@
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
+export ARCH=x86_64
+JVM=zulu17.50.19-ca-fx-jdk17.0.11-macosx_x64
+set -e
+ZIP=$JVM.tar.gz
+export JAVA_HOME=$HOME/bin/java17/
+if test -d $JAVA_HOME/$JVM/; then
+  echo "$JAVA_HOME exists."
+else
+	rm -rf $JAVA_HOME
+	mkdir -p $JAVA_HOME
+	curl -L https://cdn.azul.com/zulu/bin/$ZIP -o $ZIP
+	tar -xvzf $ZIP -C $JAVA_HOME
+	mv $JAVA_HOME/$JVM/* $JAVA_HOME/
+fi
+echo "Java home set to $JAVA_HOME"
+ ./gradlew --stop
+#rm -rf ~/.gradle/caches/
+#rm -rf ~/.gradle/daemon/
+./gradlew clean build --refresh-dependencies
+./gradlew shadowJar
+
+$JAVA_HOME/bin/java -Dprism.forceGPU=true --add-exports \
+	javafx.graphics/com.sun.javafx.css=ALL-UNNAMED \
+	--add-exports \
+	javafx.controls/com.sun.javafx.scene.control.behavior=ALL-UNNAMED \
+	--add-exports \
+	javafx.controls/com.sun.javafx.scene.control=ALL-UNNAMED \
+	--add-exports \
+	javafx.base/com.sun.javafx.event=ALL-UNNAMED \
+	--add-exports \
+	javafx.controls/com.sun.javafx.scene.control.skin.resources=ALL-UNNAMED \
+	--add-exports \
+	javafx.graphics/com.sun.javafx.util=ALL-UNNAMED \
+	--add-exports \
+	javafx.graphics/com.sun.javafx.scene.input=ALL-UNNAMED \
+	--add-opens \
+	javafx.graphics/javafx.scene=ALL-UNNAMED \
+	-jar build/libs/BowlerStudio.jar

src/main/java/com/neuronrobotics/bowlerstudio/AddFileToGistController.java

@@ -127,7 +127,7 @@ public void start(Stage primaryStage) throws Exception {
 		    	  langaugeIcon.setScaleY(FontSizeManager.getImageScale());
 		      });
 		} catch (Exception e2) {
-			// TODO Auto-generated catch block
+			// Auto-generated catch block
 			e2.printStackTrace();
 		}
 
@@ -137,7 +137,7 @@ public void start(Stage primaryStage) throws Exception {
 				String selectedItem = extention.getSelectionModel().getSelectedItem();
 				setSelected(selectedItem);
 			} catch (Exception e1) {
-				// TODO Auto-generated catch block
+				// Auto-generated catch block
 				e1.printStackTrace();
 			}
 
@@ -199,7 +199,7 @@ public void onAddFile(ActionEvent event) {
 			if (getGitRepo() == null) {
 				setGitRepo(GistHelper.createNewGist(filename, message, true));
 			}
-			System.out.println("Adding new file" + filename + " to " + getGitRepo());
+			com.neuronrobotics.sdk.common.Log.error("Adding new file" + filename + " to " + getGitRepo());
 			try {
 				ScriptingEngine.pull(getGitRepo());
 				//String defaultContents = 
@@ -241,7 +241,7 @@ public static void main(String[] args) {
 				AddFileToGistController controller = new AddFileToGistController(url, new MenuRefreshEvent() {
 					@Override
 					public void setToLoggedIn() {
-						// TODO Auto-generated method stub
+						// Auto-generated method stub
 
 					}
 
@@ -301,7 +301,7 @@ void createProject(ActionEvent event) {
 				});
 
 			} catch (Throwable e) {
-				// TODO Auto-generated catch block
+				// Auto-generated catch block
 				e.printStackTrace();
 			}
 		}).start();
@@ -334,7 +334,7 @@ public void setFileExtensionType(IScriptingLanguage lang) {
 				extention.setDisable(true);
 			});
 		} catch (Exception e) {
-			// TODO Auto-generated catch block
+			// Auto-generated catch block
 			e.printStackTrace();
 		}