Skip to content

Commit

Permalink
Merge branch 'release/2.0.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
zen committed Nov 13, 2015
2 parents 980a267 + b57cfa0 commit 88f683d
Show file tree
Hide file tree
Showing 33 changed files with 46 additions and 969 deletions.
99 changes: 30 additions & 69 deletions Example/Example.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
AD472E4C1AA9B99A00250E50 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = AD472E491AA9B99A00250E50 /* [email protected] */; };
AD472E4E1AA9BB1500250E50 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = AD472E4D1AA9BB1500250E50 /* [email protected] */; };
AD472E501AA9BB8900250E50 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = AD472E4F1AA9BB8900250E50 /* [email protected] */; };
ADD8149A1BF625F3009F1FCA /* UIImage+Autoresize.m in Sources */ = {isa = PBXBuildFile; fileRef = ADD814971BF625F3009F1FCA /* UIImage+Autoresize.m */; };
ADE9742C1A78F8500040B7C1 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = ADE9742B1A78F8500040B7C1 /* Images.xcassets */; };
ADE9744F1A78F88C0040B7C1 /* Persei.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ADE9744A1A78F8600040B7C1 /* Persei.framework */; };
ADE974511A78F8D80040B7C1 /* Persei.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = ADE9744A1A78F8600040B7C1 /* Persei.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
F4B561D1A667654F741A88FA /* Pods_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4FA0F007415B613CACE9D7CD /* Pods_Example.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -74,9 +74,6 @@
1D6A39D0D1259941A6AD567D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Example/Base.lproj/Main.storyboard; sourceTree = SOURCE_ROOT; };
1D6A3CBE4088EC6CBC44FFD2 /* CGRect+Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CGRect+Extension.swift"; sourceTree = "<group>"; };
1D6A3ED334BF5B2840F84CD1 /* CircularRevealTransition.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CircularRevealTransition.swift; sourceTree = "<group>"; };
426C27017765136F4A71C84A /* Pods-Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-Example/Pods-Example.release.xcconfig"; sourceTree = "<group>"; };
4FA0F007415B613CACE9D7CD /* Pods_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
AD0572C7400FC803BA4D5670 /* Pods-Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Example/Pods-Example.debug.xcconfig"; sourceTree = "<group>"; };
AD1F5DCC1A7F94F900BDC0CE /* ContentType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContentType.swift; sourceTree = "<group>"; };
AD472E311AA9B17F00250E50 /* TrendSansOne.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = TrendSansOne.otf; sourceTree = "<group>"; };
AD472E371AA9B59100250E50 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
Expand All @@ -88,6 +85,8 @@
AD472E491AA9B99A00250E50 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "[email protected]"; path = "../[email protected]"; sourceTree = "<group>"; };
AD472E4D1AA9BB1500250E50 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
AD472E4F1AA9BB8900250E50 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
ADD814961BF625F3009F1FCA /* UIImage+Autoresize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImage+Autoresize.h"; sourceTree = "<group>"; };
ADD814971BF625F3009F1FCA /* UIImage+Autoresize.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImage+Autoresize.m"; sourceTree = "<group>"; };
ADE9741F1A78F8500040B7C1 /* Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Example.app; sourceTree = BUILT_PRODUCTS_DIR; };
ADE974231A78F8500040B7C1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
ADE9742B1A78F8500040B7C1 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = ../Images.xcassets; sourceTree = "<group>"; };
Expand All @@ -100,7 +99,6 @@
buildActionMask = 2147483647;
files = (
ADE9744F1A78F88C0040B7C1 /* Persei.framework in Frameworks */,
F4B561D1A667654F741A88FA /* Pods_Example.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -110,7 +108,6 @@
0873BC494D5EFB1D46ADCC5A /* Frameworks */ = {
isa = PBXGroup;
children = (
4FA0F007415B613CACE9D7CD /* Pods_Example.framework */,
);
name = Frameworks;
sourceTree = "<group>";
Expand Down Expand Up @@ -199,13 +196,37 @@
path = "Content Images";
sourceTree = "<group>";
};
ADD814931BF625F3009F1FCA /* External */ = {
isa = PBXGroup;
children = (
ADD814941BF625F3009F1FCA /* UIImage+Autoresize */,
);
path = External;
sourceTree = "<group>";
};
ADD814941BF625F3009F1FCA /* UIImage+Autoresize */ = {
isa = PBXGroup;
children = (
ADD814951BF625F3009F1FCA /* Classes */,
);
path = "UIImage+Autoresize";
sourceTree = "<group>";
};
ADD814951BF625F3009F1FCA /* Classes */ = {
isa = PBXGroup;
children = (
ADD814961BF625F3009F1FCA /* UIImage+Autoresize.h */,
ADD814971BF625F3009F1FCA /* UIImage+Autoresize.m */,
);
path = Classes;
sourceTree = "<group>";
};
ADE974161A78F8500040B7C1 = {
isa = PBXGroup;
children = (
ADE974211A78F8500040B7C1 /* Example */,
ADE974201A78F8500040B7C1 /* Products */,
ADE974441A78F8600040B7C1 /* Persei.xcodeproj */,
EBC37C24D80713E2E0D3FC3A /* Pods */,
0873BC494D5EFB1D46ADCC5A /* Frameworks */,
);
sourceTree = "<group>";
Expand All @@ -221,6 +242,7 @@
ADE974211A78F8500040B7C1 /* Example */ = {
isa = PBXGroup;
children = (
ADD814931BF625F3009F1FCA /* External */,
ADE974221A78F8500040B7C1 /* Supporting Files */,
1D6A3C81FE5A4D4F0AB1B026 /* Model */,
1D6A384799617AE602C0694F /* Resources */,
Expand Down Expand Up @@ -249,29 +271,17 @@
name = Products;
sourceTree = "<group>";
};
EBC37C24D80713E2E0D3FC3A /* Pods */ = {
isa = PBXGroup;
children = (
AD0572C7400FC803BA4D5670 /* Pods-Example.debug.xcconfig */,
426C27017765136F4A71C84A /* Pods-Example.release.xcconfig */,
);
name = Pods;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
ADE9741E1A78F8500040B7C1 /* Example */ = {
isa = PBXNativeTarget;
buildConfigurationList = ADE9743E1A78F8500040B7C1 /* Build configuration list for PBXNativeTarget "Example" */;
buildPhases = (
7566F4A735687794318D01E3 /* Check Pods Manifest.lock */,
ADE9741B1A78F8500040B7C1 /* Sources */,
ADE9741C1A78F8500040B7C1 /* Frameworks */,
ADE9741D1A78F8500040B7C1 /* Resources */,
ADE974501A78F8CB0040B7C1 /* Copy Frameworks */,
31641645035E83BB4C892A39 /* Copy Pods Resources */,
A1DBAFCF2746158630BFC322 /* Embed Pods Frameworks */,
);
buildRules = (
);
Expand Down Expand Up @@ -361,54 +371,6 @@
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
31641645035E83BB4C892A39 /* Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Example/Pods-Example-resources.sh\"\n";
showEnvVarsInLog = 0;
};
7566F4A735687794318D01E3 /* Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Check Pods Manifest.lock";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
showEnvVarsInLog = 0;
};
A1DBAFCF2746158630BFC322 /* Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Example/Pods-Example-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
ADE9741B1A78F8500040B7C1 /* Sources */ = {
isa = PBXSourcesBuildPhase;
Expand All @@ -418,6 +380,7 @@
1D6A3EA611666C3A6FC56869 /* CircularRevealTransition.swift in Sources */,
1D6A3A3B096EF8DCC086DD32 /* CGRect+Extension.swift in Sources */,
1D6A3F0B8C4CF9E0E86F6132 /* AppDelegate.swift in Sources */,
ADD8149A1BF625F3009F1FCA /* UIImage+Autoresize.m in Sources */,
1D6A307F51AA47C3C7131EA5 /* ViewController.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -532,7 +495,6 @@
};
ADE9743F1A78F8500040B7C1 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = AD0572C7400FC803BA4D5670 /* Pods-Example.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
Expand All @@ -548,7 +510,6 @@
};
ADE974401A78F8500040B7C1 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 426C27017765136F4A71C84A /* Pods-Example.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
Expand Down
2 changes: 1 addition & 1 deletion Example/Example/Example-Bridging-Header.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
// Use this file to import your target's public headers that you would like to expose to Swift.
//

#import <UIImage_Autoresize/UIImage+Autoresize.h>
#import "UIImage+Autoresize.h"
0 ...e+Autoresize/Classes/UIImage+Autoresize.h → ...e+Autoresize/Classes/UIImage+Autoresize.h
View file
File renamed without changes.
0 ...e+Autoresize/Classes/UIImage+Autoresize.m → ...e+Autoresize/Classes/UIImage+Autoresize.m
View file
File renamed without changes.
0 Example/Pods/UIImage+Autoresize/LICENSE → ...ample/External/UIImage+Autoresize/LICENSE
View file
File renamed without changes.
0 Example/Pods/UIImage+Autoresize/README.md → ...ple/External/UIImage+Autoresize/README.md
View file
File renamed without changes.
9 changes: 0 additions & 9 deletions Example/Podfile
View file

This file was deleted.

10 changes: 0 additions & 10 deletions Example/Podfile.lock
View file

This file was deleted.

1 change: 0 additions & 1 deletion Example/Pods/Headers/Private/UIImage+Autoresize/UIImage+Autoresize.h
View file

This file was deleted.

1 change: 0 additions & 1 deletion Example/Pods/Headers/Public/UIImage+Autoresize/UIImage+Autoresize.h
View file

This file was deleted.

10 changes: 0 additions & 10 deletions Example/Pods/Manifest.lock
View file

This file was deleted.

Loading

0 comments on commit 88f683d

Please sign in to comment.