From 978c6c79ac045fbd467569d68a5053eaa688df8f Mon Sep 17 00:00:00 2001 From: Nick Velloff Date: Sat, 30 Apr 2016 03:35:15 -0700 Subject: [PATCH] fixes --- .../project.pbxproj | 9 +++--- GridLogo.xcodeproj/project.pbxproj | 31 +++++-------------- ...{GridAnimatedLogo.swift => GridLogo.swift} | 2 +- 3 files changed, 13 insertions(+), 29 deletions(-) rename GridLogo/{GridAnimatedLogo.swift => GridLogo.swift} (99%) diff --git a/Example/GridLogo-example/GridLogo-example.xcodeproj/project.pbxproj b/Example/GridLogo-example/GridLogo-example.xcodeproj/project.pbxproj index 7027aef..900b213 100644 --- a/Example/GridLogo-example/GridLogo-example.xcodeproj/project.pbxproj +++ b/Example/GridLogo-example/GridLogo-example.xcodeproj/project.pbxproj @@ -7,15 +7,16 @@ objects = { /* Begin PBXBuildFile section */ + 766EF3951CD4C08F00473CEA /* GridLogo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 766EF3941CD4C08F00473CEA /* GridLogo.swift */; }; 76D9B92D1CD47391001A8ADF /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76D9B92C1CD47391001A8ADF /* AppDelegate.swift */; }; 76D9B92F1CD47391001A8ADF /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76D9B92E1CD47391001A8ADF /* ViewController.swift */; }; 76D9B9321CD47391001A8ADF /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 76D9B9301CD47391001A8ADF /* Main.storyboard */; }; 76D9B9341CD47391001A8ADF /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 76D9B9331CD47391001A8ADF /* Assets.xcassets */; }; 76D9B9371CD47391001A8ADF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 76D9B9351CD47391001A8ADF /* LaunchScreen.storyboard */; }; - 76D9B9421CD4747E001A8ADF /* GridAnimatedLogo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76D9B93F1CD4747E001A8ADF /* GridAnimatedLogo.swift */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 766EF3941CD4C08F00473CEA /* GridLogo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GridLogo.swift; sourceTree = ""; }; 76D9B9291CD47391001A8ADF /* GridLogo-Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "GridLogo-Example.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 76D9B92C1CD47391001A8ADF /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 76D9B92E1CD47391001A8ADF /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; @@ -23,7 +24,6 @@ 76D9B9331CD47391001A8ADF /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 76D9B9361CD47391001A8ADF /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 76D9B9381CD47391001A8ADF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 76D9B93F1CD4747E001A8ADF /* GridAnimatedLogo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GridAnimatedLogo.swift; sourceTree = ""; }; 76D9B9401CD4747E001A8ADF /* GridLogo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GridLogo.h; sourceTree = ""; }; /* End PBXFileReference section */ @@ -71,8 +71,8 @@ 76D9B93E1CD4739E001A8ADF /* GridLogo */ = { isa = PBXGroup; children = ( - 76D9B93F1CD4747E001A8ADF /* GridAnimatedLogo.swift */, 76D9B9401CD4747E001A8ADF /* GridLogo.h */, + 766EF3941CD4C08F00473CEA /* GridLogo.swift */, ); name = GridLogo; path = ../../GridLogo; @@ -149,9 +149,9 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 766EF3951CD4C08F00473CEA /* GridLogo.swift in Sources */, 76D9B92F1CD47391001A8ADF /* ViewController.swift in Sources */, 76D9B92D1CD47391001A8ADF /* AppDelegate.swift in Sources */, - 76D9B9421CD4747E001A8ADF /* GridAnimatedLogo.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -303,6 +303,7 @@ 76D9B93D1CD47391001A8ADF /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; diff --git a/GridLogo.xcodeproj/project.pbxproj b/GridLogo.xcodeproj/project.pbxproj index 680063e..a69ade8 100644 --- a/GridLogo.xcodeproj/project.pbxproj +++ b/GridLogo.xcodeproj/project.pbxproj @@ -10,7 +10,7 @@ 01F3780D1B3F13DA0028211B /* GridLogo.h in Headers */ = {isa = PBXBuildFile; fileRef = 01F3780C1B3F13DA0028211B /* GridLogo.h */; settings = {ATTRIBUTES = (Public, ); }; }; 01F378131B3F13DA0028211B /* GridLogo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01F378071B3F13DA0028211B /* GridLogo.framework */; }; 01F3781A1B3F13DA0028211B /* GridLogoTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01F378191B3F13DA0028211B /* GridLogoTests.swift */; }; - 01F3788C1B3F6E470028211B /* GridAnimatedLogo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01F3788B1B3F6E470028211B /* GridAnimatedLogo.swift */; }; + 01F3788C1B3F6E470028211B /* GridLogo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01F3788B1B3F6E470028211B /* GridLogo.swift */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -30,7 +30,7 @@ 01F378121B3F13DA0028211B /* GridLogoTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = GridLogoTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 01F378181B3F13DA0028211B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 01F378191B3F13DA0028211B /* GridLogoTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GridLogoTests.swift; sourceTree = ""; }; - 01F3788B1B3F6E470028211B /* GridAnimatedLogo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GridAnimatedLogo.swift; sourceTree = ""; }; + 01F3788B1B3F6E470028211B /* GridLogo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GridLogo.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -55,7 +55,7 @@ 01F377FD1B3F13DA0028211B = { isa = PBXGroup; children = ( - 01F378091B3F13DA0028211B /* Source */, + 01F378091B3F13DA0028211B /* GridLogo */, 01F378161B3F13DA0028211B /* GridLogoTests */, 01F378081B3F13DA0028211B /* Products */, ); @@ -70,23 +70,14 @@ name = Products; sourceTree = ""; }; - 01F378091B3F13DA0028211B /* Source */ = { - isa = PBXGroup; - children = ( - 01F3788A1B3F69A40028211B /* Core */, - 01F3780A1B3F13DA0028211B /* Supporting Files */, - ); - name = Source; - path = GridLogo; - sourceTree = ""; - }; - 01F3780A1B3F13DA0028211B /* Supporting Files */ = { + 01F378091B3F13DA0028211B /* GridLogo */ = { isa = PBXGroup; children = ( 01F3780C1B3F13DA0028211B /* GridLogo.h */, 01F3780B1B3F13DA0028211B /* Info.plist */, + 01F3788B1B3F6E470028211B /* GridLogo.swift */, ); - name = "Supporting Files"; + path = GridLogo; sourceTree = ""; }; 01F378161B3F13DA0028211B /* GridLogoTests */ = { @@ -106,14 +97,6 @@ name = "Supporting Files"; sourceTree = ""; }; - 01F3788A1B3F69A40028211B /* Core */ = { - isa = PBXGroup; - children = ( - 01F3788B1B3F6E470028211B /* GridAnimatedLogo.swift */, - ); - name = Core; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -223,7 +206,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 01F3788C1B3F6E470028211B /* GridAnimatedLogo.swift in Sources */, + 01F3788C1B3F6E470028211B /* GridLogo.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/GridLogo/GridAnimatedLogo.swift b/GridLogo/GridLogo.swift similarity index 99% rename from GridLogo/GridAnimatedLogo.swift rename to GridLogo/GridLogo.swift index 91d0dc0..e486cc8 100644 --- a/GridLogo/GridAnimatedLogo.swift +++ b/GridLogo/GridLogo.swift @@ -1,5 +1,5 @@ // -// GridAnimatedLogo.swift +// GridLogo.swift // GridLogo // // Created by Nicholas Velloff on 6/27/15.