Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump WPILib to beta 2 #972

Merged
merged 5 commits into from
Oct 24, 2023
Merged

Bump WPILib to beta 2 #972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c95feb2
Bump to beta 2
mcm001 Oct 20, 2023
397d28d
Reduce copy paste spam going forwards
mcm001 Oct 20, 2023
2d5ccd6
Bump gradle
mcm001 Oct 20, 2023
270fd37
oops
mcm001 Oct 21, 2023
d2d4d06
Merge branch 'master' into 2024
srimanachanta Oct 21, 2023
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
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ allprojects {
apply from: "versioningHelper.gradle"

ext {
wpilibVersion = "2024.1.1-beta-1"
wpilibVersion = "2024.1.1-beta-2"
openCVversion = "4.8.0-1"
joglVersion = "2.4.0-rc-20200307"
javalinVersion = "5.6.2"
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services\.gradle\.org/distributions/gradle-8\.3-bin\.zip
distributionUrl=https\://services\.gradle\.org/distributions/gradle-8\.4-bin\.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion photonlib-cpp-examples/aimandrange/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id "cpp"
id "google-test-test-suite"
id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-1"
id "edu.wpi.first.GradleRIO"

id "com.dorongold.task-tree" version "2.1.0"
}
Expand Down
2 changes: 1 addition & 1 deletion photonlib-cpp-examples/aimattarget/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id "cpp"
id "google-test-test-suite"
id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-1"
id "edu.wpi.first.GradleRIO"

id "com.dorongold.task-tree" version "2.1.0"
}
Expand Down
2 changes: 1 addition & 1 deletion photonlib-cpp-examples/apriltagExample/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id "cpp"
id "google-test-test-suite"
id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-1"
id "edu.wpi.first.GradleRIO"

id "com.dorongold.task-tree" version "2.1.0"
}
Expand Down
1 change: 1 addition & 0 deletions photonlib-cpp-examples/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
plugins {
id "com.diffplug.spotless" version "6.1.2"
id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-2" apply false
}

allprojects {
Expand Down
2 changes: 1 addition & 1 deletion photonlib-cpp-examples/getinrange/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id "cpp"
id "google-test-test-suite"
id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-1"
id "edu.wpi.first.GradleRIO"

id "com.dorongold.task-tree" version "2.1.0"
}
Expand Down
2 changes: 1 addition & 1 deletion photonlib-cpp-examples/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services\.gradle\.org/distributions/gradle-8\.3-bin\.zip
distributionUrl=https\://services\.gradle\.org/distributions/gradle-8\.4-bin\.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion photonlib-java-examples/aimandrange/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id "java"
id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-1"
id "edu.wpi.first.GradleRIO"
}

sourceCompatibility = JavaVersion.VERSION_11
Expand Down
2 changes: 1 addition & 1 deletion photonlib-java-examples/aimattarget/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id "java"
id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-1"
id "edu.wpi.first.GradleRIO"
}

sourceCompatibility = JavaVersion.VERSION_11
Expand Down
1 change: 1 addition & 0 deletions photonlib-java-examples/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
plugins {
id "com.diffplug.spotless" version "6.1.2"
id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-2" apply false
}

apply from: "examples.gradle"
Expand Down
2 changes: 1 addition & 1 deletion photonlib-java-examples/getinrange/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id "java"
id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-1"
id "edu.wpi.first.GradleRIO"
}

sourceCompatibility = JavaVersion.VERSION_11
Expand Down
2 changes: 1 addition & 1 deletion photonlib-java-examples/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services\.gradle\.org/distributions/gradle-8\.3-bin\.zip
distributionUrl=https\://services\.gradle\.org/distributions/gradle-8\.4-bin\.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion photonlib-java-examples/simaimandrange/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id "java"
id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-1"
id "edu.wpi.first.GradleRIO"
}

sourceCompatibility = JavaVersion.VERSION_11
Expand Down
2 changes: 1 addition & 1 deletion photonlib-java-examples/swervedriveposeestsim/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id "java"
id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-1"
id "edu.wpi.first.GradleRIO"
}

sourceCompatibility = JavaVersion.VERSION_11
Expand Down
2 changes: 1 addition & 1 deletion photonlib-java-examples/swervedriveposeestsim/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=permwrapper/dists
distributionUrl=https\://services\.gradle\.org/distributions/gradle-8\.3-bin\.zip
distributionUrl=https\://services\.gradle\.org/distributions/gradle-8\.4-bin\.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=permwrapper/dists
3 changes: 3 additions & 0 deletions shared/common.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@ dependencies {

// test stuff
testImplementation("org.junit.jupiter:junit-jupiter:5.8.2")

// wpilib serde
mcm001 marked this conversation as resolved.
Show resolved Hide resolved
implementation 'us.hebi.quickbuf:quickbuf-runtime:1.3.2'
}

test {
Expand Down
8 changes: 0 additions & 8 deletions shared/examples_common.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
task copyPhotonlib() {
doFirst {
// Assume publish to maven local has just be run. Kinda curst
// // first, invoke gradle to generate the vendor json
// try {
// exec {
// commandLine 'gradlew', 'photon-lib:generateVendorJson', '-x', "check"
// }
// } catch (Exception e) {
// // ignored
// }

def vendorJsonSrc = new File("${rootDir}", "../photon-lib/build/generated/vendordeps/");
def vendorJsonDst = new File("${projectDir}/vendordeps/");
Expand Down