Skip to content

Commit 2a18286

Browse files
digitalmokshadigitalmoksha
committed
Merge branch 'release/v1.1'
2 parents 3e06734 + 88d0d2b commit 2a18286

File tree

9 files changed

+725
-29
lines changed

9 files changed

+725
-29
lines changed

‎QLCommonMark.xcodeproj/project.pbxproj

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,23 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
450C002A1EE405500016877C /* cmark_export.h in Headers */ = {isa = PBXBuildFile; fileRef = 450C00261EE405500016877C /* cmark_export.h */; };
11+
450C002B1EE405500016877C /* cmark_version.h in Headers */ = {isa = PBXBuildFile; fileRef = 450C00271EE405500016877C /* cmark_version.h */; };
12+
450C002C1EE405500016877C /* cmark.h in Headers */ = {isa = PBXBuildFile; fileRef = 450C00281EE405500016877C /* cmark.h */; };
13+
450C002D1EE405500016877C /* libcmark.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 450C00291EE405500016877C /* libcmark.a */; };
1014
453120C21E9E1E1C00D752F5 /* GenerateThumbnailForURL.m in Sources */ = {isa = PBXBuildFile; fileRef = 453120C11E9E1E1C00D752F5 /* GenerateThumbnailForURL.m */; };
1115
453120C41E9E1E1C00D752F5 /* GeneratePreviewForURL.m in Sources */ = {isa = PBXBuildFile; fileRef = 453120C31E9E1E1C00D752F5 /* GeneratePreviewForURL.m */; };
1216
453120C61E9E1E1C00D752F5 /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 453120C51E9E1E1C00D752F5 /* main.c */; };
1317
453120D01E9E1F5700D752F5 /* common_mark.h in Headers */ = {isa = PBXBuildFile; fileRef = 453120CE1E9E1F5700D752F5 /* common_mark.h */; };
1418
453120D31E9E1FD600D752F5 /* common_mark.m in Sources */ = {isa = PBXBuildFile; fileRef = 453120D21E9E1FD600D752F5 /* common_mark.m */; };
1519
45E7FCBC1E9E4B4800773069 /* themes in Resources */ = {isa = PBXBuildFile; fileRef = 45E7FCBB1E9E4B4800773069 /* themes */; };
16-
45E7FCBE1E9E63F400773069 /* cmark-0.27.1 in Resources */ = {isa = PBXBuildFile; fileRef = 45E7FCBD1E9E63F400773069 /* cmark-0.27.1 */; };
1720
/* End PBXBuildFile section */
1821

1922
/* Begin PBXFileReference section */
23+
450C00261EE405500016877C /* cmark_export.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cmark_export.h; path = cmark/cmark_export.h; sourceTree = "<group>"; };
24+
450C00271EE405500016877C /* cmark_version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cmark_version.h; path = cmark/cmark_version.h; sourceTree = "<group>"; };
25+
450C00281EE405500016877C /* cmark.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cmark.h; path = cmark/cmark.h; sourceTree = "<group>"; };
26+
450C00291EE405500016877C /* libcmark.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcmark.a; path = cmark/libcmark.a; sourceTree = "<group>"; };
2027
453120BE1E9E1E1C00D752F5 /* QLCommonMark.qlgenerator */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = QLCommonMark.qlgenerator; sourceTree = BUILT_PRODUCTS_DIR; };
2128
453120C11E9E1E1C00D752F5 /* GenerateThumbnailForURL.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GenerateThumbnailForURL.m; sourceTree = "<group>"; };
2229
453120C31E9E1E1C00D752F5 /* GeneratePreviewForURL.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GeneratePreviewForURL.m; sourceTree = "<group>"; };
@@ -26,20 +33,31 @@
2633
453120D21E9E1FD600D752F5 /* common_mark.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = common_mark.m; sourceTree = "<group>"; };
2734
453120D41E9E218A00D752F5 /* shared.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = shared.h; sourceTree = "<group>"; };
2835
45E7FCBB1E9E4B4800773069 /* themes */ = {isa = PBXFileReference; lastKnownFileType = folder; name = themes; path = QLCommonMark/Resources/themes; sourceTree = "<group>"; };
29-
45E7FCBD1E9E63F400773069 /* cmark-0.27.1 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.man; name = "cmark-0.27.1"; path = "QLCommonMark/Resources/cmark-0.27.1"; sourceTree = "<group>"; };
3036
/* End PBXFileReference section */
3137

3238
/* Begin PBXFrameworksBuildPhase section */
3339
453120BA1E9E1E1C00D752F5 /* Frameworks */ = {
3440
isa = PBXFrameworksBuildPhase;
3541
buildActionMask = 2147483647;
3642
files = (
43+
450C002D1EE405500016877C /* libcmark.a in Frameworks */,
3744
);
3845
runOnlyForDeploymentPostprocessing = 0;
3946
};
4047
/* End PBXFrameworksBuildPhase section */
4148

4249
/* Begin PBXGroup section */
50+
450C00251EE4023B0016877C /* cmark */ = {
51+
isa = PBXGroup;
52+
children = (
53+
450C00261EE405500016877C /* cmark_export.h */,
54+
450C00271EE405500016877C /* cmark_version.h */,
55+
450C00281EE405500016877C /* cmark.h */,
56+
450C00291EE405500016877C /* libcmark.a */,
57+
);
58+
name = cmark;
59+
sourceTree = "<group>";
60+
};
4361
453120B41E9E1E1C00D752F5 = {
4462
isa = PBXGroup;
4563
children = (
@@ -60,6 +78,7 @@
6078
453120C01E9E1E1C00D752F5 /* QLCommonMark */ = {
6179
isa = PBXGroup;
6280
children = (
81+
450C00251EE4023B0016877C /* cmark */,
6382
453120CE1E9E1F5700D752F5 /* common_mark.h */,
6483
453120D21E9E1FD600D752F5 /* common_mark.m */,
6584
453120C11E9E1E1C00D752F5 /* GenerateThumbnailForURL.m */,
@@ -74,7 +93,6 @@
7493
453120CD1E9E1F2100D752F5 /* Resources */ = {
7594
isa = PBXGroup;
7695
children = (
77-
45E7FCBD1E9E63F400773069 /* cmark-0.27.1 */,
7896
45E7FCBB1E9E4B4800773069 /* themes */,
7997
);
8098
name = Resources;
@@ -88,6 +106,9 @@
88106
buildActionMask = 2147483647;
89107
files = (
90108
453120D01E9E1F5700D752F5 /* common_mark.h in Headers */,
109+
450C002A1EE405500016877C /* cmark_export.h in Headers */,
110+
450C002B1EE405500016877C /* cmark_version.h in Headers */,
111+
450C002C1EE405500016877C /* cmark.h in Headers */,
91112
);
92113
runOnlyForDeploymentPostprocessing = 0;
93114
};
@@ -151,7 +172,6 @@
151172
buildActionMask = 2147483647;
152173
files = (
153174
45E7FCBC1E9E4B4800773069 /* themes in Resources */,
154-
45E7FCBE1E9E63F400773069 /* cmark-0.27.1 in Resources */,
155175
);
156176
runOnlyForDeploymentPostprocessing = 0;
157177
};
@@ -272,7 +292,7 @@
272292
"$(inherited)",
273293
"$(PROJECT_DIR)/QLCommonMark/cmark",
274294
);
275-
MACOSX_DEPLOYMENT_TARGET = 10.10;
295+
MACOSX_DEPLOYMENT_TARGET = 10.11;
276296
PRODUCT_BUNDLE_IDENTIFIER = com.digitalmoksha.QLCommonMark;
277297
PRODUCT_NAME = "$(TARGET_NAME)";
278298
WRAPPER_EXTENSION = qlgenerator;
@@ -290,7 +310,7 @@
290310
"$(inherited)",
291311
"$(PROJECT_DIR)/QLCommonMark/cmark",
292312
);
293-
MACOSX_DEPLOYMENT_TARGET = 10.10;
313+
MACOSX_DEPLOYMENT_TARGET = 10.11;
294314
PRODUCT_BUNDLE_IDENTIFIER = com.digitalmoksha.QLCommonMark;
295315
PRODUCT_NAME = "$(TARGET_NAME)";
296316
WRAPPER_EXTENSION = qlgenerator;

‎QLCommonMark/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
<key>CFBundleName</key>
3434
<string>$(PRODUCT_NAME)</string>
3535
<key>CFBundleShortVersionString</key>
36-
<string>1.0</string>
36+
<string>1.1</string>
3737
<key>CFBundleVersion</key>
38-
<string>1</string>
38+
<string>1.1</string>
3939
<key>CFPlugInDynamicRegisterFunction</key>
4040
<string></string>
4141
<key>CFPlugInDynamicRegistration</key>

‎QLCommonMark/Resources/cmark-0.27.1

-360 KB
Binary file not shown.

0 commit comments

Comments
 (0)