From 775e9307866b89e380d83104debc2b82c4b7155c Mon Sep 17 00:00:00 2001 From: Aferdita Muriqi Date: Wed, 11 Jul 2018 12:59:50 -0400 Subject: [PATCH] Xcode Project cleanup --- r2-streamer-swift.xcodeproj/project.pbxproj | 162 +----------------- .../xcschemes/r2-streamer-swift.xcscheme | 2 +- 2 files changed, 4 insertions(+), 160 deletions(-) diff --git a/r2-streamer-swift.xcodeproj/project.pbxproj b/r2-streamer-swift.xcodeproj/project.pbxproj index ee231c4a..c5dc75aa 100644 --- a/r2-streamer-swift.xcodeproj/project.pbxproj +++ b/r2-streamer-swift.xcodeproj/project.pbxproj @@ -10,7 +10,6 @@ 03D011F0208020270097A87C /* Minizip.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03D011EF208020270097A87C /* Minizip.framework */; }; 57BFC4A7209C8EDC0018EC21 /* scripts in Resources */ = {isa = PBXBuildFile; fileRef = 57BFC4A5209C8EDC0018EC21 /* scripts */; }; 57BFC4A8209C8EDC0018EC21 /* styles in Resources */ = {isa = PBXBuildFile; fileRef = 57BFC4A6209C8EDC0018EC21 /* styles */; }; - 59501DD71E2FB0D700D1B4BF /* R2Streamer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 59501DCD1E2FB0D700D1B4BF /* R2Streamer.framework */; }; 59501DDE1E2FB0D700D1B4BF /* R2Streamer.h in Headers */ = {isa = PBXBuildFile; fileRef = 59501DD01E2FB0D700D1B4BF /* R2Streamer.h */; settings = {ATTRIBUTES = (Public, ); }; }; 59501E031E2FB16600D1B4BF /* Fetcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59501DE81E2FB16600D1B4BF /* Fetcher.swift */; }; 59501E041E2FB16600D1B4BF /* Container.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59501DEA1E2FB16600D1B4BF /* Container.swift */; }; @@ -29,32 +28,19 @@ AEBE1F3D20EF903700418960 /* fonts in Resources */ = {isa = PBXBuildFile; fileRef = AEBE1F3C20EF903700418960 /* fonts */; }; F300FA371F8E1D7700442332 /* DrmDecoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = F300FA361F8E1D7700442332 /* DrmDecoder.swift */; }; F302CA271F0CD32800835B22 /* DataExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F302CA261F0CD32800835B22 /* DataExtension.swift */; }; - F302CA281F0CD32800835B22 /* DataExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F302CA261F0CD32800835B22 /* DataExtension.swift */; }; F3098E711E7BFF87002358A1 /* NCXParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3098E701E7BFF87002358A1 /* NCXParser.swift */; }; F3098E731E7BFF9B002358A1 /* NavigationDocumentParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3098E721E7BFF9B002358A1 /* NavigationDocumentParser.swift */; }; F3098E751E7C02AD002358A1 /* MetadataParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3098E741E7C02AD002358A1 /* MetadataParser.swift */; }; - F309BBDD1E696F660002F800 /* PublicationServerTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = F309BBDC1E696F660002F800 /* PublicationServerTest.swift */; }; - F309BBE01E6970C30002F800 /* AEXML.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 59501E181E2FB1F500D1B4BF /* AEXML.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - F309BBE11E6970C30002F800 /* GCDWebServers.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 59501E191E2FB1F500D1B4BF /* GCDWebServers.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - F309BBE21E6970C30002F800 /* ObjectMapper.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 59501E1A1E2FB1F500D1B4BF /* ObjectMapper.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - F31D64D41E811EF5007BEA81 /* SmokeTestReferenceManifest.json in Resources */ = {isa = PBXBuildFile; fileRef = F31D64D31E811EF5007BEA81 /* SmokeTestReferenceManifest.json */; }; - F3292B041EA5F452004848DE /* FontDeobfuscationTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3292B031EA5F452004848DE /* FontDeobfuscationTest.swift */; }; F34510C21E938CAE0071C12C /* PublicationParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = F34510C11E938CAE0071C12C /* PublicationParser.swift */; }; F351DB721E54B6DB00D84BDF /* ContainerEpubDirectory.swift in Sources */ = {isa = PBXBuildFile; fileRef = F351DB711E54B6DB00D84BDF /* ContainerEpubDirectory.swift */; }; F351DB741E54B71A00D84BDF /* ContainerEpub.swift in Sources */ = {isa = PBXBuildFile; fileRef = F351DB731E54B71A00D84BDF /* ContainerEpub.swift */; }; F36B18F41E64638E005E22B4 /* StringExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F36B18F31E64638E005E22B4 /* StringExtension.swift */; }; - F37B63551E6DC44300C6A3AC /* SampleGenerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = F37B63541E6DC44300C6A3AC /* SampleGenerator.swift */; }; F37B635E1E6EDC6300C6A3AC /* Loggable.swift in Sources */ = {isa = PBXBuildFile; fileRef = F37B635D1E6EDC6300C6A3AC /* Loggable.swift */; }; F3B8F01C1E9CD76A0052D64B /* SMILParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3B8F01B1E9CD76A0052D64B /* SMILParser.swift */; }; F3B8F0221E9E244B0052D64B /* EncryptionParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3B8F0211E9E244B0052D64B /* EncryptionParser.swift */; }; F3B8F0241E9E62A50052D64B /* ContentFilter.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3B8F0231E9E62A50052D64B /* ContentFilter.swift */; }; F3D434241E8E9DA5008C379E /* CbzParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3D434231E8E9DA5008C379E /* CbzParser.swift */; }; F3D434261E8E9ED0008C379E /* ContainerCbz.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3D434251E8E9ED0008C379E /* ContainerCbz.swift */; }; - F3DE1D861E6971A800D05F74 /* AEXML.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 59501E181E2FB1F500D1B4BF /* AEXML.framework */; }; - F3DE1D871E6971A800D05F74 /* GCDWebServers.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 59501E191E2FB1F500D1B4BF /* GCDWebServers.framework */; }; - F3DE1D881E6971A800D05F74 /* ObjectMapper.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 59501E1A1E2FB1F500D1B4BF /* ObjectMapper.framework */; }; - F3DE1D8A1E69757100D05F74 /* PublicationParsingTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3DE1D891E69757100D05F74 /* PublicationParsingTest.swift */; }; - F3DE1ECC1E6980E100D05F74 /* Samples in Resources */ = {isa = PBXBuildFile; fileRef = F3DE1EC91E69801D00D05F74 /* Samples */; }; F3DEE6E21E5C5A53007FE63D /* OPFParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3DEE6E11E5C5A53007FE63D /* OPFParser.swift */; }; F3E0214F1E9277A80094CFF7 /* ContainerCbzDirectory.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3E0214E1E9277A80094CFF7 /* ContainerCbzDirectory.swift */; }; F3E6A2D61E70111500BBD81C /* Logger.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3E6A2D51E70111500BBD81C /* Logger.swift */; }; @@ -64,37 +50,9 @@ F3ED92D61E9F702E00E15C8F /* FontDecoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3ED92D51E9F702E00E15C8F /* FontDecoder.swift */; }; F3ED92DA1EA0AF0000E15C8F /* DataInputStream.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3ED92D91EA0AF0000E15C8F /* DataInputStream.swift */; }; F3ED92DC1EA0C93F00E15C8F /* CryptoSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F3ED92DB1EA0C93F00E15C8F /* CryptoSwift.framework */; }; - F3ED92DD1EA0C9DD00E15C8F /* CryptoSwift.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = F3ED92DB1EA0C93F00E15C8F /* CryptoSwift.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - F3ED92DE1EA0C9E400E15C8F /* CryptoSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F3ED92DB1EA0C93F00E15C8F /* CryptoSwift.framework */; }; F3F41E151FA0EBDE00F97737 /* DataCompression.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3F41E141FA0EBDE00F97737 /* DataCompression.swift */; }; /* End PBXBuildFile section */ -/* Begin PBXContainerItemProxy section */ - 59501DD81E2FB0D700D1B4BF /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 59501DC41E2FB0D700D1B4BF /* Project object */; - proxyType = 1; - remoteGlobalIDString = 59501DCC1E2FB0D700D1B4BF; - remoteInfo = R2Streamer; - }; -/* End PBXContainerItemProxy section */ - -/* Begin PBXCopyFilesBuildPhase section */ - F309BBDE1E6970A40002F800 /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - F3ED92DD1EA0C9DD00E15C8F /* CryptoSwift.framework in CopyFiles */, - F309BBE01E6970C30002F800 /* AEXML.framework in CopyFiles */, - F309BBE11E6970C30002F800 /* GCDWebServers.framework in CopyFiles */, - F309BBE21E6970C30002F800 /* ObjectMapper.framework in CopyFiles */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - /* Begin PBXFileReference section */ 03D011EF208020270097A87C /* Minizip.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Minizip.framework; path = Carthage/Build/iOS/Minizip.framework; sourceTree = ""; }; 57BFC4A5209C8EDC0018EC21 /* scripts */ = {isa = PBXFileReference; lastKnownFileType = folder; path = scripts; sourceTree = ""; }; @@ -102,7 +60,6 @@ 59501DCD1E2FB0D700D1B4BF /* R2Streamer.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = R2Streamer.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 59501DD01E2FB0D700D1B4BF /* R2Streamer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = R2Streamer.h; sourceTree = ""; }; 59501DD11E2FB0D700D1B4BF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 59501DD61E2FB0D700D1B4BF /* r2-streamer-swiftTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "r2-streamer-swiftTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; 59501DDD1E2FB0D700D1B4BF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 59501DE81E2FB16600D1B4BF /* Fetcher.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Fetcher.swift; sourceTree = ""; }; 59501DEA1E2FB16600D1B4BF /* Container.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Container.swift; sourceTree = ""; }; @@ -167,18 +124,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 59501DD31E2FB0D700D1B4BF /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 59501DD71E2FB0D700D1B4BF /* R2Streamer.framework in Frameworks */, - F3DE1D861E6971A800D05F74 /* AEXML.framework in Frameworks */, - F3DE1D871E6971A800D05F74 /* GCDWebServers.framework in Frameworks */, - F3DE1D881E6971A800D05F74 /* ObjectMapper.framework in Frameworks */, - F3ED92DE1EA0C9E400E15C8F /* CryptoSwift.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -196,7 +141,6 @@ isa = PBXGroup; children = ( 59501DCD1E2FB0D700D1B4BF /* R2Streamer.framework */, - 59501DD61E2FB0D700D1B4BF /* r2-streamer-swiftTests.xctest */, ); name = Products; sourceTree = ""; @@ -384,7 +328,7 @@ 59501DC91E2FB0D700D1B4BF /* Frameworks */, 59501DCA1E2FB0D700D1B4BF /* Headers */, 59501DCB1E2FB0D700D1B4BF /* Resources */, - 59501E1E1E2FB1FC00D1B4BF /* ShellScript */, + 59501E1E1E2FB1FC00D1B4BF /* Carthage Run Script */, ); buildRules = ( ); @@ -395,25 +339,6 @@ productReference = 59501DCD1E2FB0D700D1B4BF /* R2Streamer.framework */; productType = "com.apple.product-type.framework"; }; - 59501DD51E2FB0D700D1B4BF /* r2-streamer-swiftTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 59501DE41E2FB0D700D1B4BF /* Build configuration list for PBXNativeTarget "r2-streamer-swiftTests" */; - buildPhases = ( - 59501DD21E2FB0D700D1B4BF /* Sources */, - 59501DD31E2FB0D700D1B4BF /* Frameworks */, - 59501DD41E2FB0D700D1B4BF /* Resources */, - F309BBDE1E6970A40002F800 /* CopyFiles */, - ); - buildRules = ( - ); - dependencies = ( - 59501DD91E2FB0D700D1B4BF /* PBXTargetDependency */, - ); - name = "r2-streamer-swiftTests"; - productName = R2StreamerTests; - productReference = 59501DD61E2FB0D700D1B4BF /* r2-streamer-swiftTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -429,11 +354,6 @@ LastSwiftMigration = 0930; ProvisioningStyle = Manual; }; - 59501DD51E2FB0D700D1B4BF = { - CreatedOnToolsVersion = 8.2; - DevelopmentTeam = 327YA3JNGT; - ProvisioningStyle = Automatic; - }; }; }; buildConfigurationList = 59501DC71E2FB0D700D1B4BF /* Build configuration list for PBXProject "r2-streamer-swift" */; @@ -449,7 +369,6 @@ projectRoot = ""; targets = ( 59501DCC1E2FB0D700D1B4BF /* r2-streamer-swift */, - 59501DD51E2FB0D700D1B4BF /* r2-streamer-swiftTests */, ); }; /* End PBXProject section */ @@ -465,19 +384,10 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 59501DD41E2FB0D700D1B4BF /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - F31D64D41E811EF5007BEA81 /* SmokeTestReferenceManifest.json in Resources */, - F3DE1ECC1E6980E100D05F74 /* Samples in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 59501E1E1E2FB1FC00D1B4BF /* ShellScript */ = { + 59501E1E1E2FB1FC00D1B4BF /* Carthage Run Script */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -489,6 +399,7 @@ "$(SRCROOT)/Carthage/Build/iOS/CryptoSwift.framework", "$(SRCROOT)/Carthage/Build/iOS/Minizip.framework", ); + name = "Carthage Run Script"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; @@ -536,28 +447,8 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 59501DD21E2FB0D700D1B4BF /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - F37B63551E6DC44300C6A3AC /* SampleGenerator.swift in Sources */, - F309BBDD1E696F660002F800 /* PublicationServerTest.swift in Sources */, - F3292B041EA5F452004848DE /* FontDeobfuscationTest.swift in Sources */, - F3DE1D8A1E69757100D05F74 /* PublicationParsingTest.swift in Sources */, - F302CA281F0CD32800835B22 /* DataExtension.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXSourcesBuildPhase section */ -/* Begin PBXTargetDependency section */ - 59501DD91E2FB0D700D1B4BF /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 59501DCC1E2FB0D700D1B4BF /* r2-streamer-swift */; - targetProxy = 59501DD81E2FB0D700D1B4BF /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - /* Begin XCBuildConfiguration section */ 59501DDF1E2FB0D700D1B4BF /* Debug */ = { isa = XCBuildConfiguration; @@ -735,44 +626,6 @@ }; name = Release; }; - 59501DE51E2FB0D700D1B4BF /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - CLANG_ENABLE_CODE_COVERAGE = NO; - DEVELOPMENT_TEAM = 327YA3JNGT; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/iOS", - ); - HEADER_SEARCH_PATHS = "$(SRCROOT)/**"; - INFOPLIST_FILE = R2StreamerTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = org.readium.R2StreamerTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; - }; - name = Debug; - }; - 59501DE61E2FB0D700D1B4BF /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - CLANG_ENABLE_CODE_COVERAGE = NO; - DEVELOPMENT_TEAM = 327YA3JNGT; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/iOS", - ); - HEADER_SEARCH_PATHS = "$(SRCROOT)/**"; - INFOPLIST_FILE = R2StreamerTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = org.readium.R2StreamerTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; - }; - name = Release; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -794,15 +647,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 59501DE41E2FB0D700D1B4BF /* Build configuration list for PBXNativeTarget "r2-streamer-swiftTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 59501DE51E2FB0D700D1B4BF /* Debug */, - 59501DE61E2FB0D700D1B4BF /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; /* End XCConfigurationList section */ }; rootObject = 59501DC41E2FB0D700D1B4BF /* Project object */; diff --git a/r2-streamer-swift.xcodeproj/xcshareddata/xcschemes/r2-streamer-swift.xcscheme b/r2-streamer-swift.xcodeproj/xcshareddata/xcschemes/r2-streamer-swift.xcscheme index 4751ed48..a44c1d01 100644 --- a/r2-streamer-swift.xcodeproj/xcshareddata/xcschemes/r2-streamer-swift.xcscheme +++ b/r2-streamer-swift.xcodeproj/xcshareddata/xcschemes/r2-streamer-swift.xcscheme @@ -1,6 +1,6 @@