diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2478106e..bfa31adb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,9 +3,9 @@ name: Java CI with Ant on: push: - branches: [ master, development ] + branches: [ master, development, experimental ] pull_request: - branches: [ master, development ] + branches: [ master, development, experimental ] jobs: build_and_test: diff --git a/build.xml b/build.xml index c1925453..c27070d7 100755 --- a/build.xml +++ b/build.xml @@ -27,9 +27,9 @@ - + - + diff --git a/nC.bat b/nC.bat index 6b1c5f17..26c6e91f 100755 --- a/nC.bat +++ b/nC.bat @@ -19,9 +19,9 @@ REM than half your total physical memory is best. REM *** ASKING FOR MORE MEMORY THAN HALF MAX ON WINDOWS HAS LED TO THE APPLICATION CRASHING *** set NC_MAX_MEMORY=500M -set NC_VERSION=1.7.5 +set NC_VERSION=1.7.6 -set JNEUROML_VERSION=0.13.0 +set JNEUROML_VERSION=0.13.1 REM ----------------------------- REM Should no longer be changed. **Very old version** of lems/nml libs... diff --git a/nCenv.sh b/nCenv.sh index 38c62fd4..d7704f12 100755 --- a/nCenv.sh +++ b/nCenv.sh @@ -19,9 +19,9 @@ export NC_MAX_MEMORY=450M # The rest of the settings below shouldn't have to change # Current version of neuroConstruct -export NC_VERSION=1.7.5 +export NC_VERSION=1.7.6 -export JNEUROML_VERSION=0.13.0 +export JNEUROML_VERSION=0.13.1 ######### # These are for **very old versions** of NML2/LEMS libraries... diff --git a/nbproj/nbproject/project.xml b/nbproj/nbproject/project.xml index 159e0691..3ac2d061 100644 --- a/nbproj/nbproject/project.xml +++ b/nbproj/nbproject/project.xml @@ -11,8 +11,8 @@ .. ${project.dir}/build.xml - 1.7.5 - 0.13.0 + 1.7.6 + 0.13.1 diff --git a/src/ucl/physiol/neuroconstruct/project/GeneralProperties.java b/src/ucl/physiol/neuroconstruct/project/GeneralProperties.java index 6e4b4a31..cb0c7f52 100755 --- a/src/ucl/physiol/neuroconstruct/project/GeneralProperties.java +++ b/src/ucl/physiol/neuroconstruct/project/GeneralProperties.java @@ -50,7 +50,7 @@ public class GeneralProperties private static final String packageOfCellTypes = "ucl.physiol.neuroconstruct.cell"; - private static final String versionNumber = "1.7.5"; + private static final String versionNumber = "1.7.6"; //private static final String latestNeuroMLVersionNumber = "1.8.1";