Some fixes around WebKit snapshots (pointfreeco#42)

* Some fixes around WebKit snapshots * Bump CIs * Update * Update iphoneos
sger · Apr 3, 2018 · 0a86107 · 0a86107
1 parent d194eca
commit 0a86107
Show file tree

Hide file tree

Showing 21 changed files with 501 additions and 251 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,7 +3,7 @@ version: 2
 jobs:
   build:
     macos:
-      xcode: "9.0"
+      xcode: "9.3.0"
 
     steps:
       - checkout

diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,7 @@ env:
 language: generic
 sudo: required
 dist: trusty
-osx_image: xcode9.1
+osx_image: xcode9.3
 install:
   - if [ $TRAVIS_OS_NAME = linux ]; then
       eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)";

diff --git a/Development.xcconfig b/Development.xcconfig
@@ -0,0 +1 @@
+OTHER_SWIFT_FLAGS=$(inherited) -Xfrontend -warn-long-expression-type-checking=80
diff --git a/Makefile b/Makefile
@@ -1,3 +1,6 @@
+xcodeproj:
+	swift package generate-xcodeproj --xcconfig-overrides=Development.xcconfig
+
 test-linux:
 	docker build --tag snapshot-testing . \
 		&& docker run --rm snapshot-testing
@@ -13,7 +16,7 @@ test-ios:
 	set -o pipefail && \
 	xcodebuild test \
 		-scheme SnapshotTesting-Package \
-		-destination platform="iOS Simulator,name=iPhone 8,OS=11.0" \
+		-destination platform="iOS Simulator,name=iPhone 8,OS=11.3" \
 		| xcpretty
 
 test-swift:

diff --git a/SnapshotTesting.xcodeproj/Diff_Info.plist b/SnapshotTesting.xcodeproj/Diff_Info.plist
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plist version="1.0">
+<dict>
+  <key>CFBundleDevelopmentRegion</key>
+  <string>en</string>
+  <key>CFBundleExecutable</key>
+  <string>$(EXECUTABLE_NAME)</string>
+  <key>CFBundleIdentifier</key>
+  <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+  <key>CFBundleInfoDictionaryVersion</key>
+  <string>6.0</string>
+  <key>CFBundleName</key>
+  <string>$(PRODUCT_NAME)</string>
+  <key>CFBundlePackageType</key>
+  <string>FMWK</string>
+  <key>CFBundleShortVersionString</key>
+  <string>1.0</string>
+  <key>CFBundleSignature</key>
+  <string>????</string>
+  <key>CFBundleVersion</key>
+  <string>$(CURRENT_PROJECT_VERSION)</string>
+  <key>NSPrincipalClass</key>
+  <string></string>
+</dict>
+</plist>
diff --git a/SnapshotTesting.xcodeproj/GeneratedModuleMap/WKSnapshotConfigurationShim/module.modulemap b/SnapshotTesting.xcodeproj/GeneratedModuleMap/WKSnapshotConfigurationShim/module.modulemap
@@ -0,0 +1,4 @@
+module WKSnapshotConfigurationShim {
+    umbrella header "/Users/stephen/Developer/pointfreeco/swift-snapshot-testing/Sources/WKSnapshotConfigurationShim/include/WKSnapshotConfigurationShim.h"
+    export *
+}
diff --git a/SnapshotTesting.xcodeproj/SnapshotTestingTests_Info.plist b/SnapshotTesting.xcodeproj/SnapshotTestingTests_Info.plist
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plist version="1.0">
+<dict>
+  <key>CFBundleDevelopmentRegion</key>
+  <string>en</string>
+  <key>CFBundleExecutable</key>
+  <string>$(EXECUTABLE_NAME)</string>
+  <key>CFBundleIdentifier</key>
+  <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+  <key>CFBundleInfoDictionaryVersion</key>
+  <string>6.0</string>
+  <key>CFBundleName</key>
+  <string>$(PRODUCT_NAME)</string>
+  <key>CFBundlePackageType</key>
+  <string>BNDL</string>
+  <key>CFBundleShortVersionString</key>
+  <string>1.0</string>
+  <key>CFBundleSignature</key>
+  <string>????</string>
+  <key>CFBundleVersion</key>
+  <string>$(CURRENT_PROJECT_VERSION)</string>
+  <key>NSPrincipalClass</key>
+  <string></string>
+</dict>
+</plist>
diff --git a/SnapshotTesting.xcodeproj/SnapshotTesting_Info.plist b/SnapshotTesting.xcodeproj/SnapshotTesting_Info.plist
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plist version="1.0">
+<dict>
+  <key>CFBundleDevelopmentRegion</key>
+  <string>en</string>
+  <key>CFBundleExecutable</key>
+  <string>$(EXECUTABLE_NAME)</string>
+  <key>CFBundleIdentifier</key>
+  <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+  <key>CFBundleInfoDictionaryVersion</key>
+  <string>6.0</string>
+  <key>CFBundleName</key>
+  <string>$(PRODUCT_NAME)</string>
+  <key>CFBundlePackageType</key>
+  <string>FMWK</string>
+  <key>CFBundleShortVersionString</key>
+  <string>1.0</string>
+  <key>CFBundleSignature</key>
+  <string>????</string>
+  <key>CFBundleVersion</key>
+  <string>$(CURRENT_PROJECT_VERSION)</string>
+  <key>NSPrincipalClass</key>
+  <string></string>
+</dict>
+</plist>
diff --git a/SnapshotTesting.xcodeproj/WKSnapshotConfigurationShim_Info.plist b/SnapshotTesting.xcodeproj/WKSnapshotConfigurationShim_Info.plist
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plist version="1.0">
+<dict>
+  <key>CFBundleDevelopmentRegion</key>
+  <string>en</string>
+  <key>CFBundleExecutable</key>
+  <string>$(EXECUTABLE_NAME)</string>
+  <key>CFBundleIdentifier</key>
+  <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+  <key>CFBundleInfoDictionaryVersion</key>
+  <string>6.0</string>
+  <key>CFBundleName</key>
+  <string>$(PRODUCT_NAME)</string>
+  <key>CFBundlePackageType</key>
+  <string>FMWK</string>
+  <key>CFBundleShortVersionString</key>
+  <string>1.0</string>
+  <key>CFBundleSignature</key>
+  <string>????</string>
+  <key>CFBundleVersion</key>
+  <string>$(CURRENT_PROJECT_VERSION)</string>
+  <key>NSPrincipalClass</key>
+  <string></string>
+</dict>
+</plist>
diff --git a/SnapshotTesting.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/SnapshotTesting.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/SnapshotTesting.xcodeproj/xcshareddata/xcschemes/SnapshotTesting-Package.xcscheme b/SnapshotTesting.xcodeproj/xcshareddata/xcschemes/SnapshotTesting-Package.xcscheme
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "9999"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "SnapshotTesting::Diff"
+               BuildableName = "Diff.framework"
+               BlueprintName = "Diff"
+               ReferencedContainer = "container:SnapshotTesting.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "SnapshotTesting::SnapshotTesting"
+               BuildableName = "SnapshotTesting.framework"
+               BlueprintName = "SnapshotTesting"
+               ReferencedContainer = "container:SnapshotTesting.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "SnapshotTesting::WKSnapshotConfigurationShim"
+               BuildableName = "WKSnapshotConfigurationShim.framework"
+               BlueprintName = "WKSnapshotConfigurationShim"
+               ReferencedContainer = "container:SnapshotTesting.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "SnapshotTesting::SnapshotTestingTests"
+               BuildableName = "SnapshotTestingTests.xctest"
+               BlueprintName = "SnapshotTestingTests"
+               ReferencedContainer = "container:SnapshotTesting.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "SnapshotTesting::Diff"
+            BuildableName = "Diff.framework"
+            BlueprintName = "Diff"
+            ReferencedContainer = "container:SnapshotTesting.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/SnapshotTesting.xcodeproj/xcshareddata/xcschemes/xcschememanagement.plist b/SnapshotTesting.xcodeproj/xcshareddata/xcschemes/xcschememanagement.plist
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plist version="1.0">
+<dict>
+  <key>SchemeUserState</key>
+  <dict>
+    <key>SnapshotTesting-Package.xcscheme</key>
+    <dict></dict>
+  </dict>
+  <key>SuppressBuildableAutocreation</key>
+  <dict></dict>
+</dict>
+</plist>
diff --git a/Sources/Diff/Diff.swift b/Sources/Diff/Diff.swift
@@ -35,9 +35,10 @@ public func diff<A: Hashable>(_ fst: [A], _ snd: [A]) -> [Diff<A>] {
     let sndDiff = snd.isEmpty ? [] : [Diff(type: .second, elements: snd)]
     return fstDiff + sndDiff
   } else {
-    return diff(Array(fst.prefix(upTo: fstIdx)), Array(snd.prefix(upTo: sndIdx)))
-      + [Diff(type: .both, elements: Array(fst.suffix(from: fstIdx).prefix(len)))]
-      + diff(Array(fst.suffix(from: fstIdx + len)), Array(snd.suffix(from: sndIdx + len)))
+    let fstDiff = diff(Array(fst.prefix(upTo: fstIdx)), Array(snd.prefix(upTo: sndIdx)))
+    let midDiff = [Diff(type: .both, elements: Array(fst.suffix(from: fstIdx).prefix(len)))]
+    let lstDiff = diff(Array(fst.suffix(from: fstIdx + len)), Array(snd.suffix(from: sndIdx + len)))
+    return fstDiff + midDiff + lstDiff
   }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ version: 2 @@
     jobs:
       build:
         macos:
-          xcode: "9.0"
+          xcode: "9.3.0"
         steps:
           - checkout
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		OTHER_SWIFT_FLAGS=$(inherited) -Xfrontend -warn-long-expression-type-checking=80