Skip to content

Commit

Permalink
Prepare for release
Browse files Browse the repository at this point in the history
  • Loading branch information
Wi11iamYuan committed Mar 23, 2024
1 parent 04a2429 commit e5e5385
Show file tree
Hide file tree
Showing 12 changed files with 27 additions and 424 deletions.
4 changes: 2 additions & 2 deletions 3128-Common.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "3128-common",
"version": "1.6.7",
"version": "1.6.8",
"uuid": "ae3fa5a2-78d9-47e8-921a-dba45b889445",
"frcYear": "2024",
"mavenUrls": [
Expand All @@ -12,7 +12,7 @@
{
"groupId": "com.github.Team3128",
"artifactId": "3128-common",
"version": "1.6.7"
"version": "1.6.8"
}
],
"jniDependencies": [],
Expand Down
4 changes: 2 additions & 2 deletions 3128-common.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "3128-common",
"version": "1.6.7",
"version": "1.6.8",
"uuid": "ae3fa5a2-78d9-47e8-921a-dba45b889445",
"frcYear": "2024",
"mavenUrls": [
Expand All @@ -12,7 +12,7 @@
{
"groupId": "com.github.Team3128",
"artifactId": "3128-common",
"version": "1.6.7"
"version": "1.6.8"
}
],
"jniDependencies": [],
Expand Down
17 changes: 13 additions & 4 deletions doc/common/core/misc/NAR_Robot.html
Original file line number Diff line number Diff line change
Expand Up @@ -117,12 +117,15 @@ <h2>Field Summary</h2>
<div class="table-header col-first">Modifier and Type</div>
<div class="table-header col-second">Field</div>
<div class="table-header col-last">Description</div>
<div class="col-first even-row-color"><code>static final double</code></div>
<div class="col-second even-row-color"><code><a href="#kDefaultPeriod" class="member-name-link">kDefaultPeriod</a></code></div>
<div class="col-first even-row-color"><code>static <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;</code></div>
<div class="col-second even-row-color"><code><a href="#generatedContainerPackages" class="member-name-link">generatedContainerPackages</a></code></div>
<div class="col-last even-row-color">&nbsp;</div>
<div class="col-first odd-row-color"><code>static boolean</code></div>
<div class="col-second odd-row-color"><code><a href="#logWithAdvantageKit" class="member-name-link">logWithAdvantageKit</a></code></div>
<div class="col-first odd-row-color"><code>static final double</code></div>
<div class="col-second odd-row-color"><code><a href="#kDefaultPeriod" class="member-name-link">kDefaultPeriod</a></code></div>
<div class="col-last odd-row-color">&nbsp;</div>
<div class="col-first even-row-color"><code>static boolean</code></div>
<div class="col-second even-row-color"><code><a href="#logWithAdvantageKit" class="member-name-link">logWithAdvantageKit</a></code></div>
<div class="col-last even-row-color">&nbsp;</div>
</div>
</section>
</li>
Expand Down Expand Up @@ -237,6 +240,12 @@ <h3>kDefaultPeriod</h3>
</dl>
</section>
</li>
<li>
<section class="detail" id="generatedContainerPackages">
<h3>generatedContainerPackages</h3>
<div class="member-signature"><span class="modifiers">public static</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;</span>&nbsp;<span class="element-name">generatedContainerPackages</span></div>
</section>
</li>
</ul>
</section>
</li>
Expand Down
2 changes: 2 additions & 0 deletions doc/index-all.html
Original file line number Diff line number Diff line change
Expand Up @@ -628,6 +628,8 @@ <h2 class="title" id="I:F">F</h2>
</dl>
<h2 class="title" id="I:G">G</h2>
<dl class="index">
<dt><a href="common/core/misc/NAR_Robot.html#generatedContainerPackages" class="member-name-link">generatedContainerPackages</a> - Static variable in class common.core.misc.<a href="common/core/misc/NAR_Robot.html" title="class in common.core.misc">NAR_Robot</a></dt>
<dd>&nbsp;</dd>
<dt><a href="common/hardware/motorcontroller/NAR_CANSpark.html#getAllFaults()" class="member-name-link">getAllFaults()</a> - Method in class common.hardware.motorcontroller.<a href="common/hardware/motorcontroller/NAR_CANSpark.html" title="class in common.hardware.motorcontroller">NAR_CANSpark</a></dt>
<dd>&nbsp;</dd>
<dt><a href="common/core/swerve/SwerveModule.html#getAngleMotor()" class="member-name-link">getAngleMotor()</a> - Method in class common.core.swerve.<a href="common/core/swerve/SwerveModule.html" title="class in common.core.swerve">SwerveModule</a></dt>
Expand Down
2 changes: 1 addition & 1 deletion doc/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ <h1 class="title">3128-common</h1>
</div>
<div class="block"><h1>FRC Team 3128 Robot Control Program Utility Library</h1>
<p>Provides utility classes and functions for FRC robot control programs.</p>
<p>Version 1.6.7 (March 22 2024)</p></div>
<p>Version 1.6.8 (March 23 2024)</p></div>
<div id="all-packages-table">
<div class="caption"><span>Packages</span></div>
<div class="summary-table two-column-summary">
Expand Down
38 changes: 1 addition & 37 deletions doc/legal/ADDITIONAL_LICENSE_INFO
Original file line number Diff line number Diff line change
@@ -1,37 +1 @@
ADDITIONAL INFORMATION ABOUT LICENSING

Certain files distributed by Oracle America, Inc. and/or its affiliates are
subject to the following clarification and special exception to the GPLv2,
based on the GNU Project exception for its Classpath libraries, known as the
GNU Classpath Exception.

Note that Oracle includes multiple, independent programs in this software
package. Some of those programs are provided under licenses deemed
incompatible with the GPLv2 by the Free Software Foundation and others.
For example, the package includes programs licensed under the Apache
License, Version 2.0 and may include FreeType. Such programs are licensed
to you under their original licenses.

Oracle facilitates your further distribution of this package by adding the
Classpath Exception to the necessary parts of its GPLv2 code, which permits
you to use that code in combination with other independent modules not
licensed under the GPLv2. However, note that this would not permit you to
commingle code under an incompatible license with Oracle's GPLv2 licensed
code by, for example, cutting and pasting such code into a file also
containing Oracle's GPLv2 licensed code and then distributing the result.

Additionally, if you were to remove the Classpath Exception from any of the
files to which it applies and distribute the result, you would likely be
required to license some or all of the other code in that distribution under
the GPLv2 as well, and since the GPLv2 is incompatible with the license terms
of some items included in the distribution by Oracle, removing the Classpath
Exception could therefore effectively compromise your ability to further
distribute the package.

Failing to distribute notices associated with some files may also create
unexpected legal consequences.

Proceed with caution and we recommend that you obtain the advice of a lawyer
skilled in open source matters before removing the Classpath Exception or
making modifications to this package which may subsequently be redistributed
and/or involve the use of third party software.
Please see ..\java.base\ADDITIONAL_LICENSE_INFO
28 changes: 1 addition & 27 deletions doc/legal/ASSEMBLY_EXCEPTION
Original file line number Diff line number Diff line change
@@ -1,27 +1 @@

OPENJDK ASSEMBLY EXCEPTION

The OpenJDK source code made available by Oracle America, Inc. (Oracle) at
openjdk.java.net ("OpenJDK Code") is distributed under the terms of the GNU
General Public License <http://www.gnu.org/copyleft/gpl.html> version 2
only ("GPL2"), with the following clarification and special exception.

Linking this OpenJDK Code statically or dynamically with other code
is making a combined work based on this library. Thus, the terms
and conditions of GPL2 cover the whole combination.

As a special exception, Oracle gives you permission to link this
OpenJDK Code with certain code licensed by Oracle as indicated at
http://openjdk.java.net/legal/exception-modules-2007-05-08.html
("Designated Exception Modules") to produce an executable,
regardless of the license terms of the Designated Exception Modules,
and to copy and distribute the resulting executable under GPL2,
provided that the Designated Exception Modules continue to be
governed by the licenses under which they were offered by Oracle.

As such, it allows licensees and sublicensees of Oracle's GPL2 OpenJDK Code
to build an executable that includes those portions of necessary code that
Oracle could not provide under GPL2 (or that Oracle has provided under GPL2
with the Classpath exception). If you modify or add to the OpenJDK code,
that new GPL2 code may still be combined with Designated Exception Modules
if the new code is made subject to this exception by its copyright holder.
Please see ..\java.base\ASSEMBLY_EXCEPTION
Loading

0 comments on commit e5e5385

Please sign in to comment.