From 16196bc980e524c2dd3744ae26e83169a17aa1ac Mon Sep 17 00:00:00 2001 From: Tyler Wilcox Date: Thu, 2 Mar 2023 22:46:26 -0500 Subject: [PATCH 1/3] Some minor vision changes and auto package for main builds --- .github/workflows/gradle-publish.yml | 6 ++++-- lib/publish.gradle | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/gradle-publish.yml b/.github/workflows/gradle-publish.yml index 8ec3ee3..3feef94 100644 --- a/.github/workflows/gradle-publish.yml +++ b/.github/workflows/gradle-publish.yml @@ -10,6 +10,8 @@ name: Gradle Package on: release: types: [created] + push: + branches: ["main"] jobs: build: @@ -22,10 +24,10 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v3 with: - java-version: '11' + java-version: '17' distribution: 'temurin' 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/lib/publish.gradle b/lib/publish.gradle index 94f7526..58b7f22 100644 --- a/lib/publish.gradle +++ b/lib/publish.gradle @@ -4,7 +4,7 @@ apply plugin: 'maven-publish' ext.licenseFile = files("$rootDir/LICENSE.txt") -def pubVersion = '2023.1.1-SNAPSHOT' +def pubVersion = '2023.1.2' def outputsFolder = file("$buildDir/allOutputs") From 42c00e2cdd00af02aac404927c10356f2ff3687f Mon Sep 17 00:00:00 2001 From: Tyler Wilcox Date: Thu, 2 Mar 2023 22:48:21 -0500 Subject: [PATCH 2/3] Remove vendordeps --- vendordeps/AdvantageKit.json | 41 ------------------------------------ 1 file changed, 41 deletions(-) delete mode 100644 vendordeps/AdvantageKit.json diff --git a/vendordeps/AdvantageKit.json b/vendordeps/AdvantageKit.json deleted file mode 100644 index b5c210c..0000000 --- a/vendordeps/AdvantageKit.json +++ /dev/null @@ -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": [] -} \ No newline at end of file From 198b4641eb5f4c2c20c8d96567280128faf595de Mon Sep 17 00:00:00 2001 From: Tyler Wilcox Date: Tue, 7 Mar 2023 19:17:30 -0500 Subject: [PATCH 3/3] Fix class visibility for color sensor --- lib/publish.gradle | 2 +- .../fairportrobotics/frc/poe/sensors/colorsensors/TCS34725.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/publish.gradle b/lib/publish.gradle index 58b7f22..8e3572a 100644 --- a/lib/publish.gradle +++ b/lib/publish.gradle @@ -4,7 +4,7 @@ apply plugin: 'maven-publish' ext.licenseFile = files("$rootDir/LICENSE.txt") -def pubVersion = '2023.1.2' +def pubVersion = '2023.1.3' def outputsFolder = file("$buildDir/allOutputs") diff --git a/lib/src/main/java/com/fairportrobotics/frc/poe/sensors/colorsensors/TCS34725.java b/lib/src/main/java/com/fairportrobotics/frc/poe/sensors/colorsensors/TCS34725.java index 0f76a61..15b34d8 100644 --- a/lib/src/main/java/com/fairportrobotics/frc/poe/sensors/colorsensors/TCS34725.java +++ b/lib/src/main/java/com/fairportrobotics/frc/poe/sensors/colorsensors/TCS34725.java @@ -8,7 +8,7 @@ import edu.wpi.first.wpilibj.I2C; public class TCS34725 { /** */ - class TCS34725_RGB { + public class TCS34725_RGB { private int r, g, b; public TCS34725_RGB(int r, int g, int b) {