Skip to content

Commit 68f115e

Browse files
author
Thomas Taschauer
committed
upgrade core
1 parent 04e908b commit 68f115e

2 files changed

Lines changed: 36 additions & 66 deletions

File tree

‎OpenDocument.core‎

‎OpenDocumentReader.xcodeproj/project.pbxproj‎

Lines changed: 35 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
ACF1A3E32469EFB5000BA420 /* GoogleService-Info-Lite.plist in Resources */ = {isa = PBXBuildFile; fileRef = ACF1A3E22469EFB5000BA420 /* GoogleService-Info-Lite.plist */; };
1818
ACF1A3E52469F8DE000BA420 /* Info-Lite.plist in Resources */ = {isa = PBXBuildFile; fileRef = ACF1A3E42469F8DE000BA420 /* Info-Lite.plist */; };
1919
E2064DFE22CFA1BA006441F8 /* iAd.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E2064DDF22CFA1BA006441F8 /* iAd.framework */; };
20+
E226025824C61D3E009542DE /* libpugixml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E226025724C61D21009542DE /* libpugixml.a */; };
2021
E22EB716226B621200053B86 /* DocumentBrowserTransitioningDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E22EB6F7226B621200053B86 /* DocumentBrowserTransitioningDelegate.swift */; };
2122
E22EB718226B633500053B86 /* Document.swift in Sources */ = {isa = PBXBuildFile; fileRef = E22EB717226B633500053B86 /* Document.swift */; };
2223
E22EB71A226B65E300053B86 /* DocumentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E22EB719226B65E300053B86 /* DocumentViewController.swift */; };
@@ -36,7 +37,6 @@
3637
E2D2F0692441BB5600C2F88E /* libodr_odf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E21C599824308C3E0076C37C /* libodr_odf.a */; };
3738
E2D2F06A2441BB5600C2F88E /* libodr_ooxml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E21C599A24308C3E0076C37C /* libodr_ooxml.a */; };
3839
E2D2F06B2441BB5600C2F88E /* libodr_svm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E21C599C24308C3E0076C37C /* libodr_svm.a */; };
39-
E2D2F06C2441BB5600C2F88E /* libtinyxml2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E21C599E24308C3E0076C37C /* libtinyxml2.a */; };
4040
E2D2F06D2441BBA200C2F88E /* libcryptopp-object.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E21C598224308C3E0076C37C /* libcryptopp-object.a */; };
4141
E2F7ED53220B54D600D63515 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2F7ED52220B54D600D63515 /* AppDelegate.swift */; };
4242
E2F7ED55220B54D600D63515 /* DocumentBrowserViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2F7ED54220B54D600D63515 /* DocumentBrowserViewController.swift */; };
@@ -80,20 +80,6 @@
8080
remoteGlobalIDString = 1A0F88C6684B4A73AACB18FF;
8181
remoteInfo = glog;
8282
};
83-
E21C598924308C3E0076C37C /* PBXContainerItemProxy */ = {
84-
isa = PBXContainerItemProxy;
85-
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
86-
proxyType = 2;
87-
remoteGlobalIDString = 4B3B1BDF6ADD479CA9D1F15B;
88-
remoteInfo = gtest;
89-
};
90-
E21C598B24308C3E0076C37C /* PBXContainerItemProxy */ = {
91-
isa = PBXContainerItemProxy;
92-
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
93-
proxyType = 2;
94-
remoteGlobalIDString = 23AE3CEA1FA749E391C66698;
95-
remoteInfo = gtest_main;
96-
};
9783
E21C598D24308C3E0076C37C /* PBXContainerItemProxy */ = {
9884
isa = PBXContainerItemProxy;
9985
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
@@ -143,13 +129,6 @@
143129
remoteGlobalIDString = 446E95A03302451FAB20F160;
144130
remoteInfo = odr_svm;
145131
};
146-
E21C599D24308C3E0076C37C /* PBXContainerItemProxy */ = {
147-
isa = PBXContainerItemProxy;
148-
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
149-
proxyType = 2;
150-
remoteGlobalIDString = 11EEEFF14895406BB7B97F72;
151-
remoteInfo = tinyxml2;
152-
};
153132
E21C599F24308C3E0076C37C /* PBXContainerItemProxy */ = {
154133
isa = PBXContainerItemProxy;
155134
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
@@ -161,71 +140,78 @@
161140
isa = PBXContainerItemProxy;
162141
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
163142
proxyType = 1;
164-
remoteGlobalIDString = B422B52823814FA98123E426;
143+
remoteGlobalIDString = CBF041C3EDC34BC28FF9AF8B;
165144
remoteInfo = "cryptopp-object";
166145
};
167146
E21C59B124308C720076C37C /* PBXContainerItemProxy */ = {
168147
isa = PBXContainerItemProxy;
169148
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
170149
proxyType = 1;
171-
remoteGlobalIDString = A4256C2E42D94965BDBC59FF;
150+
remoteGlobalIDString = 637C4D114A4145A28E94C5E3;
172151
remoteInfo = glog;
173152
};
174153
E21C59B324308C720076C37C /* PBXContainerItemProxy */ = {
175154
isa = PBXContainerItemProxy;
176155
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
177156
proxyType = 1;
178-
remoteGlobalIDString = 39057C6D289C4B3F8C4EBFB9;
157+
remoteGlobalIDString = 26D20B0F0E3143EB805A1AC2;
179158
remoteInfo = miniz;
180159
};
181160
E21C59B724308C720076C37C /* PBXContainerItemProxy */ = {
182161
isa = PBXContainerItemProxy;
183162
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
184163
proxyType = 1;
185-
remoteGlobalIDString = F53A9484B5134060B19FDB74;
164+
remoteGlobalIDString = 72720A084A274C11B920CE91;
186165
remoteInfo = odr_access;
187166
};
188167
E21C59B924308C720076C37C /* PBXContainerItemProxy */ = {
189168
isa = PBXContainerItemProxy;
190169
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
191170
proxyType = 1;
192-
remoteGlobalIDString = E7FC0219DAF04180847F0623;
171+
remoteGlobalIDString = EFA0811EAABB45939BC67C86;
193172
remoteInfo = odr_common;
194173
};
195174
E21C59BB24308C720076C37C /* PBXContainerItemProxy */ = {
196175
isa = PBXContainerItemProxy;
197176
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
198177
proxyType = 1;
199-
remoteGlobalIDString = 8A6A651EB596499786D9FE14;
178+
remoteGlobalIDString = F8B1CD3119D64E00B73B8B7E;
200179
remoteInfo = odr_crypto;
201180
};
202181
E21C59BD24308C720076C37C /* PBXContainerItemProxy */ = {
203182
isa = PBXContainerItemProxy;
204183
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
205184
proxyType = 1;
206-
remoteGlobalIDString = 1EE6998DB2FC4C0C9C037D1B;
185+
remoteGlobalIDString = 87940CFCCC0F49FCA968A9C1;
207186
remoteInfo = odr_odf;
208187
};
209188
E21C59BF24308C720076C37C /* PBXContainerItemProxy */ = {
210189
isa = PBXContainerItemProxy;
211190
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
212191
proxyType = 1;
213-
remoteGlobalIDString = 15E35F4548A04E899A4C88AB;
192+
remoteGlobalIDString = 160C6FF385A848AA9AD30D07;
214193
remoteInfo = odr_ooxml;
215194
};
216195
E21C59C124308C720076C37C /* PBXContainerItemProxy */ = {
217196
isa = PBXContainerItemProxy;
218197
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
219198
proxyType = 1;
220-
remoteGlobalIDString = D7B97F44B0FD4B9988A4953F;
199+
remoteGlobalIDString = F73181ED911D4D08AF98717B;
221200
remoteInfo = odr_svm;
222201
};
223-
E21C59C324308C720076C37C /* PBXContainerItemProxy */ = {
202+
E226025624C61D21009542DE /* PBXContainerItemProxy */ = {
203+
isa = PBXContainerItemProxy;
204+
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
205+
proxyType = 2;
206+
remoteGlobalIDString = CA9EDC4AB1CA45DD97B6699F;
207+
remoteInfo = pugixml;
208+
};
209+
E226025924C61D4B009542DE /* PBXContainerItemProxy */ = {
224210
isa = PBXContainerItemProxy;
225211
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
226212
proxyType = 1;
227-
remoteGlobalIDString = E1DBA86BFEFA413DA4C5024D;
228-
remoteInfo = tinyxml2;
213+
remoteGlobalIDString = ABCFF938A679442FAF59C56B;
214+
remoteInfo = pugixml;
229215
};
230216
E22E08E62441B187001A374C /* PBXContainerItemProxy */ = {
231217
isa = PBXContainerItemProxy;
@@ -259,14 +245,14 @@
259245
isa = PBXContainerItemProxy;
260246
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
261247
proxyType = 1;
262-
remoteGlobalIDString = 9DD9FF989E7F42D383EE16F0;
248+
remoteGlobalIDString = 8B11C5A568484AADA238072D;
263249
remoteInfo = odr_oldms;
264250
};
265251
E2C8C15D2441B28900B46ABE /* PBXContainerItemProxy */ = {
266252
isa = PBXContainerItemProxy;
267253
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
268254
proxyType = 1;
269-
remoteGlobalIDString = 76E6AC63EC6E4652846DB48A;
255+
remoteGlobalIDString = 394EE96DF73A46D3B53B56D1;
270256
remoteInfo = "odr-static";
271257
};
272258
/* End PBXContainerItemProxy section */
@@ -333,10 +319,10 @@
333319
E2D2F0672441BB5500C2F88E /* libodr_common.a in Frameworks */,
334320
E2064DFE22CFA1BA006441F8 /* iAd.framework in Frameworks */,
335321
E2C8C15C2441B27F00B46ABE /* libodr-static.a in Frameworks */,
336-
E2D2F06C2441BB5600C2F88E /* libtinyxml2.a in Frameworks */,
337322
E2D2F0692441BB5600C2F88E /* libodr_odf.a in Frameworks */,
338323
E2B55504245F13570077ED85 /* libodr_oldms.a in Frameworks */,
339324
E23795302274844400BA7238 /* AdSupport.framework in Frameworks */,
325+
E226025824C61D3E009542DE /* libpugixml.a in Frameworks */,
340326
E2D2F0662441BB5500C2F88E /* libodr_access.a in Frameworks */,
341327
E26C39392250DC6E009C484A /* WebKit.framework in Frameworks */,
342328
E2D2F06A2441BB5600C2F88E /* libodr_ooxml.a in Frameworks */,
@@ -371,8 +357,6 @@
371357
E21C598424308C3E0076C37C /* libcryptopp.dylib */,
372358
E21C598624308C3E0076C37C /* libcryptopp.a */,
373359
E21C598824308C3E0076C37C /* libglog.a */,
374-
E21C598A24308C3E0076C37C /* libgtestd.a */,
375-
E21C598C24308C3E0076C37C /* libgtest_maind.a */,
376360
E22E08E72441B187001A374C /* meta */,
377361
E21C598E24308C3E0076C37C /* libminiz.a */,
378362
E22E08E92441B187001A374C /* libodr-shared.dylib */,
@@ -384,7 +368,7 @@
384368
E2B55503245F13570077ED85 /* libodr_oldms.a */,
385369
E21C599A24308C3E0076C37C /* libodr_ooxml.a */,
386370
E21C599C24308C3E0076C37C /* libodr_svm.a */,
387-
E21C599E24308C3E0076C37C /* libtinyxml2.a */,
371+
E226025724C61D21009542DE /* libpugixml.a */,
388372
E21C59A024308C3E0076C37C /* translate */,
389373
);
390374
name = Products;
@@ -466,6 +450,7 @@
466450
buildRules = (
467451
);
468452
dependencies = (
453+
E226025A24C61D4B009542DE /* PBXTargetDependency */,
469454
E2B55506245F13660077ED85 /* PBXTargetDependency */,
470455
E2C8C15E2441B28900B46ABE /* PBXTargetDependency */,
471456
E21C59AE24308C720076C37C /* PBXTargetDependency */,
@@ -477,7 +462,6 @@
477462
E21C59BE24308C720076C37C /* PBXTargetDependency */,
478463
E21C59C024308C720076C37C /* PBXTargetDependency */,
479464
E21C59C224308C720076C37C /* PBXTargetDependency */,
480-
E21C59C424308C720076C37C /* PBXTargetDependency */,
481465
);
482466
name = OpenDocumentReader;
483467
productName = "OpenDocument Reader";
@@ -577,20 +561,6 @@
577561
remoteRef = E21C598724308C3E0076C37C /* PBXContainerItemProxy */;
578562
sourceTree = BUILT_PRODUCTS_DIR;
579563
};
580-
E21C598A24308C3E0076C37C /* libgtestd.a */ = {
581-
isa = PBXReferenceProxy;
582-
fileType = archive.ar;
583-
path = libgtestd.a;
584-
remoteRef = E21C598924308C3E0076C37C /* PBXContainerItemProxy */;
585-
sourceTree = BUILT_PRODUCTS_DIR;
586-
};
587-
E21C598C24308C3E0076C37C /* libgtest_maind.a */ = {
588-
isa = PBXReferenceProxy;
589-
fileType = archive.ar;
590-
path = libgtest_maind.a;
591-
remoteRef = E21C598B24308C3E0076C37C /* PBXContainerItemProxy */;
592-
sourceTree = BUILT_PRODUCTS_DIR;
593-
};
594564
E21C598E24308C3E0076C37C /* libminiz.a */ = {
595565
isa = PBXReferenceProxy;
596566
fileType = archive.ar;
@@ -640,13 +610,6 @@
640610
remoteRef = E21C599B24308C3E0076C37C /* PBXContainerItemProxy */;
641611
sourceTree = BUILT_PRODUCTS_DIR;
642612
};
643-
E21C599E24308C3E0076C37C /* libtinyxml2.a */ = {
644-
isa = PBXReferenceProxy;
645-
fileType = archive.ar;
646-
path = libtinyxml2.a;
647-
remoteRef = E21C599D24308C3E0076C37C /* PBXContainerItemProxy */;
648-
sourceTree = BUILT_PRODUCTS_DIR;
649-
};
650613
E21C59A024308C3E0076C37C /* translate */ = {
651614
isa = PBXReferenceProxy;
652615
fileType = "compiled.mach-o.executable";
@@ -655,6 +618,13 @@
655618
remoteRef = E21C599F24308C3E0076C37C /* PBXContainerItemProxy */;
656619
sourceTree = BUILT_PRODUCTS_DIR;
657620
};
621+
E226025724C61D21009542DE /* libpugixml.a */ = {
622+
isa = PBXReferenceProxy;
623+
fileType = archive.ar;
624+
path = libpugixml.a;
625+
remoteRef = E226025624C61D21009542DE /* PBXContainerItemProxy */;
626+
sourceTree = BUILT_PRODUCTS_DIR;
627+
};
658628
E22E08E72441B187001A374C /* meta */ = {
659629
isa = PBXReferenceProxy;
660630
fileType = "compiled.mach-o.executable";
@@ -832,10 +802,10 @@
832802
name = odr_svm;
833803
targetProxy = E21C59C124308C720076C37C /* PBXContainerItemProxy */;
834804
};
835-
E21C59C424308C720076C37C /* PBXTargetDependency */ = {
805+
E226025A24C61D4B009542DE /* PBXTargetDependency */ = {
836806
isa = PBXTargetDependency;
837-
name = tinyxml2;
838-
targetProxy = E21C59C324308C720076C37C /* PBXContainerItemProxy */;
807+
name = pugixml;
808+
targetProxy = E226025924C61D4B009542DE /* PBXContainerItemProxy */;
839809
};
840810
E2B55506245F13660077ED85 /* PBXTargetDependency */ = {
841811
isa = PBXTargetDependency;

0 commit comments

Comments
 (0)