From d8dcfabe081e9660d84c2fc46e5576c7d1fb6992 Mon Sep 17 00:00:00 2001 From: Kyle Van Essen Date: Sun, 14 Jun 2020 15:20:07 -0700 Subject: [PATCH] Fix additional build errors --- BlueprintLists.podspec | 2 -- Demo/Demo.xcodeproj/project.pbxproj | 8 ++++++-- .../xcshareddata/xcschemes/Demo.xcscheme | 14 ++++++++++++++ Internal Pods/Snapshot/Sources/Snapshot.swift | 11 ++++++++--- Listable.podspec | 2 ++ Podfile | 2 -- Podfile.lock | 6 +++--- 7 files changed, 33 insertions(+), 12 deletions(-) diff --git a/BlueprintLists.podspec b/BlueprintLists.podspec index e3b04146e..3717bb1fc 100644 --- a/BlueprintLists.podspec +++ b/BlueprintLists.podspec @@ -23,9 +23,7 @@ Pod::Spec.new do |s| test_spec.framework = 'XCTest' - test_spec.library = 'swiftUIKit' test_spec.library = 'swiftsimd' - test_spec.library = 'swiftCoreGraphics' test_spec.requires_app_host = true end diff --git a/Demo/Demo.xcodeproj/project.pbxproj b/Demo/Demo.xcodeproj/project.pbxproj index f0bde30d4..20b9a8abf 100644 --- a/Demo/Demo.xcodeproj/project.pbxproj +++ b/Demo/Demo.xcodeproj/project.pbxproj @@ -33,9 +33,9 @@ 0AEB96BC22FBCBA600341DFF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 0AEB96BA22FBCBA600341DFF /* LaunchScreen.storyboard */; }; 0AEB96E222FBCC1D00341DFF /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0AEB96D322FBCC1D00341DFF /* AppDelegate.swift */; }; 27B4DCE9244F88BE001BA9D9 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 27B4DCE8244F88BE001BA9D9 /* Assets.xcassets */; }; + 2B8804652490844A003BB351 /* SpacingCustomizationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B8804642490844A003BB351 /* SpacingCustomizationViewController.swift */; }; 397F72040272B0B12CAD9AEE /* Pods_Test_Targets.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CF78F98F7ED38C2DC8078110 /* Pods_Test_Targets.framework */; }; B223A33A769988911ED5C0E1 /* Pods_Demo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A1C03134338F55F7FD12551D /* Pods_Demo.framework */; }; - 2B8804652490844A003BB351 /* SpacingCustomizationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B8804642490844A003BB351 /* SpacingCustomizationViewController.swift */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -70,8 +70,8 @@ 0AEB96BD22FBCBA600341DFF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 0AEB96D322FBCC1D00341DFF /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 27B4DCE8244F88BE001BA9D9 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - A1C03134338F55F7FD12551D /* Pods_Demo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Demo.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 2B8804642490844A003BB351 /* SpacingCustomizationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpacingCustomizationViewController.swift; sourceTree = ""; }; + A1C03134338F55F7FD12551D /* Pods_Demo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Demo.framework; sourceTree = BUILT_PRODUCTS_DIR; }; C55FB4CC847A4E4F271441F7 /* Pods-Test Targets.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Test Targets.debug.xcconfig"; path = "Target Support Files/Pods-Test Targets/Pods-Test Targets.debug.xcconfig"; sourceTree = ""; }; C9EC890C0D683F6A704AB9ED /* Pods-Demo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Demo.debug.xcconfig"; path = "Target Support Files/Pods-Demo/Pods-Demo.debug.xcconfig"; sourceTree = ""; }; CF78F98F7ED38C2DC8078110 /* Pods_Test_Targets.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Test_Targets.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -343,9 +343,11 @@ files = ( ); inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Demo/Pods-Demo-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Demo/Pods-Demo-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -358,9 +360,11 @@ files = ( ); inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Test Targets/Pods-Test Targets-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Test Targets/Pods-Test Targets-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; diff --git a/Demo/Demo.xcodeproj/xcshareddata/xcschemes/Demo.xcscheme b/Demo/Demo.xcodeproj/xcshareddata/xcschemes/Demo.xcscheme index df13cb76b..34ac6e22d 100644 --- a/Demo/Demo.xcodeproj/xcshareddata/xcschemes/Demo.xcscheme +++ b/Demo/Demo.xcodeproj/xcshareddata/xcschemes/Demo.xcscheme @@ -34,6 +34,20 @@ ReferencedContainer = "container:../Pods/Pods.xcodeproj"> + + + + let data = try OutputFormat.snapshotData(with: rendering) let existingData = try self.existingData(at: url) - - try data.write(to: url) if let existingData = existingData { - try OutputFormat.validate(render: rendering, existingData: existingData) + do { + try OutputFormat.validate(render: rendering, existingData: existingData) + } catch { + try data.write(to: url) + throw error + } + } else { + try data.write(to: url) } } catch { self.onFail("Snapshot test '\(iteration.name)' with format '\(OutputFormat.self)' failed with error: \(error).", testFilePath, line) diff --git a/Listable.podspec b/Listable.podspec index 1d21ead82..a4d0c638b 100644 --- a/Listable.podspec +++ b/Listable.podspec @@ -14,6 +14,8 @@ Pod::Spec.new do |s| s.source_files = 'Listable/Sources/**/*.{swift}' + s.weak_framework = 'SwiftUI' + s.test_spec 'Tests' do |test_spec| test_spec.source_files = 'Listable/Tests/**/*.{swift}' test_spec.ios.resource_bundle = { 'ListableTestsResources' => 'Listable/Tests/Resources/**/*.*' } diff --git a/Podfile b/Podfile index 34dc465e6..6c25123d1 100644 --- a/Podfile +++ b/Podfile @@ -7,8 +7,6 @@ workspace 'Demo/Demo.xcworkspace' use_frameworks! -install! 'cocoapods', :disable_input_output_paths => true - target 'Demo' do # Local Pods pod 'Listable', :path => 'Listable.podspec', :testspecs => ['Tests'] diff --git a/Podfile.lock b/Podfile.lock index 8289576a5..12716195b 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -43,13 +43,13 @@ EXTERNAL SOURCES: :path: Internal Pods/Snapshot/Snapshot.podspec SPEC CHECKSUMS: - BlueprintLists: a519f227f4166d4b1839843577be1b357e3f1129 + BlueprintLists: 8205a31e8621df570e36e8944c58957a01f0015a BlueprintUI: 8b1c1cfd7ed73444ebfb66b54ad539cec6b600d9 BlueprintUICommonControls: 31bfe6642633a1fde476bc566c565f5473343427 EnglishDictionary: f03968b9382ddc5c8dd63535efbf783c6cd45f1c - Listable: 69ca7d96517cbabf7be508a9c14cbd1d5e781bc2 + Listable: 1d9b1abdc0768de6a68ae03b3ce279e06fb3b8f1 Snapshot: cda3414db426919d09f775434b36289c8e864183 -PODFILE CHECKSUM: 52b4a833b4d667434863e647d30cdefe154afbb8 +PODFILE CHECKSUM: a349f718f680605b20497e3cd84f96c83a8f59e7 COCOAPODS: 1.9.3