From 338f37d30227ce1061806978152ca4dc64f4d68c Mon Sep 17 00:00:00 2001
From: Tyler Veness <calcmogul@gmail.com>
Date: Sat, 5 Aug 2023 14:16:55 -0700
Subject: [PATCH] Fix header sorting of libssh (#5507)

---
 datalogtool/.styleguide                                    | 1 +
 datalogtool/src/main/native/cpp/App.cpp                    | 4 ++--
 datalogtool/src/main/native/cpp/Downloader.cpp             | 3 +--
 datalogtool/src/main/native/cpp/Sftp.h                     | 6 +++---
 roborioteamnumbersetter/.styleguide                        | 1 +
 roborioteamnumbersetter/src/main/native/cpp/SshSession.cpp | 4 ++--
 roborioteamnumbersetter/src/main/native/cpp/SshSession.h   | 3 +--
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/datalogtool/.styleguide b/datalogtool/.styleguide
index 87142fbc90..886b930536 100644
--- a/datalogtool/.styleguide
+++ b/datalogtool/.styleguide
@@ -23,6 +23,7 @@ includeOtherLibs {
   ^fmt/
   ^glass/
   ^imgui
+  ^libssh/
   ^portable-file-dialog
   ^wpi/
   ^wpigui
diff --git a/datalogtool/src/main/native/cpp/App.cpp b/datalogtool/src/main/native/cpp/App.cpp
index 6b3f7d0e88..a9e2e0c7da 100644
--- a/datalogtool/src/main/native/cpp/App.cpp
+++ b/datalogtool/src/main/native/cpp/App.cpp
@@ -4,11 +4,11 @@
 
 #include "App.h"
 
-#include <libssh/libssh.h>
-
 #include <memory>
 #include <string_view>
 
+#include <libssh/libssh.h>
+
 #define IMGUI_DEFINE_MATH_OPERATORS
 
 #include <glass/Context.h>
diff --git a/datalogtool/src/main/native/cpp/Downloader.cpp b/datalogtool/src/main/native/cpp/Downloader.cpp
index b5be764978..88e2aa6f92 100644
--- a/datalogtool/src/main/native/cpp/Downloader.cpp
+++ b/datalogtool/src/main/native/cpp/Downloader.cpp
@@ -4,8 +4,6 @@
 
 #include "Downloader.h"
 
-#include <libssh/sftp.h>
-
 #ifdef _WIN32
 #include <fcntl.h>
 #include <io.h>
@@ -20,6 +18,7 @@
 #include <glass/Storage.h>
 #include <imgui.h>
 #include <imgui_stdlib.h>
+#include <libssh/sftp.h>
 #include <portable-file-dialogs.h>
 #include <wpi/StringExtras.h>
 #include <wpi/fs.h>
diff --git a/datalogtool/src/main/native/cpp/Sftp.h b/datalogtool/src/main/native/cpp/Sftp.h
index e6fec4ae90..e033c65d2e 100644
--- a/datalogtool/src/main/native/cpp/Sftp.h
+++ b/datalogtool/src/main/native/cpp/Sftp.h
@@ -4,15 +4,15 @@
 
 #pragma once
 
-#include <libssh/libssh.h>
-#include <libssh/sftp.h>
-
 #include <span>
 #include <stdexcept>
 #include <string>
 #include <string_view>
 #include <vector>
 
+#include <libssh/libssh.h>
+#include <libssh/sftp.h>
+
 namespace sftp {
 
 struct Attributes {
diff --git a/roborioteamnumbersetter/.styleguide b/roborioteamnumbersetter/.styleguide
index 65af50d981..6e411bc832 100644
--- a/roborioteamnumbersetter/.styleguide
+++ b/roborioteamnumbersetter/.styleguide
@@ -22,6 +22,7 @@ includeOtherLibs {
   ^GLFW
   ^fmt/
   ^imgui
+  ^libssh/
   ^ntcore
   ^wpi/
   ^wpigui
diff --git a/roborioteamnumbersetter/src/main/native/cpp/SshSession.cpp b/roborioteamnumbersetter/src/main/native/cpp/SshSession.cpp
index 6424ce0083..74fc6385b8 100644
--- a/roborioteamnumbersetter/src/main/native/cpp/SshSession.cpp
+++ b/roborioteamnumbersetter/src/main/native/cpp/SshSession.cpp
@@ -5,8 +5,6 @@
 #include "SshSession.h"
 
 #include <fcntl.h>
-#include <libssh/libssh.h>
-#include <libssh/sftp.h>
 #include <stdint.h>
 #include <sys/stat.h>
 
@@ -14,6 +12,8 @@
 #include <stdexcept>
 
 #include <fmt/format.h>
+#include <libssh/libssh.h>
+#include <libssh/sftp.h>
 #include <wpi/Logger.h>
 
 using namespace sysid;
diff --git a/roborioteamnumbersetter/src/main/native/cpp/SshSession.h b/roborioteamnumbersetter/src/main/native/cpp/SshSession.h
index 2e97120f2a..47db332dad 100644
--- a/roborioteamnumbersetter/src/main/native/cpp/SshSession.h
+++ b/roborioteamnumbersetter/src/main/native/cpp/SshSession.h
@@ -4,12 +4,11 @@
 
 #pragma once
 
-#include <libssh/libssh.h>
-
 #include <stdexcept>
 #include <string>
 #include <string_view>
 
+#include <libssh/libssh.h>
 #include <wpi/Logger.h>
 
 namespace sysid {