Update VLCKit includes

akdevtech · Aug 23, 2024 · 05c8614 · 05c8614
1 parent cd23a24
commit 05c8614
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 12 deletions.
diff --git a/Sources/About/AboutController.swift b/Sources/About/AboutController.swift
@@ -113,7 +113,7 @@ class AboutController: UIViewController, MFMailComposeViewControllerDelegate, UI
         do {
             var htmlString = try String(contentsOfFile: staticHTMLPath) as NSString
 
-            let rangeOfLastStringToReplace = htmlString.range(of: "MOBILEVLCKITVERSION")
+            let rangeOfLastStringToReplace = htmlString.range(of: "VLCKITVERSION")
             let lengthOfStringToSearch = rangeOfLastStringToReplace.location +
             rangeOfLastStringToReplace.length +
             versionBuildNumberAndCodeName.count +
@@ -134,7 +134,7 @@ class AboutController: UIViewController, MFMailComposeViewControllerDelegate, UI
                                                          with: backgroundColor,
                                                          options: .literal,
                                                          range: searchRange) as NSString
-            htmlString = htmlString.replacingOccurrences(of: "MOBILEVLCKITVERSION",
+            htmlString = htmlString.replacingOccurrences(of: "VLCKITVERSION",
                                                          with: vlcLibraryVersion,
                                                          options: .literal,
                                                          range: searchRange) as NSString

diff --git a/Sources/About/iOS/About Contents.html b/Sources/About/iOS/About Contents.html
@@ -21,7 +21,7 @@
 </td>
 <td width=160 valign="middle">
 <h3>VLC for iOS</h2>
-<h5>VLCFORIOSVERSION<br /><br />MOBILEVLCKITVERSION</h5>
+<h5>VLCFORIOSVERSION<br /><br />VLCKITVERSION</h5>
 </td>
 </tr>
 </table>
@@ -38,7 +38,7 @@ <h5>VLCFORIOSVERSION<br /><br />MOBILEVLCKITVERSION</h5>
 VideoLAN, VLC and VLC media player are internationally registered trademarks of the <a href="http://www.videolan.org/videolan/">VideoLAN non-profit organization</a>.</p>
 <p align="center">VLC for iOS makes use of the following libraries, fonts and frameworks:</p>
 <br />
-&nbsp;&nbsp;&nbsp;&nbsp;<a href="https://code.videolan.org/videolan/VLCKit.git">MobileVLCKit</a><br />
+&nbsp;&nbsp;&nbsp;&nbsp;<a href="https://code.videolan.org/videolan/VLCKit.git">VLCKit</a><br />
 Copyright &copy; 2007-2024 Felix Paul K&uuml;hne, Pierre d&rsquo;Herbemont, Carola Nitz, Soomin Lee, Thomas Guillem et al. - <a href="#lgpl2">LGPLv2.1 or later</a><br />
 <br />
 &nbsp;&nbsp;&nbsp;&nbsp;<a href="https://code.videolan.org/videolan/VLCMediaLibraryKit.git">VLCMediaLibraryKit</a><br />

diff --git a/Sources/About/tvOS/About Contents.html b/Sources/About/tvOS/About Contents.html
@@ -22,7 +22,7 @@
 VideoLAN, VLC and VLC media player are internationally registered trademarks of the VideoLAN non-profit organization</a>.</p>
 <p align="center">VLC for tvOS makes use of the following libraries, fonts and frameworks:</p>
 <br />
-&nbsp;&nbsp;&nbsp;&nbsp;<b>TVVLCKit</b>
+&nbsp;&nbsp;&nbsp;&nbsp;<b>VLCKit</b>
 <br />Copyright &copy; 2007-2024 Pierre d&rsquo;Herbemont, Felix Paul K&uuml;hne, Faustino E. Osuna, et al. - LGPLv2.1 or later
 <br /><br />
 &nbsp;&nbsp;&nbsp;&nbsp;<b>libvlc</b>

diff --git a/Sources/Headers/VLC-iOS-Bridging-Header.h b/Sources/Headers/VLC-iOS-Bridging-Header.h
@@ -1,5 +1,5 @@
 #import <AppAuth/AppAuth.h>
-#import <MobileVLCKit/MobileVLCKit.h>
+#import <VLCKit/VLCKit.h>
 #import <ObjectiveDropboxOfficial/ObjectiveDropboxOfficial.h>
 #import <VLCMediaLibraryKit/VLCMediaLibraryKit.h>
 #import <XKKeychain/XKKeychain.h>

diff --git a/Sources/Headers/VLC-iOS-Prefix-Header.pch b/Sources/Headers/VLC-iOS-Prefix-Header.pch
@@ -17,8 +17,8 @@
     #import <Foundation/Foundation.h>
 #endif
 
-#import <MobileVLCKit/MobileVLCKit.h>
-#import <MobileVLCKit/vlc/libvlc_version.h>
+#import <VLCKit/VLCKit.h>
+#import <VLCKit/vlc/libvlc_version.h>
 
 #import "VLCConstants.h"
 #import "UIColor+Presets.h"

diff --git a/Sources/Headers/VLC-tvOS-Bridging-Header.h b/Sources/Headers/VLC-tvOS-Bridging-Header.h
@@ -1,6 +1,6 @@
 #import "VLCTVConstants.h"
 
-#import <TVVLCKit/TVVLCKit.h>
+#import <VLCKit/VLCKit.h>
 
 #import "VLCNetworkServerLoginInformation.h"
 #import "VLCNetworkServerLoginInformation+Keychain.h"

diff --git a/Sources/Headers/VLC-tvOS-Prefix-Header.pch b/Sources/Headers/VLC-tvOS-Prefix-Header.pch
@@ -18,8 +18,8 @@
 #import <Foundation/Foundation.h>
 #endif
 
-#import <TVVLCKit/TVVLCKit.h>
-#import <TVVLCKit/vlc/libvlc_version.h>
+#import <VLCKit/VLCKit.h>
+#import <VLCKit/vlc/libvlc_version.h>
 
 #import "UIColor+Presets.h"
 #import "VLCTVConstants.h"

diff --git a/VLC.xcodeproj/project.pbxproj b/VLC.xcodeproj/project.pbxproj
@@ -979,6 +979,7 @@
 		7DB638AA185BC0890003887C /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = Resources/iOS/Images.xcassets; sourceTree = SOURCE_ROOT; };
 		7DB66CEE2520E3B90077481C /* VLCDownloadController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCDownloadController.h; sourceTree = "<group>"; };
 		7DB66CEF2520E3B90077481C /* VLCDownloadController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCDownloadController.m; sourceTree = "<group>"; };
+		7DB9CEE22BA8ACCE0086981B /* VLCKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = VLCKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		7DBB9D3D27FF246C00ABCEC7 /* VLCMicroMediaLibraryService.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCMicroMediaLibraryService.h; sourceTree = "<group>"; };
 		7DBB9D3E27FF246C00ABCEC7 /* VLCMicroMediaLibraryService.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCMicroMediaLibraryService.m; sourceTree = "<group>"; };
 		7DBBF180183AB3B80009A339 /* VLCAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCAppDelegate.h; sourceTree = "<group>"; };
@@ -2018,6 +2019,7 @@
 		7D94FCDD16DE7D1000F2623B /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				7DB9CEE22BA8ACCE0086981B /* VLCKit.framework */,
 				7DB116302B6FA6940046059D /* PassKit.framework */,
 				7D43A29D28FB40B3002C41B1 /* CarPlay.framework */,
 				7D8968701BD3058800F4EAAD /* LocalAuthentication.framework */,
@@ -3024,8 +3026,8 @@
 				7D1329391BA1F10100BE647E /* Sources */,
 				7D13293A1BA1F10100BE647E /* Frameworks */,
 				7D13293B1BA1F10100BE647E /* Resources */,
-				982755253ECF96B8E3B17FEE /* [CP] Embed Pods Frameworks */,
 				9FC273B6B91160C54B8FDFE5 /* [CP] Copy Pods Resources */,
+				07C556AE104BE8998C7FC4C2 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -3319,6 +3321,26 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
+		07C556AE104BE8998C7FC4C2 /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-VLC-tvOS/Pods-VLC-tvOS-frameworks.sh",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/VLCKit/VLCKit.framework/VLCKit",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/VLCMediaLibraryKit/VLCMediaLibraryKit.framework/VLCMediaLibraryKit",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/VLCKit.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/VLCMediaLibraryKit.framework",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-VLC-tvOS/Pods-VLC-tvOS-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		0A9D17D120C4A14700AA4A8C /* Run SwiftLint Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;