refactor: use OLMKit from pods

matthiasn · Feb 4, 2024 · 08c7d50 · 08c7d50
1 parent 9e13b24
commit 08c7d50
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 10 deletions.
diff --git a/lib/pages/settings/flags_page.dart b/lib/pages/settings/flags_page.dart
@@ -29,6 +29,7 @@ class FlagsPage extends StatelessWidget {
           recordLocationFlag,
           enableSyncFlag,
           allowInvalidCertFlag,
+          enableMatrixFlag,
         };
 
         final filteredItems =

diff --git a/macos/Podfile b/macos/Podfile
@@ -32,6 +32,7 @@ target 'Runner' do
 
   flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__))
   pod 'OpenSSL-Universal'
+  pod 'OLMKit'
 end
 
 post_install do |installer|

diff --git a/macos/Podfile.lock b/macos/Podfile.lock
@@ -32,6 +32,11 @@ PODS:
     - FlutterMacOS
   - media_kit_native_event_loop (1.0.0):
     - FlutterMacOS
+  - OLMKit (3.2.12):
+    - OLMKit/olmc (= 3.2.12)
+    - OLMKit/olmcpp (= 3.2.12)
+  - OLMKit/olmc (3.2.12)
+  - OLMKit/olmcpp (3.2.12)
   - OpenSSL-Universal (3.1.4000)
   - package_info_plus (0.0.1):
     - FlutterMacOS
@@ -93,6 +98,7 @@ DEPENDENCIES:
   - location (from `Flutter/ephemeral/.symlinks/plugins/location/macos`)
   - media_kit_libs_macos_audio (from `Flutter/ephemeral/.symlinks/plugins/media_kit_libs_macos_audio/macos`)
   - media_kit_native_event_loop (from `Flutter/ephemeral/.symlinks/plugins/media_kit_native_event_loop/macos`)
+  - OLMKit
   - OpenSSL-Universal
   - package_info_plus (from `Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos`)
   - path_provider_foundation (from `Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin`)
@@ -112,6 +118,7 @@ SPEC REPOS:
   trunk:
     - ffmpeg-kit-macos-https
     - HotKey
+    - OLMKit
     - OpenSSL-Universal
     - ReachabilitySwift
     - sqlite3
@@ -186,6 +193,7 @@ SPEC CHECKSUMS:
   location: 7cdb0665bd6577d382b0a343acdadbcb7f964775
   media_kit_libs_macos_audio: 3871782a4f3f84c77f04d7666c87800a781c24da
   media_kit_native_event_loop: 7321675377cb9ae8596a29bddf3a3d2b5e8792c5
+  OLMKit: da115f16582e47626616874e20f7bb92222c7a51
   OpenSSL-Universal: 0adf92f748c570f9911fdb3c11fd5f1cf304e8d1
   package_info_plus: 02d7a575e80f194102bef286361c6c326e4c29ce
   path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
@@ -203,6 +211,6 @@ SPEC CHECKSUMS:
   video_player_avfoundation: 02011213dab73ae3687df27ce441fbbcc82b5579
   window_manager: 3a1844359a6295ab1e47659b1a777e36773cd6e8
 
-PODFILE CHECKSUM: 2ac34291407b655c7f9b7e15bcc9e13760f1605d
+PODFILE CHECKSUM: 1f17435b9bcfc806a7f40f5b4c74f248f88e2e3a
 
 COCOAPODS: 1.15.0
diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj
@@ -29,9 +29,6 @@
 		7E2335674AA28E31A7EEBE87 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BAE814E2540AB2A5F49FEB9F /* Pods_Runner.framework */; };
 		AD222ED52B6F1352003661C2 /* libcrypto.1.1.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = AD222ED42B6F1352003661C2 /* libcrypto.1.1.dylib */; settings = {ATTRIBUTES = (Weak, ); }; };
 		AD222ED62B6F135D003661C2 /* libcrypto.1.1.dylib in Bundle Framework */ = {isa = PBXBuildFile; fileRef = AD222ED42B6F1352003661C2 /* libcrypto.1.1.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
-		AD2C9ED72B50DEE90023FFD8 /* libolm.3.dylib in Resources */ = {isa = PBXBuildFile; fileRef = AD2C9ED62B50DEE90023FFD8 /* libolm.3.dylib */; };
-		AD2C9ED82B50E0240023FFD8 /* libolm.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = AD2C9ED62B50DEE90023FFD8 /* libolm.3.dylib */; settings = {ATTRIBUTES = (Weak, ); }; };
-		AD2C9ED92B50E0EA0023FFD8 /* libolm.3.dylib in Bundle Framework */ = {isa = PBXBuildFile; fileRef = AD2C9ED62B50DEE90023FFD8 /* libolm.3.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
 		AD3F79962B41D994009867B5 /* LibWhisper.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD3F79942B41D994009867B5 /* LibWhisper.swift */; };
 		AD3F799B2B41D9AA009867B5 /* ggml.c in Sources */ = {isa = PBXBuildFile; fileRef = AD3F79972B41D9AA009867B5 /* ggml.c */; };
 		AD3F799C2B41D9AA009867B5 /* whisper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD3F79992B41D9AA009867B5 /* whisper.cpp */; };
@@ -54,7 +51,6 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				AD2C9ED92B50E0EA0023FFD8 /* libolm.3.dylib in Bundle Framework */,
 				AD222ED62B6F135D003661C2 /* libcrypto.1.1.dylib in Bundle Framework */,
 			);
 			name = "Bundle Framework";
@@ -84,7 +80,6 @@
 		AD222ED42B6F1352003661C2 /* libcrypto.1.1.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.1.1.dylib; path = Runner/libcrypto.1.1.dylib; sourceTree = "<group>"; };
 		AD2C9ED22B50D5E00023FFD8 /* OLMKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = OLMKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		AD2C9ED42B50D9490023FFD8 /* libolm.dylib.3.2.16 */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libolm.dylib.3.2.16; path = ../../olm/build/libolm.dylib.3.2.16; sourceTree = "<group>"; };
-		AD2C9ED62B50DEE90023FFD8 /* libolm.3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libolm.3.dylib; path = Runner/libolm.3.dylib; sourceTree = "<group>"; };
 		AD3F79942B41D994009867B5 /* LibWhisper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = LibWhisper.swift; path = ../../whisper.cpp/LibWhisper.swift; sourceTree = "<group>"; };
 		AD3F79972B41D9AA009867B5 /* ggml.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ggml.c; path = "../../whisper.cpp/whisper.cpp-1.4.2/ggml.c"; sourceTree = "<group>"; };
 		AD3F79982B41D9AA009867B5 /* whisper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = whisper.h; path = "../../whisper.cpp/whisper.cpp-1.4.2/whisper.h"; sourceTree = "<group>"; };
@@ -93,6 +88,7 @@
 		AD3F79A32B41DA90009867B5 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "Runner-Bridging-Header.h"; path = "../../whisper.cpp/Runner-Bridging-Header.h"; sourceTree = "<group>"; };
 		AD3F79A42B41DAE9009867B5 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
 		AD4D50B4272DC22C00B0D18C /* RunnerDebug.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = RunnerDebug.entitlements; sourceTree = "<group>"; };
+		ADCA6A662B701F5A0050FD13 /* OLMKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = OLMKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		BAE814E2540AB2A5F49FEB9F /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		EE88E1714354055D8612F843 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -102,7 +98,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				AD2C9ED82B50E0240023FFD8 /* libolm.3.dylib in Frameworks */,
 				7E2335674AA28E31A7EEBE87 /* Pods_Runner.framework in Frameworks */,
 				AD222ED52B6F1352003661C2 /* libcrypto.1.1.dylib in Frameworks */,
 			);
@@ -125,7 +120,6 @@
 		33CC10E42044A3C60003C045 = {
 			isa = PBXGroup;
 			children = (
-				AD2C9ED62B50DEE90023FFD8 /* libolm.3.dylib */,
 				AD222ED42B6F1352003661C2 /* libcrypto.1.1.dylib */,
 				ADAC39812A06D91900E07F8F /* whisper.cpp */,
 				33FAB671232836740065AC1E /* Runner */,
@@ -197,6 +191,7 @@
 		D73912EC22F37F3D000D13A0 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				ADCA6A662B701F5A0050FD13 /* OLMKit.framework */,
 				AD2C9ED42B50D9490023FFD8 /* libolm.dylib.3.2.16 */,
 				AD2C9ED22B50D5E00023FFD8 /* OLMKit.framework */,
 				BAE814E2540AB2A5F49FEB9F /* Pods_Runner.framework */,
@@ -290,7 +285,6 @@
 			files = (
 				33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */,
 				33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */,
-				AD2C9ED72B50DEE90023FFD8 /* libolm.3.dylib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

diff --git a/macos/Runner/libolm.3.dylib b/macos/Runner/libolm.3.dylib
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: lotti
 description: Achieve your goals and keep your data private with Lotti.
 publish_to: 'none'
-version: 0.9.424+2363
+version: 0.9.424+2364
 
 msix_config:
   display_name: LottiApp