ios / Masonry · Commits

Go to a project

Authored by Jonas Budelmann
Commit 86e1db0a920d42d5e35d486352f0c220136bcf10 1 parent 2825bc84

tests now run locally with XCTest, travis still broken

Inline Side-by-side
Showing 2 changed files with 10 additions and 20 deletions
... ... @@ -18,7 +18,6 @@
DD2F3B3B17CDF44500770F03 /* NSObject+MASSubscriptSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = DD2F3B3917CDF44500770F03 /* NSObject+MASSubscriptSupport.h */; };
DD38397E17A5170F00C35C17 /* MASConstraintDelegateMock.m in Sources */ = {isa = PBXBuildFile; fileRef = DD38397D17A5170F00C35C17 /* MASConstraintDelegateMock.m */; };
DD52F1AE179CA93B005CD195 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD52F1AD179CA93B005CD195 /* Foundation.framework */; };
DD52F1BD179CA93B005CD195 /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD52F1BC179CA93B005CD195 /* SenTestingKit.framework */; };
DD52F1C0179CA93B005CD195 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD52F1AD179CA93B005CD195 /* Foundation.framework */; };
DD52F1C3179CA93B005CD195 /* libMasonry.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DD52F1AA179CA93B005CD195 /* libMasonry.a */; };
DD52F1C9179CA93B005CD195 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = DD52F1C7179CA93B005CD195 /* InfoPlist.strings */; };
... ... @@ -40,7 +39,6 @@
DD7CC16F17ACCF22007A469E /* NSLayoutConstraint+MASDebugAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = DD7CC16D17ACCF22007A469E /* NSLayoutConstraint+MASDebugAdditions.m */; };
DD93AAF317ACB647008F7D21 /* MASLayoutConstraint.h in Headers */ = {isa = PBXBuildFile; fileRef = DD93AAF117ACB647008F7D21 /* MASLayoutConstraint.h */; };
DD93AAF417ACB647008F7D21 /* MASLayoutConstraint.m in Sources */ = {isa = PBXBuildFile; fileRef = DD93AAF217ACB647008F7D21 /* MASLayoutConstraint.m */; };
DDA4D70217C0253B0076BD87 /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD52F1BC179CA93B005CD195 /* SenTestingKit.framework */; };
DDA4D70617C0253B0076BD87 /* Masonry.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DDA4D6EB17C0253B0076BD87 /* Masonry.framework */; };
DDA4D71617C025930076BD87 /* Masonry.h in Headers */ = {isa = PBXBuildFile; fileRef = DD52F1ED179CAAEE005CD195 /* Masonry.h */; settings = {ATTRIBUTES = (Public, ); }; };
DDA4D71717C0259A0076BD87 /* View+MASAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = DD52F1E5179CAACA005CD195 /* View+MASAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
... ... @@ -116,8 +114,7 @@
DD52F1AA179CA93B005CD195 /* libMasonry.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libMasonry.a; sourceTree = BUILT_PRODUCTS_DIR; };
DD52F1AD179CA93B005CD195 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
DD52F1B1179CA93B005CD195 /* Masonry-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Masonry-Prefix.pch"; sourceTree = "<group>"; };
DD52F1BB179CA93B005CD195 /* Masonry iOS Tests.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Masonry iOS Tests.octest"; sourceTree = BUILT_PRODUCTS_DIR; };
DD52F1BC179CA93B005CD195 /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; };
DD52F1BB179CA93B005CD195 /* Masonry iOS Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Masonry iOS Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
DD52F1C6179CA93B005CD195 /* MasonryTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "MasonryTests-Info.plist"; sourceTree = "<group>"; };
DD52F1C8179CA93B005CD195 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
DD52F1D6179CAA71005CD195 /* MasonryTests-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MasonryTests-Prefix.pch"; sourceTree = "<group>"; };
... ... @@ -143,7 +140,7 @@
DDA4D6EF17C0253B0076BD87 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
DDA4D6F017C0253B0076BD87 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
DDA4D6F117C0253B0076BD87 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
DDA4D70117C0253B0076BD87 /* Masonry Mac Tests.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Masonry Mac Tests.octest"; sourceTree = BUILT_PRODUCTS_DIR; };
DDA4D70117C0253B0076BD87 /* Masonry Mac Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Masonry Mac Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
DDA5752917C17C3E0010F88E /* MASUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MASUtilities.h; sourceTree = "<group>"; };
DDB4A51417DC492F0055EDFE /* NSLayoutConstraint+MASDebugAdditionsSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSLayoutConstraint+MASDebugAdditionsSpec.m"; sourceTree = "<group>"; };
DDB682AC17DC484900159454 /* View+MASAdditionsSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "View+MASAdditionsSpec.m"; sourceTree = "<group>"; };
... ... @@ -167,7 +164,6 @@
buildActionMask = 2147483647;
files = (
9CEFD2DA17CCF7A90014B0FF /* UIKit.framework in Frameworks */,
DD52F1BD179CA93B005CD195 /* SenTestingKit.framework in Frameworks */,
DD52F1C0179CA93B005CD195 /* Foundation.framework in Frameworks */,
DD52F1C3179CA93B005CD195 /* libMasonry.a in Frameworks */,
9DAD1ADAED04452C8C32D34E /* libPods-Masonry iOS Tests.a in Frameworks */,
... ... @@ -187,7 +183,6 @@
buildActionMask = 2147483647;
files = (
9CEFD2DB17CCF80D0014B0FF /* Cocoa.framework in Frameworks */,
DDA4D70217C0253B0076BD87 /* SenTestingKit.framework in Frameworks */,
DDA4D70617C0253B0076BD87 /* Masonry.framework in Frameworks */,
81A5AEFE5B9041ABBC74F614 /* libPods-Masonry Mac Tests.a in Frameworks */,
);
... ... @@ -212,9 +207,9 @@
isa = PBXGroup;
children = (
DD52F1AA179CA93B005CD195 /* libMasonry.a */,
DD52F1BB179CA93B005CD195 /* Masonry iOS Tests.octest */,
DD52F1BB179CA93B005CD195 /* Masonry iOS Tests.xctest */,
DDA4D6EB17C0253B0076BD87 /* Masonry.framework */,
DDA4D70117C0253B0076BD87 /* Masonry Mac Tests.octest */,
DDA4D70117C0253B0076BD87 /* Masonry Mac Tests.xctest */,
);
name = Products;
sourceTree = "<group>";
... ... @@ -225,7 +220,6 @@
9CEFD2D817CCF7210014B0FF /* UIKit.framework */,
9C61C40017CCF3F0001A124A /* Cocoa.framework */,
DD52F1AD179CA93B005CD195 /* Foundation.framework */,
DD52F1BC179CA93B005CD195 /* SenTestingKit.framework */,
DDA4D6EE17C0253B0076BD87 /* Other Frameworks */,
8A66D49D177E45D1B8059268 /* libPods-Masonry Mac Tests.a */,
3FF61518EB0044E0A00EB62E /* libPods-Masonry iOS Tests.a */,
... ... @@ -408,8 +402,8 @@
);
name = "Masonry iOS Tests";
productName = MasonryTests;
productReference = DD52F1BB179CA93B005CD195 /* Masonry iOS Tests.octest */;
productType = "com.apple.product-type.bundle";
productReference = DD52F1BB179CA93B005CD195 /* Masonry iOS Tests.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
};
DDA4D6EA17C0253B0076BD87 /* Masonry Mac */ = {
isa = PBXNativeTarget;
... ... @@ -448,8 +442,8 @@
);
name = "Masonry Mac Tests";
productName = "Masonry MacTests";
productReference = DDA4D70117C0253B0076BD87 /* Masonry Mac Tests.octest */;
productType = "com.apple.product-type.bundle";
productReference = DDA4D70117C0253B0076BD87 /* Masonry Mac Tests.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
};
/* End PBXNativeTarget section */
... ... @@ -792,7 +786,6 @@
GCC_PREFIX_HEADER = "MasonryTests/MasonryTests-Prefix.pch";
INFOPLIST_FILE = "MasonryTests/MasonryTests-Info.plist";
PRODUCT_NAME = "$(TARGET_NAME)";
WRAPPER_EXTENSION = octest;
};
name = Debug;
};
... ... @@ -809,7 +802,6 @@
GCC_PREFIX_HEADER = "MasonryTests/MasonryTests-Prefix.pch";
INFOPLIST_FILE = "MasonryTests/MasonryTests-Info.plist";
PRODUCT_NAME = "$(TARGET_NAME)";
WRAPPER_EXTENSION = octest;
};
name = Release;
};
... ... @@ -880,7 +872,6 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
VALID_ARCHS = "x86_64 i386";
WRAPPER_EXTENSION = octest;
};
name = Debug;
};
... ... @@ -901,7 +892,6 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
VALID_ARCHS = "x86_64 i386";
WRAPPER_EXTENSION = octest;
};
name = Release;
};
... ...
target 'Masonry Mac Tests', :exclusive => true do
platform :osx, '10.7'
pod 'Specta', '0.1.11'
pod 'Specta'
pod 'Expecta'
end
target 'Masonry iOS Tests', :exclusive => true do
platform :ios, '6.0'
pod 'Specta', '0.1.11'
pod 'Specta'
pod 'Expecta'
end
\ No newline at end of file
... ...