From 55710e81f6f079cf7990419f8d3cd8eeca277dcc Mon Sep 17 00:00:00 2001 From: Wesley Wickwire Date: Wed, 5 Dec 2018 18:21:31 -0500 Subject: [PATCH] some fixes to get the iOS tests working in xcode --- Package.resolved | 4 +- Runtime.xcodeproj/project.pbxproj | 292 ++++++++++++----------- Sources/Runtime/Info.plist | 24 -- Tests/RuntimeTests/XCTestManifests.swift | 2 +- 4 files changed, 155 insertions(+), 167 deletions(-) delete mode 100644 Sources/Runtime/Info.plist diff --git a/Package.resolved b/Package.resolved index 1ec26c4..cab035f 100644 --- a/Package.resolved +++ b/Package.resolved @@ -3,10 +3,10 @@ "pins": [ { "package": "CRuntime", - "repositoryURL": "https://github.com/noahemmet/CRuntime.git", + "repositoryURL": "https://github.com/wickwirew/CRuntime.git", "state": { "branch": null, - "revision": "f2a282f1b8ac204f4143b31a6490ad1d66612be5", + "revision": "8d0dd0ca3787d15682c1f44de3d298459870b121", "version": "1.0.0" } } diff --git a/Runtime.xcodeproj/project.pbxproj b/Runtime.xcodeproj/project.pbxproj index fde98d3..03e6504 100644 --- a/Runtime.xcodeproj/project.pbxproj +++ b/Runtime.xcodeproj/project.pbxproj @@ -5,7 +5,7 @@ objects = { "CRuntime::CRuntime::ProductTarget" = { isa = "PBXAggregateTarget"; - buildConfigurationList = "OBJ_71"; + buildConfigurationList = "OBJ_73"; buildPhases = ( ); dependencies = ( @@ -26,7 +26,7 @@ "en" ); mainGroup = "OBJ_5"; - productRefGroup = "OBJ_67"; + productRefGroup = "OBJ_69"; projectDirPath = "."; targets = ( "CRuntime::CRuntime::ProductTarget", @@ -43,43 +43,43 @@ }; "OBJ_100" = { isa = "PBXBuildFile"; - fileRef = "OBJ_33"; + fileRef = "OBJ_31"; }; "OBJ_101" = { isa = "PBXBuildFile"; - fileRef = "OBJ_34"; + fileRef = "OBJ_32"; }; "OBJ_102" = { isa = "PBXBuildFile"; - fileRef = "OBJ_35"; + fileRef = "OBJ_33"; }; "OBJ_103" = { isa = "PBXBuildFile"; - fileRef = "OBJ_37"; + fileRef = "OBJ_34"; }; "OBJ_104" = { isa = "PBXBuildFile"; - fileRef = "OBJ_38"; + fileRef = "OBJ_35"; }; "OBJ_105" = { isa = "PBXBuildFile"; - fileRef = "OBJ_39"; + fileRef = "OBJ_37"; }; "OBJ_106" = { isa = "PBXBuildFile"; - fileRef = "OBJ_40"; + fileRef = "OBJ_38"; }; "OBJ_107" = { isa = "PBXBuildFile"; - fileRef = "OBJ_41"; + fileRef = "OBJ_39"; }; "OBJ_108" = { isa = "PBXBuildFile"; - fileRef = "OBJ_42"; + fileRef = "OBJ_40"; }; "OBJ_109" = { isa = "PBXBuildFile"; - fileRef = "OBJ_44"; + fileRef = "OBJ_41"; }; "OBJ_11" = { isa = "PBXFileReference"; @@ -88,44 +88,43 @@ }; "OBJ_110" = { isa = "PBXBuildFile"; - fileRef = "OBJ_45"; + fileRef = "OBJ_42"; }; "OBJ_111" = { isa = "PBXBuildFile"; - fileRef = "OBJ_46"; + fileRef = "OBJ_44"; }; "OBJ_112" = { isa = "PBXBuildFile"; - fileRef = "OBJ_47"; + fileRef = "OBJ_45"; }; "OBJ_113" = { isa = "PBXBuildFile"; - fileRef = "OBJ_49"; + fileRef = "OBJ_46"; }; "OBJ_114" = { isa = "PBXBuildFile"; - fileRef = "OBJ_50"; + fileRef = "OBJ_47"; }; "OBJ_115" = { isa = "PBXBuildFile"; - fileRef = "OBJ_51"; + fileRef = "OBJ_49"; }; "OBJ_116" = { isa = "PBXBuildFile"; - fileRef = "OBJ_52"; + fileRef = "OBJ_50"; }; "OBJ_117" = { isa = "PBXBuildFile"; - fileRef = "OBJ_53"; + fileRef = "OBJ_51"; }; "OBJ_118" = { isa = "PBXBuildFile"; - fileRef = "OBJ_54"; + fileRef = "OBJ_52"; }; "OBJ_119" = { - isa = "PBXFrameworksBuildPhase"; - files = ( - ); + isa = "PBXBuildFile"; + fileRef = "OBJ_53"; }; "OBJ_12" = { isa = "PBXGroup"; @@ -149,16 +148,25 @@ path = "Layouts"; sourceTree = ""; }; + "OBJ_120" = { + isa = "PBXBuildFile"; + fileRef = "OBJ_54"; + }; "OBJ_121" = { + isa = "PBXFrameworksBuildPhase"; + files = ( + ); + }; + "OBJ_123" = { isa = "XCConfigurationList"; buildConfigurations = ( - "OBJ_122", - "OBJ_123" + "OBJ_124", + "OBJ_125" ); defaultConfigurationIsVisible = "0"; defaultConfigurationName = "Release"; }; - "OBJ_122" = { + "OBJ_124" = { isa = "XCBuildConfiguration"; buildSettings = { LD = "/usr/bin/true"; @@ -176,7 +184,7 @@ }; name = "Debug"; }; - "OBJ_123" = { + "OBJ_125" = { isa = "XCBuildConfiguration"; buildSettings = { LD = "/usr/bin/true"; @@ -194,56 +202,56 @@ }; name = "Release"; }; - "OBJ_124" = { + "OBJ_126" = { isa = "PBXSourcesBuildPhase"; files = ( - "OBJ_125" + "OBJ_127" ); }; - "OBJ_125" = { + "OBJ_127" = { isa = "PBXBuildFile"; fileRef = "OBJ_6"; }; - "OBJ_127" = { + "OBJ_129" = { isa = "XCConfigurationList"; buildConfigurations = ( - "OBJ_128", - "OBJ_129" + "OBJ_130", + "OBJ_131" ); defaultConfigurationIsVisible = "0"; defaultConfigurationName = "Release"; }; - "OBJ_128" = { + "OBJ_13" = { + isa = "PBXFileReference"; + path = "ClassHeader.swift"; + sourceTree = ""; + }; + "OBJ_130" = { isa = "XCBuildConfiguration"; buildSettings = { }; name = "Debug"; }; - "OBJ_129" = { + "OBJ_131" = { isa = "XCBuildConfiguration"; buildSettings = { }; name = "Release"; }; - "OBJ_13" = { - isa = "PBXFileReference"; - path = "ClassHeader.swift"; - sourceTree = ""; - }; - "OBJ_130" = { + "OBJ_132" = { isa = "PBXTargetDependency"; target = "Runtime::RuntimeTests"; }; - "OBJ_132" = { + "OBJ_134" = { isa = "XCConfigurationList"; buildConfigurations = ( - "OBJ_133", - "OBJ_134" + "OBJ_135", + "OBJ_136" ); defaultConfigurationIsVisible = "0"; defaultConfigurationName = "Release"; }; - "OBJ_133" = { + "OBJ_135" = { isa = "XCBuildConfiguration"; buildSettings = { CLANG_ENABLE_MODULES = "YES"; @@ -254,7 +262,7 @@ ); HEADER_SEARCH_PATHS = ( "$(inherited)", - "$(SRCROOT)/.build/checkouts/CRuntime.git-6497126089149231931/Sources/CRuntime" + "$(SRCROOT)/.build/checkouts/CRuntime.git--1672828878229581488/Sources/CRuntime" ); INFOPLIST_FILE = "Runtime.xcodeproj/RuntimeTests_Info.plist"; LD_RUNPATH_SEARCH_PATHS = ( @@ -279,7 +287,7 @@ }; name = "Debug"; }; - "OBJ_134" = { + "OBJ_136" = { isa = "XCBuildConfiguration"; buildSettings = { CLANG_ENABLE_MODULES = "YES"; @@ -290,7 +298,7 @@ ); HEADER_SEARCH_PATHS = ( "$(inherited)", - "$(SRCROOT)/.build/checkouts/CRuntime.git-6497126089149231931/Sources/CRuntime" + "$(SRCROOT)/.build/checkouts/CRuntime.git--1672828878229581488/Sources/CRuntime" ); INFOPLIST_FILE = "Runtime.xcodeproj/RuntimeTests_Info.plist"; LD_RUNPATH_SEARCH_PATHS = ( @@ -315,33 +323,25 @@ }; name = "Release"; }; - "OBJ_135" = { + "OBJ_137" = { isa = "PBXSourcesBuildPhase"; files = ( - "OBJ_136", - "OBJ_137", "OBJ_138", "OBJ_139", "OBJ_140", "OBJ_141", - "OBJ_142" + "OBJ_142", + "OBJ_143", + "OBJ_144" ); }; - "OBJ_136" = { - isa = "PBXBuildFile"; - fileRef = "OBJ_57"; - }; - "OBJ_137" = { - isa = "PBXBuildFile"; - fileRef = "OBJ_58"; - }; "OBJ_138" = { isa = "PBXBuildFile"; - fileRef = "OBJ_59"; + fileRef = "OBJ_57"; }; "OBJ_139" = { isa = "PBXBuildFile"; - fileRef = "OBJ_60"; + fileRef = "OBJ_58"; }; "OBJ_14" = { isa = "PBXFileReference"; @@ -350,27 +350,35 @@ }; "OBJ_140" = { isa = "PBXBuildFile"; - fileRef = "OBJ_61"; + fileRef = "OBJ_59"; }; "OBJ_141" = { isa = "PBXBuildFile"; - fileRef = "OBJ_62"; + fileRef = "OBJ_60"; }; "OBJ_142" = { isa = "PBXBuildFile"; - fileRef = "OBJ_63"; + fileRef = "OBJ_61"; }; "OBJ_143" = { + isa = "PBXBuildFile"; + fileRef = "OBJ_62"; + }; + "OBJ_144" = { + isa = "PBXBuildFile"; + fileRef = "OBJ_63"; + }; + "OBJ_145" = { isa = "PBXFrameworksBuildPhase"; files = ( - "OBJ_144" + "OBJ_146" ); }; - "OBJ_144" = { + "OBJ_146" = { isa = "PBXBuildFile"; fileRef = "Runtime::Runtime::Product"; }; - "OBJ_145" = { + "OBJ_147" = { isa = "PBXTargetDependency"; target = "Runtime::Runtime"; }; @@ -674,7 +682,9 @@ "OBJ_64", "OBJ_65", "OBJ_66", - "OBJ_67" + "OBJ_67", + "OBJ_68", + "OBJ_69" ); path = ""; sourceTree = ""; @@ -776,10 +786,20 @@ }; "OBJ_65" = { isa = "PBXFileReference"; - path = "Scripts"; + path = "Runtime"; sourceTree = "SOURCE_ROOT"; }; "OBJ_66" = { + isa = "PBXFileReference"; + path = "Scripts"; + sourceTree = "SOURCE_ROOT"; + }; + "OBJ_67" = { + isa = "PBXFileReference"; + path = "RuntimeTests"; + sourceTree = "SOURCE_ROOT"; + }; + "OBJ_68" = { isa = "PBXGroup"; children = ( ); @@ -787,7 +807,7 @@ path = ""; sourceTree = ""; }; - "OBJ_67" = { + "OBJ_69" = { isa = "PBXGroup"; children = ( "Runtime::Runtime::Product", @@ -806,37 +826,37 @@ path = ""; sourceTree = "SOURCE_ROOT"; }; - "OBJ_71" = { + "OBJ_73" = { isa = "XCConfigurationList"; buildConfigurations = ( - "OBJ_72", - "OBJ_73" + "OBJ_74", + "OBJ_75" ); defaultConfigurationIsVisible = "0"; defaultConfigurationName = "Release"; }; - "OBJ_72" = { + "OBJ_74" = { isa = "XCBuildConfiguration"; buildSettings = { }; name = "Debug"; }; - "OBJ_73" = { + "OBJ_75" = { isa = "XCBuildConfiguration"; buildSettings = { }; name = "Release"; }; - "OBJ_75" = { + "OBJ_77" = { isa = "XCConfigurationList"; buildConfigurations = ( - "OBJ_76", - "OBJ_77" + "OBJ_78", + "OBJ_79" ); defaultConfigurationIsVisible = "0"; defaultConfigurationName = "Release"; }; - "OBJ_76" = { + "OBJ_78" = { isa = "XCBuildConfiguration"; buildSettings = { ENABLE_TESTABILITY = "YES"; @@ -846,7 +866,7 @@ ); HEADER_SEARCH_PATHS = ( "$(inherited)", - "$(SRCROOT)/.build/checkouts/CRuntime.git-6497126089149231931/Sources/CRuntime" + "$(SRCROOT)/.build/checkouts/CRuntime.git--1672828878229581488/Sources/CRuntime" ); INFOPLIST_FILE = "Runtime.xcodeproj/Runtime_Info.plist"; LD_RUNPATH_SEARCH_PATHS = ( @@ -874,7 +894,7 @@ }; name = "Debug"; }; - "OBJ_77" = { + "OBJ_79" = { isa = "XCBuildConfiguration"; buildSettings = { ENABLE_TESTABILITY = "YES"; @@ -884,7 +904,7 @@ ); HEADER_SEARCH_PATHS = ( "$(inherited)", - "$(SRCROOT)/.build/checkouts/CRuntime.git-6497126089149231931/Sources/CRuntime" + "$(SRCROOT)/.build/checkouts/CRuntime.git--1672828878229581488/Sources/CRuntime" ); INFOPLIST_FILE = "Runtime.xcodeproj/Runtime_Info.plist"; LD_RUNPATH_SEARCH_PATHS = ( @@ -912,11 +932,23 @@ }; name = "Release"; }; - "OBJ_78" = { + "OBJ_8" = { + isa = "PBXGroup"; + children = ( + "OBJ_9", + "OBJ_12", + "OBJ_27", + "OBJ_36", + "OBJ_43", + "OBJ_48" + ); + name = "Runtime"; + path = "Sources/Runtime"; + sourceTree = "SOURCE_ROOT"; + }; + "OBJ_80" = { isa = "PBXSourcesBuildPhase"; files = ( - "OBJ_79", - "OBJ_80", "OBJ_81", "OBJ_82", "OBJ_83", @@ -954,66 +986,46 @@ "OBJ_115", "OBJ_116", "OBJ_117", - "OBJ_118" - ); - }; - "OBJ_79" = { - isa = "PBXBuildFile"; - fileRef = "OBJ_10"; - }; - "OBJ_8" = { - isa = "PBXGroup"; - children = ( - "OBJ_9", - "OBJ_12", - "OBJ_27", - "OBJ_36", - "OBJ_43", - "OBJ_48" + "OBJ_118", + "OBJ_119", + "OBJ_120" ); - name = "Runtime"; - path = "Sources/Runtime"; - sourceTree = "SOURCE_ROOT"; - }; - "OBJ_80" = { - isa = "PBXBuildFile"; - fileRef = "OBJ_11"; }; "OBJ_81" = { isa = "PBXBuildFile"; - fileRef = "OBJ_13"; + fileRef = "OBJ_10"; }; "OBJ_82" = { isa = "PBXBuildFile"; - fileRef = "OBJ_14"; + fileRef = "OBJ_11"; }; "OBJ_83" = { isa = "PBXBuildFile"; - fileRef = "OBJ_15"; + fileRef = "OBJ_13"; }; "OBJ_84" = { isa = "PBXBuildFile"; - fileRef = "OBJ_16"; + fileRef = "OBJ_14"; }; "OBJ_85" = { isa = "PBXBuildFile"; - fileRef = "OBJ_17"; + fileRef = "OBJ_15"; }; "OBJ_86" = { isa = "PBXBuildFile"; - fileRef = "OBJ_18"; + fileRef = "OBJ_16"; }; "OBJ_87" = { isa = "PBXBuildFile"; - fileRef = "OBJ_19"; + fileRef = "OBJ_17"; }; "OBJ_88" = { isa = "PBXBuildFile"; - fileRef = "OBJ_20"; + fileRef = "OBJ_18"; }; "OBJ_89" = { isa = "PBXBuildFile"; - fileRef = "OBJ_21"; + fileRef = "OBJ_19"; }; "OBJ_9" = { isa = "PBXGroup"; @@ -1027,50 +1039,50 @@ }; "OBJ_90" = { isa = "PBXBuildFile"; - fileRef = "OBJ_22"; + fileRef = "OBJ_20"; }; "OBJ_91" = { isa = "PBXBuildFile"; - fileRef = "OBJ_23"; + fileRef = "OBJ_21"; }; "OBJ_92" = { isa = "PBXBuildFile"; - fileRef = "OBJ_24"; + fileRef = "OBJ_22"; }; "OBJ_93" = { isa = "PBXBuildFile"; - fileRef = "OBJ_25"; + fileRef = "OBJ_23"; }; "OBJ_94" = { isa = "PBXBuildFile"; - fileRef = "OBJ_26"; + fileRef = "OBJ_24"; }; "OBJ_95" = { isa = "PBXBuildFile"; - fileRef = "OBJ_28"; + fileRef = "OBJ_25"; }; "OBJ_96" = { isa = "PBXBuildFile"; - fileRef = "OBJ_29"; + fileRef = "OBJ_26"; }; "OBJ_97" = { isa = "PBXBuildFile"; - fileRef = "OBJ_30"; + fileRef = "OBJ_28"; }; "OBJ_98" = { isa = "PBXBuildFile"; - fileRef = "OBJ_31"; + fileRef = "OBJ_29"; }; "OBJ_99" = { isa = "PBXBuildFile"; - fileRef = "OBJ_32"; + fileRef = "OBJ_30"; }; "Runtime::Runtime" = { isa = "PBXNativeTarget"; - buildConfigurationList = "OBJ_75"; + buildConfigurationList = "OBJ_77"; buildPhases = ( - "OBJ_78", - "OBJ_119" + "OBJ_80", + "OBJ_121" ); dependencies = ( ); @@ -1086,24 +1098,24 @@ }; "Runtime::RuntimePackageTests::ProductTarget" = { isa = "PBXAggregateTarget"; - buildConfigurationList = "OBJ_127"; + buildConfigurationList = "OBJ_129"; buildPhases = ( ); dependencies = ( - "OBJ_130" + "OBJ_132" ); name = "RuntimePackageTests"; productName = "RuntimePackageTests"; }; "Runtime::RuntimeTests" = { isa = "PBXNativeTarget"; - buildConfigurationList = "OBJ_132"; + buildConfigurationList = "OBJ_134"; buildPhases = ( - "OBJ_135", - "OBJ_143" + "OBJ_137", + "OBJ_145" ); dependencies = ( - "OBJ_145" + "OBJ_147" ); name = "RuntimeTests"; productName = "RuntimeTests"; @@ -1117,9 +1129,9 @@ }; "Runtime::SwiftPMPackageDescription" = { isa = "PBXNativeTarget"; - buildConfigurationList = "OBJ_121"; + buildConfigurationList = "OBJ_123"; buildPhases = ( - "OBJ_124" + "OBJ_126" ); dependencies = ( ); diff --git a/Sources/Runtime/Info.plist b/Sources/Runtime/Info.plist deleted file mode 100644 index 1007fd9..0000000 --- a/Sources/Runtime/Info.plist +++ /dev/null @@ -1,24 +0,0 @@ - - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.0 - CFBundleVersion - $(CURRENT_PROJECT_VERSION) - NSPrincipalClass - - - diff --git a/Tests/RuntimeTests/XCTestManifests.swift b/Tests/RuntimeTests/XCTestManifests.swift index 5e56d78..788758d 100644 --- a/Tests/RuntimeTests/XCTestManifests.swift +++ b/Tests/RuntimeTests/XCTestManifests.swift @@ -101,7 +101,7 @@ extension ValueWitnessTableTests { ] } -#if !os(macOS) +#if !os(macOS) && !os(iOS) public func __allTests() -> [XCTestCaseEntry] { return [ testCase(FactoryTests.__allTests),