Skip to content

Commit becd4dc

Browse files
author
Thomas Taschauer
committed
update core
1 parent b28d2a5 commit becd4dc

2 files changed

Lines changed: 55 additions & 50 deletions

File tree

‎OpenDocument.core‎

‎OpenDocumentReader.xcodeproj/project.pbxproj‎

Lines changed: 54 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
ACF1A3E32469EFB5000BA420 /* GoogleService-Info-Lite.plist in Resources */ = {isa = PBXBuildFile; fileRef = ACF1A3E22469EFB5000BA420 /* GoogleService-Info-Lite.plist */; };
1919
ACF1A3E52469F8DE000BA420 /* Info-Lite.plist in Resources */ = {isa = PBXBuildFile; fileRef = ACF1A3E42469F8DE000BA420 /* Info-Lite.plist */; };
2020
E2064DFE22CFA1BA006441F8 /* iAd.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E2064DDF22CFA1BA006441F8 /* iAd.framework */; };
21-
E226025824C61D3E009542DE /* libpugixml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E226025724C61D21009542DE /* libpugixml.a */; };
2221
E22B252F2557F0E2001D0C52 /* OpenDocumentReaderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E22B252E2557F0E2001D0C52 /* OpenDocumentReaderTests.swift */; };
2322
E22EB716226B621200053B86 /* DocumentBrowserTransitioningDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E22EB6F7226B621200053B86 /* DocumentBrowserTransitioningDelegate.swift */; };
2423
E22EB718226B633500053B86 /* Document.swift in Sources */ = {isa = PBXBuildFile; fileRef = E22EB717226B633500053B86 /* Document.swift */; };
@@ -27,6 +26,16 @@
2726
E23795302274844400BA7238 /* AdSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E237952F2274844400BA7238 /* AdSupport.framework */; };
2827
E24110312586349500800247 /* test.odt in Resources */ = {isa = PBXBuildFile; fileRef = E24110232586349500800247 /* test.odt */; };
2928
E26C39392250DC6E009C484A /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E26C39382250DC6E009C484A /* WebKit.framework */; };
29+
E273B4B125A7694C00F8D7E8 /* libglog.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E21C598824308C3E0076C37C /* libglog.a */; };
30+
E273B4B225A7694C00F8D7E8 /* libminiz.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E21C598E24308C3E0076C37C /* libminiz.a */; };
31+
E273B4B325A7694C00F8D7E8 /* libodr_access.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E21C599224308C3E0076C37C /* libodr_access.a */; };
32+
E273B4B425A7694C00F8D7E8 /* libodr_common.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E21C599424308C3E0076C37C /* libodr_common.a */; };
33+
E273B4B525A7694C00F8D7E8 /* libodr_crypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E21C599624308C3E0076C37C /* libodr_crypto.a */; };
34+
E273B4B625A7694C00F8D7E8 /* libodr_odf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E21C599824308C3E0076C37C /* libodr_odf.a */; };
35+
E273B4B725A7694C00F8D7E8 /* libodr_oldms.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E2B55503245F13570077ED85 /* libodr_oldms.a */; };
36+
E273B4B825A7694C00F8D7E8 /* libodr_ooxml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E21C599A24308C3E0076C37C /* libodr_ooxml.a */; };
37+
E273B4B925A7694C00F8D7E8 /* libodr_svm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E21C599C24308C3E0076C37C /* libodr_svm.a */; };
38+
E273B4BA25A7694C00F8D7E8 /* libpugixml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E2C70F4925A764EE0011D423 /* libpugixml.a */; };
3039
E29E4077225A4672002C06E6 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = E29E4076225A4672002C06E6 /* GoogleService-Info.plist */; };
3140
E2B55504245F13570077ED85 /* libodr_oldms.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E2B55503245F13570077ED85 /* libodr_oldms.a */; };
3241
E2C008FA220F1CF80097C594 /* CoreWrapper.mm in Sources */ = {isa = PBXBuildFile; fileRef = E2C008F9220F1CF80097C594 /* CoreWrapper.mm */; };
@@ -143,79 +152,65 @@
143152
isa = PBXContainerItemProxy;
144153
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
145154
proxyType = 1;
146-
remoteGlobalIDString = 9DC8A5A9D700461199389781;
155+
remoteGlobalIDString = D05D43DC86614B4D85B63B43;
147156
remoteInfo = "cryptopp-object";
148157
};
149158
E21C59B124308C720076C37C /* PBXContainerItemProxy */ = {
150159
isa = PBXContainerItemProxy;
151160
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
152161
proxyType = 1;
153-
remoteGlobalIDString = 6C2ED987DB1C40E79B80BE8A;
162+
remoteGlobalIDString = 0C68B618DC4B452F82B6C31A;
154163
remoteInfo = glog;
155164
};
156165
E21C59B324308C720076C37C /* PBXContainerItemProxy */ = {
157166
isa = PBXContainerItemProxy;
158167
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
159168
proxyType = 1;
160-
remoteGlobalIDString = C3311A2B352A43028E6BCB3F;
169+
remoteGlobalIDString = 715D5201110045D083EC02BF;
161170
remoteInfo = miniz;
162171
};
163172
E21C59B724308C720076C37C /* PBXContainerItemProxy */ = {
164173
isa = PBXContainerItemProxy;
165174
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
166175
proxyType = 1;
167-
remoteGlobalIDString = 8BD7818781B34FE29A1E523C;
176+
remoteGlobalIDString = CB51E46129044F1297074F90;
168177
remoteInfo = odr_access;
169178
};
170179
E21C59B924308C720076C37C /* PBXContainerItemProxy */ = {
171180
isa = PBXContainerItemProxy;
172181
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
173182
proxyType = 1;
174-
remoteGlobalIDString = 4FFB78DD6BD844308429CDB3;
183+
remoteGlobalIDString = 5BFD70D1CD3B4516A418A965;
175184
remoteInfo = odr_common;
176185
};
177186
E21C59BB24308C720076C37C /* PBXContainerItemProxy */ = {
178187
isa = PBXContainerItemProxy;
179188
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
180189
proxyType = 1;
181-
remoteGlobalIDString = 6D82AD86D43B4E20B34CE0AA;
190+
remoteGlobalIDString = A0A515D7F0DC4C5CB0BEE81D;
182191
remoteInfo = odr_crypto;
183192
};
184193
E21C59BD24308C720076C37C /* PBXContainerItemProxy */ = {
185194
isa = PBXContainerItemProxy;
186195
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
187196
proxyType = 1;
188-
remoteGlobalIDString = 5F15C6BDA0474F9D9B658C54;
197+
remoteGlobalIDString = EFE9C05B2124415189B670AB;
189198
remoteInfo = odr_odf;
190199
};
191200
E21C59BF24308C720076C37C /* PBXContainerItemProxy */ = {
192201
isa = PBXContainerItemProxy;
193202
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
194203
proxyType = 1;
195-
remoteGlobalIDString = FA9FD7102B68433D9279ABEB;
204+
remoteGlobalIDString = F22B5FFB9E5C42FE88184B35;
196205
remoteInfo = odr_ooxml;
197206
};
198207
E21C59C124308C720076C37C /* PBXContainerItemProxy */ = {
199208
isa = PBXContainerItemProxy;
200209
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
201210
proxyType = 1;
202-
remoteGlobalIDString = 788D9CC78552455485235725;
211+
remoteGlobalIDString = EF01D549AAD84FA4BE71B330;
203212
remoteInfo = odr_svm;
204213
};
205-
E226025624C61D21009542DE /* PBXContainerItemProxy */ = {
206-
isa = PBXContainerItemProxy;
207-
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
208-
proxyType = 2;
209-
remoteGlobalIDString = CA9EDC4AB1CA45DD97B6699F;
210-
remoteInfo = pugixml;
211-
};
212-
E226025924C61D4B009542DE /* PBXContainerItemProxy */ = {
213-
isa = PBXContainerItemProxy;
214-
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
215-
proxyType = 1;
216-
remoteGlobalIDString = 0EE8623163E14CB2893AE6C8;
217-
remoteInfo = pugixml;
218-
};
219214
E22B25312557F0E2001D0C52 /* PBXContainerItemProxy */ = {
220215
isa = PBXContainerItemProxy;
221216
containerPortal = E2F7ED47220B54D600D63515 /* Project object */;
@@ -255,14 +250,21 @@
255250
isa = PBXContainerItemProxy;
256251
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
257252
proxyType = 1;
258-
remoteGlobalIDString = 999EB9EE5F974BEDB8F32155;
253+
remoteGlobalIDString = F458659C6DF24C6C9CB6A61C;
259254
remoteInfo = odr_oldms;
260255
};
256+
E2C70F4825A764EE0011D423 /* PBXContainerItemProxy */ = {
257+
isa = PBXContainerItemProxy;
258+
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
259+
proxyType = 2;
260+
remoteGlobalIDString = 71B16670A03D4B1FBA451421;
261+
remoteInfo = "pugixml-static";
262+
};
261263
E2C8C15D2441B28900B46ABE /* PBXContainerItemProxy */ = {
262264
isa = PBXContainerItemProxy;
263265
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
264266
proxyType = 1;
265-
remoteGlobalIDString = E03290A5505046A988E10997;
267+
remoteGlobalIDString = 3AA15C65C3F54745AE63F50A;
266268
remoteInfo = "odr-static";
267269
};
268270
/* End PBXContainerItemProxy section */
@@ -344,19 +346,28 @@
344346
E2D2F06B2441BB5600C2F88E /* libodr_svm.a in Frameworks */,
345347
E2D2F06D2441BBA200C2F88E /* libcryptopp-object.a in Frameworks */,
346348
E2D2F0672441BB5500C2F88E /* libodr_common.a in Frameworks */,
349+
E273B4B625A7694C00F8D7E8 /* libodr_odf.a in Frameworks */,
350+
E273B4B325A7694C00F8D7E8 /* libodr_access.a in Frameworks */,
347351
E2064DFE22CFA1BA006441F8 /* iAd.framework in Frameworks */,
348352
E2C8C15C2441B27F00B46ABE /* libodr-static.a in Frameworks */,
353+
E273B4BA25A7694C00F8D7E8 /* libpugixml.a in Frameworks */,
349354
E2D2F0692441BB5600C2F88E /* libodr_odf.a in Frameworks */,
350355
E2B55504245F13570077ED85 /* libodr_oldms.a in Frameworks */,
356+
E273B4B825A7694C00F8D7E8 /* libodr_ooxml.a in Frameworks */,
351357
E23795302274844400BA7238 /* AdSupport.framework in Frameworks */,
352-
E226025824C61D3E009542DE /* libpugixml.a in Frameworks */,
358+
E273B4B125A7694C00F8D7E8 /* libglog.a in Frameworks */,
359+
E273B4B525A7694C00F8D7E8 /* libodr_crypto.a in Frameworks */,
360+
E273B4B425A7694C00F8D7E8 /* libodr_common.a in Frameworks */,
353361
E2D2F0662441BB5500C2F88E /* libodr_access.a in Frameworks */,
354362
E26C39392250DC6E009C484A /* WebKit.framework in Frameworks */,
355363
E2D2F06A2441BB5600C2F88E /* libodr_ooxml.a in Frameworks */,
356364
E2D2F0682441BB5600C2F88E /* libodr_crypto.a in Frameworks */,
365+
E273B4B725A7694C00F8D7E8 /* libodr_oldms.a in Frameworks */,
357366
E2D2F0642441BB5500C2F88E /* libglog.a in Frameworks */,
367+
E273B4B925A7694C00F8D7E8 /* libodr_svm.a in Frameworks */,
358368
21E6C5303C9ED8A9A9317BEC /* Pods_OpenDocumentReader.framework in Frameworks */,
359369
E2D2F0652441BB5500C2F88E /* libminiz.a in Frameworks */,
370+
E273B4B225A7694C00F8D7E8 /* libminiz.a in Frameworks */,
360371
);
361372
runOnlyForDeploymentPostprocessing = 0;
362373
};
@@ -399,7 +410,7 @@
399410
E2B55503245F13570077ED85 /* libodr_oldms.a */,
400411
E21C599A24308C3E0076C37C /* libodr_ooxml.a */,
401412
E21C599C24308C3E0076C37C /* libodr_svm.a */,
402-
E226025724C61D21009542DE /* libpugixml.a */,
413+
E2C70F4925A764EE0011D423 /* libpugixml.a */,
403414
E21C59A024308C3E0076C37C /* translate */,
404415
);
405416
name = Products;
@@ -513,7 +524,6 @@
513524
buildRules = (
514525
);
515526
dependencies = (
516-
E226025A24C61D4B009542DE /* PBXTargetDependency */,
517527
E2B55506245F13660077ED85 /* PBXTargetDependency */,
518528
E2C8C15E2441B28900B46ABE /* PBXTargetDependency */,
519529
E21C59AE24308C720076C37C /* PBXTargetDependency */,
@@ -686,13 +696,6 @@
686696
remoteRef = E21C599F24308C3E0076C37C /* PBXContainerItemProxy */;
687697
sourceTree = BUILT_PRODUCTS_DIR;
688698
};
689-
E226025724C61D21009542DE /* libpugixml.a */ = {
690-
isa = PBXReferenceProxy;
691-
fileType = archive.ar;
692-
path = libpugixml.a;
693-
remoteRef = E226025624C61D21009542DE /* PBXContainerItemProxy */;
694-
sourceTree = BUILT_PRODUCTS_DIR;
695-
};
696699
E22E08E72441B187001A374C /* meta */ = {
697700
isa = PBXReferenceProxy;
698701
fileType = "compiled.mach-o.executable";
@@ -722,6 +725,13 @@
722725
remoteRef = E2B55502245F13570077ED85 /* PBXContainerItemProxy */;
723726
sourceTree = BUILT_PRODUCTS_DIR;
724727
};
728+
E2C70F4925A764EE0011D423 /* libpugixml.a */ = {
729+
isa = PBXReferenceProxy;
730+
fileType = archive.ar;
731+
path = libpugixml.a;
732+
remoteRef = E2C70F4825A764EE0011D423 /* PBXContainerItemProxy */;
733+
sourceTree = BUILT_PRODUCTS_DIR;
734+
};
725735
/* End PBXReferenceProxy section */
726736

727737
/* Begin PBXResourcesBuildPhase section */
@@ -908,11 +918,6 @@
908918
name = odr_svm;
909919
targetProxy = E21C59C124308C720076C37C /* PBXContainerItemProxy */;
910920
};
911-
E226025A24C61D4B009542DE /* PBXTargetDependency */ = {
912-
isa = PBXTargetDependency;
913-
name = pugixml;
914-
targetProxy = E226025924C61D4B009542DE /* PBXContainerItemProxy */;
915-
};
916921
E22B25322557F0E2001D0C52 /* PBXTargetDependency */ = {
917922
isa = PBXTargetDependency;
918923
target = E2F7ED4E220B54D600D63515 /* OpenDocumentReader */;
@@ -1039,7 +1044,7 @@
10391044
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
10401045
CLANG_ENABLE_MODULES = YES;
10411046
CODE_SIGN_STYLE = Automatic;
1042-
CURRENT_PROJECT_VERSION = 25;
1047+
CURRENT_PROJECT_VERSION = 26;
10431048
DEFINES_MODULE = YES;
10441049
DEVELOPMENT_TEAM = 5LS6X97G6J;
10451050
HEADER_SEARCH_PATHS = (
@@ -1053,7 +1058,7 @@
10531058
"@executable_path/Frameworks",
10541059
);
10551060
LIBRARY_SEARCH_PATHS = "$(inherited)";
1056-
MARKETING_VERSION = 1.20;
1061+
MARKETING_VERSION = 1.21;
10571062
PRODUCT_BUNDLE_IDENTIFIER = at.tomtasche.reader.lite1;
10581063
PRODUCT_NAME = "$(BUNDLE_DISPLAY_NAME)";
10591064
SWIFT_OBJC_BRIDGING_HEADER = OpenDocumentReader/BridgingHeader.h;
@@ -1131,7 +1136,7 @@
11311136
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
11321137
CLANG_ENABLE_MODULES = YES;
11331138
CODE_SIGN_STYLE = Automatic;
1134-
CURRENT_PROJECT_VERSION = 25;
1139+
CURRENT_PROJECT_VERSION = 26;
11351140
DEFINES_MODULE = YES;
11361141
DEVELOPMENT_TEAM = 5LS6X97G6J;
11371142
HEADER_SEARCH_PATHS = (
@@ -1145,7 +1150,7 @@
11451150
"@executable_path/Frameworks",
11461151
);
11471152
LIBRARY_SEARCH_PATHS = "$(inherited)";
1148-
MARKETING_VERSION = 1.20;
1153+
MARKETING_VERSION = 1.21;
11491154
PRODUCT_BUNDLE_IDENTIFIER = at.tomtasche.reader.lite1;
11501155
PRODUCT_NAME = "$(BUNDLE_DISPLAY_NAME)";
11511156
SWIFT_OBJC_BRIDGING_HEADER = OpenDocumentReader/BridgingHeader.h;
@@ -1374,7 +1379,7 @@
13741379
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
13751380
CLANG_ENABLE_MODULES = YES;
13761381
CODE_SIGN_STYLE = Automatic;
1377-
CURRENT_PROJECT_VERSION = 25;
1382+
CURRENT_PROJECT_VERSION = 26;
13781383
DEFINES_MODULE = YES;
13791384
DEVELOPMENT_TEAM = 5LS6X97G6J;
13801385
HEADER_SEARCH_PATHS = (
@@ -1388,7 +1393,7 @@
13881393
"@executable_path/Frameworks",
13891394
);
13901395
LIBRARY_SEARCH_PATHS = "$(inherited)";
1391-
MARKETING_VERSION = 1.20;
1396+
MARKETING_VERSION = 1.21;
13921397
PRODUCT_BUNDLE_IDENTIFIER = "at.tomtasche.reader$(BUNDLE_ID_SUFFIX)";
13931398
PRODUCT_NAME = "$(BUNDLE_DISPLAY_NAME)";
13941399
SWIFT_OBJC_BRIDGING_HEADER = OpenDocumentReader/BridgingHeader.h;
@@ -1408,7 +1413,7 @@
14081413
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
14091414
CLANG_ENABLE_MODULES = YES;
14101415
CODE_SIGN_STYLE = Automatic;
1411-
CURRENT_PROJECT_VERSION = 25;
1416+
CURRENT_PROJECT_VERSION = 26;
14121417
DEFINES_MODULE = YES;
14131418
DEVELOPMENT_TEAM = 5LS6X97G6J;
14141419
HEADER_SEARCH_PATHS = (
@@ -1422,7 +1427,7 @@
14221427
"@executable_path/Frameworks",
14231428
);
14241429
LIBRARY_SEARCH_PATHS = "$(inherited)";
1425-
MARKETING_VERSION = 1.20;
1430+
MARKETING_VERSION = 1.21;
14261431
PRODUCT_BUNDLE_IDENTIFIER = "at.tomtasche.reader$(BUNDLE_ID_SUFFIX)";
14271432
PRODUCT_NAME = "$(BUNDLE_DISPLAY_NAME)";
14281433
SWIFT_OBJC_BRIDGING_HEADER = OpenDocumentReader/BridgingHeader.h;

0 commit comments

Comments
 (0)