Skip to content

Commit bf09af2

Browse files
TomTascheTomTasche
authored
Merge pull request #78 from opendocument-app/development
Cleanup
2 parents 3cac878 + bb8eba6 commit bf09af2

8 files changed

Lines changed: 290 additions & 174 deletions

File tree

‎OpenDocumentReader.xcodeproj/project.pbxproj‎

Lines changed: 153 additions & 43 deletions
Large diffs are not rendered by default.

‎OpenDocumentReader/CoreWrapper.mm‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
#include <optional>
1515
#include <string>
1616
#include <optional>
17-
#include <odr/document.h>
18-
#include <odr/document_cursor.h>
19-
#include <odr/document_element.h>
20-
#include <odr/file.h>
21-
#include <odr/html.h>
22-
#include <odr/open_document_reader.h>
23-
#include <odr/exceptions.h>
17+
#include <odr/document.hpp>
18+
#include <odr/document_cursor.hpp>
19+
#include <odr/document_element.hpp>
20+
#include <odr/file.hpp>
21+
#include <odr/html.hpp>
22+
#include <odr/open_document_reader.hpp>
23+
#include <odr/exceptions.hpp>
2424

2525
@implementation CoreWrapper {
2626
std::optional<odr::Html> html;

‎OpenDocumentReader/Document.swift‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
1-
/*
2-
See LICENSE folder for this sample’s licensing information.
3-
4-
Abstract:
5-
A document that manages UTF8 text files.
6-
*/
7-
81
import UIKit
92
import WebKit
10-
import Firebase
3+
import FirebaseCrashlytics
114

125
protocol DocumentDelegate: class {
136
func documentUpdateContent(_ doc: Document)

‎OpenDocumentReader/DocumentBrowserViewController.swift‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
*/
77

88
import UIKit
9-
import Firebase
9+
import FirebaseCrashlytics
10+
import FirebaseAnalytics
1011

1112
class DocumentBrowserViewController: UIDocumentBrowserViewController, UIDocumentBrowserViewControllerDelegate {
1213

‎OpenDocumentReader/DocumentViewController.swift‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ import UIKit
99
import WebKit
1010
import ScrollableSegmentedControl
1111
import UIKit.UIPrinter
12-
import Firebase
12+
import FirebaseAnalytics
13+
import FirebaseCrashlytics
1314
import GoogleMobileAds
1415
import AppTrackingTransparency
1516
import AdSupport

‎Podfile‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,12 @@ target 'OpenDocumentReader' do
1515
inherit! :search_paths
1616
end
1717
end
18+
19+
post_install do |installer|
20+
installer.pods_project.targets.each do |target|
21+
target.build_configurations.each do |config|
22+
config.build_settings['ENABLE_BITCODE'] = 'NO'
23+
end
24+
end
25+
end
26+

‎Podfile.lock‎

Lines changed: 115 additions & 113 deletions
Original file line numberDiff line numberDiff line change
@@ -1,126 +1,128 @@
11
PODS:
2-
- Firebase/Analytics (9.4.0):
2+
- Firebase/Analytics (10.13.0):
33
- Firebase/Core
4-
- Firebase/Core (9.4.0):
4+
- Firebase/Core (10.13.0):
55
- Firebase/CoreOnly
6-
- FirebaseAnalytics (~> 9.4.0)
7-
- Firebase/CoreOnly (9.4.0):
8-
- FirebaseCore (= 9.4.0)
9-
- Firebase/Crashlytics (9.4.0):
6+
- FirebaseAnalytics (~> 10.13.0)
7+
- Firebase/CoreOnly (10.13.0):
8+
- FirebaseCore (= 10.13.0)
9+
- Firebase/Crashlytics (10.13.0):
1010
- Firebase/CoreOnly
11-
- FirebaseCrashlytics (~> 9.4.0)
12-
- Firebase/Storage (9.4.0):
11+
- FirebaseCrashlytics (~> 10.13.0)
12+
- Firebase/Storage (10.13.0):
1313
- Firebase/CoreOnly
14-
- FirebaseStorage (~> 9.4.0)
15-
- FirebaseAnalytics (9.4.0):
16-
- FirebaseAnalytics/AdIdSupport (= 9.4.0)
17-
- FirebaseCore (~> 9.0)
18-
- FirebaseInstallations (~> 9.0)
19-
- GoogleUtilities/AppDelegateSwizzler (~> 7.7)
20-
- GoogleUtilities/MethodSwizzler (~> 7.7)
21-
- GoogleUtilities/Network (~> 7.7)
22-
- "GoogleUtilities/NSData+zlib (~> 7.7)"
14+
- FirebaseStorage (~> 10.13.0)
15+
- FirebaseAnalytics (10.13.0):
16+
- FirebaseAnalytics/AdIdSupport (= 10.13.0)
17+
- FirebaseCore (~> 10.0)
18+
- FirebaseInstallations (~> 10.0)
19+
- GoogleUtilities/AppDelegateSwizzler (~> 7.11)
20+
- GoogleUtilities/MethodSwizzler (~> 7.11)
21+
- GoogleUtilities/Network (~> 7.11)
22+
- "GoogleUtilities/NSData+zlib (~> 7.11)"
2323
- nanopb (< 2.30910.0, >= 2.30908.0)
24-
- FirebaseAnalytics/AdIdSupport (9.4.0):
25-
- FirebaseCore (~> 9.0)
26-
- FirebaseInstallations (~> 9.0)
27-
- GoogleAppMeasurement (= 9.4.0)
28-
- GoogleUtilities/AppDelegateSwizzler (~> 7.7)
29-
- GoogleUtilities/MethodSwizzler (~> 7.7)
30-
- GoogleUtilities/Network (~> 7.7)
31-
- "GoogleUtilities/NSData+zlib (~> 7.7)"
24+
- FirebaseAnalytics/AdIdSupport (10.13.0):
25+
- FirebaseCore (~> 10.0)
26+
- FirebaseInstallations (~> 10.0)
27+
- GoogleAppMeasurement (= 10.13.0)
28+
- GoogleUtilities/AppDelegateSwizzler (~> 7.11)
29+
- GoogleUtilities/MethodSwizzler (~> 7.11)
30+
- GoogleUtilities/Network (~> 7.11)
31+
- "GoogleUtilities/NSData+zlib (~> 7.11)"
3232
- nanopb (< 2.30910.0, >= 2.30908.0)
33-
- FirebaseAppCheckInterop (9.4.0)
34-
- FirebaseAuthInterop (9.4.0)
35-
- FirebaseCore (9.4.0):
36-
- FirebaseCoreDiagnostics (~> 9.0)
37-
- FirebaseCoreInternal (~> 9.0)
38-
- GoogleUtilities/Environment (~> 7.7)
39-
- GoogleUtilities/Logger (~> 7.7)
40-
- FirebaseCoreDiagnostics (9.4.0):
41-
- GoogleDataTransport (< 10.0.0, >= 9.1.4)
42-
- GoogleUtilities/Environment (~> 7.7)
43-
- GoogleUtilities/Logger (~> 7.7)
44-
- nanopb (< 2.30910.0, >= 2.30908.0)
45-
- FirebaseCoreExtension (9.4.0):
46-
- FirebaseCore (~> 9.0)
47-
- FirebaseCoreInternal (9.4.0):
48-
- "GoogleUtilities/NSData+zlib (~> 7.7)"
49-
- FirebaseCrashlytics (9.4.0):
50-
- FirebaseCore (~> 9.0)
51-
- FirebaseInstallations (~> 9.0)
52-
- GoogleDataTransport (< 10.0.0, >= 9.1.4)
53-
- GoogleUtilities/Environment (~> 7.7)
33+
- FirebaseAppCheckInterop (10.13.0)
34+
- FirebaseAuthInterop (10.13.0)
35+
- FirebaseCore (10.13.0):
36+
- FirebaseCoreInternal (~> 10.0)
37+
- GoogleUtilities/Environment (~> 7.8)
38+
- GoogleUtilities/Logger (~> 7.8)
39+
- FirebaseCoreExtension (10.13.0):
40+
- FirebaseCore (~> 10.0)
41+
- FirebaseCoreInternal (10.13.0):
42+
- "GoogleUtilities/NSData+zlib (~> 7.8)"
43+
- FirebaseCrashlytics (10.13.0):
44+
- FirebaseCore (~> 10.5)
45+
- FirebaseInstallations (~> 10.0)
46+
- FirebaseSessions (~> 10.5)
47+
- GoogleDataTransport (~> 9.2)
48+
- GoogleUtilities/Environment (~> 7.8)
5449
- nanopb (< 2.30910.0, >= 2.30908.0)
5550
- PromisesObjC (~> 2.1)
56-
- FirebaseInstallations (9.4.0):
57-
- FirebaseCore (~> 9.0)
58-
- GoogleUtilities/Environment (~> 7.7)
59-
- GoogleUtilities/UserDefaults (~> 7.7)
51+
- FirebaseInstallations (10.13.0):
52+
- FirebaseCore (~> 10.0)
53+
- GoogleUtilities/Environment (~> 7.8)
54+
- GoogleUtilities/UserDefaults (~> 7.8)
6055
- PromisesObjC (~> 2.1)
61-
- FirebaseStorage (9.4.0):
62-
- FirebaseAppCheckInterop (~> 9.0)
63-
- FirebaseAuthInterop (~> 9.0)
64-
- FirebaseCore (~> 9.0)
65-
- FirebaseCoreExtension (~> 9.0)
66-
- FirebaseStorageInternal (~> 9.0)
67-
- FirebaseStorageInternal (9.4.0):
68-
- FirebaseCore (~> 9.0)
69-
- GTMSessionFetcher/Core (< 3.0, >= 1.7)
70-
- Google-Mobile-Ads-SDK (9.9.0):
71-
- GoogleAppMeasurement (< 10.0, >= 7.0)
56+
- FirebaseSessions (10.13.0):
57+
- FirebaseCore (~> 10.5)
58+
- FirebaseCoreExtension (~> 10.0)
59+
- FirebaseInstallations (~> 10.0)
60+
- GoogleDataTransport (~> 9.2)
61+
- GoogleUtilities/Environment (~> 7.10)
62+
- nanopb (< 2.30910.0, >= 2.30908.0)
63+
- PromisesSwift (~> 2.1)
64+
- FirebaseStorage (10.13.0):
65+
- FirebaseAppCheckInterop (~> 10.0)
66+
- FirebaseAuthInterop (~> 10.0)
67+
- FirebaseCore (~> 10.0)
68+
- FirebaseCoreExtension (~> 10.0)
69+
- GTMSessionFetcher/Core (< 4.0, >= 2.1)
70+
- Google-Mobile-Ads-SDK (10.9.0):
71+
- GoogleAppMeasurement (< 11.0, >= 7.0)
7272
- GoogleUserMessagingPlatform (>= 1.1)
73-
- GoogleAppMeasurement (9.4.0):
74-
- GoogleAppMeasurement/AdIdSupport (= 9.4.0)
75-
- GoogleUtilities/AppDelegateSwizzler (~> 7.7)
76-
- GoogleUtilities/MethodSwizzler (~> 7.7)
77-
- GoogleUtilities/Network (~> 7.7)
78-
- "GoogleUtilities/NSData+zlib (~> 7.7)"
73+
- GoogleAppMeasurement (10.13.0):
74+
- GoogleAppMeasurement/AdIdSupport (= 10.13.0)
75+
- GoogleUtilities/AppDelegateSwizzler (~> 7.11)
76+
- GoogleUtilities/MethodSwizzler (~> 7.11)
77+
- GoogleUtilities/Network (~> 7.11)
78+
- "GoogleUtilities/NSData+zlib (~> 7.11)"
7979
- nanopb (< 2.30910.0, >= 2.30908.0)
80-
- GoogleAppMeasurement/AdIdSupport (9.4.0):
81-
- GoogleAppMeasurement/WithoutAdIdSupport (= 9.4.0)
82-
- GoogleUtilities/AppDelegateSwizzler (~> 7.7)
83-
- GoogleUtilities/MethodSwizzler (~> 7.7)
84-
- GoogleUtilities/Network (~> 7.7)
85-
- "GoogleUtilities/NSData+zlib (~> 7.7)"
80+
- GoogleAppMeasurement/AdIdSupport (10.13.0):
81+
- GoogleAppMeasurement/WithoutAdIdSupport (= 10.13.0)
82+
- GoogleUtilities/AppDelegateSwizzler (~> 7.11)
83+
- GoogleUtilities/MethodSwizzler (~> 7.11)
84+
- GoogleUtilities/Network (~> 7.11)
85+
- "GoogleUtilities/NSData+zlib (~> 7.11)"
8686
- nanopb (< 2.30910.0, >= 2.30908.0)
87-
- GoogleAppMeasurement/WithoutAdIdSupport (9.4.0):
88-
- GoogleUtilities/AppDelegateSwizzler (~> 7.7)
89-
- GoogleUtilities/MethodSwizzler (~> 7.7)
90-
- GoogleUtilities/Network (~> 7.7)
91-
- "GoogleUtilities/NSData+zlib (~> 7.7)"
87+
- GoogleAppMeasurement/WithoutAdIdSupport (10.13.0):
88+
- GoogleUtilities/AppDelegateSwizzler (~> 7.11)
89+
- GoogleUtilities/MethodSwizzler (~> 7.11)
90+
- GoogleUtilities/Network (~> 7.11)
91+
- "GoogleUtilities/NSData+zlib (~> 7.11)"
9292
- nanopb (< 2.30910.0, >= 2.30908.0)
93-
- GoogleDataTransport (9.2.0):
93+
- GoogleDataTransport (9.2.5):
9494
- GoogleUtilities/Environment (~> 7.7)
9595
- nanopb (< 2.30910.0, >= 2.30908.0)
9696
- PromisesObjC (< 3.0, >= 1.2)
97-
- GoogleUserMessagingPlatform (2.0.0)
98-
- GoogleUtilities/AppDelegateSwizzler (7.7.0):
97+
- GoogleUserMessagingPlatform (2.1.0)
98+
- GoogleUtilities/AppDelegateSwizzler (7.11.5):
9999
- GoogleUtilities/Environment
100100
- GoogleUtilities/Logger
101101
- GoogleUtilities/Network
102-
- GoogleUtilities/Environment (7.7.0):
102+
- GoogleUtilities/Environment (7.11.5):
103103
- PromisesObjC (< 3.0, >= 1.2)
104-
- GoogleUtilities/Logger (7.7.0):
104+
- GoogleUtilities/Logger (7.11.5):
105105
- GoogleUtilities/Environment
106-
- GoogleUtilities/MethodSwizzler (7.7.0):
106+
- GoogleUtilities/MethodSwizzler (7.11.5):
107107
- GoogleUtilities/Logger
108-
- GoogleUtilities/Network (7.7.0):
108+
- GoogleUtilities/Network (7.11.5):
109109
- GoogleUtilities/Logger
110110
- "GoogleUtilities/NSData+zlib"
111111
- GoogleUtilities/Reachability
112-
- "GoogleUtilities/NSData+zlib (7.7.0)"
113-
- GoogleUtilities/Reachability (7.7.0):
112+
- "GoogleUtilities/NSData+zlib (7.11.5)"
113+
- GoogleUtilities/Reachability (7.11.5):
114114
- GoogleUtilities/Logger
115-
- GoogleUtilities/UserDefaults (7.7.0):
115+
- GoogleUtilities/UserDefaults (7.11.5):
116116
- GoogleUtilities/Logger
117-
- GTMSessionFetcher/Core (2.0.0)
117+
- GTMSessionFetcher/Core (3.1.1)
118118
- nanopb (2.30909.0):
119119
- nanopb/decode (= 2.30909.0)
120120
- nanopb/encode (= 2.30909.0)
121121
- nanopb/decode (2.30909.0)
122122
- nanopb/encode (2.30909.0)
123-
- PromisesObjC (2.1.1)
123+
- PromisesObjC (2.3.1)
124+
- PromisesSwift (2.3.1):
125+
- PromisesObjC (= 2.3.1)
124126
- ScrollableSegmentedControl (1.5.0)
125127

126128
DEPENDENCIES:
@@ -138,13 +140,12 @@ SPEC REPOS:
138140
- FirebaseAppCheckInterop
139141
- FirebaseAuthInterop
140142
- FirebaseCore
141-
- FirebaseCoreDiagnostics
142143
- FirebaseCoreExtension
143144
- FirebaseCoreInternal
144145
- FirebaseCrashlytics
145146
- FirebaseInstallations
147+
- FirebaseSessions
146148
- FirebaseStorage
147-
- FirebaseStorageInternal
148149
- Google-Mobile-Ads-SDK
149150
- GoogleAppMeasurement
150151
- GoogleDataTransport
@@ -153,31 +154,32 @@ SPEC REPOS:
153154
- GTMSessionFetcher
154155
- nanopb
155156
- PromisesObjC
157+
- PromisesSwift
156158
- ScrollableSegmentedControl
157159

158160
SPEC CHECKSUMS:
159-
Firebase: 7703fc4022824b6d6db1bf7bea58d13b8e17ec46
160-
FirebaseAnalytics: a1a24e72b7ba7f47045a4633f1abb545c07bd29c
161-
FirebaseAppCheckInterop: 63119cdfc94b16c3e9421513c17f597aee2ea225
162-
FirebaseAuthInterop: 826d3d772b554e3675ceaab8c665008277ca9d1c
163-
FirebaseCore: 9a2b10270a854731c4d4d8a97d0aa8380ec3458d
164-
FirebaseCoreDiagnostics: aaa87098082c4d4bdd1a9557b1186d18ca85ce8c
165-
FirebaseCoreExtension: 2cf8c542b54ad3c2d4b746c22e8828b670dcd9b0
166-
FirebaseCoreInternal: a13302b0088fbf5f38b79b6ece49c2af7d3e05d6
167-
FirebaseCrashlytics: 121ea1d37f4906c94c4c9307297af5121b98b789
168-
FirebaseInstallations: 61db1054e688d2bdc4e2b3f744c1b086e913b742
169-
FirebaseStorage: 160ba975dd3452d9c59a3bf5ea9bf70ff96bd3c2
170-
FirebaseStorageInternal: 425c7dc7de44d9b7e07a9f8d6515bab0f1266b87
171-
Google-Mobile-Ads-SDK: 8822993da940ab920bad131b5bffce7eb3f62c6a
172-
GoogleAppMeasurement: 5d69e04287fc2c10cc43724bfa4bf31fc12c3dff
173-
GoogleDataTransport: 1c8145da7117bd68bbbed00cf304edb6a24de00f
174-
GoogleUserMessagingPlatform: ab890ce5f6620f293a21b6bdd82e416a2c73aeca
175-
GoogleUtilities: e0913149f6b0625b553d70dae12b49fc62914fd1
176-
GTMSessionFetcher: 681175626052e03fdde7952f7e9c7a9785719506
161+
Firebase: 343d7539befb614d22b2eae24759f6307b1175e9
162+
FirebaseAnalytics: 9a12e090ead49f8877ed8132ae920e3cbbd2fcd0
163+
FirebaseAppCheckInterop: 5e12dc623d443dedffcde9c6f3ed41510125d8ef
164+
FirebaseAuthInterop: 74875bde5d15636522a8fe98beb561df7a54db58
165+
FirebaseCore: 9948a31ff2c6cf323f9b040068201a95d271b68d
166+
FirebaseCoreExtension: ce60f9db46d83944cf444664d6d587474128eeca
167+
FirebaseCoreInternal: b342e37cd4f5b4454ec34308f073420e7920858e
168+
FirebaseCrashlytics: 4679fbc4768fcb4dd6f5533101841d40256d4475
169+
FirebaseInstallations: b28af1b9f997f1a799efe818c94695a3728c352f
170+
FirebaseSessions: 991fb4c20b3505eef125f7cbfa20a5b5b189c2a4
171+
FirebaseStorage: f2d1a84d78a7226d97bc76d85cf1092cab5f2b7d
172+
Google-Mobile-Ads-SDK: e81e8b009a182dc8dd14951782efdbb30a5e4510
173+
GoogleAppMeasurement: 3ae505b44174bcc0775f5c86cecc5826259fbb1e
174+
GoogleDataTransport: 54dee9d48d14580407f8f5fbf2f496e92437a2f2
175+
GoogleUserMessagingPlatform: dce302b8f1b84d6e945812ee7a15c3f65a102cbf
176+
GoogleUtilities: 13e2c67ede716b8741c7989e26893d151b2b2084
177+
GTMSessionFetcher: e8647203b65cee28c5f73d0f473d096653945e72
177178
nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431
178-
PromisesObjC: ab77feca74fa2823e7af4249b8326368e61014cb
179+
PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4
180+
PromisesSwift: 28dca69a9c40779916ac2d6985a0192a5cb4a265
179181
ScrollableSegmentedControl: 2e64bbe8968a7fcd8aae5014434481464fcdfe60
180182

181-
PODFILE CHECKSUM: 55a033d715a08541580f2abd7fcc12a2d724614e
183+
PODFILE CHECKSUM: 35cd182dc790891ebc7626066c33a6e947e7167e
182184

183-
COCOAPODS: 1.11.3
185+
COCOAPODS: 1.12.1

‎conanfile.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[requires]
2-
odrcore/2.1.2@
2+
odrcore/3.0.0@
33

44
[generators]
55
xcode

0 commit comments

Comments
 (0)