From 19ac69f476a45cff458dda55075ed513e2ca7d6a Mon Sep 17 00:00:00 2001
From: RWC <splaser3@gmail.com>
Date: Sat, 3 Jan 2026 21:39:50 +0800
Subject: [PATCH] Update build environment to macos-15-intel and Add necessary
 imports to Settings.xm  (#679)

---
 .gitattributes                 | 1 +
 .github/workflows/buildapp.yml | 2 +-
 .gitmodules                    | 2 +-
 Source/Settings.xm             | 9 +++++++--
 Tweaks/YTUHD                   | 2 +-
 5 files changed, 11 insertions(+), 5 deletions(-)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..c8b7534
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+.gitmodules merge=ours
\ No newline at end of file
diff --git a/.github/workflows/buildapp.yml b/.github/workflows/buildapp.yml
index 8cb9b9e..951c5aa 100644
--- a/.github/workflows/buildapp.yml
+++ b/.github/workflows/buildapp.yml
@@ -54,7 +54,7 @@ concurrency:
 jobs:
   build:
     name: Build YTLitePlus
-    runs-on: macos-13
+    runs-on: macos-15-intel
     permissions:
       contents: write
 
diff --git a/.gitmodules b/.gitmodules
index 8c8be94..b299503 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -36,7 +36,7 @@
 	url = https://github.com/PoomSmart/YTABConfig
 [submodule "Tweaks/YTUHD"]
 	path = Tweaks/YTUHD
-	url = https://github.com/aricloverALT/YTUHD
+	url = https://github.com/splaser/YTUHD.git
 [submodule "Tweaks/YouGroupSettings"]
 	path = Tweaks/YouGroupSettings
 	url = https://github.com/PoomSmart/YouGroupSettings
diff --git a/Source/Settings.xm b/Source/Settings.xm
index dfec44a..8946f03 100644
--- a/Source/Settings.xm
+++ b/Source/Settings.xm
@@ -1,3 +1,7 @@
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+#import <string.h>
+
 #import "../YTLitePlus.h"
 #import "../Tweaks/YouTubeHeader/YTSettingsViewController.h"
 #import "../Tweaks/YouTubeHeader/YTSearchableSettingsViewController.h"
@@ -8,6 +12,7 @@
 #import "SettingsKeys.h"
 // #import "AppIconOptionsController.h"
 
+
 // Basic switch item
 #define BASIC_SWITCH(title, description, key) \
     [YTSettingsSectionItemClass switchItemWithTitle:title \
@@ -247,7 +252,7 @@ static const NSInteger YTLiteSection = 789;
     // Helper to generate checkmark setting items for selecting gesture modes
     static YTSettingsSectionItem* (^gestureCheckmarkSettingItem)(NSInteger, NSString *) = ^(NSInteger idx, NSString *key) {
         return [YTSettingsSectionItemClass 
-            checkmarkItemWithTitle:sectionGestureSelectedModeToString(idx)
+            checkmarkItemWithTitle:sectionGestureSelectedModeToString((GestureMode)idx)
             selectBlock:^BOOL (YTSettingsCell *cell, NSUInteger arg1) {
                 [[NSUserDefaults standardUserDefaults] setInteger:idx forKey:key];
                 [settingsViewController reloadData];
@@ -261,7 +266,7 @@ static const NSInteger YTLiteSection = 789;
         return [YTSettingsSectionItemClass itemWithTitle:LOC(sectionLabel)
             accessibilityIdentifier:nil
             detailTextBlock:^NSString *() {
-                return sectionGestureSelectedModeToString(GetInteger(sectionKey));
+                return sectionGestureSelectedModeToString((GestureMode)GetInteger(sectionKey));
             }
             selectBlock:^BOOL (YTSettingsCell *cell, NSUInteger arg1) {
                 NSArray <YTSettingsSectionItem *> *rows = @[
diff --git a/Tweaks/YTUHD b/Tweaks/YTUHD
index 0f59b38..4bac4a5 160000
--- a/Tweaks/YTUHD
+++ b/Tweaks/YTUHD
@@ -1 +1 @@
-Subproject commit 0f59b38817d554ab692a0053456319847a6ab1a1
+Subproject commit 4bac4a50a640a6792b41cf053d4df6c94dc8550a