From c4c9cefd997da7c9effa7293028af5b2e3558e9f Mon Sep 17 00:00:00 2001 From: Matt Date: Tue, 3 Jan 2023 20:04:31 -0800 Subject: [PATCH 1/2] Bump to wpilib 2023.1.1 --- build.gradle | 2 +- photon-server/build.gradle | 2 +- .../aimandrange/.wpilib/wpilib_preferences.json | 2 +- photonlib-cpp-examples/aimandrange/build.gradle | 2 +- .../aimattarget/.wpilib/wpilib_preferences.json | 2 +- photonlib-cpp-examples/aimattarget/build.gradle | 2 +- .../getinrange/.wpilib/wpilib_preferences.json | 2 +- photonlib-cpp-examples/getinrange/build.gradle | 2 +- .../aimandrange/.wpilib/wpilib_preferences.json | 2 +- photonlib-java-examples/aimandrange/build.gradle | 2 +- .../aimattarget/.wpilib/wpilib_preferences.json | 2 +- photonlib-java-examples/aimattarget/build.gradle | 2 +- .../getinrange/.wpilib/wpilib_preferences.json | 2 +- photonlib-java-examples/getinrange/build.gradle | 2 +- .../simaimandrange/.wpilib/wpilib_preferences.json | 2 +- photonlib-java-examples/simaimandrange/build.gradle | 2 +- .../simposeest/.wpilib/wpilib_preferences.json | 2 +- photonlib-java-examples/simposeest/build.gradle | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/build.gradle b/build.gradle index 5ca8e439fb..b42616e1b1 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ allprojects { apply from: "versioningHelper.gradle" ext { - wpilibVersion = "2023.1.1-beta-7-15-g1e7fcd5" + wpilibVersion = "2023.1.1" opencvVersion = "4.6.0-4" joglVersion = "2.4.0-rc-20200307" pubVersion = versionString diff --git a/photon-server/build.gradle b/photon-server/build.gradle index 41c400aea0..cb0ad7b13c 100644 --- a/photon-server/build.gradle +++ b/photon-server/build.gradle @@ -100,7 +100,7 @@ run { remotes { pi { - host = 'photonvision.local' + host = 'photonvision-2.local' user = 'pi' password = 'raspberry' knownHosts = allowAnyHosts diff --git a/photonlib-cpp-examples/aimandrange/.wpilib/wpilib_preferences.json b/photonlib-cpp-examples/aimandrange/.wpilib/wpilib_preferences.json index 6b05d14d6d..cf67d2d09f 100644 --- a/photonlib-cpp-examples/aimandrange/.wpilib/wpilib_preferences.json +++ b/photonlib-cpp-examples/aimandrange/.wpilib/wpilib_preferences.json @@ -1,6 +1,6 @@ { "enableCppIntellisense": true, "currentLanguage": "cpp", - "projectYear": "2023Beta", + "projectYear": "2023", "teamNumber": 5 } diff --git a/photonlib-cpp-examples/aimandrange/build.gradle b/photonlib-cpp-examples/aimandrange/build.gradle index c611f2e202..ed04c979a8 100644 --- a/photonlib-cpp-examples/aimandrange/build.gradle +++ b/photonlib-cpp-examples/aimandrange/build.gradle @@ -1,7 +1,7 @@ plugins { id "cpp" id "google-test-test-suite" - id "edu.wpi.first.GradleRIO" version "2023.1.1-beta-7" + id "edu.wpi.first.GradleRIO" version "2023.1.1" id "com.dorongold.task-tree" version "2.1.0" } diff --git a/photonlib-cpp-examples/aimattarget/.wpilib/wpilib_preferences.json b/photonlib-cpp-examples/aimattarget/.wpilib/wpilib_preferences.json index 6b05d14d6d..cf67d2d09f 100644 --- a/photonlib-cpp-examples/aimattarget/.wpilib/wpilib_preferences.json +++ b/photonlib-cpp-examples/aimattarget/.wpilib/wpilib_preferences.json @@ -1,6 +1,6 @@ { "enableCppIntellisense": true, "currentLanguage": "cpp", - "projectYear": "2023Beta", + "projectYear": "2023", "teamNumber": 5 } diff --git a/photonlib-cpp-examples/aimattarget/build.gradle b/photonlib-cpp-examples/aimattarget/build.gradle index c611f2e202..ed04c979a8 100644 --- a/photonlib-cpp-examples/aimattarget/build.gradle +++ b/photonlib-cpp-examples/aimattarget/build.gradle @@ -1,7 +1,7 @@ plugins { id "cpp" id "google-test-test-suite" - id "edu.wpi.first.GradleRIO" version "2023.1.1-beta-7" + id "edu.wpi.first.GradleRIO" version "2023.1.1" id "com.dorongold.task-tree" version "2.1.0" } diff --git a/photonlib-cpp-examples/getinrange/.wpilib/wpilib_preferences.json b/photonlib-cpp-examples/getinrange/.wpilib/wpilib_preferences.json index 6b05d14d6d..cf67d2d09f 100644 --- a/photonlib-cpp-examples/getinrange/.wpilib/wpilib_preferences.json +++ b/photonlib-cpp-examples/getinrange/.wpilib/wpilib_preferences.json @@ -1,6 +1,6 @@ { "enableCppIntellisense": true, "currentLanguage": "cpp", - "projectYear": "2023Beta", + "projectYear": "2023", "teamNumber": 5 } diff --git a/photonlib-cpp-examples/getinrange/build.gradle b/photonlib-cpp-examples/getinrange/build.gradle index c611f2e202..ed04c979a8 100644 --- a/photonlib-cpp-examples/getinrange/build.gradle +++ b/photonlib-cpp-examples/getinrange/build.gradle @@ -1,7 +1,7 @@ plugins { id "cpp" id "google-test-test-suite" - id "edu.wpi.first.GradleRIO" version "2023.1.1-beta-7" + id "edu.wpi.first.GradleRIO" version "2023.1.1" id "com.dorongold.task-tree" version "2.1.0" } diff --git a/photonlib-java-examples/aimandrange/.wpilib/wpilib_preferences.json b/photonlib-java-examples/aimandrange/.wpilib/wpilib_preferences.json index 2efa43c187..c63569f160 100644 --- a/photonlib-java-examples/aimandrange/.wpilib/wpilib_preferences.json +++ b/photonlib-java-examples/aimandrange/.wpilib/wpilib_preferences.json @@ -1,6 +1,6 @@ { "enableCppIntellisense": false, "currentLanguage": "java", - "projectYear": "2023Beta", + "projectYear": "2023", "teamNumber": 6995 } diff --git a/photonlib-java-examples/aimandrange/build.gradle b/photonlib-java-examples/aimandrange/build.gradle index 66ffce3458..833733bac6 100644 --- a/photonlib-java-examples/aimandrange/build.gradle +++ b/photonlib-java-examples/aimandrange/build.gradle @@ -1,6 +1,6 @@ plugins { id "java" - id "edu.wpi.first.GradleRIO" version "2023.1.1-beta-7" + id "edu.wpi.first.GradleRIO" version "2023.1.1" } sourceCompatibility = JavaVersion.VERSION_11 diff --git a/photonlib-java-examples/aimattarget/.wpilib/wpilib_preferences.json b/photonlib-java-examples/aimattarget/.wpilib/wpilib_preferences.json index 2efa43c187..c63569f160 100644 --- a/photonlib-java-examples/aimattarget/.wpilib/wpilib_preferences.json +++ b/photonlib-java-examples/aimattarget/.wpilib/wpilib_preferences.json @@ -1,6 +1,6 @@ { "enableCppIntellisense": false, "currentLanguage": "java", - "projectYear": "2023Beta", + "projectYear": "2023", "teamNumber": 6995 } diff --git a/photonlib-java-examples/aimattarget/build.gradle b/photonlib-java-examples/aimattarget/build.gradle index d9311d45a9..25db8dfd96 100644 --- a/photonlib-java-examples/aimattarget/build.gradle +++ b/photonlib-java-examples/aimattarget/build.gradle @@ -1,6 +1,6 @@ plugins { id "java" - id "edu.wpi.first.GradleRIO" version "2023.1.1-beta-7" + id "edu.wpi.first.GradleRIO" version "2023.1.1" } sourceCompatibility = JavaVersion.VERSION_11 diff --git a/photonlib-java-examples/getinrange/.wpilib/wpilib_preferences.json b/photonlib-java-examples/getinrange/.wpilib/wpilib_preferences.json index 2efa43c187..c63569f160 100644 --- a/photonlib-java-examples/getinrange/.wpilib/wpilib_preferences.json +++ b/photonlib-java-examples/getinrange/.wpilib/wpilib_preferences.json @@ -1,6 +1,6 @@ { "enableCppIntellisense": false, "currentLanguage": "java", - "projectYear": "2023Beta", + "projectYear": "2023", "teamNumber": 6995 } diff --git a/photonlib-java-examples/getinrange/build.gradle b/photonlib-java-examples/getinrange/build.gradle index 66ffce3458..833733bac6 100644 --- a/photonlib-java-examples/getinrange/build.gradle +++ b/photonlib-java-examples/getinrange/build.gradle @@ -1,6 +1,6 @@ plugins { id "java" - id "edu.wpi.first.GradleRIO" version "2023.1.1-beta-7" + id "edu.wpi.first.GradleRIO" version "2023.1.1" } sourceCompatibility = JavaVersion.VERSION_11 diff --git a/photonlib-java-examples/simaimandrange/.wpilib/wpilib_preferences.json b/photonlib-java-examples/simaimandrange/.wpilib/wpilib_preferences.json index 2efa43c187..c63569f160 100644 --- a/photonlib-java-examples/simaimandrange/.wpilib/wpilib_preferences.json +++ b/photonlib-java-examples/simaimandrange/.wpilib/wpilib_preferences.json @@ -1,6 +1,6 @@ { "enableCppIntellisense": false, "currentLanguage": "java", - "projectYear": "2023Beta", + "projectYear": "2023", "teamNumber": 6995 } diff --git a/photonlib-java-examples/simaimandrange/build.gradle b/photonlib-java-examples/simaimandrange/build.gradle index 66ffce3458..833733bac6 100644 --- a/photonlib-java-examples/simaimandrange/build.gradle +++ b/photonlib-java-examples/simaimandrange/build.gradle @@ -1,6 +1,6 @@ plugins { id "java" - id "edu.wpi.first.GradleRIO" version "2023.1.1-beta-7" + id "edu.wpi.first.GradleRIO" version "2023.1.1" } sourceCompatibility = JavaVersion.VERSION_11 diff --git a/photonlib-java-examples/simposeest/.wpilib/wpilib_preferences.json b/photonlib-java-examples/simposeest/.wpilib/wpilib_preferences.json index 2efa43c187..c63569f160 100644 --- a/photonlib-java-examples/simposeest/.wpilib/wpilib_preferences.json +++ b/photonlib-java-examples/simposeest/.wpilib/wpilib_preferences.json @@ -1,6 +1,6 @@ { "enableCppIntellisense": false, "currentLanguage": "java", - "projectYear": "2023Beta", + "projectYear": "2023", "teamNumber": 6995 } diff --git a/photonlib-java-examples/simposeest/build.gradle b/photonlib-java-examples/simposeest/build.gradle index 66ffce3458..833733bac6 100644 --- a/photonlib-java-examples/simposeest/build.gradle +++ b/photonlib-java-examples/simposeest/build.gradle @@ -1,6 +1,6 @@ plugins { id "java" - id "edu.wpi.first.GradleRIO" version "2023.1.1-beta-7" + id "edu.wpi.first.GradleRIO" version "2023.1.1" } sourceCompatibility = JavaVersion.VERSION_11 From adb4296ee244a0be087b6fef971fbc5fbfd73f6b Mon Sep 17 00:00:00 2001 From: Matt Date: Fri, 6 Jan 2023 11:45:06 -0500 Subject: [PATCH 2/2] Update build.gradle --- photon-server/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/photon-server/build.gradle b/photon-server/build.gradle index cb0ad7b13c..41c400aea0 100644 --- a/photon-server/build.gradle +++ b/photon-server/build.gradle @@ -100,7 +100,7 @@ run { remotes { pi { - host = 'photonvision-2.local' + host = 'photonvision.local' user = 'pi' password = 'raspberry' knownHosts = allowAnyHosts