Skip to content

Commit a5e9bc6

Browse files
author
Test
committed
update core
1 parent 7854fcf commit a5e9bc6

3 files changed

Lines changed: 87 additions & 105 deletions

File tree

OpenDocument.core

OpenDocumentReader.xcodeproj/project.pbxproj

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
/* Begin PBXBuildFile section */
1010
21E6C5303C9ED8A9A9317BEC /* Pods_OpenDocumentReader.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EF00F649A86477A6C27F07C0 /* Pods_OpenDocumentReader.framework */; };
1111
52D3B301272D314B00DB425F /* libcryptopp-object.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 52D3B2EC272D312400DB425F /* libcryptopp-object.a */; };
12-
52D3B303272D314B00DB425F /* libglog.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 52D3B2F2272D312400DB425F /* libglog.a */; };
1312
52D3B304272D314B00DB425F /* libminiz.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 52D3B2F6272D312400DB425F /* libminiz.a */; };
1413
52D3B305272D314B00DB425F /* libodr-object.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 52D3B2F8272D312400DB425F /* libodr-object.a */; };
1514
52D3B307272D314B00DB425F /* libpugixml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 52D3B2FE272D312400DB425F /* libpugixml.a */; };
@@ -69,13 +68,6 @@
6968
remoteGlobalIDString = 46CC554B58AD484688474163;
7069
remoteInfo = "cryptopp-static";
7170
};
72-
52D3B2F1272D312400DB425F /* PBXContainerItemProxy */ = {
73-
isa = PBXContainerItemProxy;
74-
containerPortal = 52D3B2D3272D312400DB425F /* odr-ios.xcodeproj */;
75-
proxyType = 2;
76-
remoteGlobalIDString = 452D0B81DB154D1FBC468174;
77-
remoteInfo = glog;
78-
};
7971
52D3B2F3272D312400DB425F /* PBXContainerItemProxy */ = {
8072
isa = PBXContainerItemProxy;
8173
containerPortal = 52D3B2D3272D312400DB425F /* odr-ios.xcodeproj */;
@@ -213,7 +205,6 @@
213205
52D3B301272D314B00DB425F /* libcryptopp-object.a in Frameworks */,
214206
E23795302274844400BA7238 /* AdSupport.framework in Frameworks */,
215207
E26C39392250DC6E009C484A /* WebKit.framework in Frameworks */,
216-
52D3B303272D314B00DB425F /* libglog.a in Frameworks */,
217208
52D3B307272D314B00DB425F /* libpugixml.a in Frameworks */,
218209
21E6C5303C9ED8A9A9317BEC /* Pods_OpenDocumentReader.framework in Frameworks */,
219210
52D3B304272D314B00DB425F /* libminiz.a in Frameworks */,
@@ -230,7 +221,6 @@
230221
52D3B2EC272D312400DB425F /* libcryptopp-object.a */,
231222
52D3B2EE272D312400DB425F /* libcryptopp.dylib */,
232223
52D3B2F0272D312400DB425F /* libcryptopp.a */,
233-
52D3B2F2272D312400DB425F /* libglog.a */,
234224
52D3B2F4272D312400DB425F /* meta */,
235225
52D3B2F6272D312400DB425F /* libminiz.a */,
236226
52D3B2F8272D312400DB425F /* libodr-object.a */,
@@ -464,13 +454,6 @@
464454
remoteRef = 52D3B2EF272D312400DB425F /* PBXContainerItemProxy */;
465455
sourceTree = BUILT_PRODUCTS_DIR;
466456
};
467-
52D3B2F2272D312400DB425F /* libglog.a */ = {
468-
isa = PBXReferenceProxy;
469-
fileType = archive.ar;
470-
path = libglog.a;
471-
remoteRef = 52D3B2F1272D312400DB425F /* PBXContainerItemProxy */;
472-
sourceTree = BUILT_PRODUCTS_DIR;
473-
};
474457
52D3B2F4272D312400DB425F /* meta */ = {
475458
isa = PBXReferenceProxy;
476459
fileType = "compiled.mach-o.executable";
@@ -780,7 +763,7 @@
780763
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
781764
CLANG_ENABLE_MODULES = YES;
782765
CODE_SIGN_STYLE = Automatic;
783-
CURRENT_PROJECT_VERSION = 30;
766+
CURRENT_PROJECT_VERSION = 31;
784767
DEFINES_MODULE = YES;
785768
DEVELOPMENT_TEAM = 5LS6X97G6J;
786769
HEADER_SEARCH_PATHS = (
@@ -873,7 +856,7 @@
873856
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
874857
CLANG_ENABLE_MODULES = YES;
875858
CODE_SIGN_STYLE = Automatic;
876-
CURRENT_PROJECT_VERSION = 30;
859+
CURRENT_PROJECT_VERSION = 31;
877860
DEFINES_MODULE = YES;
878861
DEVELOPMENT_TEAM = 5LS6X97G6J;
879862
HEADER_SEARCH_PATHS = (
@@ -1118,7 +1101,7 @@
11181101
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
11191102
CLANG_ENABLE_MODULES = YES;
11201103
CODE_SIGN_STYLE = Automatic;
1121-
CURRENT_PROJECT_VERSION = 30;
1104+
CURRENT_PROJECT_VERSION = 31;
11221105
DEFINES_MODULE = YES;
11231106
DEVELOPMENT_TEAM = 5LS6X97G6J;
11241107
HEADER_SEARCH_PATHS = (
@@ -1152,7 +1135,7 @@
11521135
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
11531136
CLANG_ENABLE_MODULES = YES;
11541137
CODE_SIGN_STYLE = Automatic;
1155-
CURRENT_PROJECT_VERSION = 30;
1138+
CURRENT_PROJECT_VERSION = 31;
11561139
DEFINES_MODULE = YES;
11571140
DEVELOPMENT_TEAM = 5LS6X97G6J;
11581141
HEADER_SEARCH_PATHS = (

Podfile.lock

Lines changed: 82 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -1,114 +1,113 @@
11
PODS:
2-
- Firebase/Analytics (8.0.0):
2+
- Firebase/Analytics (8.9.0):
33
- Firebase/Core
4-
- Firebase/Core (8.0.0):
4+
- Firebase/Core (8.9.0):
55
- Firebase/CoreOnly
6-
- FirebaseAnalytics (~> 8.0.0)
7-
- Firebase/CoreOnly (8.0.0):
8-
- FirebaseCore (= 8.0.0)
9-
- Firebase/Crashlytics (8.0.0):
6+
- FirebaseAnalytics (~> 8.9.0)
7+
- Firebase/CoreOnly (8.9.0):
8+
- FirebaseCore (= 8.9.0)
9+
- Firebase/Crashlytics (8.9.0):
1010
- Firebase/CoreOnly
11-
- FirebaseCrashlytics (~> 8.0.0)
12-
- Firebase/Storage (8.0.0):
11+
- FirebaseCrashlytics (~> 8.9.0)
12+
- Firebase/Storage (8.9.0):
1313
- Firebase/CoreOnly
14-
- FirebaseStorage (~> 8.0.0)
15-
- FirebaseAnalytics (8.0.0):
16-
- FirebaseAnalytics/AdIdSupport (= 8.0.0)
14+
- FirebaseStorage (~> 8.9.0)
15+
- FirebaseAnalytics (8.9.0):
16+
- FirebaseAnalytics/AdIdSupport (= 8.9.0)
1717
- FirebaseCore (~> 8.0)
1818
- FirebaseInstallations (~> 8.0)
19-
- GoogleUtilities/AppDelegateSwizzler (~> 7.4)
20-
- GoogleUtilities/MethodSwizzler (~> 7.4)
21-
- GoogleUtilities/Network (~> 7.4)
22-
- "GoogleUtilities/NSData+zlib (~> 7.4)"
19+
- GoogleUtilities/AppDelegateSwizzler (~> 7.6)
20+
- GoogleUtilities/MethodSwizzler (~> 7.6)
21+
- GoogleUtilities/Network (~> 7.6)
22+
- "GoogleUtilities/NSData+zlib (~> 7.6)"
2323
- nanopb (~> 2.30908.0)
24-
- FirebaseAnalytics/AdIdSupport (8.0.0):
25-
- FirebaseAnalytics/Base (= 8.0.0)
24+
- FirebaseAnalytics/AdIdSupport (8.9.0):
2625
- FirebaseCore (~> 8.0)
2726
- FirebaseInstallations (~> 8.0)
28-
- GoogleAppMeasurement (= 8.0.0)
29-
- GoogleUtilities/AppDelegateSwizzler (~> 7.4)
30-
- GoogleUtilities/MethodSwizzler (~> 7.4)
31-
- GoogleUtilities/Network (~> 7.4)
32-
- "GoogleUtilities/NSData+zlib (~> 7.4)"
27+
- GoogleAppMeasurement (= 8.9.0)
28+
- GoogleUtilities/AppDelegateSwizzler (~> 7.6)
29+
- GoogleUtilities/MethodSwizzler (~> 7.6)
30+
- GoogleUtilities/Network (~> 7.6)
31+
- "GoogleUtilities/NSData+zlib (~> 7.6)"
3332
- nanopb (~> 2.30908.0)
34-
- FirebaseAnalytics/Base (8.0.0):
35-
- FirebaseCore (~> 8.0)
36-
- FirebaseInstallations (~> 8.0)
37-
- GoogleUtilities/AppDelegateSwizzler (~> 7.4)
38-
- GoogleUtilities/MethodSwizzler (~> 7.4)
39-
- GoogleUtilities/Network (~> 7.4)
40-
- "GoogleUtilities/NSData+zlib (~> 7.4)"
41-
- nanopb (~> 2.30908.0)
42-
- FirebaseCore (8.0.0):
33+
- FirebaseCore (8.9.0):
4334
- FirebaseCoreDiagnostics (~> 8.0)
44-
- GoogleUtilities/Environment (~> 7.4)
45-
- GoogleUtilities/Logger (~> 7.4)
46-
- FirebaseCoreDiagnostics (8.0.0):
47-
- GoogleDataTransport (~> 9.0)
48-
- GoogleUtilities/Environment (~> 7.4)
49-
- GoogleUtilities/Logger (~> 7.4)
35+
- GoogleUtilities/Environment (~> 7.6)
36+
- GoogleUtilities/Logger (~> 7.6)
37+
- FirebaseCoreDiagnostics (8.9.0):
38+
- GoogleDataTransport (~> 9.1)
39+
- GoogleUtilities/Environment (~> 7.6)
40+
- GoogleUtilities/Logger (~> 7.6)
5041
- nanopb (~> 2.30908.0)
51-
- FirebaseCrashlytics (8.0.0):
42+
- FirebaseCrashlytics (8.9.0):
5243
- FirebaseCore (~> 8.0)
5344
- FirebaseInstallations (~> 8.0)
54-
- GoogleDataTransport (~> 9.0)
45+
- GoogleDataTransport (~> 9.1)
46+
- GoogleUtilities/Environment (~> 7.6)
5547
- nanopb (~> 2.30908.0)
56-
- PromisesObjC (~> 1.2)
57-
- FirebaseInstallations (8.0.0):
48+
- PromisesObjC (< 3.0, >= 1.2)
49+
- FirebaseInstallations (8.9.0):
5850
- FirebaseCore (~> 8.0)
59-
- GoogleUtilities/Environment (~> 7.4)
60-
- GoogleUtilities/UserDefaults (~> 7.4)
61-
- PromisesObjC (~> 1.2)
62-
- FirebaseStorage (8.0.0):
51+
- GoogleUtilities/Environment (~> 7.6)
52+
- GoogleUtilities/UserDefaults (~> 7.6)
53+
- PromisesObjC (< 3.0, >= 1.2)
54+
- FirebaseStorage (8.9.0):
6355
- FirebaseCore (~> 8.0)
6456
- GTMSessionFetcher/Core (~> 1.5)
65-
- Google-Mobile-Ads-SDK (8.5.0):
57+
- Google-Mobile-Ads-SDK (8.12.0):
6658
- GoogleAppMeasurement (< 9.0, >= 7.0)
6759
- GoogleUserMessagingPlatform (>= 1.1)
68-
- GoogleAppMeasurement (8.0.0):
69-
- GoogleAppMeasurement/AdIdSupport (= 8.0.0)
70-
- GoogleUtilities/AppDelegateSwizzler (~> 7.4)
71-
- GoogleUtilities/MethodSwizzler (~> 7.4)
72-
- GoogleUtilities/Network (~> 7.4)
73-
- "GoogleUtilities/NSData+zlib (~> 7.4)"
60+
- GoogleAppMeasurement (8.9.0):
61+
- GoogleAppMeasurement/AdIdSupport (= 8.9.0)
62+
- GoogleUtilities/AppDelegateSwizzler (~> 7.6)
63+
- GoogleUtilities/MethodSwizzler (~> 7.6)
64+
- GoogleUtilities/Network (~> 7.6)
65+
- "GoogleUtilities/NSData+zlib (~> 7.6)"
66+
- nanopb (~> 2.30908.0)
67+
- GoogleAppMeasurement/AdIdSupport (8.9.0):
68+
- GoogleAppMeasurement/WithoutAdIdSupport (= 8.9.0)
69+
- GoogleUtilities/AppDelegateSwizzler (~> 7.6)
70+
- GoogleUtilities/MethodSwizzler (~> 7.6)
71+
- GoogleUtilities/Network (~> 7.6)
72+
- "GoogleUtilities/NSData+zlib (~> 7.6)"
7473
- nanopb (~> 2.30908.0)
75-
- GoogleAppMeasurement/AdIdSupport (8.0.0):
76-
- GoogleUtilities/AppDelegateSwizzler (~> 7.4)
77-
- GoogleUtilities/MethodSwizzler (~> 7.4)
78-
- GoogleUtilities/Network (~> 7.4)
79-
- "GoogleUtilities/NSData+zlib (~> 7.4)"
74+
- GoogleAppMeasurement/WithoutAdIdSupport (8.9.0):
75+
- GoogleUtilities/AppDelegateSwizzler (~> 7.6)
76+
- GoogleUtilities/MethodSwizzler (~> 7.6)
77+
- GoogleUtilities/Network (~> 7.6)
78+
- "GoogleUtilities/NSData+zlib (~> 7.6)"
8079
- nanopb (~> 2.30908.0)
81-
- GoogleDataTransport (9.0.0):
80+
- GoogleDataTransport (9.1.2):
8281
- GoogleUtilities/Environment (~> 7.2)
8382
- nanopb (~> 2.30908.0)
84-
- PromisesObjC (~> 1.2)
83+
- PromisesObjC (< 3.0, >= 1.2)
8584
- GoogleUserMessagingPlatform (2.0.0)
86-
- GoogleUtilities/AppDelegateSwizzler (7.4.1):
85+
- GoogleUtilities/AppDelegateSwizzler (7.6.0):
8786
- GoogleUtilities/Environment
8887
- GoogleUtilities/Logger
8988
- GoogleUtilities/Network
90-
- GoogleUtilities/Environment (7.4.1):
91-
- PromisesObjC (~> 1.2)
92-
- GoogleUtilities/Logger (7.4.1):
89+
- GoogleUtilities/Environment (7.6.0):
90+
- PromisesObjC (< 3.0, >= 1.2)
91+
- GoogleUtilities/Logger (7.6.0):
9392
- GoogleUtilities/Environment
94-
- GoogleUtilities/MethodSwizzler (7.4.1):
93+
- GoogleUtilities/MethodSwizzler (7.6.0):
9594
- GoogleUtilities/Logger
96-
- GoogleUtilities/Network (7.4.1):
95+
- GoogleUtilities/Network (7.6.0):
9796
- GoogleUtilities/Logger
9897
- "GoogleUtilities/NSData+zlib"
9998
- GoogleUtilities/Reachability
100-
- "GoogleUtilities/NSData+zlib (7.4.1)"
101-
- GoogleUtilities/Reachability (7.4.1):
99+
- "GoogleUtilities/NSData+zlib (7.6.0)"
100+
- GoogleUtilities/Reachability (7.6.0):
102101
- GoogleUtilities/Logger
103-
- GoogleUtilities/UserDefaults (7.4.1):
102+
- GoogleUtilities/UserDefaults (7.6.0):
104103
- GoogleUtilities/Logger
105-
- GTMSessionFetcher/Core (1.5.0)
104+
- GTMSessionFetcher/Core (1.7.0)
106105
- nanopb (2.30908.0):
107106
- nanopb/decode (= 2.30908.0)
108107
- nanopb/encode (= 2.30908.0)
109108
- nanopb/decode (2.30908.0)
110109
- nanopb/encode (2.30908.0)
111-
- PromisesObjC (1.2.12)
110+
- PromisesObjC (2.0.0)
112111
- ScrollableSegmentedControl (1.5.0)
113112

114113
DEPENDENCIES:
@@ -139,21 +138,21 @@ SPEC REPOS:
139138
- ScrollableSegmentedControl
140139

141140
SPEC CHECKSUMS:
142-
Firebase: 73c3e3b216ec1ecbc54d2ffdd4670c65c749edb1
143-
FirebaseAnalytics: dcb92c7c9ef4fa7ffac276e8f87bd4fc8c97f1b8
144-
FirebaseCore: 3f09591d51292843e2a46f18358d60bf4e996255
145-
FirebaseCoreDiagnostics: a31d987ba0fe16d59886a5dbadc2f1de871f88c8
146-
FirebaseCrashlytics: 69cddb6bfa7656c5346e603bc85b029392252ee6
147-
FirebaseInstallations: c4aab1005d6547b00a7529777fe52f5d4d45165b
148-
FirebaseStorage: 61bcd27880fa17362f68be67d3683d04bfd7b1c7
149-
Google-Mobile-Ads-SDK: 6f5c41bf73db1656e5b203ba9c31e3d0899a128d
150-
GoogleAppMeasurement: c6bbc9753d046b5456dd4f940057fbad2c28419e
151-
GoogleDataTransport: 11e3a5f2c190327df1a4a5d7e7ae3d4d5b9c9e4c
141+
Firebase: 13d8d96499e2635428d5bf0ec675df21f95d9a95
142+
FirebaseAnalytics: 3a11ed901750e1ebcbe35e75915ff079878ea385
143+
FirebaseCore: 599ee609343eaf4941bd188f85e3aa077ffe325b
144+
FirebaseCoreDiagnostics: 5daa63f1c1409d981a2d5007daa100b36eac6a34
145+
FirebaseCrashlytics: 40efbd81157dae307ec95612fa1328347284d2c2
146+
FirebaseInstallations: caa7c8e0d3e2345b8829d2fa9ca1b4dfbf2fcc85
147+
FirebaseStorage: 452c98c31ccb40b819764bf3039426c4388d9939
148+
Google-Mobile-Ads-SDK: fb31b6ef68ef352b551ee29585cd9ceb07230cd0
149+
GoogleAppMeasurement: b54a857d347703d67c7a6f23713760c9bcfe9008
150+
GoogleDataTransport: 629c20a4d363167143f30ea78320d5a7eb8bd940
152151
GoogleUserMessagingPlatform: ab890ce5f6620f293a21b6bdd82e416a2c73aeca
153-
GoogleUtilities: f8a43108b38a68eebe8b3540e1f4f2d28843ce20
154-
GTMSessionFetcher: b3503b20a988c4e20cc189aa798fd18220133f52
152+
GoogleUtilities: 684ee790a24f73ebb2d1d966e9711c203f2a4237
153+
GTMSessionFetcher: 43748f93435c2aa068b1cbe39655aaf600652e91
155154
nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96
156-
PromisesObjC: 3113f7f76903778cf4a0586bd1ab89329a0b7b97
155+
PromisesObjC: 68159ce6952d93e17b2dfe273b8c40907db5ba58
157156
ScrollableSegmentedControl: 2e64bbe8968a7fcd8aae5014434481464fcdfe60
158157

159158
PODFILE CHECKSUM: 55a033d715a08541580f2abd7fcc12a2d724614e

0 commit comments

Comments
 (0)