From 863f2b718f0838ec5c9f40a231c3771be3268bf9 Mon Sep 17 00:00:00 2001 From: Morten Date: Sun, 5 Mar 2023 13:46:48 +0900 Subject: [PATCH] Fix Framework targets (#46) * Added missing files to build Now, we can build and run tests using just this project. * fixed framework targets --------- Co-authored-by: Brad Andalman Co-authored-by: Morten Bertz --- DocX.xcodeproj/project.pbxproj | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/DocX.xcodeproj/project.pbxproj b/DocX.xcodeproj/project.pbxproj index b6c72a4..0a56a6a 100644 --- a/DocX.xcodeproj/project.pbxproj +++ b/DocX.xcodeproj/project.pbxproj @@ -7,6 +7,11 @@ objects = { /* Begin PBXBuildFile section */ + 5A2E47BD29B4535200DFAC1F /* DocXStyleConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A2E47BC29B4535200DFAC1F /* DocXStyleConfiguration.swift */; }; + 5A2E47BE29B4535200DFAC1F /* DocXStyleConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A2E47BC29B4535200DFAC1F /* DocXStyleConfiguration.swift */; }; + 5A2E47C029B4536300DFAC1F /* ImageGeneration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A2E47BF29B4536300DFAC1F /* ImageGeneration.swift */; }; + 5A2E47C129B4537D00DFAC1F /* ImageGeneration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A2E47BF29B4536300DFAC1F /* ImageGeneration.swift */; }; + 5A2E47C329B453AB00DFAC1F /* styles.xml in Resources */ = {isa = PBXBuildFile; fileRef = 5A2E47C229B453AB00DFAC1F /* styles.xml */; }; 5A4FC7E927FEF5630063F796 /* AttributedString.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A4FC7E827FEF5630063F796 /* AttributedString.swift */; }; 5A4FC7EA27FEF5630063F796 /* AttributedString.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A4FC7E827FEF5630063F796 /* AttributedString.swift */; }; 5A4FC7F827FFB4630063F796 /* lenna.md in Resources */ = {isa = PBXBuildFile; fileRef = 5A4FC7F727FFB4630063F796 /* lenna.md */; }; @@ -65,6 +70,10 @@ 5AE8342722377A5B00E68343 /* NSUnderlineStyle+Elements.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5AE8341A22375D9E00E68343 /* NSUnderlineStyle+Elements.swift */; }; 5AE83428223781F600E68343 /* NSAttributedString+DocX.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5AE833EB223683F000E68343 /* NSAttributedString+DocX.swift */; }; 5AE834292237822B00E68343 /* blank in Resources */ = {isa = PBXBuildFile; fileRef = 5AE833F2223688A400E68343 /* blank */; }; + 6D51921D29AD8B7A0043ECA8 /* DocXStyleConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D51921C29AD8B7A0043ECA8 /* DocXStyleConfiguration.swift */; }; + 6D51921F29AD8C800043ECA8 /* DocXStyleConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D51921C29AD8B7A0043ECA8 /* DocXStyleConfiguration.swift */; }; + 6D51922129AD8D320043ECA8 /* styles.xml in Resources */ = {isa = PBXBuildFile; fileRef = 6D51922029AD8D320043ECA8 /* styles.xml */; }; + 6D51922229AD8D320043ECA8 /* styles.xml in Resources */ = {isa = PBXBuildFile; fileRef = 6D51922029AD8D320043ECA8 /* styles.xml */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -86,6 +95,9 @@ /* Begin PBXFileReference section */ 5A0AD5CE26099AA200C146D3 /* NSTextAttachement+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSTextAttachement+Extensions.swift"; sourceTree = ""; }; + 5A2E47BC29B4535200DFAC1F /* DocXStyleConfiguration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DocXStyleConfiguration.swift; sourceTree = ""; }; + 5A2E47BF29B4536300DFAC1F /* ImageGeneration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageGeneration.swift; sourceTree = ""; }; + 5A2E47C229B453AB00DFAC1F /* styles.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = styles.xml; sourceTree = ""; }; 5A4FC7E827FEF5630063F796 /* AttributedString.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AttributedString.swift; sourceTree = ""; }; 5A4FC7F727FFB4630063F796 /* lenna.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = lenna.md; sourceTree = ""; }; 5A4FC7F927FFB46C0063F796 /* lenna.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = lenna.png; sourceTree = ""; }; @@ -121,6 +133,8 @@ 5AE8340B22373A5200E68343 /* NSParagraphStyle+Elements.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSParagraphStyle+Elements.swift"; sourceTree = ""; }; 5AE834112237573F00E68343 /* FontElements.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FontElements.swift; sourceTree = ""; }; 5AE8341A22375D9E00E68343 /* NSUnderlineStyle+Elements.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSUnderlineStyle+Elements.swift"; sourceTree = ""; }; + 6D51921C29AD8B7A0043ECA8 /* DocXStyleConfiguration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DocXStyleConfiguration.swift; sourceTree = ""; }; + 6D51922029AD8D320043ECA8 /* styles.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = styles.xml; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -198,6 +212,7 @@ 5A9F70BC22350300008E967C /* DocX.swift */, 5AC6C9B4260ACCEB0059F7B0 /* DocXWriting.swift */, 5A6B3DBE26D86D33009F6859 /* DocXOptions.swift */, + 6D51921C29AD8B7A0043ECA8 /* DocXStyleConfiguration.swift */, 5AC6C9B7260AD4CF0059F7B0 /* DocXWriter.swift */, 5A9F70BE22350300008E967C /* NSAttributedString+DocX-macOS.swift */, 5AE833EB223683F000E68343 /* NSAttributedString+DocX.swift */, @@ -215,6 +230,7 @@ 5A8406BB2609DF2B002B8B34 /* ImageRelationship.swift */, 5A8406CC2609DF65002B8B34 /* Bundle+Extensions.swift */, 5A4FC7E827FEF5630063F796 /* AttributedString.swift */, + 5A2E47BC29B4535200DFAC1F /* DocXStyleConfiguration.swift */, 5A9F70A3223502D6008E967C /* DocX.h */, 5A9F70A4223502D6008E967C /* Info.plist */, ); @@ -224,10 +240,13 @@ 5A9F70AD223502D6008E967C /* DocXTests */ = { isa = PBXGroup; children = ( + 5A2E47C229B453AB00DFAC1F /* styles.xml */, + 5A2E47BF29B4536300DFAC1F /* ImageGeneration.swift */, 5A4FC7F727FFB4630063F796 /* lenna.md */, 5A4FC7F927FFB46C0063F796 /* lenna.png */, 5A9F70C62235031B008E967C /* blank.docx */, 5A9F70AE223502D6008E967C /* DocXTests.swift */, + 6D51922029AD8D320043ECA8 /* styles.xml */, 5A9F70B0223502D6008E967C /* Info.plist */, ); path = DocXTests; @@ -406,6 +425,7 @@ buildActionMask = 2147483647; files = ( 5A9F70C72235031B008E967C /* blank.docx in Resources */, + 5A2E47C329B453AB00DFAC1F /* styles.xml in Resources */, 5A4FC7F827FFB4630063F796 /* lenna.md in Resources */, 5A4FC7FA27FFB46C0063F796 /* lenna.png in Resources */, ); @@ -424,6 +444,7 @@ buildActionMask = 2147483647; files = ( 5A4FC7FC27FFB6240063F796 /* Picture1.png in Resources */, + 6D51922229AD8D320043ECA8 /* styles.xml in Resources */, 5A4FC7FD27FFB6430063F796 /* lenna.md in Resources */, 5A4FC7FE27FFB6460063F796 /* lenna.png in Resources */, ); @@ -440,6 +461,7 @@ 5AE834122237573F00E68343 /* FontElements.swift in Sources */, 5A9F711D223607A8008E967C /* NSAttributedString+Extensions.swift in Sources */, 5A8406CD2609DF65002B8B34 /* Bundle+Extensions.swift in Sources */, + 5A2E47BD29B4535200DFAC1F /* DocXStyleConfiguration.swift in Sources */, 5AC6C9B8260AD4CF0059F7B0 /* DocXWriter.swift in Sources */, 5AE833F12236861F00E68343 /* PlatformSpecific-macOS.swift in Sources */, 5A9F70F922350DDE008E967C /* AttributeElements.swift in Sources */, @@ -464,6 +486,7 @@ buildActionMask = 2147483647; files = ( 5A9F70AF223502D6008E967C /* DocXTests.swift in Sources */, + 5A2E47C029B4536300DFAC1F /* ImageGeneration.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -475,6 +498,7 @@ 5AE834132237573F00E68343 /* FontElements.swift in Sources */, 5AE833EF2236852500E68343 /* PlatformSpecific-iOS.swift in Sources */, 5A8406CE2609DF65002B8B34 /* Bundle+Extensions.swift in Sources */, + 5A2E47BE29B4535200DFAC1F /* DocXStyleConfiguration.swift in Sources */, 5AC6C9B9260AD4CF0059F7B0 /* DocXWriter.swift in Sources */, 5AE833D12236831500E68343 /* NSAttributedString+Extensions.swift in Sources */, 5AE833D52236831500E68343 /* AttributeElements.swift in Sources */, @@ -499,6 +523,7 @@ buildActionMask = 2147483647; files = ( 5AE8340422368ADC00E68343 /* DocX_iOS_Tests.swift in Sources */, + 5A2E47C129B4537D00DFAC1F /* ImageGeneration.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -666,7 +691,7 @@ "@executable_path/../Frameworks", "@loader_path/Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 10.15; + MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.telethon.docx; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; @@ -700,7 +725,7 @@ "@executable_path/../Frameworks", "@loader_path/Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 10.15; + MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.telethon.docx; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; @@ -724,7 +749,7 @@ "@executable_path/../Frameworks", "@loader_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 10.15; PRODUCT_BUNDLE_IDENTIFIER = com.telethon.docx.DocXTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0;