Skip to content

Commit 9cde6dd

Browse files
adamwulfadamwulf
committed
Set to use PerformanceBezier 1.3.0 for SPM. Also set public headers to be an explicit directory. this helps SPM not to attempt to include headers that are meant to be private.
1 parent 41b2c5f commit 9cde6dd

23 files changed

+71
-43
lines changed

‎ClippingBezier.podspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ Pod::Spec.new do |s|
99
s.license = {:type => 'CC BY', :file => 'LICENSE' }
1010

1111
s.source = { :git => "https://github.com/adamwulf/ClippingBezier.git", :tag => s.version}
12-
s.source_files = ['ClippingBezier/*.{h,m,mm,cpp,cxx,hxx,c}']
13-
s.public_header_files = ['ClippingBezier/UIBezierPath+*.h','ClippingBezier/DK*.h','ClippingBezier/ClippingBezier.h','ClippingBezier/MMBackwardCompatible.h']
12+
s.source_files = ['ClippingBezier/*.{h,m,mm,cpp,cxx,hxx,c}','ClippingBezier/PublicHeaders/*.{h,m,mm,cpp,cxx,hxx,c}']
13+
s.public_header_files = ['ClippingBezier/PublicHeaders/*.h']
1414

1515
s.platform = :ios
1616
s.ios.deployment_target = "12.0"
1717

1818
s.framework = 'Foundation'
19-
s.dependency 'PerformanceBezier', '~> 1.1'
19+
s.dependency 'PerformanceBezier', '~> 1.3'
2020
s.xcconfig = { "DEFINES_MODULE" => "YES", "OTHER_CPLUSPLUSFLAGS" => "$(OTHER_CFLAGS) -fmodules -fcxx-modules" }
2121

2222
end

‎ClippingBezier.xcodeproj/project.pbxproj‎

Lines changed: 45 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
6605F9EE1B11259F0092991F /* lib2geom.license in Resources */ = {isa = PBXBuildFile; fileRef = 6605F9ED1B11259F0092991F /* lib2geom.license */; };
1515
6605F9F01B1125D60092991F /* JRSwizzle.license in Resources */ = {isa = PBXBuildFile; fileRef = 6605F9EF1B1125D60092991F /* JRSwizzle.license */; };
1616
6605F9F21B1125FC0092991F /* BaseGFX.license in Resources */ = {isa = PBXBuildFile; fileRef = 6605F9F11B1125FC0092991F /* BaseGFX.license */; };
17-
6605F9F41B112D0E0092991F /* utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 6605F9F31B112D0E0092991F /* utils.h */; };
1817
6605F9F71B11328B0092991F /* bezier-clipping.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6605F9F61B11328B0092991F /* bezier-clipping.mm */; };
1918
6605FA061B1159640092991F /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 6605FA051B1159640092991F /* main.m */; };
2019
6605FA091B1159640092991F /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 6605FA081B1159640092991F /* AppDelegate.m */; };
@@ -25,9 +24,7 @@
2524
6605FA291B1159AC0092991F /* MMClipView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6605FA281B1159AC0092991F /* MMClipView.m */; };
2625
664A487E1AFEF23F00DE634E /* point.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 664A487D1AFEF23F00DE634E /* point.cpp */; };
2726
664A48821AFEF26200DE634E /* matrix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 664A48801AFEF26200DE634E /* matrix.cpp */; };
28-
664A48831AFEF26200DE634E /* matrix.h in Headers */ = {isa = PBXBuildFile; fileRef = 664A48811AFEF26200DE634E /* matrix.h */; };
2927
664A48861AFEF26E00DE634E /* transforms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 664A48841AFEF26E00DE634E /* transforms.cpp */; };
30-
664A48871AFEF26E00DE634E /* transforms.h in Headers */ = {isa = PBXBuildFile; fileRef = 664A48851AFEF26E00DE634E /* transforms.h */; };
3128
664A48901AFEF39800DE634E /* BezierUtilsLicense in Resources */ = {isa = PBXBuildFile; fileRef = 664A488F1AFEF39800DE634E /* BezierUtilsLicense */; };
3229
665E8D4B1B0D2688009E32FC /* MMClippingBezierTrimmingTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 665E8D4A1B0D2688009E32FC /* MMClippingBezierTrimmingTests.m */; };
3330
665E8D4C1B0D273F009E32FC /* ClippingBezier.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 66AFACE71A8DDCA200FD0263 /* ClippingBezier.framework */; };
@@ -44,8 +41,6 @@
4441
666EEC341A8D910100B9F171 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 66B9D1F51A8C2B1800CAC341 /* UIKit.framework */; };
4542
66767CB21AFED58200443B03 /* UIBezierPath+Trimming.h in Headers */ = {isa = PBXBuildFile; fileRef = 66767CB01AFED58200443B03 /* UIBezierPath+Trimming.h */; settings = {ATTRIBUTES = (Public, ); }; };
4643
66767CB31AFED58200443B03 /* UIBezierPath+Trimming.m in Sources */ = {isa = PBXBuildFile; fileRef = 66767CB11AFED58200443B03 /* UIBezierPath+Trimming.m */; };
47-
66767CB61AFED77400443B03 /* point.h in Headers */ = {isa = PBXBuildFile; fileRef = 66767CB51AFED77400443B03 /* point.h */; };
48-
66767CB81AFED78A00443B03 /* coord.h in Headers */ = {isa = PBXBuildFile; fileRef = 66767CB71AFED78A00443B03 /* coord.h */; };
4944
66767CC21AFEDA5000443B03 /* NearestPoint.c in Sources */ = {isa = PBXBuildFile; fileRef = 66767CC01AFEDA5000443B03 /* NearestPoint.c */; };
5045
66767CC31AFEDA5000443B03 /* NearestPoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 66767CC11AFEDA5000443B03 /* NearestPoint.h */; };
5146
6696DEE51B2E318A00A2BC8E /* MMClippingBezierGeometryTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 6696DEE41B2E318A00A2BC8E /* MMClippingBezierGeometryTest.m */; };
@@ -62,7 +57,6 @@
6257
66AFAD051A8DDD5F00FD0263 /* UIBezierPath+GeometryExtras.m in Sources */ = {isa = PBXBuildFile; fileRef = 668288541A893F7E0038A1C4 /* UIBezierPath+GeometryExtras.m */; };
6358
66AFAD061A8DDD6100FD0263 /* UIBezierPath+Clipping.m in Sources */ = {isa = PBXBuildFile; fileRef = 668288521A893F7E0038A1C4 /* UIBezierPath+Clipping.m */; };
6459
66AFAD071A8DDD6400FD0263 /* bezierclip.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 668288161A893F200038A1C4 /* bezierclip.cxx */; };
65-
66AFAD081A8DDD6500FD0263 /* convexhull.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 668288181A893F200038A1C4 /* convexhull.cxx */; };
6660
66AFAD0A1A8DDD6900FD0263 /* MMBackwardCompatible.m in Sources */ = {isa = PBXBuildFile; fileRef = 668288471A893F5A0038A1C4 /* MMBackwardCompatible.m */; };
6761
66AFAD0B1A8DDD6C00FD0263 /* DKVector.m in Sources */ = {isa = PBXBuildFile; fileRef = 668288121A893F060038A1C4 /* DKVector.m */; };
6862
66AFAD0C1A8DDD7100FD0263 /* ClippingBezier.h in Headers */ = {isa = PBXBuildFile; fileRef = 662D40C31A8D862600A1CB63 /* ClippingBezier.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -87,6 +81,9 @@
8781
C5692F662457874000BD0D8F /* JRSwizzle.h in Headers */ = {isa = PBXBuildFile; fileRef = C5692F642457874000BD0D8F /* JRSwizzle.h */; };
8882
C5790914256D84A80064F08E /* UIBezierPath+SamplePaths.m in Sources */ = {isa = PBXBuildFile; fileRef = C5F904AE2465DD11003D153D /* UIBezierPath+SamplePaths.m */; };
8983
C5A4575A255F0A78005BF9F4 /* MMClippingBezierTodoTests.m in Sources */ = {isa = PBXBuildFile; fileRef = C5A45759255F0A78005BF9F4 /* MMClippingBezierTodoTests.m */; };
84+
C5E250F7261C27FB0052483A /* gauss.hxx in Headers */ = {isa = PBXBuildFile; fileRef = 668288191A893F200038A1C4 /* gauss.hxx */; settings = {ATTRIBUTES = (Private, ); }; };
85+
C5E25105261C28050052483A /* bezierclip.hxx in Headers */ = {isa = PBXBuildFile; fileRef = 668288171A893F200038A1C4 /* bezierclip.hxx */; settings = {ATTRIBUTES = (Private, ); }; };
86+
C5E25106261C28050052483A /* convexhull.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 668288181A893F200038A1C4 /* convexhull.cxx */; };
9087
C5F904AF2465DD11003D153D /* UIBezierPath+SamplePaths.m in Sources */ = {isa = PBXBuildFile; fileRef = C5F904AE2465DD11003D153D /* UIBezierPath+SamplePaths.m */; };
9188
/* End PBXBuildFile section */
9289

@@ -423,8 +420,8 @@
423420
6682878A1A893CE50038A1C4 /* ClippingBezier */ = {
424421
isa = PBXGroup;
425422
children = (
423+
C5E25126261C28B70052483A /* PublicHeaders */,
426424
6605F9F51B1131890092991F /* 3rd Party */,
427-
662D40C31A8D862600A1CB63 /* ClippingBezier.h */,
428425
668288101A893EFA0038A1C4 /* Vector */,
429426
6682884C1A893F750038A1C4 /* Categories */,
430427
668287991A893DD10038A1C4 /* Classes */,
@@ -436,20 +433,12 @@
436433
668287991A893DD10038A1C4 /* Classes */ = {
437434
isa = PBXGroup;
438435
children = (
439-
6682879A1A893DDD0038A1C4 /* DKUIBezierPathClippedSegment.h */,
440436
6682879B1A893DDD0038A1C4 /* DKUIBezierPathClippedSegment.m */,
441-
6682879C1A893DDD0038A1C4 /* DKUIBezierPathClippingResult.h */,
442437
6682879D1A893DDD0038A1C4 /* DKUIBezierPathClippingResult.m */,
443-
6682879E1A893DDD0038A1C4 /* DKUIBezierPathIntersectionPoint.h */,
444-
6682879F1A893DDD0038A1C4 /* DKUIBezierPathIntersectionPoint+Private.h */,
445438
668287A01A893DDD0038A1C4 /* DKUIBezierPathIntersectionPoint.m */,
446-
668287A11A893DDD0038A1C4 /* DKUIBezierUnmatchedPathIntersectionPoint.h */,
447439
668287A21A893DDD0038A1C4 /* DKUIBezierUnmatchedPathIntersectionPoint.m */,
448-
668287A31A893DDD0038A1C4 /* DKUIBezierPathShape.h */,
449440
668287A41A893DDD0038A1C4 /* DKUIBezierPathShape.m */,
450-
668287A51A893DDD0038A1C4 /* DKTangentAtPoint.h */,
451441
668287A61A893DDD0038A1C4 /* DKTangentAtPoint.m */,
452-
66FD53301A89546A00E7B486 /* DKIntersectionOfPaths.h */,
453442
66FD53311A89546A00E7B486 /* DKIntersectionOfPaths.m */,
454443
);
455444
name = Classes;
@@ -458,7 +447,6 @@
458447
668288101A893EFA0038A1C4 /* Vector */ = {
459448
isa = PBXGroup;
460449
children = (
461-
668288111A893F060038A1C4 /* DKVector.h */,
462450
668288121A893F060038A1C4 /* DKVector.m */,
463451
);
464452
name = Vector;
@@ -478,7 +466,6 @@
478466
668288431A893F530038A1C4 /* JRSwizzle */ = {
479467
isa = PBXGroup;
480468
children = (
481-
668288461A893F5A0038A1C4 /* MMBackwardCompatible.h */,
482469
668288471A893F5A0038A1C4 /* MMBackwardCompatible.m */,
483470
C5692F642457874000BD0D8F /* JRSwizzle.h */,
484471
C5692F632457874000BD0D8F /* JRSwizzle.m */,
@@ -489,17 +476,11 @@
489476
6682884C1A893F750038A1C4 /* Categories */ = {
490477
isa = PBXGroup;
491478
children = (
492-
668288501A893F7E0038A1C4 /* UIBezierPath+Clipping.h */,
493-
668288511A893F7E0038A1C4 /* UIBezierPath+Clipping_Private.h */,
494479
668288521A893F7E0038A1C4 /* UIBezierPath+Clipping.m */,
495480
C555A8C2261BD4860017E1B4 /* UIBezierPath+ClippingCPP.mm */,
496-
668288531A893F7E0038A1C4 /* UIBezierPath+GeometryExtras.h */,
497481
668288541A893F7E0038A1C4 /* UIBezierPath+GeometryExtras.m */,
498-
668288551A893F7E0038A1C4 /* UIBezierPath+DKOSX.h */,
499482
668288561A893F7E0038A1C4 /* UIBezierPath+DKOSX.m */,
500-
668288571A893F7E0038A1C4 /* UIBezierPath+Intersections.h */,
501483
668288581A893F7E0038A1C4 /* UIBezierPath+Intersections.m */,
502-
66767CB01AFED58200443B03 /* UIBezierPath+Trimming.h */,
503484
66767CB11AFED58200443B03 /* UIBezierPath+Trimming.m */,
504485
);
505486
name = Categories;
@@ -515,16 +496,37 @@
515496
path = ../ClippingBezier;
516497
sourceTree = "<group>";
517498
};
499+
C5E25126261C28B70052483A /* PublicHeaders */ = {
500+
isa = PBXGroup;
501+
children = (
502+
662D40C31A8D862600A1CB63 /* ClippingBezier.h */,
503+
668288501A893F7E0038A1C4 /* UIBezierPath+Clipping.h */,
504+
668288511A893F7E0038A1C4 /* UIBezierPath+Clipping_Private.h */,
505+
668288531A893F7E0038A1C4 /* UIBezierPath+GeometryExtras.h */,
506+
668288551A893F7E0038A1C4 /* UIBezierPath+DKOSX.h */,
507+
668288571A893F7E0038A1C4 /* UIBezierPath+Intersections.h */,
508+
66767CB01AFED58200443B03 /* UIBezierPath+Trimming.h */,
509+
668288111A893F060038A1C4 /* DKVector.h */,
510+
6682879A1A893DDD0038A1C4 /* DKUIBezierPathClippedSegment.h */,
511+
6682879C1A893DDD0038A1C4 /* DKUIBezierPathClippingResult.h */,
512+
6682879E1A893DDD0038A1C4 /* DKUIBezierPathIntersectionPoint.h */,
513+
6682879F1A893DDD0038A1C4 /* DKUIBezierPathIntersectionPoint+Private.h */,
514+
668287A11A893DDD0038A1C4 /* DKUIBezierUnmatchedPathIntersectionPoint.h */,
515+
668287A31A893DDD0038A1C4 /* DKUIBezierPathShape.h */,
516+
668287A51A893DDD0038A1C4 /* DKTangentAtPoint.h */,
517+
66FD53301A89546A00E7B486 /* DKIntersectionOfPaths.h */,
518+
668288461A893F5A0038A1C4 /* MMBackwardCompatible.h */,
519+
);
520+
path = PublicHeaders;
521+
sourceTree = "<group>";
522+
};
518523
/* End PBXGroup section */
519524

520525
/* Begin PBXHeadersBuildPhase section */
521526
66AFACE31A8DDCA200FD0263 /* Headers */ = {
522527
isa = PBXHeadersBuildPhase;
523528
buildActionMask = 2147483647;
524529
files = (
525-
664A48831AFEF26200DE634E /* matrix.h in Headers */,
526-
66767CB81AFED78A00443B03 /* coord.h in Headers */,
527-
6605F9F41B112D0E0092991F /* utils.h in Headers */,
528530
66AFAD0C1A8DDD7100FD0263 /* ClippingBezier.h in Headers */,
529531
66AFAD111A8DDD7D00FD0263 /* UIBezierPath+GeometryExtras.h in Headers */,
530532
66AFAD121A8DDD7E00FD0263 /* UIBezierPath+DKOSX.h in Headers */,
@@ -540,11 +542,11 @@
540542
66767CB21AFED58200443B03 /* UIBezierPath+Trimming.h in Headers */,
541543
66AFAD191A8DDD8A00FD0263 /* DKUIBezierUnmatchedPathIntersectionPoint.h in Headers */,
542544
66AFAD0F1A8DDD7800FD0263 /* UIBezierPath+Clipping.h in Headers */,
543-
66767CB61AFED77400443B03 /* point.h in Headers */,
545+
C5E250F7261C27FB0052483A /* gauss.hxx in Headers */,
544546
66AFAD0E1A8DDD7500FD0263 /* MMBackwardCompatible.h in Headers */,
547+
C5E25105261C28050052483A /* bezierclip.hxx in Headers */,
545548
66AFAD101A8DDD7A00FD0263 /* UIBezierPath+Clipping_Private.h in Headers */,
546549
66AFAD181A8DDD8800FD0263 /* DKUIBezierPathIntersectionPoint+Private.h in Headers */,
547-
664A48871AFEF26E00DE634E /* transforms.h in Headers */,
548550
C5692F662457874000BD0D8F /* JRSwizzle.h in Headers */,
549551
);
550552
runOnlyForDeploymentPostprocessing = 0;
@@ -829,12 +831,12 @@
829831
66AFACFB1A8DDD4500FD0263 /* DKUIBezierPathClippingResult.m in Sources */,
830832
C555A8C4261BD4860017E1B4 /* UIBezierPath+ClippingCPP.mm in Sources */,
831833
66AFAD041A8DDD5E00FD0263 /* UIBezierPath+DKOSX.m in Sources */,
834+
C5E25106261C28050052483A /* convexhull.cxx in Sources */,
832835
66AFAD071A8DDD6400FD0263 /* bezierclip.cxx in Sources */,
833836
66AFAD0B1A8DDD6C00FD0263 /* DKVector.m in Sources */,
834837
66767CB31AFED58200443B03 /* UIBezierPath+Trimming.m in Sources */,
835838
66AFAD0A1A8DDD6900FD0263 /* MMBackwardCompatible.m in Sources */,
836839
66AFAD061A8DDD6100FD0263 /* UIBezierPath+Clipping.m in Sources */,
837-
66AFAD081A8DDD6500FD0263 /* convexhull.cxx in Sources */,
838840
66AFAD051A8DDD5F00FD0263 /* UIBezierPath+GeometryExtras.m in Sources */,
839841
C5692F652457874000BD0D8F /* JRSwizzle.m in Sources */,
840842
66AFAD031A8DDD5C00FD0263 /* UIBezierPath+Intersections.m in Sources */,
@@ -1190,6 +1192,13 @@
11901192
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
11911193
GCC_WARN_UNUSED_FUNCTION = YES;
11921194
GCC_WARN_UNUSED_VARIABLE = YES;
1195+
HEADER_SEARCH_PATHS = (
1196+
"$(SRCROOT)/ClippingBezier/PublicHeaders",
1197+
"$(inherited)",
1198+
"\"${PODS_ROOT}/Headers/Public\"",
1199+
"\"${PODS_ROOT}/Headers/Public/ClippingBezier\"",
1200+
"\"${PODS_ROOT}/Headers/Public/PerformanceBezier\"",
1201+
);
11931202
INFOPLIST_FILE = ClippingBezier/Info.plist;
11941203
MARKETING_VERSION = 1.1.1;
11951204
MTL_ENABLE_DEBUG_INFO = YES;
@@ -1236,6 +1245,13 @@
12361245
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
12371246
GCC_WARN_UNUSED_FUNCTION = YES;
12381247
GCC_WARN_UNUSED_VARIABLE = YES;
1248+
HEADER_SEARCH_PATHS = (
1249+
"$(SRCROOT)/ClippingBezier/PublicHeaders",
1250+
"$(inherited)",
1251+
"\"${PODS_ROOT}/Headers/Public\"",
1252+
"\"${PODS_ROOT}/Headers/Public/ClippingBezier\"",
1253+
"\"${PODS_ROOT}/Headers/Public/PerformanceBezier\"",
1254+
);
12391255
INFOPLIST_FILE = ClippingBezier/Info.plist;
12401256
MARKETING_VERSION = 1.1.1;
12411257
MTL_ENABLE_DEBUG_INFO = NO;

‎ClippingBezier/ClippingBezier.h‎ renamed to ‎ClippingBezier/PublicHeaders/ClippingBezier.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88

99
#import <Foundation/Foundation.h>
1010

11+
// SwiftPackageManager needs imports to be "", while frameworks generally want <>
12+
// It's unfortunately not enough to `#if SWIFT_PACKAGE`, as if ClippingBezier
13+
// is a dependency of another SPM package, then the SWIFT_PACKAGE seems to not be
14+
// set when building that dependency. So instead, we'll choose based off of Cocoapods
15+
1116
#if COCOAPODS
1217
#import <ClippingBezier/DKIntersectionOfPaths.h>
1318
#import <ClippingBezier/DKIntersectionOfPaths.h>

‎ClippingBezier/DKIntersectionOfPaths.h‎ renamed to ‎ClippingBezier/PublicHeaders/DKIntersectionOfPaths.h‎

File renamed without changes.

‎ClippingBezier/DKTangentAtPoint.h‎ renamed to ‎ClippingBezier/PublicHeaders/DKTangentAtPoint.h‎

File renamed without changes.

‎ClippingBezier/DKUIBezierPathClippedSegment.h‎ renamed to ‎ClippingBezier/PublicHeaders/DKUIBezierPathClippedSegment.h‎

File renamed without changes.

‎ClippingBezier/DKUIBezierPathClippingResult.h‎ renamed to ‎ClippingBezier/PublicHeaders/DKUIBezierPathClippingResult.h‎

File renamed without changes.

‎ClippingBezier/DKUIBezierPathIntersectionPoint+Private.h‎ renamed to ‎ClippingBezier/PublicHeaders/DKUIBezierPathIntersectionPoint+Private.h‎

File renamed without changes.

‎ClippingBezier/DKUIBezierPathIntersectionPoint.h‎ renamed to ‎ClippingBezier/PublicHeaders/DKUIBezierPathIntersectionPoint.h‎

File renamed without changes.

‎ClippingBezier/DKUIBezierPathShape.h‎ renamed to ‎ClippingBezier/PublicHeaders/DKUIBezierPathShape.h‎

File renamed without changes.

0 commit comments

Comments
 (0)