From e519af6b793690cc4d13e859f68c4d8e47d29067 Mon Sep 17 00:00:00 2001 From: Brentley Jones Date: Tue, 14 Aug 2018 09:14:27 -0500 Subject: [PATCH] Fix compiler error in test project --- .../Project.xcodeproj/project.pbxproj | 16 ++++++++++++---- .../{ => Module}/module.modulemap | 0 .../StaticLibrary_ObjC/StaticLibrary_ObjC.m | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) rename Tests/Fixtures/TestProject/StaticLibrary_ObjC/{ => Module}/module.modulemap (100%) diff --git a/Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj b/Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj index 7cf11f75..687bb9d8 100644 --- a/Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj +++ b/Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj @@ -79,7 +79,7 @@ BF_734036107922 /* MyFramework.h in Headers */ = {isa = PBXBuildFile; fileRef = FR_183521624014 /* MyFramework.h */; settings = {ATTRIBUTES = (Public, ); }; }; BF_742449020987 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FR_410645050443 /* Alamofire.framework */; }; BF_747443236192 /* App_watchOS.app in Embed Watch Content */ = {isa = PBXBuildFile; fileRef = FR_324671077936 /* App_watchOS.app */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; - BF_755064703081 /* module.modulemap in CopyFiles */ = {isa = PBXBuildFile; fileRef = FR_851415936432 /* module.modulemap */; }; + BF_752022362638 /* module.modulemap in CopyFiles */ = {isa = PBXBuildFile; fileRef = FR_665156855283 /* module.modulemap */; }; BF_757906110813 = {isa = PBXBuildFile; fileRef = FR_662315837182 /* Framework.framework */; }; BF_807556340853 /* Empty.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = FR_837374194182 /* Empty.h */; }; BF_813358525536 /* MyFramework.h in Headers */ = {isa = PBXBuildFile; fileRef = FR_183521624014 /* MyFramework.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -219,7 +219,7 @@ dstSubfolderSpec = 16; files = ( BF_607543323797 /* StaticLibrary_ObjC.h in CopyFiles */, - BF_755064703081 /* module.modulemap in CopyFiles */, + BF_752022362638 /* module.modulemap in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -342,6 +342,7 @@ FR_655678458041 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; FR_660690926982 /* config.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = config.xcconfig; sourceTree = ""; }; FR_662315837182 /* Framework.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Framework.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + FR_665156855283 /* module.modulemap */ = {isa = PBXFileReference; path = module.modulemap; sourceTree = ""; }; FR_675266829517 /* Standalone.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Standalone.swift; sourceTree = ""; }; FR_698230898030 /* StaticLibrary_ObjC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = StaticLibrary_ObjC.h; sourceTree = ""; }; "FR_698230898030-1" /* StaticLibrary_ObjC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = StaticLibrary_ObjC.m; sourceTree = ""; }; @@ -358,7 +359,6 @@ FR_825232110500 /* App_iOS.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = App_iOS.app; sourceTree = BUILT_PRODUCTS_DIR; }; FR_830053537293 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; FR_837374194182 /* Empty.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Empty.h; sourceTree = ""; }; - FR_851415936432 /* module.modulemap */ = {isa = PBXFileReference; path = module.modulemap; sourceTree = ""; }; FR_854336462818 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; FR_868653349092 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; FR_935153865209 /* iMessageApp.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = iMessageApp.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -515,7 +515,7 @@ G_3997550084026 /* StaticLibrary_ObjC */ = { isa = PBXGroup; children = ( - FR_851415936432 /* module.modulemap */, + G_5938599606592 /* Module */, FR_698230898030 /* StaticLibrary_ObjC.h */, "FR_698230898030-1" /* StaticLibrary_ObjC.m */, ); @@ -553,6 +553,14 @@ path = "App_watchOS Extension"; sourceTree = ""; }; + G_5938599606592 /* Module */ = { + isa = PBXGroup; + children = ( + FR_665156855283 /* module.modulemap */, + ); + path = Module; + sourceTree = ""; + }; G_6651250437419 /* StandaloneFiles */ = { isa = PBXGroup; children = ( diff --git a/Tests/Fixtures/TestProject/StaticLibrary_ObjC/module.modulemap b/Tests/Fixtures/TestProject/StaticLibrary_ObjC/Module/module.modulemap similarity index 100% rename from Tests/Fixtures/TestProject/StaticLibrary_ObjC/module.modulemap rename to Tests/Fixtures/TestProject/StaticLibrary_ObjC/Module/module.modulemap diff --git a/Tests/Fixtures/TestProject/StaticLibrary_ObjC/StaticLibrary_ObjC.m b/Tests/Fixtures/TestProject/StaticLibrary_ObjC/StaticLibrary_ObjC.m index c709873e..9fb0c9bf 100644 --- a/Tests/Fixtures/TestProject/StaticLibrary_ObjC/StaticLibrary_ObjC.m +++ b/Tests/Fixtures/TestProject/StaticLibrary_ObjC/StaticLibrary_ObjC.m @@ -3,7 +3,7 @@ @implementation SLObjC - (NSString *)description { - return "Hello, World!"; + return @"Hello, World!"; } @end