Merge pull request #17 from endorpersand/bump-ce-1.10.0

Bump CircuitSim + JDK versions
zucchini · Jan 17, 2025 · 5bf9711 · 5bf9711
2 parents b06aeef + 3b4a1d1
commit 5bf9711
Show file tree

Hide file tree

Showing 97 changed files with 4,761 additions and 2,684 deletions.
diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml
@@ -8,10 +8,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 14
+    - name: Set up JDK 17
       uses: actions/setup-java@v2
       with:
-        java-version: '14'
+        java-version: '17'
         distribution: 'adopt'
         server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
         settings-path: ${{ github.workspace }} # location for the settings.xml file

diff --git a/.github/workflows/gradle-publish.yml b/.github/workflows/gradle-publish.yml
@@ -13,10 +13,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 14
+    - name: Set up JDK 17
       uses: actions/setup-java@v2
       with:
-        java-version: '14'
+        java-version: '17'
         distribution: 'adopt'
 
     - name: Publish to GitHub Packages

diff --git a/CircuitSim.jar b/CircuitSim.jar
diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ So I have two goals in this template:
 Getting Started
 ---------------
 
-_Note: The `CircuitSim.jar` in the repo is built against the [CS2110 fork of CircuitSim](https://github.com/gt-cs2110/CircuitSim), which is not compatible with files created in "regular" CircuitSim. If you are using vanilla CircuitSim, you probably need to rebuild this library._
+_Note: The `CircuitSim.jar` in the repo is built against the [CE fork of CircuitSim](https://github.com/gt-cs2110/CircuitSim), which is not compatible with files created in "regular" CircuitSim. If you are using vanilla CircuitSim, you probably need to rebuild this library._
 
 To make your own CircuitSim tester, take a look at the [sample tester repo](https://github.com/zucchini/sample-circuitsim-tester).
 

diff --git a/build.gradle b/build.gradle
@@ -13,8 +13,8 @@ plugins {
 group = 'io.zucchini.circuitsim-tester'
 version gitVersion()
 
-sourceCompatibility = JavaVersion.VERSION_14
-targetCompatibility = JavaVersion.VERSION_14
+sourceCompatibility = JavaVersion.VERSION_17
+targetCompatibility = JavaVersion.VERSION_17
 
 repositories {
     mavenCentral()
@@ -52,7 +52,7 @@ javadoc {
     // For github pages
     destinationDir = file('docs')
     options.addBooleanOption 'html5', true
-    options.addStringOption  'link', 'https://docs.oracle.com/en/java/javase/14/docs/api/'
+    options.addStringOption  'link', 'https://docs.oracle.com/en/java/javase/17/docs/api/'
 }
 
 task sourcesJar(type: Jar) {

diff --git a/docs/allclasses-index.html b/docs/allclasses-index.html
@@ -1,62 +1,61 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (23) -->
 <title>All Classes and Interfaces (CircuitSim Autograder API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <meta name="description" content="class index">
 <meta name="generator" content="javadoc/AllClassesIndexWriter">
-<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
-<link rel="stylesheet" type="text/css" href="script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="jquery-ui.overrides.css" title="Style">
-<script type="text/javascript" src="script.js"></script>
-<script type="text/javascript" src="script-dir/jquery-3.5.1.min.js"></script>
-<script type="text/javascript" src="script-dir/jquery-ui.min.js"></script>
+<link rel="stylesheet" type="text/css" href="resource-files/jquery-ui.min.css" title="Style">
+<link rel="stylesheet" type="text/css" href="resource-files/stylesheet.css" title="Style">
+<script type="text/javascript" src="script-files/script.js"></script>
+<script type="text/javascript" src="script-files/jquery-3.7.1.min.js"></script>
+<script type="text/javascript" src="script-files/jquery-ui.min.js"></script>
 </head>
 <body class="all-classes-index-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "./";
+<script type="text/javascript">const pathtoroot = "./";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
-<div class="flex-box">
-<header role="banner" class="flex-header">
+<header role="banner">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
 <div class="top-nav" id="navbar-top">
+<div class="nav-content">
+<div class="nav-menu-button"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button></div>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="index.html">Overview</a></li>
-<li>Package</li>
-<li>Class</li>
 <li><a href="overview-tree.html">Tree</a></li>
 <li><a href="index-all.html">Index</a></li>
+<li><a href="search.html">Search</a></li>
 <li><a href="help-doc.html#all-classes">Help</a></li>
 </ul>
 </div>
+</div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-content">
+<ol class="sub-nav-list"></ol>
+<div class="nav-list-search">
+<input type="text" id="search-input" disabled placeholder="Search" aria-label="Search in documentation" autocomplete="off">
+<input type="reset" id="reset-search" disabled value="Reset">
+</div>
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <span class="skip-nav" id="skip-navbar-top"></span></nav>
 </header>
-<div class="flex-content">
+<div class="main-grid">
 <main role="main">
 <div class="header">
 <h1 title="All Classes and Interfaces" class="title">All Classes and Interfaces</h1>
 </div>
 <div id="all-classes-table">
-<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="all-classes-table-tab0" role="tab" aria-selected="true" aria-controls="all-classes-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('all-classes-table', 'all-classes-table', 2)" class="active-table-tab">All Classes and Interfaces</button><button id="all-classes-table-tab2" role="tab" aria-selected="false" aria-controls="all-classes-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('all-classes-table', 'all-classes-table-tab2', 2)" class="table-tab">Classes</button><button id="all-classes-table-tab3" role="tab" aria-selected="false" aria-controls="all-classes-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('all-classes-table', 'all-classes-table-tab3', 2)" class="table-tab">Enum Classes</button><button id="all-classes-table-tab7" role="tab" aria-selected="false" aria-controls="all-classes-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('all-classes-table', 'all-classes-table-tab7', 2)" class="table-tab">Annotation Interfaces</button></div>
-<div id="all-classes-table.tabpanel" role="tabpanel">
-<div class="summary-table two-column-summary" aria-labelledby="all-classes-table-tab0">
+<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="all-classes-table-tab0" role="tab" aria-selected="true" aria-controls="all-classes-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('all-classes-table', 'all-classes-table', 2)" class="active-table-tab">All Classes and Interfaces</button><button id="all-classes-table-tab2" role="tab" aria-selected="false" aria-controls="all-classes-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('all-classes-table', 'all-classes-table-tab2', 2)" class="table-tab">Classes</button><button id="all-classes-table-tab3" role="tab" aria-selected="false" aria-controls="all-classes-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('all-classes-table', 'all-classes-table-tab3', 2)" class="table-tab">Enum Classes</button><button id="all-classes-table-tab6" role="tab" aria-selected="false" aria-controls="all-classes-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('all-classes-table', 'all-classes-table-tab6', 2)" class="table-tab">Annotation Interfaces</button></div>
+<div id="all-classes-table.tabpanel" role="tabpanel" aria-labelledby="all-classes-table-tab0">
+<div class="summary-table two-column-summary">
 <div class="table-header col-first">Class</div>
 <div class="table-header col-last">Description</div>
 <div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="io/zucchini/circuitsimtester/api/BaseMemory.html" title="class in io.zucchini.circuitsimtester.api">BaseMemory</a></div>
@@ -135,17 +134,17 @@ <h1 title="All Classes and Interfaces" class="title">All Classes and Interfaces<
 <div class="block">Please see <a href="io/zucchini/circuitsimtester/api/Subcircuit.html#mockPulser(java.lang.String,boolean,io.zucchini.circuitsimtester.api.Subcircuit.PulserType)"><code>Subcircuit.mockPulser(String,boolean,PulserType)</code></a>
  for details on this enum.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab7"><a href="io/zucchini/circuitsimtester/api/SubcircuitComponent.html" title="annotation interface in io.zucchini.circuitsimtester.api">SubcircuitComponent</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab7">
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab6"><a href="io/zucchini/circuitsimtester/api/SubcircuitComponent.html" title="annotation interface in io.zucchini.circuitsimtester.api">SubcircuitComponent</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab6">
 <div class="block">Instructs <a href="io/zucchini/circuitsimtester/extension/CircuitSimExtension.html" title="class in io.zucchini.circuitsimtester.extension"><code>CircuitSimExtension</code></a> to find and inject a CircuitSim
  component into the annotated field in a test class.</div>
 </div>
 <div class="col-first even-row-color all-classes-table all-classes-table-tab3"><a href="io/zucchini/circuitsimtester/api/SubcircuitComponent.Type.html" title="enum class in io.zucchini.circuitsimtester.api">SubcircuitComponent.Type</a></div>
 <div class="col-last even-row-color all-classes-table all-classes-table-tab3">
 <div class="block">Please see <a href="io/zucchini/circuitsimtester/api/SubcircuitComponent.html#type()"><code>SubcircuitComponent.type()</code></a> for details on this enum.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab7"><a href="io/zucchini/circuitsimtester/api/SubcircuitTest.html" title="annotation interface in io.zucchini.circuitsimtester.api">SubcircuitTest</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab7">
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab6"><a href="io/zucchini/circuitsimtester/api/SubcircuitTest.html" title="annotation interface in io.zucchini.circuitsimtester.api">SubcircuitTest</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab6">
 <div class="block">Marks this JUnit test class as testing a subcircuit with the provided
  <code>.sim</code> file path and subcircuit name.</div>
 </div>
@@ -154,6 +153,5 @@ <h1 title="All Classes and Interfaces" class="title">All Classes and Interfaces<
 </div>
 </main>
 </div>
-</div>
 </body>
 </html>
diff --git a/docs/allpackages-index.html b/docs/allpackages-index.html
@@ -1,50 +1,53 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (23) -->
 <title>All Packages (CircuitSim Autograder API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <meta name="description" content="package index">
 <meta name="generator" content="javadoc/AllPackagesIndexWriter">
-<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
-<link rel="stylesheet" type="text/css" href="script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="jquery-ui.overrides.css" title="Style">
-<script type="text/javascript" src="script.js"></script>
-<script type="text/javascript" src="script-dir/jquery-3.5.1.min.js"></script>
-<script type="text/javascript" src="script-dir/jquery-ui.min.js"></script>
+<link rel="stylesheet" type="text/css" href="resource-files/jquery-ui.min.css" title="Style">
+<link rel="stylesheet" type="text/css" href="resource-files/stylesheet.css" title="Style">
+<script type="text/javascript" src="script-files/script.js"></script>
+<script type="text/javascript" src="script-files/jquery-3.7.1.min.js"></script>
+<script type="text/javascript" src="script-files/jquery-ui.min.js"></script>
 </head>
 <body class="all-packages-index-page">
-<script type="text/javascript">var pathtoroot = "./";
+<script type="text/javascript">const pathtoroot = "./";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
-<div class="flex-box">
-<header role="banner" class="flex-header">
+<header role="banner">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
 <div class="top-nav" id="navbar-top">
+<div class="nav-content">
+<div class="nav-menu-button"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button></div>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="index.html">Overview</a></li>
-<li>Package</li>
-<li>Class</li>
 <li><a href="overview-tree.html">Tree</a></li>
 <li><a href="index-all.html">Index</a></li>
+<li><a href="search.html">Search</a></li>
 <li><a href="help-doc.html#all-packages">Help</a></li>
 </ul>
 </div>
+</div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-content">
+<ol class="sub-nav-list"></ol>
+<div class="nav-list-search">
+<input type="text" id="search-input" disabled placeholder="Search" aria-label="Search in documentation" autocomplete="off">
+<input type="reset" id="reset-search" disabled value="Reset">
+</div>
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <span class="skip-nav" id="skip-navbar-top"></span></nav>
 </header>
-<div class="flex-content">
+<div class="main-grid">
 <main role="main">
 <div class="header">
 <h1 title="All&amp;nbsp;Packages" class="title">All&nbsp;Packages</h1>
@@ -67,6 +70,5 @@ <h1 title="All&amp;nbsp;Packages" class="title">All&nbsp;Packages</h1>
 </div>
 </main>
 </div>
-</div>
 </body>
 </html>