1.13.2 -- Update libkiwix (#283)

* update realm * ignore xcframework * update project settings * optimize imports * bump build number * changelog * widget deployment target
kiwix · Jul 4, 2020 · fdee6a4 · fdee6a4
1 parent 459cd86
commit fdee6a4
Show file tree

Hide file tree

Showing 8 changed files with 63 additions and 811 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
 AppStore/screenshots
-Model/libkiwix
+libkiwix.xcframework
 *.zim
 
 \.idea

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 1.13.2
+
+- updated version of libkiwix and dependencies to resolve an issue where the app couldn't open some of the latest zim files
+- updated version of realm to 5.2
+
+
 ## 1.13.1
 
 - Resource unavailable alert: shown when a link was taped on, but the zim file is deleted.

diff --git a/Kiwix.xcodeproj/project.pbxproj b/Kiwix.xcodeproj/project.pbxproj
diff --git a/Kiwix.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Kiwix.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -15,17 +15,17 @@
         "repositoryURL": "https://github.com/realm/realm-cocoa",
         "state": {
           "branch": null,
-          "revision": "8cc4d9ea5815f34c39a518261f81a82ca3270b69",
-          "version": "5.0.2"
+          "revision": "3857a5e1325d1f16667ea03ce828a9855c412882",
+          "version": "5.2.0"
         }
       },
       {
         "package": "RealmCore",
         "repositoryURL": "https://github.com/realm/realm-core",
         "state": {
           "branch": null,
-          "revision": "bc900a2a8e05722c1b42f95396adb3c99eeb500f",
-          "version": "6.0.6"
+          "revision": "8f7b9327111f974ea4961b8641af103fd4f6755a",
+          "version": "6.0.8"
         }
       },
       {

diff --git a/Model/Entities/ZimFileMetaData.mm b/Model/Entities/ZimFileMetaData.mm
@@ -1,14 +1,17 @@
 //
-//  OPDSStreamZimFile.m
+//  ZimFileMetaData.mm
 //  Kiwix
 //
 //  Created by Chris Li on 3/8/20.
 //  Copyright © 2020 Chris Li. All rights reserved.
 //
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdocumentation"
+#include "kiwix/book.h"
+#pragma clang diagnostic pop
+
 #import "ZimFileMetaData.h"
-#include "book.h"
-#include "otherTools.h"
 
 #define SAFE_READ(X, Y) try {X = Y;} catch (std::exception) {X = nil;}
 #define SAFE_READ_BOOL(X, Y) try {X = Y;} catch (std::exception) {X = false;}

diff --git a/Model/Operations/OPDSRefreshOperation/OPDSStreamParser.mm b/Model/Operations/OPDSRefreshOperation/OPDSStreamParser.mm
@@ -6,17 +6,16 @@
 //  Copyright © 2020 Chris Li. All rights reserved.
 //
 
-#import "OPDSStreamParser.h"
-#import "ZimFileMetaData.h"
-#include "book.h"
-
 #pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Weverything"
-#include "library.h"
-#include "manager.h"
-#include "otherTools.h"
+#pragma clang diagnostic ignored "-Wdocumentation"
+#include "kiwix/book.h"
+#include "kiwix/library.h"
+#include "kiwix/manager.h"
 #pragma clang diagnostic pop
 
+#import "OPDSStreamParser.h"
+#import "ZimFileMetaData.h"
+
 @interface OPDSStreamParser ()
 
 @property (assign) kiwix::Library *library;

diff --git a/Model/Operations/SearchOperation/SearchOperation.mm b/Model/Operations/SearchOperation/SearchOperation.mm
@@ -6,8 +6,12 @@
 //  Copyright © 2020 Chris Li. All rights reserved.
 //
 
-#import "reader.h"
-#import "searcher.h"
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdocumentation"
+#import "kiwix/reader.h"
+#import "kiwix/searcher.h"
+#pragma clang diagnostic pop
+
 #import "SearchOperation.h"
 #import "SearchResult.h"
 #import "ZimMultiReader.h"

diff --git a/Model/ZimMultiReader/ZimMultiReader.mm b/Model/ZimMultiReader/ZimMultiReader.mm
@@ -8,10 +8,15 @@
 
 #include <set>
 #include <unordered_map>
-#include "book.h"
-#include "entry.h"
-#include "reader.h"
-#include "searcher.h"
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdocumentation"
+#include "kiwix/book.h"
+#include "kiwix/entry.h"
+#include "kiwix/reader.h"
+#include "kiwix/searcher.h"
+#pragma clang diagnostic pop
+
 #import "ZimMultiReader.h"
 #import "ZimFileMetaData.h"