From 2143b1193df1b682d99addb064cc395250ec148e Mon Sep 17 00:00:00 2001 From: Kevin Harrington Date: Thu, 22 Jun 2023 11:20:17 -0400 Subject: [PATCH 01/11] test the new exception handeling process --- libraries/bowler-script-kernel | 2 +- .../neuronrobotics/bowlerstudio/creature/CreatureLab.java | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/libraries/bowler-script-kernel b/libraries/bowler-script-kernel index 8c8b05934..65d33709e 160000 --- a/libraries/bowler-script-kernel +++ b/libraries/bowler-script-kernel @@ -1 +1 @@ -Subproject commit 8c8b05934e2038fe4aece1ed26e5b8d61628c8d4 +Subproject commit 65d33709ef6730547e5c47a0651ed279ac02cda6 diff --git a/src/main/java/com/neuronrobotics/bowlerstudio/creature/CreatureLab.java b/src/main/java/com/neuronrobotics/bowlerstudio/creature/CreatureLab.java index bed1eeea5..e44ff2026 100644 --- a/src/main/java/com/neuronrobotics/bowlerstudio/creature/CreatureLab.java +++ b/src/main/java/com/neuronrobotics/bowlerstudio/creature/CreatureLab.java @@ -131,7 +131,6 @@ public void initializeUI(BowlerAbstractDevice pm) { private void regenFromUiEvent() { BowlerStudio.runLater(() -> { - if (System.currentTimeMillis() - timeSinceLastUpdate < 500) { return; } @@ -256,14 +255,14 @@ public void run() { rb1.setToggleGroup(group); rb1.setSelected(true); rb1.setOnAction(event -> { - setCadMode(false); + BowlerStudio.runLater(() ->setCadMode(false)); }); RadioButton rb2 = new RadioButton(); rb2.setToggleGroup(group); rb2.fire(); rb2.setOnAction(event -> { - setCadMode(true); + BowlerStudio.runLater(() ->setCadMode(true)); }); radioOptions = new HBox(10); From f8d4c0409b2a3cbcbd025e3ad945a8436ac4d297 Mon Sep 17 00:00:00 2001 From: Kevin Harrington Date: Thu, 22 Jun 2023 11:28:28 -0400 Subject: [PATCH 02/11] kernel --- libraries/bowler-script-kernel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/bowler-script-kernel b/libraries/bowler-script-kernel index 65d33709e..60957587f 160000 --- a/libraries/bowler-script-kernel +++ b/libraries/bowler-script-kernel @@ -1 +1 @@ -Subproject commit 65d33709ef6730547e5c47a0651ed279ac02cda6 +Subproject commit 60957587fffa2b91097a2e9b209e5b81359f28fa From 002e7a9d57a5713765ead2d0681e0b1fe3dbc883 Mon Sep 17 00:00:00 2001 From: Kevin Harrington Date: Thu, 22 Jun 2023 11:29:46 -0400 Subject: [PATCH 03/11] kernel --- libraries/bowler-script-kernel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/bowler-script-kernel b/libraries/bowler-script-kernel index 60957587f..4b1edb6f3 160000 --- a/libraries/bowler-script-kernel +++ b/libraries/bowler-script-kernel @@ -1 +1 @@ -Subproject commit 60957587fffa2b91097a2e9b209e5b81359f28fa +Subproject commit 4b1edb6f3e0e8afd76ae21c560e994ab5b963454 From 4583d1588e41f5a243ceb25cc9fc5d2f36e1573c Mon Sep 17 00:00:00 2001 From: Kevin Harrington Date: Thu, 22 Jun 2023 13:28:25 -0400 Subject: [PATCH 04/11] remove duplicate function --- .../bowlerstudio/BowlerStudioModularFrame.java | 4 ++-- .../bowlerstudio/creature/CreatureLab.java | 1 + .../creature/MobleBaseMenueFactory.java | 16 ++++++++-------- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/neuronrobotics/bowlerstudio/BowlerStudioModularFrame.java b/src/main/java/com/neuronrobotics/bowlerstudio/BowlerStudioModularFrame.java index 1391bbc66..3784a3eca 100644 --- a/src/main/java/com/neuronrobotics/bowlerstudio/BowlerStudioModularFrame.java +++ b/src/main/java/com/neuronrobotics/bowlerstudio/BowlerStudioModularFrame.java @@ -289,7 +289,7 @@ public void showCreatureLab(int depth) { if (!isOpen.get(key)) { isOpen.put(key, true); new Thread(() -> { - ThreadUtil.wait(100); + //ThreadUtil.wait(100); BowlerStudio.runLater(() -> { try { @@ -398,7 +398,7 @@ public void addTab(Tab newTab, boolean b) { } DockNode dn = new DockNode(newTab.getContent(), newTab.getText(), newTab.getGraphic()); dn.closedProperty().addListener(event -> { - closeTab(newTab); + BowlerStudio.runLater(() ->closeTab(newTab)); }); webTabs.put(newTab, dn); diff --git a/src/main/java/com/neuronrobotics/bowlerstudio/creature/CreatureLab.java b/src/main/java/com/neuronrobotics/bowlerstudio/creature/CreatureLab.java index e44ff2026..3cdbd1016 100644 --- a/src/main/java/com/neuronrobotics/bowlerstudio/creature/CreatureLab.java +++ b/src/main/java/com/neuronrobotics/bowlerstudio/creature/CreatureLab.java @@ -84,6 +84,7 @@ public void initializeUI(BowlerAbstractDevice pm) { autoRegen.setSelected(true); regenFromUiEvent(); }); + regen.setGraphic(AssetFactory.loadIcon("Generate-Cad.png")); // TODO Auto-generated method stub setText(pm.getScriptingName()); diff --git a/src/main/java/com/neuronrobotics/bowlerstudio/creature/MobleBaseMenueFactory.java b/src/main/java/com/neuronrobotics/bowlerstudio/creature/MobleBaseMenueFactory.java index 2bff721ff..5d83252c7 100644 --- a/src/main/java/com/neuronrobotics/bowlerstudio/creature/MobleBaseMenueFactory.java +++ b/src/main/java/com/neuronrobotics/bowlerstudio/creature/MobleBaseMenueFactory.java @@ -171,13 +171,13 @@ public static void load(MobileBase device, TreeView view, TreeItem regnerate = new TreeItem("Generate Cad", - AssetFactory.loadIcon("Generate-Cad.png")); - - callbackMapForTreeitems.put(regnerate, () -> { - creatureLab.generateCad(); - - }); +// TreeItem regnerate = new TreeItem("Generate Cad", +// AssetFactory.loadIcon("Generate-Cad.png")); +// +// callbackMapForTreeitems.put(regnerate, () -> { +// creatureLab.generateCad(); +// +// }); TreeItem kinematics = new TreeItem("Kinematic STL", AssetFactory.loadIcon("Printable-Cad.png")); @@ -461,7 +461,7 @@ public void onTransformChaging(TransformNR newTrans) { rootItem.getChildren().addAll(bodymass, imuCenter,PlaceLimb); if (root) - rootItem.getChildren().addAll(physics, regnerate, printable,arrangeBed, kinematics); + rootItem.getChildren().addAll(physics, printable,arrangeBed, kinematics); rootItem.getChildren().addAll(addArm, addleg, addFixed, addsteerable); if (creatureIsOwnedByUser) { if (root) From 0c958617797b6e0e2a5401d3d49cd27fae016a84 Mon Sep 17 00:00:00 2001 From: Kevin Harrington Date: Thu, 22 Jun 2023 14:09:44 -0400 Subject: [PATCH 05/11] updating shadowjar version --- build.gradle | 329 +++++++++++++++++---------------- libraries/bowler-script-kernel | 2 +- 2 files changed, 167 insertions(+), 164 deletions(-) diff --git a/build.gradle b/build.gradle index c8fcb5de7..448cb6ee1 100644 --- a/build.gradle +++ b/build.gradle @@ -1,56 +1,62 @@ buildscript { - repositories { - jcenter() - } - dependencies { - classpath 'com.github.jengelman.gradle.plugins:shadow:5.0.0' - } + repositories { + [ + jcenter(), + mavenCentral(), + maven { + url "https://plugins.gradle.org/m2/" + } + ] + } + dependencies { + classpath 'com.github.jengelman.gradle.plugins:shadow:5.1.0' + } } boolean is64Bit() { ////System.out.println("Arch: "+getOsArch()); return getOsArch().startsWith("x86_64") || getOsArch().startsWith("amd64"); } - boolean isARM() { +boolean isARM() { return getOsArch().startsWith("arm"); } - boolean isCortexA8(){ +boolean isCortexA8(){ if(isARM()){ //TODO check for cortex a8 vs arm9 generic return true; } return false; } - boolean isWindows() { +boolean isWindows() { ////System.out.println("OS name: "+getOsName()); return getOsName().toLowerCase().startsWith("windows") ||getOsName().toLowerCase().startsWith("microsoft") || getOsName().toLowerCase().startsWith("ms"); } - boolean isLinux() { +boolean isLinux() { return getOsName().toLowerCase().startsWith("linux"); } - boolean isOSX() { +boolean isOSX() { return getOsName().toLowerCase().startsWith("mac"); } - String getExtension() { +String getExtension() { if(isWindows()) { return ".dll"; } - + if(isLinux()) { return ".so"; } - + if(isOSX()) { return ".jnilib"; } - + return ""; } -String getOsName() { +String getOsName() { return System.getProperty("os.name"); } @@ -66,38 +72,41 @@ plugins { id 'signing' id 'maven' id 'application' - } - import com.github.jk1.license.render.* - import com.github.jk1.license.importer.* - - licenseReport { - // Set output directory for the report data. - // Defaults to ${project.buildDir}/reports/dependency-license. - outputDir = "$projectDir/build/licenses" - - // Adjust the configurations to fetch dependencies. Default is 'runtimeClasspath' - // For Android projects use 'releaseRuntimeClasspath' or 'yourFlavorNameReleaseRuntimeClasspath' - // Use 'ALL' to dynamically resolve all configurations: - // configurations = ALL - configurations = ['runtimeClasspath'] - - - // List the ids (in module:name format) to exclude from dependency report. Supports regular expressions. - // By default excludes is empty. - excludes = ['moduleGroup:moduleName'] - - // Don't include artifacts of project's own group into the report - excludeOwnGroup = false - - // Don't exclude bom dependencies. - // If set to true, then all boms will be excluded from the report - excludeBoms = false - - // Set custom report renderer, implementing ReportRenderer. - // Yes, you can write your own to support any format necessary. - renderers = [new XmlReportRenderer('third-party-libs.xml', 'Back-End Libraries'), new CsvReportRenderer('third-party-libs.csv')] +} +import com.github.jk1.license.render.* +import com.github.jk1.license.importer.* - } +licenseReport { + // Set output directory for the report data. + // Defaults to ${project.buildDir}/reports/dependency-license. + outputDir = "$projectDir/build/licenses" + + // Adjust the configurations to fetch dependencies. Default is 'runtimeClasspath' + // For Android projects use 'releaseRuntimeClasspath' or 'yourFlavorNameReleaseRuntimeClasspath' + // Use 'ALL' to dynamically resolve all configurations: + // configurations = ALL + configurations = ['runtimeClasspath'] + + + // List the ids (in module:name format) to exclude from dependency report. Supports regular expressions. + // By default excludes is empty. + excludes = ['moduleGroup:moduleName'] + + // Don't include artifacts of project's own group into the report + excludeOwnGroup = false + + // Don't exclude bom dependencies. + // If set to true, then all boms will be excluded from the report + excludeBoms = false + + // Set custom report renderer, implementing ReportRenderer. + // Yes, you can write your own to support any format necessary. + renderers = [ + new XmlReportRenderer('third-party-libs.xml', 'Back-End Libraries'), + new CsvReportRenderer('third-party-libs.csv') + ] + +} //apply plugin: 'edu.sc.seis.launch4j' [compileJava, compileTestJava]*.options*.encoding = 'UTF-8' @@ -117,19 +126,20 @@ configurations.all { exclude module: 'slf4j-log4j12' } sourceSets { - + test { java { - srcDirs = ["test/java/src" ] // Note @Peter's comment below + srcDirs = [ + "test/java/src" ] // Note @Peter's comment below } } } /* -launch4j { - mainClassName = ext.mainClass - icon = buildDir.getAbsolutePath()+"/src/main/resources/CommonWealthRobotics.ico" -} -*/ + launch4j { + mainClassName = ext.mainClass + icon = buildDir.getAbsolutePath()+"/src/main/resources/CommonWealthRobotics.ico" + } + */ Properties props = new Properties() props.load(new FileInputStream(buildDir.getAbsolutePath()+"/src/main/resources/com/neuronrobotics/bowlerstudio/build.properties")) @@ -137,7 +147,7 @@ props.load(new FileInputStream(buildDir.getAbsolutePath()+"/src/main/resources/c repositories { maven { url 'https://oss.sonatype.org/service/local/repositories/releases/content/' } - + //com.neuronrobotics hosting point maven { url 'https://oss.sonatype.org/content/repositories/staging/' } mavenCentral() @@ -154,12 +164,12 @@ repositories { //maven { url 'https://dl.bintray.com/commonwealthrobotics/maven-artifacts' } - + } dependencies { - - + + compile group: 'org.json', name: 'json', version: '20180813' compile 'com.google.crypto.tink:tink:1.3.0-rc1' @@ -167,23 +177,23 @@ dependencies { compile group: 'org.fxmisc.richtext', name: 'richtextfx', version: '0.6' - + compile group: 'org.codehaus.groovy', name: 'groovy', version:'2.3.7'; -//make grapes work - compile group: 'org.apache.ivy', name:'ivy', version:'2.2.0' - + //make grapes work + compile group: 'org.apache.ivy', name:'ivy', version:'2.2.0' + compile group: 'org.controlsfx', name: 'controlsfx', version: '8.0.6' compile group: 'commons-lang', name: 'commons-lang', version: '2.6' compile group: 'commons-codec', name: 'commons-codec', version: '1.7' - + // https://mvnrepository.com/artifact/org.eclipse.jgit/org.eclipse.jgit -implementation group: 'org.eclipse.jgit', name: 'org.eclipse.jgit', version: '5.13.1.202206130422-r' - + implementation group: 'org.eclipse.jgit', name: 'org.eclipse.jgit', version: '5.13.1.202206130422-r' + compile group: 'com.squareup.okhttp', name: 'okhttp-urlconnection', version: '2.0.0' compile group: 'org.mockito', name: 'mockito-all', version: '1.9.5' compile group: 'com.infradna.tool', name: 'bridge-method-injector', version: '1.14' - //compile group: 'com.neuronrobotics', name:'GithubPasswordManager', version:'0.6.1' - + //compile group: 'com.neuronrobotics', name:'GithubPasswordManager', version:'0.6.1' + compile 'com.miglayout:miglayout-swing:4.2' compile 'commons-io:commons-io:2.6' compile group:'org.python',name:'jython',version:'2.5.3' @@ -195,88 +205,83 @@ implementation group: 'org.eclipse.jgit', name: 'org.eclipse.jgit', version: '5. compile "org.eclipse.jetty:jetty-servlets:9.4.36.v20210114" compile "org.eclipse.jetty:jetty-webapp:9.4.36.v20210114" compile "javax.servlet:javax.servlet-api:3.1.0" - - + + //compile 'org.clojure:tools.nrepl:0.2.10' //compile "overtone:overtone:0.9.1" //compile "edu.cmu.sphinx:sphinx4-core:5prealpha-SNAPSHOT" //compile "edu.cmu.sphinx:sphinx4-data:5prealpha-SNAPSHOT" compile group: 'java3d', name: 'vecmath', version: '1.3.1' - compile 'org.slf4j:slf4j-simple:1.6.1' - - //compile "com.neuronrobotics:JavaCad:0.14.0" + compile 'org.slf4j:slf4j-simple:1.6.1' + + //compile "com.neuronrobotics:JavaCad:0.14.0" compile "com.neuronrobotics:CHDK-PTP-Java:0.5.3-SNAPSHOT" //compile "com.neuronrobotics:java-bowler:3.25.4" //compile fileTree (dir: '../java-bowler/build/libs/', includes: ['nrsdk-3.23.3-jar-with-dependencies.jar']) //compile fileTree (dir: '../JCSG/build/libs/', includes: ['JavaCad-0.8.2.jar']) compile "com.neuronrobotics:WalnutiQ:2.3.3" - - + + /* - String basedir =System.getenv("OPENCV_DIR")+"/java/opencv-249.jar"; - - if(isWindows()){ - basedir =System.getenv("OPENCV_DIR")+"\\..\\..\\java\\opencv-249.jar"; - println("OPENCV_DIR="+basedir); - compile files(basedir) - } - if(isOSX()){ - basedir =System.getenv("OPENCV_DIR")+"../../java/opencv-249.jar"; - println("OPENCV_DIR="+basedir); - if(System.getenv("OPENCV_DIR")!=null) - compile files(basedir) - else - //If you set your OPENCV_DIR environment variable, then we wouldnt have to do hacky things - compile files('/Applications/BowlerStudio.app/Contents/MacOS/opencv249build/bin/opencv-249.jar') - } - if(isLinux()){ - //compile files('/usr/share/java/opencv-249.jar') - if(new File("/usr/share/OpenCV/java/").exists()){ - System.out.println("Using the legacy opencv dir ") - compile fileTree (dir: '/usr/share/OpenCV/java/', includes: ['*opencv-24*.jar']) - }else{ - compile fileTree (dir: '/usr/share/java/', includes: ['*opencv-24*.jar']) - } - } - */ + String basedir =System.getenv("OPENCV_DIR")+"/java/opencv-249.jar"; + if(isWindows()){ + basedir =System.getenv("OPENCV_DIR")+"\\..\\..\\java\\opencv-249.jar"; + println("OPENCV_DIR="+basedir); + compile files(basedir) + } + if(isOSX()){ + basedir =System.getenv("OPENCV_DIR")+"../../java/opencv-249.jar"; + println("OPENCV_DIR="+basedir); + if(System.getenv("OPENCV_DIR")!=null) + compile files(basedir) + else + //If you set your OPENCV_DIR environment variable, then we wouldnt have to do hacky things + compile files('/Applications/BowlerStudio.app/Contents/MacOS/opencv249build/bin/opencv-249.jar') + } + if(isLinux()){ + //compile files('/usr/share/java/opencv-249.jar') + if(new File("/usr/share/OpenCV/java/").exists()){ + System.out.println("Using the legacy opencv dir ") + compile fileTree (dir: '/usr/share/OpenCV/java/', includes: ['*opencv-24*.jar']) + }else{ + compile fileTree (dir: '/usr/share/java/', includes: ['*opencv-24*.jar']) + } + } + */ //compile group: 'jfree', name: 'jfreechart', version: '1.0.12' compile group: 'jexcelapi', name: 'jxl', version: '2.4.2' //compile group: 'com.google.zxing', name: 'zxing-parent', version: '3.2.0' //compile group:'com.github.ellzord', name:'JALSE', version:'1.0.9' - + compile group:'de.huxhorn.sulky', name:'de.huxhorn.sulky.3rdparty.jlayer', version:'1.0' - //compile("org.springframework.boot:spring-boot-starter-web:1.2.7.RELEASE") - - compile 'com.google.code.gson:gson:2.5' - compile 'org.jsoup:jsoup:1.8.3' + //compile("org.springframework.boot:spring-boot-starter-web:1.2.7.RELEASE") + + compile 'com.google.code.gson:gson:2.5' + compile 'org.jsoup:jsoup:1.8.3' compile 'org.apache.httpcomponents:httpclient:4.5.1' //compile 'cz.advel.jbullet:jbullet:20101010-1' //compile 'org.bubblecloud.jbullet:jbullet:2.72.2.4'// replaced by local jar because jbullet maven went down //compile "alda:alda:1.0.0-rc14" - + //Deep Learning 4 j and dependancies /* - compile 'org.deeplearning4j:deeplearning4j-core:0.4-rc3.8' - - //compile 'org.nd4j:nd4j-x86:0.4-rc3.8' - - compile 'org.deeplearning4j:deeplearning4j-nlp:0.4-rc3.8' - - compile 'org.deeplearning4j:deeplearning4j-ui:0.4-rc3.8' - - compile 'com.google.guava:guava:19.0' - compile 'org.nd4j:canova-nd4j-image:0.0.0.14' - compile 'org.nd4j:canova-nd4j-codec:0.0.0.14' - compile 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.5.1' - */ + compile 'org.deeplearning4j:deeplearning4j-core:0.4-rc3.8' + //compile 'org.nd4j:nd4j-x86:0.4-rc3.8' + compile 'org.deeplearning4j:deeplearning4j-nlp:0.4-rc3.8' + compile 'org.deeplearning4j:deeplearning4j-ui:0.4-rc3.8' + compile 'com.google.guava:guava:19.0' + compile 'org.nd4j:canova-nd4j-image:0.0.0.14' + compile 'org.nd4j:canova-nd4j-codec:0.0.0.14' + compile 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.5.1' + */ // JScience: - //compile 'org.jscience:jscience:4.3.1' - + //compile 'org.jscience:jscience:4.3.1' + compile 'javax.media:jmf:2.1.1e' - - //Weka + + //Weka //compile 'nz.ac.waikato.cms.weka:weka-stable:3.6.13' - + //Firmata compile 'com.github.kurbatov:firmata4j:2.3.4.1' @@ -291,7 +296,7 @@ implementation group: 'org.eclipse.jgit', name: 'org.eclipse.jgit', version: '5. //compile "org.jfxtras:jfxtras-window:8.0-r4" //compile "org.jfxtras:jfxtras-menu:8.0-r4" //compile "org.jfxtras:jfxtras-labs:8.0-r4" - + //https://bintray.com/clearcontrol/ClearControl/DockFX //compile 'org.dockfx:DockFX:0.1.12' //compile 'com.github.movisens:SmartGattLib:1.7' @@ -304,16 +309,16 @@ implementation group: 'org.eclipse.jgit', name: 'org.eclipse.jgit', version: '5. // https://mvnrepository.com/artifact/com.nativelibs4java/jnaerator //compile group: 'com.nativelibs4java', name: 'jnaerator', version: '0.11' // https://mvnrepository.com/artifact/com.github.kurbatov/firmata4j - + // https://mvnrepository.com/artifact/com.fifesoft/rsyntaxtextarea compile group: 'com.fifesoft', name: 'rsyntaxtextarea', version: '2.6.0' - //compile 'org.bubblecloud.jbullet:jbullet:2.72.2.4' - // https://mvnrepository.com/artifact/org.apache.xmlgraphics/batik-svggen + //compile 'org.bubblecloud.jbullet:jbullet:2.72.2.4' + // https://mvnrepository.com/artifact/org.apache.xmlgraphics/batik-svggen compile group: 'org.apache.xmlgraphics', name: 'batik-svggen', version: '1.7' // https://mvnrepository.com/artifact/org.axsl.org.w3c.dom.svg/svg-dom-java compile group: 'org.axsl.org.w3c.dom.svg', name: 'svg-dom-java', version: '1.1' - + //compile fileTree (dir: 'libraries/bowler-script-kernel/libs/', includes: ['*.jar']) compile project(':libraries:bowler-script-kernel:java-bowler') @@ -323,16 +328,16 @@ implementation group: 'org.eclipse.jgit', name: 'org.eclipse.jgit', version: '5. compile project(':libraries:bowler-script-kernel:GithubPasswordManager:GithubPasswordManager') //compile project(':kinematics-chef') //compile 'com.neuronrobotics:kinematics-chef-core:0.0.15' - + //compile fileTree (dir: 'libraries/java-bowler/libs/', includes: ['*.jar']) compile 'com.google.guava:guava:19+' implementation 'org.kohsuke.stapler:stapler:1.263' implementation group: 'org.kohsuke', name: 'wordnet-random-name', version: '1.2' - + //https://github.com/HanSolo/Medusa compile group: 'eu.hansolo', name: 'Medusa', version: '7.1' - + } // create a fat-jar (class files plus dependencies @@ -344,46 +349,44 @@ jar { // project class files compiled from source //from files(sourceSets.main.output.classesDir) - manifest { - attributes( - "Main-Class": 'com.neuronrobotics.bowlerstudio.BowlerStudio', - "Manifest-Version": "1.0", - "Created-By": "CommonWealth Robotics Cooperative", - "Specification-Title": props."app.name", - "Specification-Version": props."app.version", - "Specification-Vendor": "CommonWealth Robotics Cooperative", - "Implementation-Title": props."app.name", - "Implementation-Version" : props."app.version", - "Implementation-Vendor": "CommonWealth Robotics Cooperative" - - - ) - } + manifest { + attributes( + "Main-Class": 'com.neuronrobotics.bowlerstudio.BowlerStudio', + "Manifest-Version": "1.0", + "Created-By": "CommonWealth Robotics Cooperative", + "Specification-Title": props."app.name", + "Specification-Version": props."app.version", + "Specification-Vendor": "CommonWealth Robotics Cooperative", + "Implementation-Title": props."app.name", + "Implementation-Version" : props."app.version", + "Implementation-Vendor": "CommonWealth Robotics Cooperative" + + + ) + } } task ('showAll') { doLast { - allprojects.each { - println(it.name+':') - println('-compile:') - configurations.compile.each { - c -> - println(' '+c.name) + allprojects.each { + println(it.name+':') + println('-compile:') + configurations.compile.each { c -> + println(' '+c.name) + } + println '-testCompile:' + configurations.testCompile.each { r-> + println(' '+ r.name) } - println '-testCompile:' - configurations.testCompile.each { - r-> - println(' '+ r.name) - } } } - } +} shadowJar { zip64 true - mainClassName = 'com.neuronrobotics.bowlerstudio.BowlerStudio' - baseName = 'BowlerStudio' - classifier = "" - mergeServiceFiles() + mainClassName = 'com.neuronrobotics.bowlerstudio.BowlerStudio' + baseName = 'BowlerStudio' + classifier = "" + mergeServiceFiles() } diff --git a/libraries/bowler-script-kernel b/libraries/bowler-script-kernel index 4b1edb6f3..90220c2c5 160000 --- a/libraries/bowler-script-kernel +++ b/libraries/bowler-script-kernel @@ -1 +1 @@ -Subproject commit 4b1edb6f3e0e8afd76ae21c560e994ab5b963454 +Subproject commit 90220c2c5923ef330df9e5abbeb33a8c850f9130 From f5f57094e82a4a04de800981b69d6bd251c136a2 Mon Sep 17 00:00:00 2001 From: Kevin Harrington Date: Thu, 22 Jun 2023 14:29:25 -0400 Subject: [PATCH 06/11] add local cache for faster builds --- build.gradle | 2 +- libraries/bowler-script-kernel | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 448cb6ee1..982c866b2 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral(), maven { url "https://plugins.gradle.org/m2/" - } + },mavenLocal() ] } dependencies { diff --git a/libraries/bowler-script-kernel b/libraries/bowler-script-kernel index 90220c2c5..bf47ee993 160000 --- a/libraries/bowler-script-kernel +++ b/libraries/bowler-script-kernel @@ -1 +1 @@ -Subproject commit 90220c2c5923ef330df9e5abbeb33a8c850f9130 +Subproject commit bf47ee9938c72e818ecf9dc48a61aef3d192d211 From 785662c1036b86149773817a15c19d41d4e7637f Mon Sep 17 00:00:00 2001 From: Kevin Harrington Date: Thu, 22 Jun 2023 14:48:35 -0400 Subject: [PATCH 07/11] adding source to top --- build.gradle | 6 +++++- libraries/bowler-script-kernel | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 982c866b2..35219674d 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,8 @@ buildscript { mavenCentral(), maven { url "https://plugins.gradle.org/m2/" - },mavenLocal() + }, + mavenLocal() ] } dependencies { @@ -146,6 +147,9 @@ props.load(new FileInputStream(buildDir.getAbsolutePath()+"/src/main/resources/c repositories { + maven { + url "https://repo1.maven.org/maven2/" + } maven { url 'https://oss.sonatype.org/service/local/repositories/releases/content/' } //com.neuronrobotics hosting point diff --git a/libraries/bowler-script-kernel b/libraries/bowler-script-kernel index bf47ee993..e4fd815c0 160000 --- a/libraries/bowler-script-kernel +++ b/libraries/bowler-script-kernel @@ -1 +1 @@ -Subproject commit bf47ee9938c72e818ecf9dc48a61aef3d192d211 +Subproject commit e4fd815c0eeec243cbbab58254978c2c0b2b6a85 From efbe71edb2754691c2b34da0c965954bcbf3a302 Mon Sep 17 00:00:00 2001 From: Kevin Harrington Date: Thu, 22 Jun 2023 16:07:12 -0400 Subject: [PATCH 08/11] kernel --- libraries/bowler-script-kernel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/bowler-script-kernel b/libraries/bowler-script-kernel index e4fd815c0..2ec01ca99 160000 --- a/libraries/bowler-script-kernel +++ b/libraries/bowler-script-kernel @@ -1 +1 @@ -Subproject commit e4fd815c0eeec243cbbab58254978c2c0b2b6a85 +Subproject commit 2ec01ca99abd28170deadf0832a9a202fa25896e From 0f47e57c86e5c4b5118edad63adceb3539bc9b32 Mon Sep 17 00:00:00 2001 From: Kevin Harrington Date: Thu, 22 Jun 2023 16:21:34 -0400 Subject: [PATCH 09/11] kernel --- libraries/bowler-script-kernel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/bowler-script-kernel b/libraries/bowler-script-kernel index 2ec01ca99..216bf89be 160000 --- a/libraries/bowler-script-kernel +++ b/libraries/bowler-script-kernel @@ -1 +1 @@ -Subproject commit 2ec01ca99abd28170deadf0832a9a202fa25896e +Subproject commit 216bf89be49068659078f9cfdb71c39be29954ba From 12f44e9aabd9a6ba333a672af5e32758456b8e84 Mon Sep 17 00:00:00 2001 From: Kevin Harrington Date: Thu, 22 Jun 2023 16:53:46 -0400 Subject: [PATCH 10/11] update to reduced spring hosting --- build.gradle | 23 +++++++++++++++++++---- libraries/bowler-script-kernel | 2 +- libraries/dockfx | 2 +- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 35219674d..e00cd6d44 100644 --- a/build.gradle +++ b/build.gradle @@ -147,16 +147,31 @@ props.load(new FileInputStream(buildDir.getAbsolutePath()+"/src/main/resources/c repositories { + mavenCentral() maven { - url "https://repo1.maven.org/maven2/" + url 'https://mlt.jfrog.io/artifactory/mlt-mvn-releases-local/' } - maven { url 'https://oss.sonatype.org/service/local/repositories/releases/content/' } + maven { url 'https://repo.maven.apache.org/maven2/' } + + maven { url 'https://repo1.maven.org/maven2/'} + + //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/' } - mavenCentral() + + 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://repository-bubblecloud.forge.cloudbees.com/release/'} maven { url 'https://clojars.org/repo' } maven { url 'https://jline.sourceforge.net/m2repo' } maven { url 'https://repo.spring.io/milestone'} diff --git a/libraries/bowler-script-kernel b/libraries/bowler-script-kernel index 216bf89be..ea36a92a6 160000 --- a/libraries/bowler-script-kernel +++ b/libraries/bowler-script-kernel @@ -1 +1 @@ -Subproject commit 216bf89be49068659078f9cfdb71c39be29954ba +Subproject commit ea36a92a6187bfe187cc4ca3197d46fdba4713d3 diff --git a/libraries/dockfx b/libraries/dockfx index 8a9b7e34d..6e86e5951 160000 --- a/libraries/dockfx +++ b/libraries/dockfx @@ -1 +1 @@ -Subproject commit 8a9b7e34dc5af49bc258d8730e6cd1bc03b8f330 +Subproject commit 6e86e595136af14e562f9e02ed4ffee4bc7e6a5d From 6679503252ef1c1ab8d4eec25332f5c57f83a5cc Mon Sep 17 00:00:00 2001 From: Kevin Harrington Date: Thu, 22 Jun 2023 17:10:15 -0400 Subject: [PATCH 11/11] kernel --- libraries/bowler-script-kernel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/bowler-script-kernel b/libraries/bowler-script-kernel index ea36a92a6..486a74131 160000 --- a/libraries/bowler-script-kernel +++ b/libraries/bowler-script-kernel @@ -1 +1 @@ -Subproject commit ea36a92a6187bfe187cc4ca3197d46fdba4713d3 +Subproject commit 486a7413115e1db3c633d5511fcc66dc1ebc7849