Skip to content
Merged

Dev #1030

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
6c414ee
Fixes #988 - Fix Appearance of File -> Open
beanbeanjuice Mar 6, 2025
723d8d1
dart 3.7, redraw_counter_component_mixin had an error
mongbean Mar 10, 2025
463144a
formatting for dart 3.7
mongbean Mar 10, 2025
207a76d
renamed ___ variables to have names since they were not wildcards and…
dave-doty Apr 3, 2025
5fc74b1
Merge pull request #1020 from UC-Davis-molecular-computing/#1019-upgr…
mongbean Apr 3, 2025
245ac12
Merge pull request #1017 from UC-Davis-molecular-computing/988-fix-ap…
beanbeanjuice Apr 14, 2025
468e5cf
Fixes #1023 - Update GitHub Actions Dart Version
beanbeanjuice May 2, 2025
566063d
Lock Dart Version in GitHub Actions
beanbeanjuice May 2, 2025
9ddf6f1
Lock Dart Version to Major Release Version
beanbeanjuice May 2, 2025
b8128d1
Fixes #1025 - Adds Dependabot Support
beanbeanjuice May 2, 2025
06bcdca
Fixes #984 - Replace Tuples with Records
beanbeanjuice May 15, 2025
43198c0
Updated Formatting
beanbeanjuice May 15, 2025
24d6c79
Changed CONTRIBUTING.md to Use Latest Dart
beanbeanjuice May 15, 2025
07f3e79
Update pubspec.lock
dave-doty May 15, 2025
a0db9e0
Merge pull request #1024 from UC-Davis-molecular-computing/1023-fix-g…
beanbeanjuice May 15, 2025
bcd94d1
Update pubspec.lock
dave-doty May 15, 2025
8b43f33
Fixes #1023 - Update GitHub Actions Dart Version
beanbeanjuice May 2, 2025
bef75e6
Lock Dart Version in GitHub Actions
beanbeanjuice May 2, 2025
6174c0a
Lock Dart Version to Major Release Version
beanbeanjuice May 2, 2025
31e7289
Changed CONTRIBUTING.md to Use Latest Dart
beanbeanjuice May 15, 2025
1d15a45
Update pubspec.lock
dave-doty May 15, 2025
67f727a
Fixes #1023 - Update GitHub Actions Dart Version
beanbeanjuice May 2, 2025
1d4d4ae
Lock Dart Version in GitHub Actions
beanbeanjuice May 2, 2025
7dcaad3
Lock Dart Version to Major Release Version
beanbeanjuice May 2, 2025
a5136a4
Changed CONTRIBUTING.md to Use Latest Dart
beanbeanjuice May 15, 2025
c9bc0fb
Merge pull request #1027 from UC-Davis-molecular-computing/984-replac…
beanbeanjuice May 16, 2025
4146b82
Merge pull request #1026 from UC-Davis-molecular-computing/1025-add-d…
beanbeanjuice May 16, 2025
d0c5705
fixes #1009: fix bug when switching between open dialogs
dave-doty May 16, 2025
603017d
Update design_dialog_form.dart
dave-doty May 16, 2025
3acfde5
removed unused packages from pubspec.yaml
dave-doty May 16, 2025
b619a00
Update dart.yml
dave-doty May 30, 2025
45c4f89
changed oxview View to have oxview file instead of oxdna (preserving …
dave-doty Aug 28, 2025
ee8bdfc
changed ubuntu to latest, and made Dart upper bound of <3.9.0 to avoi…
dave-doty Aug 28, 2025
e53851c
modified github actions to use Dart 3.8 to satisfy pubspec.yaml upper…
dave-doty Aug 28, 2025
6ba5133
bumped version
dave-doty Aug 28, 2025
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
7 changes: 7 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
version: 2
updates:
- package-ecosystem: "pub"
directory: "/" # Directory of pubspec.yaml
target-branch: "dev"
schedule:
interval: "weekly" # daily, weekly, monthly
33 changes: 14 additions & 19 deletions .github/workflows/dart.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,30 +8,25 @@ jobs:
run_unit_tests:
if: github.event.pull_request.draft == false

runs-on: ubuntu-22.04

runs-on: ubuntu-latest
steps:
- name: Setup Dart SDK Step 1
run: sudo apt-get update
- name: Setup Dart SDK Step 2
run: sudo apt-get install apt-transport-https
- name: Setup Dart SDK Step 3
run: sudo sh -c 'wget -qO- https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -'
- name: Setup Dart SDK Step 4
run: sudo sh -c 'wget -qO- https://storage.googleapis.com/download.dartlang.org/linux/debian/dart_stable.list > /etc/apt/sources.list.d/dart_stable.list'
- name: Setup Dart SDK Step 5
run: wget -O /tmp/dart_3.5.4-1_amd64.deb https://storage.googleapis.com/dart-archive/channels/stable/release/3.5.4/linux_packages/dart_3.5.4-1_amd64.deb
- name: Setup Dart SDK Step 6
run: sudo apt install /tmp/dart_3.5.4-1_amd64.deb
- uses: actions/checkout@v4
- name: Checkout branch
uses: actions/checkout@v4

- name: Setup Dart SDK # Using Dart 3.8 to match pubspec.yaml constraint
uses: dart-lang/setup-dart@v1 # https://github.com/dart-lang/setup-dart
with:
sdk: 3.8

- name: Install dependencies
run: PATH="$PATH:/usr/lib/dart/bin" dart pub get
- name: Run tests
run: PATH="$PATH:/usr/lib/dart/bin" dart run build_runner test
run: dart pub get

- name: Run Tests
run: dart run build_runner test

fail_if_pull_request_is_draft:
if: github.event.pull_request.draft == true
runs-on: ubuntu-18.04
runs-on: ubuntu-latest
steps:
- name: Fails in order to indicate that pull request needs to be marked as ready to review and unit tests workflow needs to pass.
run: exit 1
31 changes: 13 additions & 18 deletions .github/workflows/dart_formatting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,30 +8,25 @@ jobs:
check_formatting:
if: github.event.pull_request.draft == false

runs-on: ubuntu-22.04

runs-on: ubuntu-latest
steps:
- name: Setup Dart SDK Step 1
run: sudo apt-get update
- name: Setup Dart SDK Step 2
run: sudo apt-get install apt-transport-https
- name: Setup Dart SDK Step 3
run: sudo sh -c 'wget -qO- https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -'
- name: Setup Dart SDK Step 4
run: sudo sh -c 'wget -qO- https://storage.googleapis.com/download.dartlang.org/linux/debian/dart_stable.list > /etc/apt/sources.list.d/dart_stable.list'
- name: Setup Dart SDK Step 5
run: wget -O /tmp/dart_3.5.4-1_amd64.deb https://storage.googleapis.com/dart-archive/channels/stable/release/3.5.4/linux_packages/dart_3.5.4-1_amd64.deb
- name: Setup Dart SDK Step 6
run: sudo apt install /tmp/dart_3.5.4-1_amd64.deb
- uses: actions/checkout@v4
- name: Checkout branch
uses: actions/checkout@v4

- name: Setup Dart SDK # Using Dart 3.8 to match pubspec.yaml constraint
uses: dart-lang/setup-dart@v1 # https://github.com/dart-lang/setup-dart
with:
sdk: 3.8

- name: Install dependencies
run: PATH="$PATH:/usr/lib/dart/bin" dart pub get
run: dart pub get

- name: Verify formatting
run: PATH="$PATH:/usr/lib/dart/bin" dart format -l 110 --output=none --set-exit-if-changed .
run: dart format -l 110 --output=none --set-exit-if-changed .

fail_if_pull_request_is_draft:
if: github.event.pull_request.draft == true
runs-on: ubuntu-18.04
runs-on: ubuntu-latest
steps:
- name: Fails in order to indicate that pull request needs to be marked as ready to review and formatting workflow needs to pass.
run: exit 1
32 changes: 10 additions & 22 deletions .github/workflows/gh-pages-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,44 +7,32 @@ on:

jobs:
deploy:
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
steps:
- name: Checkout dev branch
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: dev

- name: Checkout gh-pages branch
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: gh-pages
path: gh-pages-repo



- name: Setup Dart SDK Step 1
run: sudo apt-get update
- name: Setup Dart SDK Step 2
run: sudo apt-get install apt-transport-https
- name: Setup Dart SDK Step 3
run: sudo sh -c 'wget -qO- https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -'
- name: Setup Dart SDK Step 4
run: sudo sh -c 'wget -qO- https://storage.googleapis.com/download.dartlang.org/linux/debian/dart_stable.list > /etc/apt/sources.list.d/dart_stable.list'
- name: Setup Dart SDK Step 5
run: wget -O /tmp/dart_3.5.4-1_amd64.deb https://storage.googleapis.com/dart-archive/channels/stable/release/3.5.4/linux_packages/dart_3.5.4-1_amd64.deb
- name: Setup Dart SDK Step 6
run: sudo apt install /tmp/dart_3.5.4-1_amd64.deb
- name: Setup Dart SDK # Using Dart 3.8 to match pubspec.yaml constraint
uses: dart-lang/setup-dart@v1 # https://github.com/dart-lang/setup-dart
with:
sdk: 3.8

- name: Install dependencies
run: PATH="$PATH:/usr/lib/dart/bin" dart pub get
run: dart pub get

- name: Install webdev
run: PATH="$PATH:/usr/lib/dart/bin" dart pub global activate webdev

run: dart pub global activate webdev

- name: Build into gh-pages repo
run: PATH="$PATH:/usr/lib/dart/bin" dart pub global run webdev build -o web:gh-pages-repo/dev

run: dart pub global run webdev build -o web:gh-pages-repo/dev

- name: Deploy
uses: peaceiris/actions-gh-pages@v3
Expand Down
39 changes: 16 additions & 23 deletions .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,46 +7,39 @@ on:

jobs:
deploy:
runs-on: ubuntu-22.04
runs-on: ubuntu-latest

steps:
- name: Checkout main branch
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Checkout gh-pages branch
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: gh-pages
path: gh-pages-repo

- name: Setup Dart SDK # Using Dart 3.8 to match pubspec.yaml constraint
uses: dart-lang/setup-dart@v1 # https://github.com/dart-lang/setup-dart
with:
sdk: 3.8


- name: Setup Dart SDK Step 1
run: sudo apt-get update
- name: Setup Dart SDK Step 2
run: sudo apt-get install apt-transport-https
- name: Setup Dart SDK Step 3
run: sudo sh -c 'wget -qO- https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -'
- name: Setup Dart SDK Step 4
run: sudo sh -c 'wget -qO- https://storage.googleapis.com/download.dartlang.org/linux/debian/dart_stable.list > /etc/apt/sources.list.d/dart_stable.list'
- name: Setup Dart SDK Step 5
run: wget -O /tmp/dart_3.5.4-1_amd64.deb https://storage.googleapis.com/dart-archive/channels/stable/release/3.5.4/linux_packages/dart_3.5.4-1_amd64.deb
- name: Setup Dart SDK Step 6
run: sudo apt install /tmp/dart_3.5.4-1_amd64.deb
- name: Install dependencies
run: PATH="$PATH:/usr/lib/dart/bin" dart pub get

- name: Install webdev
run: PATH="$PATH:/usr/lib/dart/bin" dart pub global activate webdev
run: dart pub get

- name: Activate webdev
run: dart pub global activate webdev

- name: Build into gh-pages repo
run: PATH="$PATH:/usr/lib/dart/bin" dart pub global run webdev build -o web:/tmp/scadnano ; cp -r /tmp/scadnano/* gh-pages-repo
run: dart pub global run webdev build -o web:/tmp/scadnano ; cp -r /tmp/scadnano/* gh-pages-repo

- name: Retrieve version
run: echo "VERSION=$(cat lib/src/constants.dart | grep 'const String CURRENT_VERSION = .*' | grep -oP '\d+\.\d+\.\d+')" >> $GITHUB_ENV
run: echo "VERSION=$(cat lib/src/constants.dart | grep 'const String CURRENT_VERSION = .*' | grep -oP '\d+\.\d+\.\d+')" >> $GITHUB_ENV

- name: Build into gh-pages-repo/VERSION
run: |
if [ "$VERSION" != "" ]; then
PATH="$PATH:/usr/lib/dart/bin" dart pub global run webdev build -o web:gh-pages-repo/v$VERSION
dart pub global run webdev build -o web:gh-pages-repo/v$VERSION
else
echo "::warning deploying VERSION skipped because VERSION number could not be found"
fi
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
release:
name: "Release"
runs-on: ubuntu-22.04
runs-on: ubuntu-latest

steps:
# ...
Expand Down
32 changes: 7 additions & 25 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -241,23 +241,17 @@ git checkout dev

### Installing Dart

This project requires using Dart version **3.5.4**, not the latest version. Click on a dropdown below for installation instructions for your operating system.
This project requires using the latest Dart version. Click on a dropdown below for installation instructions for your operating system.

<!--TODO: Find a way to use code blocks with syntax highlighting inside <details>-->

<details><summary><strong>Windows</strong></summary>
First, install <a href="https://chocolatey.org/install">Chocolatey</a> if you haven't already. If <code>choco help</code> shows a help menu for using Chocolatey, then you've set it up correctly.

Then, open a shell (cmd/Powershell) with Administrative privileges (go to Start type `cmd`, right-click on "Command Prompt", or type Powershell and right-click on "Powershell"; in both cases pick "Run as administrator") and install Dart 3.5.4:
Then, open a shell (cmd/Powershell) with Administrative privileges (go to Start type `cmd`, right-click on "Command Prompt", or type Powershell and right-click on "Powershell"; in both cases pick "Run as administrator") and install Dart:

<pre>
choco install dart-sdk --version 3.5.4
</pre>

To stop Chocolatey from automatically updating Dart to the latest version, pin it:

<pre>
choco pin --name="'dart-sdk'" --version="'3.5.4'"
choco install dart-sdk
</pre>

</details>
Expand All @@ -267,16 +261,10 @@ First, install <a href="https://brew.sh/">Homebrew</a> if you haven't already. I

It may help to run `brew tap dart-lang/dart` first.

Then, install Dart 3.5.4:

<pre>
brew install dart@3.5.4
</pre>

To stop Homebrew from automatically updating Dart to the latest version, pin it:
Then, install Dart:

<pre>
brew pin dart@3.5.4
brew install dart
</pre>

If running `dart` in a terminal now does not work, you may need to follow <a href="https://docs.brew.sh/FAQ#my-mac-apps-dont-find-homebrew-utilities">these instructions</a>.
Expand All @@ -292,17 +280,11 @@ wget -qO- https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo gpg --dea
echo 'deb [signed-by=/usr/share/keyrings/dart.gpg arch=amd64] https://storage.googleapis.com/download.dartlang.org/linux/debian stable main' | sudo tee /etc/apt/sources.list.d/dart_stable.list
</pre>

Then, install Dart 3.5.4:
Then, install Dart:

<pre>
sudo apt-get update
sudo apt-get install dart=3.5.4
</pre>

To stop apt from automatically updating Dart to the latest version, hold it:

<pre>
sudo apt-mark hold dart=3.5.4
sudo apt-get install dart
</pre>

</details>
Expand Down
Loading