Merge branch 'tyler' of https://github.com/FairportRobotics/potential-octo-eureka into tyler
This commit is contained in:
commit
cc59d183ae
|
|
@ -10,6 +10,8 @@ name: Gradle Package
|
||||||
on:
|
on:
|
||||||
release:
|
release:
|
||||||
types: [created]
|
types: [created]
|
||||||
|
push:
|
||||||
|
branches: ["main"]
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
|
|
@ -22,10 +24,10 @@ jobs:
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
- name: Set up JDK 11
|
- name: Set up JDK 17
|
||||||
uses: actions/setup-java@v3
|
uses: actions/setup-java@v3
|
||||||
with:
|
with:
|
||||||
java-version: '11'
|
java-version: '17'
|
||||||
distribution: 'temurin'
|
distribution: 'temurin'
|
||||||
server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
|
server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
|
||||||
settings-path: ${{ github.workspace }} # location for the settings.xml file
|
settings-path: ${{ github.workspace }} # location for the settings.xml file
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@ apply plugin: 'maven-publish'
|
||||||
|
|
||||||
ext.licenseFile = files("$rootDir/LICENSE.txt")
|
ext.licenseFile = files("$rootDir/LICENSE.txt")
|
||||||
|
|
||||||
def pubVersion = '2023.1.1-SNAPSHOT'
|
def pubVersion = '2023.1.3'
|
||||||
|
|
||||||
def outputsFolder = file("$buildDir/allOutputs")
|
def outputsFolder = file("$buildDir/allOutputs")
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ import edu.wpi.first.wpilibj.I2C;
|
||||||
public class TCS34725 {
|
public class TCS34725 {
|
||||||
|
|
||||||
/** */
|
/** */
|
||||||
class TCS34725_RGB {
|
public class TCS34725_RGB {
|
||||||
private int r, g, b;
|
private int r, g, b;
|
||||||
|
|
||||||
public TCS34725_RGB(int r, int g, int b) {
|
public TCS34725_RGB(int r, int g, int b) {
|
||||||
|
|
|
||||||
|
|
@ -1,41 +0,0 @@
|
||||||
{
|
|
||||||
"fileName": "AdvantageKit.json",
|
|
||||||
"name": "AdvantageKit",
|
|
||||||
"version": "2.2.1",
|
|
||||||
"uuid": "d820cc26-74e3-11ec-90d6-0242ac120003",
|
|
||||||
"mavenUrls": [],
|
|
||||||
"jsonUrl": "https://github.com/Mechanical-Advantage/AdvantageKit/releases/latest/download/AdvantageKit.json",
|
|
||||||
"javaDependencies": [
|
|
||||||
{
|
|
||||||
"groupId": "org.littletonrobotics.akit.junction",
|
|
||||||
"artifactId": "wpilib-shim",
|
|
||||||
"version": "2.2.1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"groupId": "org.littletonrobotics.akit.junction",
|
|
||||||
"artifactId": "junction-core",
|
|
||||||
"version": "2.2.1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"groupId": "org.littletonrobotics.akit.conduit",
|
|
||||||
"artifactId": "conduit-api",
|
|
||||||
"version": "2.2.1"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"jniDependencies": [
|
|
||||||
{
|
|
||||||
"groupId": "org.littletonrobotics.akit.conduit",
|
|
||||||
"artifactId": "conduit-wpilibio",
|
|
||||||
"version": "2.2.1",
|
|
||||||
"skipInvalidPlatforms": false,
|
|
||||||
"isJar": false,
|
|
||||||
"validPlatforms": [
|
|
||||||
"linuxathena",
|
|
||||||
"windowsx86-64",
|
|
||||||
"linuxx86-64",
|
|
||||||
"osxuniversal"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"cppDependencies": []
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue