From 94dd049ee9ddae8118625849a960a130d078b6d9 Mon Sep 17 00:00:00 2001 From: Andre Stenvall Date: Sat, 21 Apr 2018 12:37:06 +0200 Subject: [PATCH 1/6] Initial Carthage project --- .../Carthage.xcodeproj/project.pbxproj | 448 ++++++++++++++++++ .../contents.xcworkspacedata | 7 + .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../Carthage/Carthage/AppDelegate.swift | 46 ++ .../AppIcon.appiconset/Contents.json | 98 ++++ .../Carthage/Assets.xcassets/Contents.json | 6 + .../Base.lproj/LaunchScreen.storyboard | 25 + Integration/Carthage/Carthage/Info.plist | 43 ++ .../CarthageTests/CarthageTests.swift | 36 ++ Integration/Carthage/CarthageTests/Info.plist | 22 + .../xcshareddata/IDEWorkspaceChecks.plist | 8 + 11 files changed, 747 insertions(+) create mode 100644 Integration/Carthage/Carthage.xcodeproj/project.pbxproj create mode 100644 Integration/Carthage/Carthage.xcodeproj/project.xcworkspace/contents.xcworkspacedata create mode 100644 Integration/Carthage/Carthage.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 Integration/Carthage/Carthage/AppDelegate.swift create mode 100644 Integration/Carthage/Carthage/Assets.xcassets/AppIcon.appiconset/Contents.json create mode 100644 Integration/Carthage/Carthage/Assets.xcassets/Contents.json create mode 100644 Integration/Carthage/Carthage/Base.lproj/LaunchScreen.storyboard create mode 100644 Integration/Carthage/Carthage/Info.plist create mode 100644 Integration/Carthage/CarthageTests/CarthageTests.swift create mode 100644 Integration/Carthage/CarthageTests/Info.plist create mode 100644 Integration/CocoaPods/CocoaPods.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/Integration/Carthage/Carthage.xcodeproj/project.pbxproj b/Integration/Carthage/Carthage.xcodeproj/project.pbxproj new file mode 100644 index 0000000..422f3e5 --- /dev/null +++ b/Integration/Carthage/Carthage.xcodeproj/project.pbxproj @@ -0,0 +1,448 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 50; + objects = { + +/* Begin PBXBuildFile section */ + 3F5031AC208B47AD00DB306B /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F5031AB208B47AD00DB306B /* AppDelegate.swift */; }; + 3F5031B3208B47AE00DB306B /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3F5031B2208B47AE00DB306B /* Assets.xcassets */; }; + 3F5031B6208B47AE00DB306B /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3F5031B4208B47AE00DB306B /* LaunchScreen.storyboard */; }; + 3F5031C1208B47AE00DB306B /* CarthageTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F5031C0208B47AE00DB306B /* CarthageTests.swift */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 3F5031BD208B47AE00DB306B /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 3F5031A0208B47AD00DB306B /* Project object */; + proxyType = 1; + remoteGlobalIDString = 3F5031A7208B47AD00DB306B; + remoteInfo = Carthage; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXFileReference section */ + 3F5031A8208B47AD00DB306B /* Carthage.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Carthage.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 3F5031AB208B47AD00DB306B /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 3F5031B2208B47AE00DB306B /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 3F5031B5208B47AE00DB306B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; + 3F5031B7208B47AE00DB306B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 3F5031BC208B47AE00DB306B /* CarthageTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CarthageTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 3F5031C0208B47AE00DB306B /* CarthageTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CarthageTests.swift; sourceTree = ""; }; + 3F5031C2208B47AE00DB306B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 3F5031A5208B47AD00DB306B /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 3F5031B9208B47AE00DB306B /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 3F50319F208B47AD00DB306B = { + isa = PBXGroup; + children = ( + 3F5031AA208B47AD00DB306B /* Carthage */, + 3F5031BF208B47AE00DB306B /* CarthageTests */, + 3F5031A9208B47AD00DB306B /* Products */, + ); + sourceTree = ""; + }; + 3F5031A9208B47AD00DB306B /* Products */ = { + isa = PBXGroup; + children = ( + 3F5031A8208B47AD00DB306B /* Carthage.app */, + 3F5031BC208B47AE00DB306B /* CarthageTests.xctest */, + ); + name = Products; + sourceTree = ""; + }; + 3F5031AA208B47AD00DB306B /* Carthage */ = { + isa = PBXGroup; + children = ( + 3F5031AB208B47AD00DB306B /* AppDelegate.swift */, + 3F5031B2208B47AE00DB306B /* Assets.xcassets */, + 3F5031B4208B47AE00DB306B /* LaunchScreen.storyboard */, + 3F5031B7208B47AE00DB306B /* Info.plist */, + ); + path = Carthage; + sourceTree = ""; + }; + 3F5031BF208B47AE00DB306B /* CarthageTests */ = { + isa = PBXGroup; + children = ( + 3F5031C0208B47AE00DB306B /* CarthageTests.swift */, + 3F5031C2208B47AE00DB306B /* Info.plist */, + ); + path = CarthageTests; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 3F5031A7208B47AD00DB306B /* Carthage */ = { + isa = PBXNativeTarget; + buildConfigurationList = 3F5031C5208B47AE00DB306B /* Build configuration list for PBXNativeTarget "Carthage" */; + buildPhases = ( + 3F5031A4208B47AD00DB306B /* Sources */, + 3F5031A5208B47AD00DB306B /* Frameworks */, + 3F5031A6208B47AD00DB306B /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = Carthage; + productName = Carthage; + productReference = 3F5031A8208B47AD00DB306B /* Carthage.app */; + productType = "com.apple.product-type.application"; + }; + 3F5031BB208B47AE00DB306B /* CarthageTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 3F5031C8208B47AE00DB306B /* Build configuration list for PBXNativeTarget "CarthageTests" */; + buildPhases = ( + 3F5031B8208B47AE00DB306B /* Sources */, + 3F5031B9208B47AE00DB306B /* Frameworks */, + 3F5031BA208B47AE00DB306B /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 3F5031BE208B47AE00DB306B /* PBXTargetDependency */, + ); + name = CarthageTests; + productName = CarthageTests; + productReference = 3F5031BC208B47AE00DB306B /* CarthageTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 3F5031A0208B47AD00DB306B /* Project object */ = { + isa = PBXProject; + attributes = { + LastSwiftUpdateCheck = 0930; + LastUpgradeCheck = 0930; + ORGANIZATIONNAME = SnapshotTest; + TargetAttributes = { + 3F5031A7208B47AD00DB306B = { + CreatedOnToolsVersion = 9.3; + }; + 3F5031BB208B47AE00DB306B = { + CreatedOnToolsVersion = 9.3; + TestTargetID = 3F5031A7208B47AD00DB306B; + }; + }; + }; + buildConfigurationList = 3F5031A3208B47AD00DB306B /* Build configuration list for PBXProject "Carthage" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 3F50319F208B47AD00DB306B; + productRefGroup = 3F5031A9208B47AD00DB306B /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 3F5031A7208B47AD00DB306B /* Carthage */, + 3F5031BB208B47AE00DB306B /* CarthageTests */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 3F5031A6208B47AD00DB306B /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 3F5031B6208B47AE00DB306B /* LaunchScreen.storyboard in Resources */, + 3F5031B3208B47AE00DB306B /* Assets.xcassets in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 3F5031BA208B47AE00DB306B /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 3F5031A4208B47AD00DB306B /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 3F5031AC208B47AD00DB306B /* AppDelegate.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 3F5031B8208B47AE00DB306B /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 3F5031C1208B47AE00DB306B /* CarthageTests.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + 3F5031BE208B47AE00DB306B /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 3F5031A7208B47AD00DB306B /* Carthage */; + targetProxy = 3F5031BD208B47AE00DB306B /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin PBXVariantGroup section */ + 3F5031B4208B47AE00DB306B /* LaunchScreen.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 3F5031B5208B47AE00DB306B /* Base */, + ); + name = LaunchScreen.storyboard; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 3F5031C3208B47AE00DB306B /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 11.3; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + }; + name = Debug; + }; + 3F5031C4208B47AE00DB306B /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 11.3; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + 3F5031C6208B47AE00DB306B /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_STYLE = Automatic; + INFOPLIST_FILE = Carthage/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.SnapshotTest.Carthage; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 4.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 3F5031C7208B47AE00DB306B /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_STYLE = Automatic; + INFOPLIST_FILE = Carthage/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.SnapshotTest.Carthage; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 4.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Release; + }; + 3F5031C9208B47AE00DB306B /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + INFOPLIST_FILE = CarthageTests/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.SnapshotTest.CarthageTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 4.0; + TARGETED_DEVICE_FAMILY = "1,2"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Carthage.app/Carthage"; + }; + name = Debug; + }; + 3F5031CA208B47AE00DB306B /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + INFOPLIST_FILE = CarthageTests/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.SnapshotTest.CarthageTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 4.0; + TARGETED_DEVICE_FAMILY = "1,2"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Carthage.app/Carthage"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 3F5031A3208B47AD00DB306B /* Build configuration list for PBXProject "Carthage" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 3F5031C3208B47AE00DB306B /* Debug */, + 3F5031C4208B47AE00DB306B /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 3F5031C5208B47AE00DB306B /* Build configuration list for PBXNativeTarget "Carthage" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 3F5031C6208B47AE00DB306B /* Debug */, + 3F5031C7208B47AE00DB306B /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 3F5031C8208B47AE00DB306B /* Build configuration list for PBXNativeTarget "CarthageTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 3F5031C9208B47AE00DB306B /* Debug */, + 3F5031CA208B47AE00DB306B /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 3F5031A0208B47AD00DB306B /* Project object */; +} diff --git a/Integration/Carthage/Carthage.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Integration/Carthage/Carthage.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..fc93b2d --- /dev/null +++ b/Integration/Carthage/Carthage.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/Integration/Carthage/Carthage.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Integration/Carthage/Carthage.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/Integration/Carthage/Carthage.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/Integration/Carthage/Carthage/AppDelegate.swift b/Integration/Carthage/Carthage/AppDelegate.swift new file mode 100644 index 0000000..01fed25 --- /dev/null +++ b/Integration/Carthage/Carthage/AppDelegate.swift @@ -0,0 +1,46 @@ +// +// AppDelegate.swift +// Carthage +// +// Created by Andre Stenvall on 2018-04-21. +// Copyright © 2018 SnapshotTest. All rights reserved. +// + +import UIKit + +@UIApplicationMain +class AppDelegate: UIResponder, UIApplicationDelegate { + + var window: UIWindow? + + + func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool { + // Override point for customization after application launch. + return true + } + + func applicationWillResignActive(_ application: UIApplication) { + // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state. + // Use this method to pause ongoing tasks, disable timers, and invalidate graphics rendering callbacks. Games should use this method to pause the game. + } + + func applicationDidEnterBackground(_ application: UIApplication) { + // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. + // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits. + } + + func applicationWillEnterForeground(_ application: UIApplication) { + // Called as part of the transition from the background to the active state; here you can undo many of the changes made on entering the background. + } + + func applicationDidBecomeActive(_ application: UIApplication) { + // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface. + } + + func applicationWillTerminate(_ application: UIApplication) { + // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:. + } + + +} + diff --git a/Integration/Carthage/Carthage/Assets.xcassets/AppIcon.appiconset/Contents.json b/Integration/Carthage/Carthage/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000..d8db8d6 --- /dev/null +++ b/Integration/Carthage/Carthage/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,98 @@ +{ + "images" : [ + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "3x" + }, + { + "idiom" : "iphone", + "size" : "29x29", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "29x29", + "scale" : "3x" + }, + { + "idiom" : "iphone", + "size" : "40x40", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "40x40", + "scale" : "3x" + }, + { + "idiom" : "iphone", + "size" : "60x60", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "60x60", + "scale" : "3x" + }, + { + "idiom" : "ipad", + "size" : "20x20", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "20x20", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "29x29", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "29x29", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "40x40", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "40x40", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "76x76", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "76x76", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "83.5x83.5", + "scale" : "2x" + }, + { + "idiom" : "ios-marketing", + "size" : "1024x1024", + "scale" : "1x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Integration/Carthage/Carthage/Assets.xcassets/Contents.json b/Integration/Carthage/Carthage/Assets.xcassets/Contents.json new file mode 100644 index 0000000..da4a164 --- /dev/null +++ b/Integration/Carthage/Carthage/Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Integration/Carthage/Carthage/Base.lproj/LaunchScreen.storyboard b/Integration/Carthage/Carthage/Base.lproj/LaunchScreen.storyboard new file mode 100644 index 0000000..f83f6fd --- /dev/null +++ b/Integration/Carthage/Carthage/Base.lproj/LaunchScreen.storyboard @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Integration/Carthage/Carthage/Info.plist b/Integration/Carthage/Carthage/Info.plist new file mode 100644 index 0000000..4222ac2 --- /dev/null +++ b/Integration/Carthage/Carthage/Info.plist @@ -0,0 +1,43 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1 + LSRequiresIPhoneOS + + UILaunchStoryboardName + LaunchScreen + UIRequiredDeviceCapabilities + + armv7 + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + + diff --git a/Integration/Carthage/CarthageTests/CarthageTests.swift b/Integration/Carthage/CarthageTests/CarthageTests.swift new file mode 100644 index 0000000..92e2eca --- /dev/null +++ b/Integration/Carthage/CarthageTests/CarthageTests.swift @@ -0,0 +1,36 @@ +// +// CarthageTests.swift +// CarthageTests +// +// Created by Andre Stenvall on 2018-04-21. +// Copyright © 2018 SnapshotTest. All rights reserved. +// + +import XCTest +@testable import Carthage + +class CarthageTests: XCTestCase { + + override func setUp() { + super.setUp() + // Put setup code here. This method is called before the invocation of each test method in the class. + } + + override func tearDown() { + // Put teardown code here. This method is called after the invocation of each test method in the class. + super.tearDown() + } + + func testExample() { + // This is an example of a functional test case. + // Use XCTAssert and related functions to verify your tests produce the correct results. + } + + func testPerformanceExample() { + // This is an example of a performance test case. + self.measure { + // Put the code you want to measure the time of here. + } + } + +} diff --git a/Integration/Carthage/CarthageTests/Info.plist b/Integration/Carthage/CarthageTests/Info.plist new file mode 100644 index 0000000..6c40a6c --- /dev/null +++ b/Integration/Carthage/CarthageTests/Info.plist @@ -0,0 +1,22 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + BNDL + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1 + + diff --git a/Integration/CocoaPods/CocoaPods.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Integration/CocoaPods/CocoaPods.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/Integration/CocoaPods/CocoaPods.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + From 651082b23cadf625469b8ec38f57d8ad2a080bd1 Mon Sep 17 00:00:00 2001 From: Andre Stenvall Date: Mon, 23 Apr 2018 09:21:29 +0200 Subject: [PATCH 2/6] Disable Bitcode --- SnapshotTest.xcodeproj/project.pbxproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/SnapshotTest.xcodeproj/project.pbxproj b/SnapshotTest.xcodeproj/project.pbxproj index f83a9c6..5e4c9d1 100644 --- a/SnapshotTest.xcodeproj/project.pbxproj +++ b/SnapshotTest.xcodeproj/project.pbxproj @@ -790,6 +790,7 @@ COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -849,6 +850,7 @@ COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_BITCODE = NO; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; From be940d3a98ec26d0d2de1a7d2bd9794a7c295322 Mon Sep 17 00:00:00 2001 From: Andre Stenvall Date: Mon, 23 Apr 2018 09:24:03 +0200 Subject: [PATCH 3/6] Extract testcase for integration tests to a shared directory --- Integration/CocoaPods/CocoaPods.xcodeproj/project.pbxproj | 8 ++++---- .../Tests/SnapshotTestTests.swift} | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) rename Integration/{CocoaPods/CocoaPodsTests/CocoaPodsTests.swift => Shared/Tests/SnapshotTestTests.swift} (99%) diff --git a/Integration/CocoaPods/CocoaPods.xcodeproj/project.pbxproj b/Integration/CocoaPods/CocoaPods.xcodeproj/project.pbxproj index f7e2af9..520aaf2 100644 --- a/Integration/CocoaPods/CocoaPods.xcodeproj/project.pbxproj +++ b/Integration/CocoaPods/CocoaPods.xcodeproj/project.pbxproj @@ -8,10 +8,10 @@ /* Begin PBXBuildFile section */ 0F797F813BC082EEFBC1AF59 /* Pods_CocoaPods.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD845447AC59C5642E50687C /* Pods_CocoaPods.framework */; }; + 3F665928208B4C44009FEEBC /* SnapshotTestTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F665927208B4C44009FEEBC /* SnapshotTestTests.swift */; }; 3FC4E3BA1FCDDC690025C844 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3FC4E3B91FCDDC690025C844 /* AppDelegate.swift */; }; 3FC4E3C11FCDDC690025C844 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3FC4E3C01FCDDC690025C844 /* Assets.xcassets */; }; 3FC4E3C41FCDDC690025C844 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3FC4E3C21FCDDC690025C844 /* LaunchScreen.storyboard */; }; - 3FC4E3CF1FCDDC6A0025C844 /* CocoaPodsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3FC4E3CE1FCDDC6A0025C844 /* CocoaPodsTests.swift */; }; FA5F597379ADEA51E0654722 /* Pods_CocoaPodsTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9B421D4732C4306B9E858C26 /* Pods_CocoaPodsTests.framework */; }; /* End PBXBuildFile section */ @@ -27,13 +27,13 @@ /* Begin PBXFileReference section */ 11FA3274E01BFCC5F8F78A87 /* Pods-CocoaPodsTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CocoaPodsTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-CocoaPodsTests/Pods-CocoaPodsTests.debug.xcconfig"; sourceTree = ""; }; + 3F665927208B4C44009FEEBC /* SnapshotTestTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SnapshotTestTests.swift; path = ../../Shared/Tests/SnapshotTestTests.swift; sourceTree = ""; }; 3FC4E3B61FCDDC690025C844 /* CocoaPods.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CocoaPods.app; sourceTree = BUILT_PRODUCTS_DIR; }; 3FC4E3B91FCDDC690025C844 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 3FC4E3C01FCDDC690025C844 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 3FC4E3C31FCDDC690025C844 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 3FC4E3C51FCDDC690025C844 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 3FC4E3CA1FCDDC6A0025C844 /* CocoaPodsTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CocoaPodsTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 3FC4E3CE1FCDDC6A0025C844 /* CocoaPodsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CocoaPodsTests.swift; sourceTree = ""; }; 3FC4E3D01FCDDC6A0025C844 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 9B421D4732C4306B9E858C26 /* Pods_CocoaPodsTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_CocoaPodsTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; A621AA189ADAA34CC006E1A7 /* Pods-CocoaPods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CocoaPods.release.xcconfig"; path = "Pods/Target Support Files/Pods-CocoaPods/Pods-CocoaPods.release.xcconfig"; sourceTree = ""; }; @@ -96,7 +96,7 @@ 3FC4E3CD1FCDDC6A0025C844 /* CocoaPodsTests */ = { isa = PBXGroup; children = ( - 3FC4E3CE1FCDDC6A0025C844 /* CocoaPodsTests.swift */, + 3F665927208B4C44009FEEBC /* SnapshotTestTests.swift */, 3FC4E3D01FCDDC6A0025C844 /* Info.plist */, ); path = CocoaPodsTests; @@ -340,7 +340,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 3FC4E3CF1FCDDC6A0025C844 /* CocoaPodsTests.swift in Sources */, + 3F665928208B4C44009FEEBC /* SnapshotTestTests.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Integration/CocoaPods/CocoaPodsTests/CocoaPodsTests.swift b/Integration/Shared/Tests/SnapshotTestTests.swift similarity index 99% rename from Integration/CocoaPods/CocoaPodsTests/CocoaPodsTests.swift rename to Integration/Shared/Tests/SnapshotTestTests.swift index 518a14e..88d386a 100644 --- a/Integration/CocoaPods/CocoaPodsTests/CocoaPodsTests.swift +++ b/Integration/Shared/Tests/SnapshotTestTests.swift @@ -25,6 +25,7 @@ // OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // +import UIKit import SnapshotTest class CocoaPodsTests: SnapshotTestCase { From ddd8b746d6d7a1a226959b15d6755c3f00df2f1f Mon Sep 17 00:00:00 2001 From: Andre Stenvall Date: Mon, 23 Apr 2018 09:24:59 +0200 Subject: [PATCH 4/6] Rename integration project for Carthage --- .../contents.xcworkspacedata | 7 -- .../project.pbxproj | 94 +++++++++++++------ .../contents.xcworkspacedata | 7 ++ .../xcshareddata/IDEWorkspaceChecks.plist | 0 .../AppDelegate.swift | 0 .../AppIcon.appiconset/Contents.json | 0 .../Assets.xcassets/Contents.json | 0 .../Base.lproj/LaunchScreen.storyboard | 0 .../Info.plist | 0 .../CarthageTests.swift | 2 +- .../Info.plist | 0 11 files changed, 71 insertions(+), 39 deletions(-) delete mode 100644 Integration/Carthage/Carthage.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename Integration/Carthage/{Carthage.xcodeproj => CarthageIntegration.xcodeproj}/project.pbxproj (78%) create mode 100644 Integration/Carthage/CarthageIntegration.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename Integration/Carthage/{Carthage.xcodeproj => CarthageIntegration.xcodeproj}/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist (100%) rename Integration/Carthage/{Carthage => CarthageIntegration}/AppDelegate.swift (100%) rename Integration/Carthage/{Carthage => CarthageIntegration}/Assets.xcassets/AppIcon.appiconset/Contents.json (100%) rename Integration/Carthage/{Carthage => CarthageIntegration}/Assets.xcassets/Contents.json (100%) rename Integration/Carthage/{Carthage => CarthageIntegration}/Base.lproj/LaunchScreen.storyboard (100%) rename Integration/Carthage/{Carthage => CarthageIntegration}/Info.plist (100%) rename Integration/Carthage/{CarthageTests => CarthageIntegrationTests}/CarthageTests.swift (96%) rename Integration/Carthage/{CarthageTests => CarthageIntegrationTests}/Info.plist (100%) diff --git a/Integration/Carthage/Carthage.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Integration/Carthage/Carthage.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index fc93b2d..0000000 --- a/Integration/Carthage/Carthage.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/Integration/Carthage/Carthage.xcodeproj/project.pbxproj b/Integration/Carthage/CarthageIntegration.xcodeproj/project.pbxproj similarity index 78% rename from Integration/Carthage/Carthage.xcodeproj/project.pbxproj rename to Integration/Carthage/CarthageIntegration.xcodeproj/project.pbxproj index 422f3e5..5d035cc 100644 --- a/Integration/Carthage/Carthage.xcodeproj/project.pbxproj +++ b/Integration/Carthage/CarthageIntegration.xcodeproj/project.pbxproj @@ -7,10 +7,12 @@ objects = { /* Begin PBXBuildFile section */ + 3F1113F8208BB0F10037AE4C /* SnapshotTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F66592C208BAF6A009FEEBC /* SnapshotTest.framework */; }; 3F5031AC208B47AD00DB306B /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F5031AB208B47AD00DB306B /* AppDelegate.swift */; }; 3F5031B3208B47AE00DB306B /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3F5031B2208B47AE00DB306B /* Assets.xcassets */; }; 3F5031B6208B47AE00DB306B /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3F5031B4208B47AE00DB306B /* LaunchScreen.storyboard */; }; 3F5031C1208B47AE00DB306B /* CarthageTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F5031C0208B47AE00DB306B /* CarthageTests.swift */; }; + 3F66592A208B4C5C009FEEBC /* SnapshotTestTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F665929208B4C5C009FEEBC /* SnapshotTestTests.swift */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -24,14 +26,16 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 3F5031A8208B47AD00DB306B /* Carthage.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Carthage.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 3F5031A8208B47AD00DB306B /* CarthageIntegration-iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "CarthageIntegration-iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 3F5031AB208B47AD00DB306B /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 3F5031B2208B47AE00DB306B /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 3F5031B5208B47AE00DB306B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 3F5031B7208B47AE00DB306B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 3F5031BC208B47AE00DB306B /* CarthageTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CarthageTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 3F5031BC208B47AE00DB306B /* CarthageIntegrationTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CarthageIntegrationTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 3F5031C0208B47AE00DB306B /* CarthageTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CarthageTests.swift; sourceTree = ""; }; 3F5031C2208B47AE00DB306B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 3F665929208B4C5C009FEEBC /* SnapshotTestTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SnapshotTestTests.swift; path = ../../Shared/Tests/SnapshotTestTests.swift; sourceTree = ""; }; + 3F66592C208BAF6A009FEEBC /* SnapshotTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SnapshotTest.framework; path = Carthage/Build/iOS/SnapshotTest.framework; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -46,6 +50,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 3F1113F8208BB0F10037AE4C /* SnapshotTest.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -55,22 +60,23 @@ 3F50319F208B47AD00DB306B = { isa = PBXGroup; children = ( - 3F5031AA208B47AD00DB306B /* Carthage */, - 3F5031BF208B47AE00DB306B /* CarthageTests */, + 3F5031AA208B47AD00DB306B /* CarthageIntegration */, + 3F5031BF208B47AE00DB306B /* CarthageIntegrationTests */, 3F5031A9208B47AD00DB306B /* Products */, + 3F66592B208BAF6A009FEEBC /* Frameworks */, ); sourceTree = ""; }; 3F5031A9208B47AD00DB306B /* Products */ = { isa = PBXGroup; children = ( - 3F5031A8208B47AD00DB306B /* Carthage.app */, - 3F5031BC208B47AE00DB306B /* CarthageTests.xctest */, + 3F5031A8208B47AD00DB306B /* CarthageIntegration-iOS.app */, + 3F5031BC208B47AE00DB306B /* CarthageIntegrationTests.xctest */, ); name = Products; sourceTree = ""; }; - 3F5031AA208B47AD00DB306B /* Carthage */ = { + 3F5031AA208B47AD00DB306B /* CarthageIntegration */ = { isa = PBXGroup; children = ( 3F5031AB208B47AD00DB306B /* AppDelegate.swift */, @@ -78,24 +84,33 @@ 3F5031B4208B47AE00DB306B /* LaunchScreen.storyboard */, 3F5031B7208B47AE00DB306B /* Info.plist */, ); - path = Carthage; + path = CarthageIntegration; sourceTree = ""; }; - 3F5031BF208B47AE00DB306B /* CarthageTests */ = { + 3F5031BF208B47AE00DB306B /* CarthageIntegrationTests */ = { isa = PBXGroup; children = ( + 3F665929208B4C5C009FEEBC /* SnapshotTestTests.swift */, 3F5031C0208B47AE00DB306B /* CarthageTests.swift */, 3F5031C2208B47AE00DB306B /* Info.plist */, ); - path = CarthageTests; + path = CarthageIntegrationTests; + sourceTree = ""; + }; + 3F66592B208BAF6A009FEEBC /* Frameworks */ = { + isa = PBXGroup; + children = ( + 3F66592C208BAF6A009FEEBC /* SnapshotTest.framework */, + ); + name = Frameworks; sourceTree = ""; }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 3F5031A7208B47AD00DB306B /* Carthage */ = { + 3F5031A7208B47AD00DB306B /* CarthageIntegration-iOS */ = { isa = PBXNativeTarget; - buildConfigurationList = 3F5031C5208B47AE00DB306B /* Build configuration list for PBXNativeTarget "Carthage" */; + buildConfigurationList = 3F5031C5208B47AE00DB306B /* Build configuration list for PBXNativeTarget "CarthageIntegration-iOS" */; buildPhases = ( 3F5031A4208B47AD00DB306B /* Sources */, 3F5031A5208B47AD00DB306B /* Frameworks */, @@ -105,14 +120,14 @@ ); dependencies = ( ); - name = Carthage; + name = "CarthageIntegration-iOS"; productName = Carthage; - productReference = 3F5031A8208B47AD00DB306B /* Carthage.app */; + productReference = 3F5031A8208B47AD00DB306B /* CarthageIntegration-iOS.app */; productType = "com.apple.product-type.application"; }; - 3F5031BB208B47AE00DB306B /* CarthageTests */ = { + 3F5031BB208B47AE00DB306B /* CarthageIntegrationTests */ = { isa = PBXNativeTarget; - buildConfigurationList = 3F5031C8208B47AE00DB306B /* Build configuration list for PBXNativeTarget "CarthageTests" */; + buildConfigurationList = 3F5031C8208B47AE00DB306B /* Build configuration list for PBXNativeTarget "CarthageIntegrationTests" */; buildPhases = ( 3F5031B8208B47AE00DB306B /* Sources */, 3F5031B9208B47AE00DB306B /* Frameworks */, @@ -123,9 +138,9 @@ dependencies = ( 3F5031BE208B47AE00DB306B /* PBXTargetDependency */, ); - name = CarthageTests; + name = CarthageIntegrationTests; productName = CarthageTests; - productReference = 3F5031BC208B47AE00DB306B /* CarthageTests.xctest */; + productReference = 3F5031BC208B47AE00DB306B /* CarthageIntegrationTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; /* End PBXNativeTarget section */ @@ -147,7 +162,7 @@ }; }; }; - buildConfigurationList = 3F5031A3208B47AD00DB306B /* Build configuration list for PBXProject "Carthage" */; + buildConfigurationList = 3F5031A3208B47AD00DB306B /* Build configuration list for PBXProject "CarthageIntegration" */; compatibilityVersion = "Xcode 9.3"; developmentRegion = en; hasScannedForEncodings = 0; @@ -160,8 +175,8 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 3F5031A7208B47AD00DB306B /* Carthage */, - 3F5031BB208B47AE00DB306B /* CarthageTests */, + 3F5031A7208B47AD00DB306B /* CarthageIntegration-iOS */, + 3F5031BB208B47AE00DB306B /* CarthageIntegrationTests */, ); }; /* End PBXProject section */ @@ -199,6 +214,7 @@ buildActionMask = 2147483647; files = ( 3F5031C1208B47AE00DB306B /* CarthageTests.swift in Sources */, + 3F66592A208B4C5C009FEEBC /* SnapshotTestTests.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -207,7 +223,7 @@ /* Begin PBXTargetDependency section */ 3F5031BE208B47AE00DB306B /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 3F5031A7208B47AD00DB306B /* Carthage */; + target = 3F5031A7208B47AD00DB306B /* CarthageIntegration-iOS */; targetProxy = 3F5031BD208B47AE00DB306B /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -343,7 +359,11 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; - INFOPLIST_FILE = Carthage/Info.plist; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Carthage/Build/iOS", + ); + INFOPLIST_FILE = CarthageIntegration/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -360,7 +380,11 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; - INFOPLIST_FILE = Carthage/Info.plist; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Carthage/Build/iOS", + ); + INFOPLIST_FILE = CarthageIntegration/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -378,7 +402,11 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; - INFOPLIST_FILE = CarthageTests/Info.plist; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Carthage/Build/iOS", + ); + INFOPLIST_FILE = CarthageIntegrationTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -388,7 +416,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Carthage.app/Carthage"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/CarthageIntegration-iOS.app/CarthageIntegration-iOS"; }; name = Debug; }; @@ -398,7 +426,11 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; - INFOPLIST_FILE = CarthageTests/Info.plist; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Carthage/Build/iOS", + ); + INFOPLIST_FILE = CarthageIntegrationTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -408,14 +440,14 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Carthage.app/Carthage"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/CarthageIntegration-iOS.app/CarthageIntegration-iOS"; }; name = Release; }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 3F5031A3208B47AD00DB306B /* Build configuration list for PBXProject "Carthage" */ = { + 3F5031A3208B47AD00DB306B /* Build configuration list for PBXProject "CarthageIntegration" */ = { isa = XCConfigurationList; buildConfigurations = ( 3F5031C3208B47AE00DB306B /* Debug */, @@ -424,7 +456,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 3F5031C5208B47AE00DB306B /* Build configuration list for PBXNativeTarget "Carthage" */ = { + 3F5031C5208B47AE00DB306B /* Build configuration list for PBXNativeTarget "CarthageIntegration-iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( 3F5031C6208B47AE00DB306B /* Debug */, @@ -433,7 +465,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 3F5031C8208B47AE00DB306B /* Build configuration list for PBXNativeTarget "CarthageTests" */ = { + 3F5031C8208B47AE00DB306B /* Build configuration list for PBXNativeTarget "CarthageIntegrationTests" */ = { isa = XCConfigurationList; buildConfigurations = ( 3F5031C9208B47AE00DB306B /* Debug */, diff --git a/Integration/Carthage/CarthageIntegration.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Integration/Carthage/CarthageIntegration.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..ef65f1f --- /dev/null +++ b/Integration/Carthage/CarthageIntegration.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/Integration/Carthage/Carthage.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Integration/Carthage/CarthageIntegration.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from Integration/Carthage/Carthage.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to Integration/Carthage/CarthageIntegration.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/Integration/Carthage/Carthage/AppDelegate.swift b/Integration/Carthage/CarthageIntegration/AppDelegate.swift similarity index 100% rename from Integration/Carthage/Carthage/AppDelegate.swift rename to Integration/Carthage/CarthageIntegration/AppDelegate.swift diff --git a/Integration/Carthage/Carthage/Assets.xcassets/AppIcon.appiconset/Contents.json b/Integration/Carthage/CarthageIntegration/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from Integration/Carthage/Carthage/Assets.xcassets/AppIcon.appiconset/Contents.json rename to Integration/Carthage/CarthageIntegration/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/Integration/Carthage/Carthage/Assets.xcassets/Contents.json b/Integration/Carthage/CarthageIntegration/Assets.xcassets/Contents.json similarity index 100% rename from Integration/Carthage/Carthage/Assets.xcassets/Contents.json rename to Integration/Carthage/CarthageIntegration/Assets.xcassets/Contents.json diff --git a/Integration/Carthage/Carthage/Base.lproj/LaunchScreen.storyboard b/Integration/Carthage/CarthageIntegration/Base.lproj/LaunchScreen.storyboard similarity index 100% rename from Integration/Carthage/Carthage/Base.lproj/LaunchScreen.storyboard rename to Integration/Carthage/CarthageIntegration/Base.lproj/LaunchScreen.storyboard diff --git a/Integration/Carthage/Carthage/Info.plist b/Integration/Carthage/CarthageIntegration/Info.plist similarity index 100% rename from Integration/Carthage/Carthage/Info.plist rename to Integration/Carthage/CarthageIntegration/Info.plist diff --git a/Integration/Carthage/CarthageTests/CarthageTests.swift b/Integration/Carthage/CarthageIntegrationTests/CarthageTests.swift similarity index 96% rename from Integration/Carthage/CarthageTests/CarthageTests.swift rename to Integration/Carthage/CarthageIntegrationTests/CarthageTests.swift index 92e2eca..8b64980 100644 --- a/Integration/Carthage/CarthageTests/CarthageTests.swift +++ b/Integration/Carthage/CarthageIntegrationTests/CarthageTests.swift @@ -7,7 +7,7 @@ // import XCTest -@testable import Carthage +@testable import CarthageIntegration class CarthageTests: XCTestCase { diff --git a/Integration/Carthage/CarthageTests/Info.plist b/Integration/Carthage/CarthageIntegrationTests/Info.plist similarity index 100% rename from Integration/Carthage/CarthageTests/Info.plist rename to Integration/Carthage/CarthageIntegrationTests/Info.plist From 5f14eb0b0f760c7047657e4297ca8b00d71c2198 Mon Sep 17 00:00:00 2001 From: Andre Stenvall Date: Mon, 23 Apr 2018 09:29:01 +0200 Subject: [PATCH 5/6] Add Cartfile for integration project --- Integration/Carthage/.gitignore | 1 + Integration/Carthage/Cartfile | 1 + 2 files changed, 2 insertions(+) create mode 100644 Integration/Carthage/.gitignore create mode 100644 Integration/Carthage/Cartfile diff --git a/Integration/Carthage/.gitignore b/Integration/Carthage/.gitignore new file mode 100644 index 0000000..97c11c9 --- /dev/null +++ b/Integration/Carthage/.gitignore @@ -0,0 +1 @@ +Carthage/ \ No newline at end of file diff --git a/Integration/Carthage/Cartfile b/Integration/Carthage/Cartfile new file mode 100644 index 0000000..85d462a --- /dev/null +++ b/Integration/Carthage/Cartfile @@ -0,0 +1 @@ +git "../../" "HEAD" \ No newline at end of file From 1859e41260af9eb99293cd75cb1daa8cd96089eb Mon Sep 17 00:00:00 2001 From: Andre Stenvall Date: Mon, 23 Apr 2018 12:53:40 +0200 Subject: [PATCH 6/6] Add Carthage integration to build.sh --- build.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build.sh b/build.sh index 9c1ddf0..a6056a0 100755 --- a/build.sh +++ b/build.sh @@ -11,4 +11,9 @@ set -o pipefail && xcodebuild -project "SnapshotTest.xcodeproj" -scheme "Snapsho pushd Integration/CocoaPods/ bundle exec pod install set -o pipefail && xcodebuild -workspace "CocoaPods.xcworkspace" -scheme "CocoaPods" -configuration "Debug" -sdk "iphonesimulator" -destination "name=iPhone 7" clean test | bundle exec xcpretty +popd + +## Carthage +pushd Integration/Carthage/ +carthage update popd \ No newline at end of file