Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,15 @@ jobs:
distribution: 'adopt'


- name: Install SVN on macos
if: ${{ matrix.runs-on == 'macos-latest' || matrix.runs-on == 'macos-13' }}
- name: Install dependencies (macOS)
if: ${{ contains(matrix.runs-on, 'macos') }}
run: |
brew install subversion

- name: Install dependencies (Ubuntu)
if: ${{ contains(matrix.runs-on, 'ubuntu') }}
run: sudo apt-get install -y subversion

- name: Set up env
run: |
mkdir temp
Expand Down
4 changes: 2 additions & 2 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@

<tstamp/>
<property name="name" value="neuroConstruct"/>
<property name="version" value="1.7.6"/>
<property name="version" value="1.7.7"/>
<property name="version.impl" value="${version}"/>
<property name="year" value="2024"/>
<property name="year" value="2025"/>

<echo message="----------- ${name} v${version} ------------"/>

Expand Down
4 changes: 2 additions & 2 deletions nC.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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.6
set NC_VERSION=1.7.7

set JNEUROML_VERSION=0.13.3
set JNEUROML_VERSION=0.14.0

REM -----------------------------
REM Should no longer be changed. **Very old version** of lems/nml libs...
Expand Down
4 changes: 2 additions & 2 deletions nCenv.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.6
export NC_VERSION=1.7.7

export JNEUROML_VERSION=0.13.3
export JNEUROML_VERSION=0.14.0

#########
# These are for **very old versions** of NML2/LEMS libraries...
Expand Down
2 changes: 1 addition & 1 deletion nbproj/nbproject/project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<property name="project.dir">..</property>
<property name="ant.script">${project.dir}/build.xml</property>
<property name="nC.version">1.7.6</property>
<property name="jneuroml.version">0.13.3</property>
<property name="jneuroml.version">0.14.0</property>
</properties>
<folders>
<source-folder>
Expand Down
1 change: 1 addition & 0 deletions osb/checkOsb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@ standardGHProject 'ghk-nernst' 'showcase'
# standardGHProject 'CElegansNeuroML' 'invertebrate/celegans' 'openworm' # replaced by c302, so not updated...
standardGHProject 'c302' 'invertebrate/celegans' 'openworm'
standardGHProject 'CelegansNeuromechanicalGaitModulation' 'invertebrate/celegans'
standardGHProject 'CE_locomotion' 'invertebrate/celegans' 'openworm'
standardGHProject 'muscle_model' 'invertebrate/celegans' 'openworm'
standardGHProject 'JohnsonMailler_MuscleModel' 'invertebrate/celegans' 'openworm'
standardGHProject 'NicolettiEtAl2019_NeuronModels' 'invertebrate/celegans' 'openworm'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public class GeneralProperties

private static final String packageOfCellTypes = "ucl.physiol.neuroconstruct.cell";

private static final String versionNumber = "1.7.6";
private static final String versionNumber = "1.7.7";

//private static final String latestNeuroMLVersionNumber = "1.8.1";

Expand Down