diff --git a/.travis.yml b/.travis.yml index f260b41..3d81ff4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,16 @@ -language: objective-c -osx_image: xcode8 +language: swift +osx_image: xcode8.3 env: -- DESTINATION="OS=10.0,name=iPhone 7" SCHEME="Bender" SDK=iphonesimulator10.0 - + matrix: + - DESTINATION="OS=10.0,name=iPhone 7" SCHEME="MetalBender" SDK=iphonesimulator10.3 + - DESTINATION="generic/platform=iOS" SCHEME="MetalBender" SDK=iphoneos10.3 + - DESTINATION="OS=10.0,name=iPhone 7" SCHEME="Example" SDK=iphonesimulator10.3 + - DESTINATION="generic/platform=iOS" SCHEME="Example" SDK=iphoneos10.3 before_install: - brew update - brew outdated carthage || brew upgrade carthage - carthage update --platform iOS - gem install xcpretty --no-rdoc --no-ri --no-document --quiet - script: -- xcodebuild clean build -project Bender.xcodeproj -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO test | xcpretty -c -- xcodebuild test -project Bender.xcodeproj -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO test | xcpretty -c +- xcodebuild clean -workspace Bender.xcworkspace -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO | xcpretty -c; test ${PIPESTATUS[0]} -eq 0 +- xcodebuild build -workspace Bender.xcworkspace -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO | xcpretty -c; test ${PIPESTATUS[0]} -eq 0 diff --git a/Bender.xcodeproj/project.pbxproj b/Bender.xcodeproj/project.pbxproj index 3ddec15..c0cc33e 100644 --- a/Bender.xcodeproj/project.pbxproj +++ b/Bender.xcodeproj/project.pbxproj @@ -88,8 +88,7 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 103E67F4764279069AF23A03 /* Pods_Bender.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Bender.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 28F8287D1C494B2C00330CF4 /* Bender.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Bender.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 28F8287D1C494B2C00330CF4 /* MetalBender.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MetalBender.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 28F828801C494B2C00330CF4 /* Bender.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Bender.h; sourceTree = ""; }; 28F828821C494B2C00330CF4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 46354BC31EEF320700B083EF /* DependencyListBuilder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DependencyListBuilder.swift; sourceTree = ""; }; @@ -197,7 +196,7 @@ 28F8287E1C494B2C00330CF4 /* Products */ = { isa = PBXGroup; children = ( - 28F8287D1C494B2C00330CF4 /* Bender.framework */, + 28F8287D1C494B2C00330CF4 /* MetalBender.framework */, ); name = Products; sourceTree = ""; @@ -386,7 +385,6 @@ 8F0693391F352B3C0004D3E9 /* MetalPerformanceShadersStub.framework */, 8F7C22311F30EE5B006DA176 /* MetalPerformanceShadersProxy.framework */, 8FAB772B1ECC87E20050AB16 /* SwiftProtobuf.framework */, - 103E67F4764279069AF23A03 /* Pods_Bender.framework */, ); name = Frameworks; sourceTree = ""; @@ -416,9 +414,9 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 28F8287C1C494B2C00330CF4 /* Bender */ = { + 28F8287C1C494B2C00330CF4 /* MetalBender */ = { isa = PBXNativeTarget; - buildConfigurationList = 28F828911C494B2C00330CF4 /* Build configuration list for PBXNativeTarget "Bender" */; + buildConfigurationList = 28F828911C494B2C00330CF4 /* Build configuration list for PBXNativeTarget "MetalBender" */; buildPhases = ( 28F828781C494B2C00330CF4 /* Sources */, 28F828791C494B2C00330CF4 /* Frameworks */, @@ -429,9 +427,9 @@ ); dependencies = ( ); - name = Bender; + name = MetalBender; productName = Bender; - productReference = 28F8287D1C494B2C00330CF4 /* Bender.framework */; + productReference = 28F8287D1C494B2C00330CF4 /* MetalBender.framework */; productType = "com.apple.product-type.framework"; }; /* End PBXNativeTarget section */ @@ -461,7 +459,7 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 28F8287C1C494B2C00330CF4 /* Bender */, + 28F8287C1C494B2C00330CF4 /* MetalBender */, ); }; /* End PBXProject section */ @@ -713,7 +711,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 28F828911C494B2C00330CF4 /* Build configuration list for PBXNativeTarget "Bender" */ = { + 28F828911C494B2C00330CF4 /* Build configuration list for PBXNativeTarget "MetalBender" */ = { isa = XCConfigurationList; buildConfigurations = ( 28F828921C494B2C00330CF4 /* Debug */, diff --git a/Bender.xcodeproj/xcshareddata/xcschemes/Bender.xcscheme b/Bender.xcodeproj/xcshareddata/xcschemes/MetalBender.xcscheme similarity index 70% rename from Bender.xcodeproj/xcshareddata/xcschemes/Bender.xcscheme rename to Bender.xcodeproj/xcshareddata/xcschemes/MetalBender.xcscheme index b31715e..9de6b66 100644 --- a/Bender.xcodeproj/xcshareddata/xcschemes/Bender.xcscheme +++ b/Bender.xcodeproj/xcshareddata/xcschemes/MetalBender.xcscheme @@ -1,6 +1,6 @@ @@ -28,26 +28,7 @@ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv = "YES"> - - - - - - - - @@ -65,8 +46,8 @@ @@ -83,8 +64,8 @@ diff --git a/Example/Example.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj index 2d71571..19d40c4 100644 --- a/Example/Example.xcodeproj/project.pbxproj +++ b/Example/Example.xcodeproj/project.pbxproj @@ -33,8 +33,6 @@ 8F7C22351F30EE6E006DA176 /* MetalPerformanceShadersProxy.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 8F7C22331F30EE6E006DA176 /* MetalPerformanceShadersProxy.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 8F9F358E1EDCC5FE005F4DAE /* InstanceNormTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8F9F358D1EDCC5FE005F4DAE /* InstanceNormTests.swift */; }; 8FA6BAB91ED5AB2D004450C0 /* RandomLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8FA6BAB81ED5AB2D004450C0 /* RandomLoader.swift */; }; - 8FA8E3251EC0BE7300E8BAD8 /* Bender.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8F9CAB221D89C756006E1824 /* Bender.framework */; }; - 8FA8E3261EC0BE7300E8BAD8 /* Bender.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 8F9CAB221D89C756006E1824 /* Bender.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 8FAD35061ED48825004B69DA /* tftest.pbtxt in Resources */ = {isa = PBXBuildFile; fileRef = 8FAD35051ED48825004B69DA /* tftest.pbtxt */; }; 8FCD3E991ED8A88200B1AAE6 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8FCD3E981ED8A88200B1AAE6 /* ViewController.swift */; }; 8FCD3E9F1ED8B5DF00B1AAE6 /* g_and_w2.pb in Resources */ = {isa = PBXBuildFile; fileRef = 8FCD3E9E1ED8B5DF00B1AAE6 /* g_and_w2.pb */; }; @@ -54,6 +52,8 @@ CFAD253D1ED7EA090003C4FA /* TextureConversionTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = CFAD253A1ED7EA090003C4FA /* TextureConversionTest.swift */; }; CFAD253F1ED7EA930003C4FA /* TestData.swift in Sources */ = {isa = PBXBuildFile; fileRef = CFAD253E1ED7EA930003C4FA /* TestData.swift */; }; CFAD25411ED7EB5A0003C4FA /* CompletionSerializer.swift in Sources */ = {isa = PBXBuildFile; fileRef = CFAD25401ED7EB5A0003C4FA /* CompletionSerializer.swift */; }; + CFC14FF91F396B6A00ACC4A1 /* MetalBender.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CFC14FF81F396B6A00ACC4A1 /* MetalBender.framework */; }; + CFC14FFA1F396B6A00ACC4A1 /* MetalBender.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = CFC14FF81F396B6A00ACC4A1 /* MetalBender.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -64,20 +64,6 @@ remoteGlobalIDString = 28F828CB1C4B714D00330CF4; remoteInfo = Example; }; - 8F9CAB211D89C756006E1824 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 287D0A741C4B7B26004566D6 /* Bender.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 28F8287D1C494B2C00330CF4; - remoteInfo = Bender; - }; - 8FA8E3271EC0BE7300E8BAD8 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 287D0A741C4B7B26004566D6 /* Bender.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 28F8287C1C494B2C00330CF4; - remoteInfo = Bender; - }; /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -87,8 +73,8 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( + CFC14FFA1F396B6A00ACC4A1 /* MetalBender.framework in Embed Frameworks */, 8F7C22351F30EE6E006DA176 /* MetalPerformanceShadersProxy.framework in Embed Frameworks */, - 8FA8E3261EC0BE7300E8BAD8 /* Bender.framework in Embed Frameworks */, 8F0693381F3527F60004D3E9 /* MetalPerformanceShadersStub.framework in Embed Frameworks */, 8FCD3EA81ED8BE1F00B1AAE6 /* SwiftProtobuf.framework in Embed Frameworks */, ); @@ -99,7 +85,6 @@ /* Begin PBXFileReference section */ 287D0A711C4B7877004566D6 /* ExampleUITests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExampleUITests.swift; sourceTree = ""; }; - 287D0A741C4B7B26004566D6 /* Bender.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Bender.xcodeproj; path = ../Bender.xcodeproj; sourceTree = ""; }; 28F828CC1C4B714D00330CF4 /* Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Example.app; sourceTree = BUILT_PRODUCTS_DIR; }; 28F828CF1C4B714D00330CF4 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AppDelegate.swift; path = Example/AppDelegate.swift; sourceTree = ""; }; 28F828D11C4B714D00330CF4 /* StyleTransferViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = StyleTransferViewController.swift; path = Example/StyleTransferViewController.swift; sourceTree = ""; }; @@ -145,7 +130,7 @@ CFAD253A1ED7EA090003C4FA /* TextureConversionTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TextureConversionTest.swift; path = Example/Tests/TextureConversionTest.swift; sourceTree = ""; }; CFAD253E1ED7EA930003C4FA /* TestData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TestData.swift; path = Example/Tests/Helpers/TestData.swift; sourceTree = ""; }; CFAD25401ED7EB5A0003C4FA /* CompletionSerializer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = CompletionSerializer.swift; path = Example/Tests/Helpers/CompletionSerializer.swift; sourceTree = ""; }; - DC52F68BC56AC40E8DF9A1DE /* Pods_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + CFC14FF81F396B6A00ACC4A1 /* MetalBender.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = MetalBender.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -153,8 +138,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + CFC14FF91F396B6A00ACC4A1 /* MetalBender.framework in Frameworks */, 8F7C22341F30EE6E006DA176 /* MetalPerformanceShadersProxy.framework in Frameworks */, - 8FA8E3251EC0BE7300E8BAD8 /* Bender.framework in Frameworks */, 8F0693371F3527F60004D3E9 /* MetalPerformanceShadersStub.framework in Frameworks */, 8FCD3EA71ED8BE1F00B1AAE6 /* SwiftProtobuf.framework in Frameworks */, ); @@ -173,13 +158,10 @@ 28F828C31C4B714D00330CF4 = { isa = PBXGroup; children = ( - 8F0693361F3527F60004D3E9 /* MetalPerformanceShadersStub.framework */, - 8F7C22331F30EE6E006DA176 /* MetalPerformanceShadersProxy.framework */, 28F828CE1C4B714D00330CF4 /* Example */, 28F828E31C4B714D00330CF4 /* ExampleUITests */, 28F828CD1C4B714D00330CF4 /* Products */, 8FCD3E9D1ED8AC8200B1AAE6 /* Frameworks */, - 287D0A741C4B7B26004566D6 /* Bender.xcodeproj */, ); sourceTree = ""; }; @@ -256,14 +238,6 @@ name = "Custom Layers"; sourceTree = ""; }; - 8F9CAB1D1D89C755006E1824 /* Products */ = { - isa = PBXGroup; - children = ( - 8F9CAB221D89C756006E1824 /* Bender.framework */, - ); - name = Products; - sourceTree = ""; - }; 8FCD3E971ED8A58D00B1AAE6 /* Controllers */ = { isa = PBXGroup; children = ( @@ -289,8 +263,10 @@ 8FCD3E9D1ED8AC8200B1AAE6 /* Frameworks */ = { isa = PBXGroup; children = ( + CFC14FF81F396B6A00ACC4A1 /* MetalBender.framework */, + 8F0693361F3527F60004D3E9 /* MetalPerformanceShadersStub.framework */, + 8F7C22331F30EE6E006DA176 /* MetalPerformanceShadersProxy.framework */, 8FCD3EA61ED8BE1F00B1AAE6 /* SwiftProtobuf.framework */, - DC52F68BC56AC40E8DF9A1DE /* Pods_Example.framework */, ); name = Frameworks; sourceTree = ""; @@ -336,7 +312,6 @@ buildRules = ( ); dependencies = ( - 8FA8E3281EC0BE7300E8BAD8 /* PBXTargetDependency */, ); name = Example; productName = Example; @@ -394,12 +369,6 @@ mainGroup = 28F828C31C4B714D00330CF4; productRefGroup = 28F828CD1C4B714D00330CF4 /* Products */; projectDirPath = ""; - projectReferences = ( - { - ProductGroup = 8F9CAB1D1D89C755006E1824 /* Products */; - ProjectRef = 287D0A741C4B7B26004566D6 /* Bender.xcodeproj */; - }, - ); projectRoot = ""; targets = ( 28F828CB1C4B714D00330CF4 /* Example */, @@ -408,16 +377,6 @@ }; /* End PBXProject section */ -/* Begin PBXReferenceProxy section */ - 8F9CAB221D89C756006E1824 /* Bender.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Bender.framework; - remoteRef = 8F9CAB211D89C756006E1824 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; -/* End PBXReferenceProxy section */ - /* Begin PBXResourcesBuildPhase section */ 28F828CA1C4B714D00330CF4 /* Resources */ = { isa = PBXResourcesBuildPhase; @@ -497,11 +456,6 @@ target = 28F828CB1C4B714D00330CF4 /* Example */; targetProxy = 28F828E11C4B714D00330CF4 /* PBXContainerItemProxy */; }; - 8FA8E3281EC0BE7300E8BAD8 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = Bender; - targetProxy = 8FA8E3271EC0BE7300E8BAD8 /* PBXContainerItemProxy */; - }; /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ @@ -615,8 +569,8 @@ 28F828EA1C4B714D00330CF4 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; DEVELOPMENT_TEAM = 6F2G55XL63; FRAMEWORK_SEARCH_PATHS = ( @@ -629,16 +583,18 @@ OTHER_SWIFT_FLAGS = "\"-Xfrontend\" \"-warn-long-function-bodies=150\""; PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.Example; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 3.0; + TARGETED_DEVICE_FAMILY = 1; }; name = Debug; }; 28F828EB1C4B714D00330CF4 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; DEVELOPMENT_TEAM = 6F2G55XL63; FRAMEWORK_SEARCH_PATHS = ( @@ -651,8 +607,10 @@ OTHER_SWIFT_FLAGS = "\"-Xfrontend\" \"-warn-long-function-bodies=150\""; PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.Example; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 3.0; + TARGETED_DEVICE_FAMILY = 1; }; name = Release; }; diff --git a/Example/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme b/Example/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme index fe8f6e3..c540d5a 100644 --- a/Example/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme +++ b/Example/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme @@ -6,6 +6,20 @@ parallelizeBuildables = "YES" buildImplicitDependencies = "YES"> + + + +