Merge pull request #74 from opendocument-app/feature/conan

conan build

Author: TomTasche

.github/workflows/ios_main.yml

@@ -4,7 +4,7 @@ on: [push]
 jobs:
   test:
     name: test
-    runs-on: macos-latest
+    runs-on: macos-11
     steps:
       - name: checkout
         uses: actions/checkout@v2
@@ -15,18 +15,19 @@ jobs:
       - name: pods
         run: pod install
 
-      - name: brew
-        run: ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" < /dev/null 2> /dev/null
-      - name: fix ninja install
-        run: rm '/usr/local/bin/2to3'
-      - name: ninja
-        run: brew install ninja
       # https://stackoverflow.com/a/57758679/198996
       - name: bundler
         run: gem install bundler:1.17.3
       - name: fastlane
         run: bundle install
 
+      - name: pip
+        run: python3 -m ensurepip
+      - name: conan
+        run: pip3 install conan
+      - name: conan repo
+        run: conan remote add odr https://odr.jfrog.io/artifactory/api/conan/odr-conan
+
       - name: run tests
         run: bundle exec fastlane tests
 #      - uses: actions/upload-artifact@v2

.gitignore

@@ -70,3 +70,8 @@ fastlane/test_output
 .DS_Store
 
 fastlane/report.xml
+
+conanbuildinfo.*
+conaninfo.txt
+conan.lock
+graph_info.json

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "OpenDocument.core"]
-	path = OpenDocument.core
-	url = https://github.com/andiwand/OpenDocument.core.git
 [submodule "ios-cmake"]
 	path = ios-cmake
 	url = https://github.com/leetal/ios-cmake.git

OpenDocument.core

@@ -63,10 +63,10 @@ - (bool)translate:(NSString *)inputPath into:(NSString *)outputPath with:(NSStri
 
             _pageNames = pageNames;
             _pagePaths = pagePaths;
-        } catch (odr::UnknownFileType) {
+        } catch (odr::UnknownFileType&) {
             _errorCode = @(-5);
             return false;
-        } catch (odr::WrongPassword) {
+        } catch (odr::WrongPassword&) {
             _errorCode = @(-2);
             return false;
         } catch (...) {

OpenDocumentReader.xcodeproj/project.pbxproj

@@ -125,6 +125,10 @@ class Document: UIDocument {
         delegate?.documentLoadingCompleted(self)
     }
 
+    override func handleError(_ error: Error, userInteractionPermitted: Bool) {
+        Crashlytics.crashlytics().record(error: error)
+    }
+    
     override func writeContents(_ contents: Any, to url: URL, for saveOperation: UIDocument.SaveOperation, originalContentsURL: URL?) throws {
         var diff = ""
 

OpenDocumentReader/CoreWrapper.mm

@@ -233,7 +233,6 @@ class DocumentViewController: UIViewController, DocumentDelegate, GADBannerViewD
         webview?.evaluateJavaScript("odr.searchNext(\"" + searchText + "\")", completionHandler: { (value: Any!, error: Error!) -> Void in
             if error != nil {
                 Crashlytics.crashlytics().record(error: error)
-                fatalError("search failed")
             }
         })
     }
@@ -242,7 +241,6 @@ class DocumentViewController: UIViewController, DocumentDelegate, GADBannerViewD
         webview?.evaluateJavaScript("odr.search(\"" + searchText + "\")", completionHandler: { (value: Any!, error: Error!) -> Void in
             if error != nil {
                 Crashlytics.crashlytics().record(error: error)
-                fatalError("search failed")
             }
         })
     }

OpenDocumentReader/Document.swift

@@ -56,13 +56,13 @@ class OpenDocumentReaderTests: XCTestCase {
             var translatePath = URL(fileURLWithPath: NSTemporaryDirectory())
             translatePath.appendPathComponent("translate.html")
 
-            coreWrapper.translate(saveURL?.path, into: translatePath.path, at: 0, with: nil, editable: true)
+            coreWrapper.translate(saveURL?.path, into: translatePath.path, with: nil, editable: true)
             XCTAssertNil(coreWrapper.errorCode)
 
             var backTranslatePath = URL(fileURLWithPath: NSTemporaryDirectory())
             backTranslatePath.appendPathComponent("backtranslate.html")
 
-            let diff = "{\"modifiedText\":{\"3\":\"This is a simple test document to demonstrate the DocumentLoadewwwwr example!\"}}"
+            let diff = "{\"modifiedText\":{\"/child:3/child:0\":\"This is a simple test document to demonstrate the DocumentLoaderwwww example!\"}}"
 
             coreWrapper.backTranslate(diff, into: backTranslatePath.path)
             XCTAssertNil(coreWrapper.errorCode)

OpenDocumentReader/DocumentViewController.swift

@@ -2,7 +2,6 @@
 It's Android's first OpenOffice Document Reader... for iOS!
 
 ## Setup
-1. run "git submodule update --init --recursive"
-2. run "pod install"
-3. run "bash build-simulator.sh" or "bash build-device.sh"
-4. open workspace in Xcode
+1. run "pod install"
+2. run "bash build-simulator.sh" or "bash build-device.sh"
+3. open workspace in Xcode