diff --git a/Zxcvbn/Images.xcassets/AppIcon.appiconset/Contents.json b/Example/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 76% rename from Zxcvbn/Images.xcassets/AppIcon.appiconset/Contents.json rename to Example/Assets.xcassets/AppIcon.appiconset/Contents.json index 91bf9c1..36d2c80 100644 --- a/Zxcvbn/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/Example/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -5,16 +5,31 @@ "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" : "29x29", diff --git a/Example/Base.lproj/LaunchScreen.storyboard b/Example/Base.lproj/LaunchScreen.storyboard new file mode 100644 index 0000000..1447b3c --- /dev/null +++ b/Example/Base.lproj/LaunchScreen.storyboard @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Zxcvbn/Base.lproj/Main_iPad.storyboard b/Example/Base.lproj/Main_iPad.storyboard similarity index 100% rename from Zxcvbn/Base.lproj/Main_iPad.storyboard rename to Example/Base.lproj/Main_iPad.storyboard diff --git a/Zxcvbn/Base.lproj/Main_iPhone.storyboard b/Example/Base.lproj/Main_iPhone.storyboard similarity index 100% rename from Zxcvbn/Base.lproj/Main_iPhone.storyboard rename to Example/Base.lproj/Main_iPhone.storyboard diff --git a/Zxcvbn/DBAppDelegate.h b/Example/DBAppDelegate.h similarity index 90% rename from Zxcvbn/DBAppDelegate.h rename to Example/DBAppDelegate.h index babfe1d..0065edb 100644 --- a/Zxcvbn/DBAppDelegate.h +++ b/Example/DBAppDelegate.h @@ -6,6 +6,8 @@ // Copyright (c) 2014 Dropbox. All rights reserved. // +#include + @interface DBAppDelegate : UIResponder @property (strong, nonatomic) UIWindow *window; diff --git a/Zxcvbn/DBAppDelegate.m b/Example/DBAppDelegate.m similarity index 99% rename from Zxcvbn/DBAppDelegate.m rename to Example/DBAppDelegate.m index 53f8866..b135d68 100644 --- a/Zxcvbn/DBAppDelegate.m +++ b/Example/DBAppDelegate.m @@ -8,7 +8,7 @@ #import "DBAppDelegate.h" -#import "DBZxcvbn.h" +#import @implementation DBAppDelegate diff --git a/Zxcvbn/DBCreateAccountViewController.h b/Example/DBCreateAccountViewController.h similarity index 100% rename from Zxcvbn/DBCreateAccountViewController.h rename to Example/DBCreateAccountViewController.h diff --git a/Zxcvbn/DBCreateAccountViewController.m b/Example/DBCreateAccountViewController.m similarity index 97% rename from Zxcvbn/DBCreateAccountViewController.m rename to Example/DBCreateAccountViewController.m index dd991f4..06e237c 100644 --- a/Zxcvbn/DBCreateAccountViewController.m +++ b/Example/DBCreateAccountViewController.m @@ -8,7 +8,7 @@ #import "DBCreateAccountViewController.h" -#import "DBPasswordStrengthMeterView.h" +#import @interface DBCreateAccountViewController () diff --git a/Zxcvbn/Zxcvbn-Info.plist b/Example/Info.plist similarity index 85% rename from Zxcvbn/Zxcvbn-Info.plist rename to Example/Info.plist index 00331ac..949c040 100644 --- a/Zxcvbn/Zxcvbn-Info.plist +++ b/Example/Info.plist @@ -4,16 +4,14 @@ CFBundleDevelopmentRegion en - CFBundleDisplayName - ${PRODUCT_NAME} CFBundleExecutable - ${EXECUTABLE_NAME} + $(EXECUTABLE_NAME) CFBundleIdentifier - com.dropbox.${PRODUCT_NAME:rfc1034identifier} + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName - ${PRODUCT_NAME} + $(PRODUCT_NAME) CFBundlePackageType APPL CFBundleShortVersionString @@ -21,9 +19,11 @@ CFBundleSignature ???? CFBundleVersion - 1.0 + 1 LSRequiresIPhoneOS + UILaunchStoryboardName + LaunchScreen UIMainStoryboardFile Main_iPhone UIMainStoryboardFile~ipad diff --git a/Zxcvbn/main.m b/Example/main.m similarity index 100% rename from Zxcvbn/main.m rename to Example/main.m diff --git a/Zxcvbn.xcodeproj/project.pbxproj b/Zxcvbn.xcodeproj/project.pbxproj index 49f29ee..d312238 100644 --- a/Zxcvbn.xcodeproj/project.pbxproj +++ b/Zxcvbn.xcodeproj/project.pbxproj @@ -7,212 +7,153 @@ objects = { /* Begin PBXBuildFile section */ - 08AE00E318B9A795006BB842 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 08AE00E218B9A795006BB842 /* README.md */; }; - 08EDE53F18B913EA0056B2C4 /* DBPasswordStrengthMeterView.m in Sources */ = {isa = PBXBuildFile; fileRef = 08EDE53E18B913EA0056B2C4 /* DBPasswordStrengthMeterView.m */; }; - 08EDE54218B9146C0056B2C4 /* DBCreateAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 08EDE54118B9146C0056B2C4 /* DBCreateAccountViewController.m */; }; - 08F59F8418A8830300FB34D6 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08F59F8318A8830300FB34D6 /* Foundation.framework */; }; - 08F59F8618A8830300FB34D6 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08F59F8518A8830300FB34D6 /* CoreGraphics.framework */; }; - 08F59F8818A8830300FB34D6 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08F59F8718A8830300FB34D6 /* UIKit.framework */; }; - 08F59F8E18A8830300FB34D6 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 08F59F8C18A8830300FB34D6 /* InfoPlist.strings */; }; - 08F59F9018A8830300FB34D6 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 08F59F8F18A8830300FB34D6 /* main.m */; }; - 08F59F9418A8830300FB34D6 /* DBAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 08F59F9318A8830300FB34D6 /* DBAppDelegate.m */; }; - 08F59F9718A8830300FB34D6 /* Main_iPhone.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 08F59F9518A8830300FB34D6 /* Main_iPhone.storyboard */; }; - 08F59F9A18A8830300FB34D6 /* Main_iPad.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 08F59F9818A8830300FB34D6 /* Main_iPad.storyboard */; }; - 08F59F9F18A8830300FB34D6 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 08F59F9E18A8830300FB34D6 /* Images.xcassets */; }; - 08F59FA618A8830300FB34D6 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08F59FA518A8830300FB34D6 /* XCTest.framework */; }; - 08F59FA718A8830300FB34D6 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08F59F8318A8830300FB34D6 /* Foundation.framework */; }; - 08F59FA818A8830300FB34D6 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08F59F8718A8830300FB34D6 /* UIKit.framework */; }; - 08F59FB018A8830300FB34D6 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 08F59FAE18A8830300FB34D6 /* InfoPlist.strings */; }; - 08F59FB218A8830300FB34D6 /* ZxcvbnTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 08F59FB118A8830300FB34D6 /* ZxcvbnTests.m */; }; - 08F59FC118A8832800FB34D6 /* DBZxcvbn.m in Sources */ = {isa = PBXBuildFile; fileRef = 08F59FBF18A8832800FB34D6 /* DBZxcvbn.m */; }; - 08F59FC418A885EE00FB34D6 /* DBMatcher.m in Sources */ = {isa = PBXBuildFile; fileRef = 08F59FC318A885EE00FB34D6 /* DBMatcher.m */; }; - 08F59FC718A887BB00FB34D6 /* DBScorer.m in Sources */ = {isa = PBXBuildFile; fileRef = 08F59FC618A887BB00FB34D6 /* DBScorer.m */; }; - 08F5A01418A88C0800FB34D6 /* adjacency_graphs.json in Resources */ = {isa = PBXBuildFile; fileRef = 08F5A01218A88C0800FB34D6 /* adjacency_graphs.json */; }; - 08F5A01518A88C0800FB34D6 /* frequency_lists.json in Resources */ = {isa = PBXBuildFile; fileRef = 08F5A01318A88C0800FB34D6 /* frequency_lists.json */; }; - 4C70A41919003A460014646E /* LICENSE.txt in Resources */ = {isa = PBXBuildFile; fileRef = 4C70A41819003A460014646E /* LICENSE.txt */; }; + D80ECB6C1BDEAA420055EF0A /* Zxcvbn.h in Headers */ = {isa = PBXBuildFile; fileRef = D80ECB6B1BDEAA420055EF0A /* Zxcvbn.h */; settings = {ATTRIBUTES = (Public, ); }; }; + D80ECB731BDEAA420055EF0A /* Zxcvbn.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D80ECB681BDEAA420055EF0A /* Zxcvbn.framework */; }; + D80ECB781BDEAA420055EF0A /* ZxcvbnTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D80ECB771BDEAA420055EF0A /* ZxcvbnTests.m */; }; + D80ECB8B1BDEAA7D0055EF0A /* DBMatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = D80ECB821BDEAA7D0055EF0A /* DBMatcher.h */; settings = {ATTRIBUTES = (Public, ); }; }; + D80ECB8C1BDEAA7D0055EF0A /* DBMatcher.m in Sources */ = {isa = PBXBuildFile; fileRef = D80ECB831BDEAA7D0055EF0A /* DBMatcher.m */; }; + D80ECB8D1BDEAA7D0055EF0A /* DBMatcher.m in Sources */ = {isa = PBXBuildFile; fileRef = D80ECB831BDEAA7D0055EF0A /* DBMatcher.m */; }; + D80ECB8E1BDEAA7D0055EF0A /* DBPasswordStrengthMeterView.h in Headers */ = {isa = PBXBuildFile; fileRef = D80ECB841BDEAA7D0055EF0A /* DBPasswordStrengthMeterView.h */; settings = {ATTRIBUTES = (Public, ); }; }; + D80ECB8F1BDEAA7D0055EF0A /* DBPasswordStrengthMeterView.m in Sources */ = {isa = PBXBuildFile; fileRef = D80ECB851BDEAA7D0055EF0A /* DBPasswordStrengthMeterView.m */; }; + D80ECB901BDEAA7D0055EF0A /* DBPasswordStrengthMeterView.m in Sources */ = {isa = PBXBuildFile; fileRef = D80ECB851BDEAA7D0055EF0A /* DBPasswordStrengthMeterView.m */; }; + D80ECB911BDEAA7D0055EF0A /* DBScorer.h in Headers */ = {isa = PBXBuildFile; fileRef = D80ECB861BDEAA7D0055EF0A /* DBScorer.h */; settings = {ATTRIBUTES = (Public, ); }; }; + D80ECB921BDEAA7D0055EF0A /* DBScorer.m in Sources */ = {isa = PBXBuildFile; fileRef = D80ECB871BDEAA7D0055EF0A /* DBScorer.m */; }; + D80ECB931BDEAA7D0055EF0A /* DBScorer.m in Sources */ = {isa = PBXBuildFile; fileRef = D80ECB871BDEAA7D0055EF0A /* DBScorer.m */; }; + D80ECB941BDEAA7D0055EF0A /* DBZxcvbn.h in Headers */ = {isa = PBXBuildFile; fileRef = D80ECB881BDEAA7D0055EF0A /* DBZxcvbn.h */; settings = {ATTRIBUTES = (Public, ); }; }; + D80ECB951BDEAA7D0055EF0A /* DBZxcvbn.m in Sources */ = {isa = PBXBuildFile; fileRef = D80ECB891BDEAA7D0055EF0A /* DBZxcvbn.m */; }; + D80ECB961BDEAA7D0055EF0A /* DBZxcvbn.m in Sources */ = {isa = PBXBuildFile; fileRef = D80ECB891BDEAA7D0055EF0A /* DBZxcvbn.m */; }; + D80ECB9C1BDEAAD40055EF0A /* adjacency_graphs.json in Resources */ = {isa = PBXBuildFile; fileRef = D80ECB9A1BDEAABE0055EF0A /* adjacency_graphs.json */; }; + D80ECB9D1BDEAAD40055EF0A /* frequency_lists.json in Resources */ = {isa = PBXBuildFile; fileRef = D80ECB9B1BDEAABE0055EF0A /* frequency_lists.json */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 08F59FA918A8830300FB34D6 /* PBXContainerItemProxy */ = { + D80ECB741BDEAA420055EF0A /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 08F59F7818A8830300FB34D6 /* Project object */; + containerPortal = D80ECB5F1BDEAA420055EF0A /* Project object */; proxyType = 1; - remoteGlobalIDString = 08F59F7F18A8830300FB34D6; + remoteGlobalIDString = D80ECB671BDEAA420055EF0A; remoteInfo = Zxcvbn; }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 08AE00E218B9A795006BB842 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.md; sourceTree = SOURCE_ROOT; }; - 08EDE53D18B913EA0056B2C4 /* DBPasswordStrengthMeterView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DBPasswordStrengthMeterView.h; sourceTree = ""; }; - 08EDE53E18B913EA0056B2C4 /* DBPasswordStrengthMeterView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DBPasswordStrengthMeterView.m; sourceTree = ""; }; - 08EDE54018B9146C0056B2C4 /* DBCreateAccountViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DBCreateAccountViewController.h; sourceTree = ""; }; - 08EDE54118B9146C0056B2C4 /* DBCreateAccountViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DBCreateAccountViewController.m; sourceTree = ""; }; - 08F59F8018A8830300FB34D6 /* Zxcvbn.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Zxcvbn.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 08F59F8318A8830300FB34D6 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; - 08F59F8518A8830300FB34D6 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; - 08F59F8718A8830300FB34D6 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; - 08F59F8B18A8830300FB34D6 /* Zxcvbn-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Zxcvbn-Info.plist"; sourceTree = ""; }; - 08F59F8D18A8830300FB34D6 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; - 08F59F8F18A8830300FB34D6 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; - 08F59F9118A8830300FB34D6 /* Zxcvbn-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Zxcvbn-Prefix.pch"; sourceTree = ""; }; - 08F59F9218A8830300FB34D6 /* DBAppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DBAppDelegate.h; sourceTree = ""; }; - 08F59F9318A8830300FB34D6 /* DBAppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DBAppDelegate.m; sourceTree = ""; }; - 08F59F9618A8830300FB34D6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main_iPhone.storyboard; sourceTree = ""; }; - 08F59F9918A8830300FB34D6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main_iPad.storyboard; sourceTree = ""; }; - 08F59F9E18A8830300FB34D6 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; - 08F59FA418A8830300FB34D6 /* ZxcvbnTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ZxcvbnTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 08F59FA518A8830300FB34D6 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; }; - 08F59FAD18A8830300FB34D6 /* ZxcvbnTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "ZxcvbnTests-Info.plist"; sourceTree = ""; }; - 08F59FAF18A8830300FB34D6 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; - 08F59FB118A8830300FB34D6 /* ZxcvbnTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZxcvbnTests.m; sourceTree = ""; }; - 08F59FBE18A8832800FB34D6 /* DBZxcvbn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DBZxcvbn.h; sourceTree = ""; }; - 08F59FBF18A8832800FB34D6 /* DBZxcvbn.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DBZxcvbn.m; sourceTree = ""; }; - 08F59FC218A885EE00FB34D6 /* DBMatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DBMatcher.h; sourceTree = ""; }; - 08F59FC318A885EE00FB34D6 /* DBMatcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DBMatcher.m; sourceTree = ""; }; - 08F59FC518A887BB00FB34D6 /* DBScorer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DBScorer.h; sourceTree = ""; }; - 08F59FC618A887BB00FB34D6 /* DBScorer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DBScorer.m; sourceTree = ""; }; - 08F5A01218A88C0800FB34D6 /* adjacency_graphs.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = adjacency_graphs.json; sourceTree = ""; }; - 08F5A01318A88C0800FB34D6 /* frequency_lists.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = frequency_lists.json; sourceTree = ""; }; - 4C70A41819003A460014646E /* LICENSE.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE.txt; sourceTree = SOURCE_ROOT; }; + D80ECB681BDEAA420055EF0A /* Zxcvbn.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Zxcvbn.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + D80ECB6B1BDEAA420055EF0A /* Zxcvbn.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Zxcvbn.h; sourceTree = ""; }; + D80ECB6D1BDEAA420055EF0A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + D80ECB721BDEAA420055EF0A /* ZxcvbnTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ZxcvbnTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + D80ECB771BDEAA420055EF0A /* ZxcvbnTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZxcvbnTests.m; sourceTree = ""; }; + D80ECB791BDEAA420055EF0A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + D80ECB821BDEAA7D0055EF0A /* DBMatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DBMatcher.h; sourceTree = ""; }; + D80ECB831BDEAA7D0055EF0A /* DBMatcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DBMatcher.m; sourceTree = ""; }; + D80ECB841BDEAA7D0055EF0A /* DBPasswordStrengthMeterView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DBPasswordStrengthMeterView.h; sourceTree = ""; }; + D80ECB851BDEAA7D0055EF0A /* DBPasswordStrengthMeterView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DBPasswordStrengthMeterView.m; sourceTree = ""; }; + D80ECB861BDEAA7D0055EF0A /* DBScorer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DBScorer.h; sourceTree = ""; }; + D80ECB871BDEAA7D0055EF0A /* DBScorer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DBScorer.m; sourceTree = ""; }; + D80ECB881BDEAA7D0055EF0A /* DBZxcvbn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DBZxcvbn.h; sourceTree = ""; }; + D80ECB891BDEAA7D0055EF0A /* DBZxcvbn.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DBZxcvbn.m; sourceTree = ""; }; + D80ECB9A1BDEAABE0055EF0A /* adjacency_graphs.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; name = adjacency_graphs.json; path = generated/adjacency_graphs.json; sourceTree = ""; }; + D80ECB9B1BDEAABE0055EF0A /* frequency_lists.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; name = frequency_lists.json; path = generated/frequency_lists.json; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 08F59F7D18A8830300FB34D6 /* Frameworks */ = { + D80ECB641BDEAA420055EF0A /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 08F59F8618A8830300FB34D6 /* CoreGraphics.framework in Frameworks */, - 08F59F8818A8830300FB34D6 /* UIKit.framework in Frameworks */, - 08F59F8418A8830300FB34D6 /* Foundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - 08F59FA118A8830300FB34D6 /* Frameworks */ = { + D80ECB6F1BDEAA420055EF0A /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 08F59FA618A8830300FB34D6 /* XCTest.framework in Frameworks */, - 08F59FA818A8830300FB34D6 /* UIKit.framework in Frameworks */, - 08F59FA718A8830300FB34D6 /* Foundation.framework in Frameworks */, + D80ECB731BDEAA420055EF0A /* Zxcvbn.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 08F59F7718A8830300FB34D6 = { + D80ECB5E1BDEAA420055EF0A = { isa = PBXGroup; children = ( - 08F59F8918A8830300FB34D6 /* Zxcvbn */, - 08F59FAB18A8830300FB34D6 /* ZxcvbnTests */, - 08F59F8218A8830300FB34D6 /* Frameworks */, - 08F59F8118A8830300FB34D6 /* Products */, + D80ECB6A1BDEAA420055EF0A /* Zxcvbn */, + D80ECB761BDEAA420055EF0A /* ZxcvbnTests */, + D80ECB691BDEAA420055EF0A /* Products */, ); sourceTree = ""; }; - 08F59F8118A8830300FB34D6 /* Products */ = { + D80ECB691BDEAA420055EF0A /* Products */ = { isa = PBXGroup; children = ( - 08F59F8018A8830300FB34D6 /* Zxcvbn.app */, - 08F59FA418A8830300FB34D6 /* ZxcvbnTests.xctest */, + D80ECB681BDEAA420055EF0A /* Zxcvbn.framework */, + D80ECB721BDEAA420055EF0A /* ZxcvbnTests.xctest */, ); name = Products; sourceTree = ""; }; - 08F59F8218A8830300FB34D6 /* Frameworks */ = { + D80ECB6A1BDEAA420055EF0A /* Zxcvbn */ = { isa = PBXGroup; children = ( - 08F59F8518A8830300FB34D6 /* CoreGraphics.framework */, - 08F59F8318A8830300FB34D6 /* Foundation.framework */, - 08F59F8718A8830300FB34D6 /* UIKit.framework */, - 08F59FA518A8830300FB34D6 /* XCTest.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; - 08F59F8918A8830300FB34D6 /* Zxcvbn */ = { - isa = PBXGroup; - children = ( - 08F59FBB18A8832800FB34D6 /* Zxcvbn */, - 08F59F9218A8830300FB34D6 /* DBAppDelegate.h */, - 08F59F9318A8830300FB34D6 /* DBAppDelegate.m */, - 08F59F9518A8830300FB34D6 /* Main_iPhone.storyboard */, - 08F59F9818A8830300FB34D6 /* Main_iPad.storyboard */, - 08EDE54018B9146C0056B2C4 /* DBCreateAccountViewController.h */, - 08EDE54118B9146C0056B2C4 /* DBCreateAccountViewController.m */, - 08EDE53D18B913EA0056B2C4 /* DBPasswordStrengthMeterView.h */, - 08EDE53E18B913EA0056B2C4 /* DBPasswordStrengthMeterView.m */, - 08F59F9E18A8830300FB34D6 /* Images.xcassets */, - 08F59F8A18A8830300FB34D6 /* Supporting Files */, + D80ECB6B1BDEAA420055EF0A /* Zxcvbn.h */, + D80ECB821BDEAA7D0055EF0A /* DBMatcher.h */, + D80ECB831BDEAA7D0055EF0A /* DBMatcher.m */, + D80ECB861BDEAA7D0055EF0A /* DBScorer.h */, + D80ECB871BDEAA7D0055EF0A /* DBScorer.m */, + D80ECB881BDEAA7D0055EF0A /* DBZxcvbn.h */, + D80ECB891BDEAA7D0055EF0A /* DBZxcvbn.m */, + D80ECB841BDEAA7D0055EF0A /* DBPasswordStrengthMeterView.h */, + D80ECB851BDEAA7D0055EF0A /* DBPasswordStrengthMeterView.m */, + D80ECB991BDEAAA10055EF0A /* Generated */, + D80ECB6D1BDEAA420055EF0A /* Info.plist */, ); path = Zxcvbn; sourceTree = ""; }; - 08F59F8A18A8830300FB34D6 /* Supporting Files */ = { + D80ECB761BDEAA420055EF0A /* ZxcvbnTests */ = { isa = PBXGroup; children = ( - 08F59F8B18A8830300FB34D6 /* Zxcvbn-Info.plist */, - 08F59F8C18A8830300FB34D6 /* InfoPlist.strings */, - 08F59F8F18A8830300FB34D6 /* main.m */, - 08F59F9118A8830300FB34D6 /* Zxcvbn-Prefix.pch */, - 08AE00E218B9A795006BB842 /* README.md */, - 4C70A41819003A460014646E /* LICENSE.txt */, - ); - name = "Supporting Files"; - sourceTree = ""; - }; - 08F59FAB18A8830300FB34D6 /* ZxcvbnTests */ = { - isa = PBXGroup; - children = ( - 08F59FB118A8830300FB34D6 /* ZxcvbnTests.m */, - 08F59FAC18A8830300FB34D6 /* Supporting Files */, + D80ECB771BDEAA420055EF0A /* ZxcvbnTests.m */, + D80ECB791BDEAA420055EF0A /* Info.plist */, ); path = ZxcvbnTests; sourceTree = ""; }; - 08F59FAC18A8830300FB34D6 /* Supporting Files */ = { - isa = PBXGroup; - children = ( - 08F59FAD18A8830300FB34D6 /* ZxcvbnTests-Info.plist */, - 08F59FAE18A8830300FB34D6 /* InfoPlist.strings */, - ); - name = "Supporting Files"; - sourceTree = ""; - }; - 08F59FBB18A8832800FB34D6 /* Zxcvbn */ = { + D80ECB991BDEAAA10055EF0A /* Generated */ = { isa = PBXGroup; children = ( - 08F5A01118A88C0800FB34D6 /* generated */, - 08F59FC218A885EE00FB34D6 /* DBMatcher.h */, - 08F59FC318A885EE00FB34D6 /* DBMatcher.m */, - 08F59FC518A887BB00FB34D6 /* DBScorer.h */, - 08F59FC618A887BB00FB34D6 /* DBScorer.m */, - 08F59FBE18A8832800FB34D6 /* DBZxcvbn.h */, - 08F59FBF18A8832800FB34D6 /* DBZxcvbn.m */, + D80ECB9A1BDEAABE0055EF0A /* adjacency_graphs.json */, + D80ECB9B1BDEAABE0055EF0A /* frequency_lists.json */, ); - path = Zxcvbn; + name = Generated; sourceTree = ""; }; - 08F5A01118A88C0800FB34D6 /* generated */ = { - isa = PBXGroup; - children = ( - 08F5A01218A88C0800FB34D6 /* adjacency_graphs.json */, - 08F5A01318A88C0800FB34D6 /* frequency_lists.json */, +/* End PBXGroup section */ + +/* Begin PBXHeadersBuildPhase section */ + D80ECB651BDEAA420055EF0A /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + D80ECB6C1BDEAA420055EF0A /* Zxcvbn.h in Headers */, + D80ECB8B1BDEAA7D0055EF0A /* DBMatcher.h in Headers */, + D80ECB911BDEAA7D0055EF0A /* DBScorer.h in Headers */, + D80ECB941BDEAA7D0055EF0A /* DBZxcvbn.h in Headers */, + D80ECB8E1BDEAA7D0055EF0A /* DBPasswordStrengthMeterView.h in Headers */, ); - path = generated; - sourceTree = ""; + runOnlyForDeploymentPostprocessing = 0; }; -/* End PBXGroup section */ +/* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 08F59F7F18A8830300FB34D6 /* Zxcvbn */ = { + D80ECB671BDEAA420055EF0A /* Zxcvbn */ = { isa = PBXNativeTarget; - buildConfigurationList = 08F59FB518A8830300FB34D6 /* Build configuration list for PBXNativeTarget "Zxcvbn" */; + buildConfigurationList = D80ECB7C1BDEAA420055EF0A /* Build configuration list for PBXNativeTarget "Zxcvbn" */; buildPhases = ( - 08F59F7C18A8830300FB34D6 /* Sources */, - 08F59F7D18A8830300FB34D6 /* Frameworks */, - 08F59F7E18A8830300FB34D6 /* Resources */, + D80ECB631BDEAA420055EF0A /* Sources */, + D80ECB641BDEAA420055EF0A /* Frameworks */, + D80ECB651BDEAA420055EF0A /* Headers */, + D80ECB661BDEAA420055EF0A /* Resources */, ); buildRules = ( ); @@ -220,157 +161,117 @@ ); name = Zxcvbn; productName = Zxcvbn; - productReference = 08F59F8018A8830300FB34D6 /* Zxcvbn.app */; - productType = "com.apple.product-type.application"; + productReference = D80ECB681BDEAA420055EF0A /* Zxcvbn.framework */; + productType = "com.apple.product-type.framework"; }; - 08F59FA318A8830300FB34D6 /* ZxcvbnTests */ = { + D80ECB711BDEAA420055EF0A /* ZxcvbnTests */ = { isa = PBXNativeTarget; - buildConfigurationList = 08F59FB818A8830300FB34D6 /* Build configuration list for PBXNativeTarget "ZxcvbnTests" */; + buildConfigurationList = D80ECB7F1BDEAA420055EF0A /* Build configuration list for PBXNativeTarget "ZxcvbnTests" */; buildPhases = ( - 08F59FA018A8830300FB34D6 /* Sources */, - 08F59FA118A8830300FB34D6 /* Frameworks */, - 08F59FA218A8830300FB34D6 /* Resources */, + D80ECB6E1BDEAA420055EF0A /* Sources */, + D80ECB6F1BDEAA420055EF0A /* Frameworks */, + D80ECB701BDEAA420055EF0A /* Resources */, ); buildRules = ( ); dependencies = ( - 08F59FAA18A8830300FB34D6 /* PBXTargetDependency */, + D80ECB751BDEAA420055EF0A /* PBXTargetDependency */, ); name = ZxcvbnTests; productName = ZxcvbnTests; - productReference = 08F59FA418A8830300FB34D6 /* ZxcvbnTests.xctest */; + productReference = D80ECB721BDEAA420055EF0A /* ZxcvbnTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ - 08F59F7818A8830300FB34D6 /* Project object */ = { + D80ECB5F1BDEAA420055EF0A /* Project object */ = { isa = PBXProject; attributes = { - CLASSPREFIX = DB; - LastUpgradeCheck = 0510; + LastUpgradeCheck = 0710; ORGANIZATIONNAME = Dropbox; TargetAttributes = { - 08F59FA318A8830300FB34D6 = { - TestTargetID = 08F59F7F18A8830300FB34D6; + D80ECB671BDEAA420055EF0A = { + CreatedOnToolsVersion = 7.1; + }; + D80ECB711BDEAA420055EF0A = { + CreatedOnToolsVersion = 7.1; }; }; }; - buildConfigurationList = 08F59F7B18A8830300FB34D6 /* Build configuration list for PBXProject "Zxcvbn" */; + buildConfigurationList = D80ECB621BDEAA420055EF0A /* Build configuration list for PBXProject "Zxcvbn" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( en, - Base, ); - mainGroup = 08F59F7718A8830300FB34D6; - productRefGroup = 08F59F8118A8830300FB34D6 /* Products */; + mainGroup = D80ECB5E1BDEAA420055EF0A; + productRefGroup = D80ECB691BDEAA420055EF0A /* Products */; projectDirPath = ""; projectRoot = ""; targets = ( - 08F59F7F18A8830300FB34D6 /* Zxcvbn */, - 08F59FA318A8830300FB34D6 /* ZxcvbnTests */, + D80ECB671BDEAA420055EF0A /* Zxcvbn */, + D80ECB711BDEAA420055EF0A /* ZxcvbnTests */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ - 08F59F7E18A8830300FB34D6 /* Resources */ = { + D80ECB661BDEAA420055EF0A /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 08F59F9A18A8830300FB34D6 /* Main_iPad.storyboard in Resources */, - 08F5A01518A88C0800FB34D6 /* frequency_lists.json in Resources */, - 08F5A01418A88C0800FB34D6 /* adjacency_graphs.json in Resources */, - 4C70A41919003A460014646E /* LICENSE.txt in Resources */, - 08F59F9F18A8830300FB34D6 /* Images.xcassets in Resources */, - 08F59F9718A8830300FB34D6 /* Main_iPhone.storyboard in Resources */, - 08F59F8E18A8830300FB34D6 /* InfoPlist.strings in Resources */, - 08AE00E318B9A795006BB842 /* README.md in Resources */, + D80ECB9C1BDEAAD40055EF0A /* adjacency_graphs.json in Resources */, + D80ECB9D1BDEAAD40055EF0A /* frequency_lists.json in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; - 08F59FA218A8830300FB34D6 /* Resources */ = { + D80ECB701BDEAA420055EF0A /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 08F59FB018A8830300FB34D6 /* InfoPlist.strings in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - 08F59F7C18A8830300FB34D6 /* Sources */ = { + D80ECB631BDEAA420055EF0A /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 08EDE54218B9146C0056B2C4 /* DBCreateAccountViewController.m in Sources */, - 08F59FC418A885EE00FB34D6 /* DBMatcher.m in Sources */, - 08F59FC118A8832800FB34D6 /* DBZxcvbn.m in Sources */, - 08EDE53F18B913EA0056B2C4 /* DBPasswordStrengthMeterView.m in Sources */, - 08F59F9418A8830300FB34D6 /* DBAppDelegate.m in Sources */, - 08F59FC718A887BB00FB34D6 /* DBScorer.m in Sources */, - 08F59F9018A8830300FB34D6 /* main.m in Sources */, + D80ECB921BDEAA7D0055EF0A /* DBScorer.m in Sources */, + D80ECB8F1BDEAA7D0055EF0A /* DBPasswordStrengthMeterView.m in Sources */, + D80ECB951BDEAA7D0055EF0A /* DBZxcvbn.m in Sources */, + D80ECB8C1BDEAA7D0055EF0A /* DBMatcher.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; - 08F59FA018A8830300FB34D6 /* Sources */ = { + D80ECB6E1BDEAA420055EF0A /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 08F59FB218A8830300FB34D6 /* ZxcvbnTests.m in Sources */, + D80ECB961BDEAA7D0055EF0A /* DBZxcvbn.m in Sources */, + D80ECB8D1BDEAA7D0055EF0A /* DBMatcher.m in Sources */, + D80ECB931BDEAA7D0055EF0A /* DBScorer.m in Sources */, + D80ECB781BDEAA420055EF0A /* ZxcvbnTests.m in Sources */, + D80ECB901BDEAA7D0055EF0A /* DBPasswordStrengthMeterView.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 08F59FAA18A8830300FB34D6 /* PBXTargetDependency */ = { + D80ECB751BDEAA420055EF0A /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 08F59F7F18A8830300FB34D6 /* Zxcvbn */; - targetProxy = 08F59FA918A8830300FB34D6 /* PBXContainerItemProxy */; + target = D80ECB671BDEAA420055EF0A /* Zxcvbn */; + targetProxy = D80ECB741BDEAA420055EF0A /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ -/* Begin PBXVariantGroup section */ - 08F59F8C18A8830300FB34D6 /* InfoPlist.strings */ = { - isa = PBXVariantGroup; - children = ( - 08F59F8D18A8830300FB34D6 /* en */, - ); - name = InfoPlist.strings; - sourceTree = ""; - }; - 08F59F9518A8830300FB34D6 /* Main_iPhone.storyboard */ = { - isa = PBXVariantGroup; - children = ( - 08F59F9618A8830300FB34D6 /* Base */, - ); - name = Main_iPhone.storyboard; - sourceTree = ""; - }; - 08F59F9818A8830300FB34D6 /* Main_iPad.storyboard */ = { - isa = PBXVariantGroup; - children = ( - 08F59F9918A8830300FB34D6 /* Base */, - ); - name = Main_iPad.storyboard; - sourceTree = ""; - }; - 08F59FAE18A8830300FB34D6 /* InfoPlist.strings */ = { - isa = PBXVariantGroup; - children = ( - 08F59FAF18A8830300FB34D6 /* en */, - ); - name = InfoPlist.strings; - sourceTree = ""; - }; -/* End PBXVariantGroup section */ - /* Begin XCBuildConfiguration section */ - 08F59FB318A8830300FB34D6 /* Debug */ = { + D80ECB7A1BDEAA420055EF0A /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -385,31 +286,39 @@ CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", "$(inherited)", ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; 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; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 7.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; }; name = Debug; }; - 08F59FB418A8830300FB34D6 /* Release */ = { + D80ECB7B1BDEAA420055EF0A /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -424,121 +333,117 @@ CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = YES; + COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; + 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; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 7.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; }; name = Release; }; - 08F59FB618A8830300FB34D6 /* Debug */ = { + D80ECB7D1BDEAA420055EF0A /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "Zxcvbn/Zxcvbn-Prefix.pch"; - INFOPLIST_FILE = "Zxcvbn/Zxcvbn-Info.plist"; + APPLICATION_EXTENSION_API_ONLY = YES; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = Zxcvbn/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = com.dropbox.Zxcvbn; PRODUCT_NAME = "$(TARGET_NAME)"; - WRAPPER_EXTENSION = app; + SKIP_INSTALL = YES; }; name = Debug; }; - 08F59FB718A8830300FB34D6 /* Release */ = { + D80ECB7E1BDEAA420055EF0A /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "Zxcvbn/Zxcvbn-Prefix.pch"; - INFOPLIST_FILE = "Zxcvbn/Zxcvbn-Info.plist"; + APPLICATION_EXTENSION_API_ONLY = YES; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = Zxcvbn/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = com.dropbox.Zxcvbn; PRODUCT_NAME = "$(TARGET_NAME)"; - WRAPPER_EXTENSION = app; + SKIP_INSTALL = YES; }; name = Release; }; - 08F59FB918A8830300FB34D6 /* Debug */ = { + D80ECB801BDEAA420055EF0A /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/Zxcvbn.app/Zxcvbn"; - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - "$(DEVELOPER_FRAMEWORKS_DIR)", - ); - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "Zxcvbn/Zxcvbn-Prefix.pch"; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - INFOPLIST_FILE = "ZxcvbnTests/ZxcvbnTests-Info.plist"; + INFOPLIST_FILE = ZxcvbnTests/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = com.dropbox.Zxcvbn.ZxcvbnTests; PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUNDLE_LOADER)"; - WRAPPER_EXTENSION = xctest; }; name = Debug; }; - 08F59FBA18A8830300FB34D6 /* Release */ = { + D80ECB811BDEAA420055EF0A /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/Zxcvbn.app/Zxcvbn"; - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - "$(DEVELOPER_FRAMEWORKS_DIR)", - ); - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "Zxcvbn/Zxcvbn-Prefix.pch"; - INFOPLIST_FILE = "ZxcvbnTests/ZxcvbnTests-Info.plist"; + INFOPLIST_FILE = ZxcvbnTests/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = com.dropbox.Zxcvbn.ZxcvbnTests; PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUNDLE_LOADER)"; - WRAPPER_EXTENSION = xctest; }; name = Release; }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 08F59F7B18A8830300FB34D6 /* Build configuration list for PBXProject "Zxcvbn" */ = { + D80ECB621BDEAA420055EF0A /* Build configuration list for PBXProject "Zxcvbn" */ = { isa = XCConfigurationList; buildConfigurations = ( - 08F59FB318A8830300FB34D6 /* Debug */, - 08F59FB418A8830300FB34D6 /* Release */, + D80ECB7A1BDEAA420055EF0A /* Debug */, + D80ECB7B1BDEAA420055EF0A /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 08F59FB518A8830300FB34D6 /* Build configuration list for PBXNativeTarget "Zxcvbn" */ = { + D80ECB7C1BDEAA420055EF0A /* Build configuration list for PBXNativeTarget "Zxcvbn" */ = { isa = XCConfigurationList; buildConfigurations = ( - 08F59FB618A8830300FB34D6 /* Debug */, - 08F59FB718A8830300FB34D6 /* Release */, + D80ECB7D1BDEAA420055EF0A /* Debug */, + D80ECB7E1BDEAA420055EF0A /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 08F59FB818A8830300FB34D6 /* Build configuration list for PBXNativeTarget "ZxcvbnTests" */ = { + D80ECB7F1BDEAA420055EF0A /* Build configuration list for PBXNativeTarget "ZxcvbnTests" */ = { isa = XCConfigurationList; buildConfigurations = ( - 08F59FB918A8830300FB34D6 /* Debug */, - 08F59FBA18A8830300FB34D6 /* Release */, + D80ECB801BDEAA420055EF0A /* Debug */, + D80ECB811BDEAA420055EF0A /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; - rootObject = 08F59F7818A8830300FB34D6 /* Project object */; + rootObject = D80ECB5F1BDEAA420055EF0A /* Project object */; } diff --git a/Zxcvbn.xcodeproj/project.xcworkspace/xcshareddata/Zxcvbn.xccheckout b/Zxcvbn.xcodeproj/project.xcworkspace/xcshareddata/Zxcvbn.xccheckout deleted file mode 100644 index 82a5ebe..0000000 --- a/Zxcvbn.xcodeproj/project.xcworkspace/xcshareddata/Zxcvbn.xccheckout +++ /dev/null @@ -1,41 +0,0 @@ - - - - - IDESourceControlProjectFavoriteDictionaryKey - - IDESourceControlProjectIdentifier - D1EAD098-B433-4423-B8EA-822C8AABB984 - IDESourceControlProjectName - Zxcvbn - IDESourceControlProjectOriginsDictionary - - 6F1D88DD2F0D58B5AAC6B50172E9E48A750F45C8 - github.com:dropbox/zxcvbn-ios.git - - IDESourceControlProjectPath - Zxcvbn.xcodeproj - IDESourceControlProjectRelativeInstallPathDictionary - - 6F1D88DD2F0D58B5AAC6B50172E9E48A750F45C8 - ../.. - - IDESourceControlProjectURL - github.com:dropbox/zxcvbn-ios.git - IDESourceControlProjectVersion - 111 - IDESourceControlProjectWCCIdentifier - 6F1D88DD2F0D58B5AAC6B50172E9E48A750F45C8 - IDESourceControlProjectWCConfigurations - - - IDESourceControlRepositoryExtensionIdentifierKey - public.vcs.git - IDESourceControlWCCIdentifierKey - 6F1D88DD2F0D58B5AAC6B50172E9E48A750F45C8 - IDESourceControlWCCName - zxcvbn-ios - - - - diff --git a/Zxcvbn.xcodeproj/xcshareddata/xcschemes/Zxcvbn.xcscheme b/Zxcvbn.xcodeproj/xcshareddata/xcschemes/Zxcvbn.xcscheme new file mode 100644 index 0000000..101069c --- /dev/null +++ b/Zxcvbn.xcodeproj/xcshareddata/xcschemes/Zxcvbn.xcscheme @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Zxcvbn/Zxcvbn/DBMatcher.h b/Zxcvbn/DBMatcher.h similarity index 98% rename from Zxcvbn/Zxcvbn/DBMatcher.h rename to Zxcvbn/DBMatcher.h index 491b1cd..d6293ec 100644 --- a/Zxcvbn/Zxcvbn/DBMatcher.h +++ b/Zxcvbn/DBMatcher.h @@ -6,6 +6,8 @@ // Copyright (c) 2014 Dropbox. All rights reserved. // +#import + @interface DBMatcher : NSObject @property (nonatomic, assign) NSUInteger keyboardAverageDegree; diff --git a/Zxcvbn/Zxcvbn/DBMatcher.m b/Zxcvbn/DBMatcher.m similarity index 99% rename from Zxcvbn/Zxcvbn/DBMatcher.m rename to Zxcvbn/DBMatcher.m index e8ab5bb..d183357 100644 --- a/Zxcvbn/Zxcvbn/DBMatcher.m +++ b/Zxcvbn/DBMatcher.m @@ -606,7 +606,7 @@ - (NSArray *)loadFrequencyLists { NSMutableArray *dictionaryMatchers = [[NSMutableArray alloc] init]; - NSString *filePath = [[NSBundle mainBundle] pathForResource:@"frequency_lists" ofType:@"json"]; + NSString *filePath = [[NSBundle bundleForClass:[self class]] pathForResource:@"frequency_lists" ofType:@"json"]; NSData *data = [NSData dataWithContentsOfFile:filePath]; NSError *error; @@ -629,7 +629,7 @@ - (NSArray *)loadFrequencyLists - (NSDictionary *)loadAdjacencyGraphs { - NSString *filePath = [[NSBundle mainBundle] pathForResource:@"adjacency_graphs" ofType:@"json"]; + NSString *filePath = [[NSBundle bundleForClass:[self class]] pathForResource:@"adjacency_graphs" ofType:@"json"]; NSData *data = [NSData dataWithContentsOfFile:filePath]; NSError *error; diff --git a/Zxcvbn/Zxcvbn/DBScorer.h b/Zxcvbn/DBScorer.h similarity index 96% rename from Zxcvbn/Zxcvbn/DBScorer.h rename to Zxcvbn/DBScorer.h index 26bd85b..0ae6018 100644 --- a/Zxcvbn/Zxcvbn/DBScorer.h +++ b/Zxcvbn/DBScorer.h @@ -6,6 +6,8 @@ // Copyright (c) 2014 Dropbox. All rights reserved. // +#import + @class DBResult; @interface DBScorer : NSObject diff --git a/Zxcvbn/Zxcvbn/DBScorer.m b/Zxcvbn/DBScorer.m similarity index 100% rename from Zxcvbn/Zxcvbn/DBScorer.m rename to Zxcvbn/DBScorer.m diff --git a/Zxcvbn/Zxcvbn/DBZxcvbn.h b/Zxcvbn/DBZxcvbn.h similarity index 100% rename from Zxcvbn/Zxcvbn/DBZxcvbn.h rename to Zxcvbn/DBZxcvbn.h diff --git a/Zxcvbn/Zxcvbn/DBZxcvbn.m b/Zxcvbn/DBZxcvbn.m similarity index 96% rename from Zxcvbn/Zxcvbn/DBZxcvbn.m rename to Zxcvbn/DBZxcvbn.m index 850f692..d212b18 100644 --- a/Zxcvbn/Zxcvbn/DBZxcvbn.m +++ b/Zxcvbn/DBZxcvbn.m @@ -7,6 +7,7 @@ // #import "DBZxcvbn.h" +#import @interface DBZxcvbn () diff --git a/Zxcvbn/Images.xcassets/LaunchImage.launchimage/Contents.json b/Zxcvbn/Images.xcassets/LaunchImage.launchimage/Contents.json deleted file mode 100644 index 6f870a4..0000000 --- a/Zxcvbn/Images.xcassets/LaunchImage.launchimage/Contents.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "images" : [ - { - "orientation" : "portrait", - "idiom" : "iphone", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "iphone", - "subtype" : "retina4", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "ipad", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "1x" - }, - { - "orientation" : "landscape", - "idiom" : "ipad", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "1x" - }, - { - "orientation" : "portrait", - "idiom" : "ipad", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "2x" - }, - { - "orientation" : "landscape", - "idiom" : "ipad", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Zxcvbn/Info.plist b/Zxcvbn/Info.plist new file mode 100644 index 0000000..d3de8ee --- /dev/null +++ b/Zxcvbn/Info.plist @@ -0,0 +1,26 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + NSPrincipalClass + + + diff --git a/Zxcvbn/Zxcvbn-Prefix.pch b/Zxcvbn/Zxcvbn-Prefix.pch deleted file mode 100644 index 82a2bb4..0000000 --- a/Zxcvbn/Zxcvbn-Prefix.pch +++ /dev/null @@ -1,16 +0,0 @@ -// -// Prefix header -// -// The contents of this file are implicitly included at the beginning of every source file. -// - -#import - -#ifndef __IPHONE_5_0 -#warning "This project uses features only available in iOS SDK 5.0 and later." -#endif - -#ifdef __OBJC__ - #import - #import -#endif diff --git a/Zxcvbn/Zxcvbn.h b/Zxcvbn/Zxcvbn.h new file mode 100644 index 0000000..02bf591 --- /dev/null +++ b/Zxcvbn/Zxcvbn.h @@ -0,0 +1,20 @@ +// +// Zxcvbn.h +// Zxcvbn +// +// Created by 🎃 on 26 Oct 2015. +// Copyright © 2015 Dropbox. All rights reserved. +// + +#import + +//! Project version number for Zxcvbn. +FOUNDATION_EXPORT double ZxcvbnVersionNumber; + +//! Project version string for Zxcvbn. +FOUNDATION_EXPORT const unsigned char ZxcvbnVersionString[]; + +#import +#import +#import +#import diff --git a/Zxcvbn/en.lproj/InfoPlist.strings b/Zxcvbn/en.lproj/InfoPlist.strings deleted file mode 100644 index 477b28f..0000000 --- a/Zxcvbn/en.lproj/InfoPlist.strings +++ /dev/null @@ -1,2 +0,0 @@ -/* Localized versions of Info.plist keys */ - diff --git a/Zxcvbn/Zxcvbn/generated/adjacency_graphs.json b/Zxcvbn/generated/adjacency_graphs.json similarity index 100% rename from Zxcvbn/Zxcvbn/generated/adjacency_graphs.json rename to Zxcvbn/generated/adjacency_graphs.json diff --git a/Zxcvbn/Zxcvbn/generated/frequency_lists.json b/Zxcvbn/generated/frequency_lists.json similarity index 100% rename from Zxcvbn/Zxcvbn/generated/frequency_lists.json rename to Zxcvbn/generated/frequency_lists.json diff --git a/ZxcvbnTests/ZxcvbnTests-Info.plist b/ZxcvbnTests/Info.plist similarity index 80% rename from ZxcvbnTests/ZxcvbnTests-Info.plist rename to ZxcvbnTests/Info.plist index 0ec9bbf..ba72822 100644 --- a/ZxcvbnTests/ZxcvbnTests-Info.plist +++ b/ZxcvbnTests/Info.plist @@ -5,11 +5,13 @@ CFBundleDevelopmentRegion en CFBundleExecutable - ${EXECUTABLE_NAME} + $(EXECUTABLE_NAME) CFBundleIdentifier - com.dropbox.${PRODUCT_NAME:rfc1034identifier} + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 + CFBundleName + $(PRODUCT_NAME) CFBundlePackageType BNDL CFBundleShortVersionString diff --git a/ZxcvbnTests/ZxcvbnTests.m b/ZxcvbnTests/ZxcvbnTests.m index 39cb2e1..73ac0ce 100644 --- a/ZxcvbnTests/ZxcvbnTests.m +++ b/ZxcvbnTests/ZxcvbnTests.m @@ -2,8 +2,8 @@ // ZxcvbnTests.m // ZxcvbnTests // -// Created by Leah Culver on 2/9/14. -// Copyright (c) 2014 Dropbox. All rights reserved. +// Created by 🎃 on 26 Oct 2015. +// Copyright © 2015 Dropbox. All rights reserved. // #import @@ -14,21 +14,26 @@ @interface ZxcvbnTests : XCTestCase @implementation ZxcvbnTests -- (void)setUp -{ +- (void)setUp { [super setUp]; // Put setup code here. This method is called before the invocation of each test method in the class. } -- (void)tearDown -{ +- (void)tearDown { // Put teardown code here. This method is called after the invocation of each test method in the class. [super tearDown]; } -- (void)testExample -{ - XCTFail(@"No implementation for \"%s\"", __PRETTY_FUNCTION__); +- (void)testExample { + // This is an example of a functional test case. + // Use XCTAssert and related functions to verify your tests produce the correct results. +} + +- (void)testPerformanceExample { + // This is an example of a performance test case. + [self measureBlock:^{ + // Put the code you want to measure the time of here. + }]; } @end diff --git a/ZxcvbnTests/en.lproj/InfoPlist.strings b/ZxcvbnTests/en.lproj/InfoPlist.strings deleted file mode 100644 index 477b28f..0000000 --- a/ZxcvbnTests/en.lproj/InfoPlist.strings +++ /dev/null @@ -1,2 +0,0 @@ -/* Localized versions of Info.plist keys */ - diff --git a/iOS Example.xcodeproj/project.pbxproj b/iOS Example.xcodeproj/project.pbxproj new file mode 100644 index 0000000..609c708 --- /dev/null +++ b/iOS Example.xcodeproj/project.pbxproj @@ -0,0 +1,392 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXBuildFile section */ + D80ECBB11BDEAE9D0055EF0A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = D80ECBB01BDEAE9D0055EF0A /* main.m */; }; + D80ECBBC1BDEAE9D0055EF0A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D80ECBBB1BDEAE9D0055EF0A /* Assets.xcassets */; }; + D80ECBBF1BDEAE9D0055EF0A /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D80ECBBD1BDEAE9D0055EF0A /* LaunchScreen.storyboard */; }; + D80ECBF81BDEB0890055EF0A /* DBAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = D80ECBF71BDEB0890055EF0A /* DBAppDelegate.m */; }; + D80ECBFB1BDEB0B10055EF0A /* DBCreateAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D80ECBFA1BDEB0B10055EF0A /* DBCreateAccountViewController.m */; }; + D8EF582F1BDEB1470014E84B /* Zxcvbn.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D80ECC021BDEB0FE0055EF0A /* Zxcvbn.framework */; }; + D8EF58491BDEBEF30014E84B /* Main_iPad.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D8EF58451BDEBEF30014E84B /* Main_iPad.storyboard */; }; + D8EF584A1BDEBEF30014E84B /* Main_iPhone.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D8EF58471BDEBEF30014E84B /* Main_iPhone.storyboard */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + D80ECC011BDEB0FE0055EF0A /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = D80ECBFC1BDEB0FE0055EF0A /* Zxcvbn.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = D80ECB681BDEAA420055EF0A; + remoteInfo = Zxcvbn; + }; + D80ECC031BDEB0FE0055EF0A /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = D80ECBFC1BDEB0FE0055EF0A /* Zxcvbn.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = D80ECB721BDEAA420055EF0A; + remoteInfo = ZxcvbnTests; + }; + D8EF582B1BDEB1420014E84B /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = D80ECBFC1BDEB0FE0055EF0A /* Zxcvbn.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = D80ECB671BDEAA420055EF0A; + remoteInfo = Zxcvbn; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXFileReference section */ + D80ECBAC1BDEAE9D0055EF0A /* iOS Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "iOS Example.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + D80ECBB01BDEAE9D0055EF0A /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; + D80ECBBB1BDEAE9D0055EF0A /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + D80ECBBE1BDEAE9D0055EF0A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; + D80ECBC01BDEAE9D0055EF0A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + D80ECBF61BDEB0890055EF0A /* DBAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DBAppDelegate.h; sourceTree = ""; }; + D80ECBF71BDEB0890055EF0A /* DBAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DBAppDelegate.m; sourceTree = ""; }; + D80ECBF91BDEB0B10055EF0A /* DBCreateAccountViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DBCreateAccountViewController.h; sourceTree = ""; }; + D80ECBFA1BDEB0B10055EF0A /* DBCreateAccountViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DBCreateAccountViewController.m; sourceTree = ""; }; + D80ECBFC1BDEB0FE0055EF0A /* Zxcvbn.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = Zxcvbn.xcodeproj; sourceTree = ""; }; + D8EF58461BDEBEF30014E84B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main_iPad.storyboard; sourceTree = ""; }; + D8EF58481BDEBEF30014E84B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main_iPhone.storyboard; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + D80ECBA91BDEAE9D0055EF0A /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + D8EF582F1BDEB1470014E84B /* Zxcvbn.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + D80ECBA31BDEAE9D0055EF0A = { + isa = PBXGroup; + children = ( + D80ECBAE1BDEAE9D0055EF0A /* Source */, + D80ECBAD1BDEAE9D0055EF0A /* Products */, + D80ECBFC1BDEB0FE0055EF0A /* Zxcvbn.xcodeproj */, + ); + sourceTree = ""; + }; + D80ECBAD1BDEAE9D0055EF0A /* Products */ = { + isa = PBXGroup; + children = ( + D80ECBAC1BDEAE9D0055EF0A /* iOS Example.app */, + ); + name = Products; + sourceTree = ""; + }; + D80ECBAE1BDEAE9D0055EF0A /* Source */ = { + isa = PBXGroup; + children = ( + D80ECBF61BDEB0890055EF0A /* DBAppDelegate.h */, + D80ECBF71BDEB0890055EF0A /* DBAppDelegate.m */, + D80ECBF91BDEB0B10055EF0A /* DBCreateAccountViewController.h */, + D80ECBFA1BDEB0B10055EF0A /* DBCreateAccountViewController.m */, + D80ECBAF1BDEAE9D0055EF0A /* Supporting Files */, + ); + name = Source; + path = Example; + sourceTree = ""; + }; + D80ECBAF1BDEAE9D0055EF0A /* Supporting Files */ = { + isa = PBXGroup; + children = ( + D80ECBB01BDEAE9D0055EF0A /* main.m */, + D80ECBBB1BDEAE9D0055EF0A /* Assets.xcassets */, + D8EF58451BDEBEF30014E84B /* Main_iPad.storyboard */, + D8EF58471BDEBEF30014E84B /* Main_iPhone.storyboard */, + D80ECBBD1BDEAE9D0055EF0A /* LaunchScreen.storyboard */, + D80ECBC01BDEAE9D0055EF0A /* Info.plist */, + ); + name = "Supporting Files"; + sourceTree = ""; + }; + D80ECBFD1BDEB0FE0055EF0A /* Products */ = { + isa = PBXGroup; + children = ( + D80ECC021BDEB0FE0055EF0A /* Zxcvbn.framework */, + D80ECC041BDEB0FE0055EF0A /* ZxcvbnTests.xctest */, + ); + name = Products; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + D80ECBAB1BDEAE9D0055EF0A /* iOS Example */ = { + isa = PBXNativeTarget; + buildConfigurationList = D80ECBD91BDEAE9E0055EF0A /* Build configuration list for PBXNativeTarget "iOS Example" */; + buildPhases = ( + D80ECBA81BDEAE9D0055EF0A /* Sources */, + D80ECBA91BDEAE9D0055EF0A /* Frameworks */, + D80ECBAA1BDEAE9D0055EF0A /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + D8EF582C1BDEB1420014E84B /* PBXTargetDependency */, + ); + name = "iOS Example"; + productName = "iOS Example"; + productReference = D80ECBAC1BDEAE9D0055EF0A /* iOS Example.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + D80ECBA41BDEAE9D0055EF0A /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 0710; + ORGANIZATIONNAME = Dropbox; + TargetAttributes = { + D80ECBAB1BDEAE9D0055EF0A = { + CreatedOnToolsVersion = 7.1; + }; + }; + }; + buildConfigurationList = D80ECBA71BDEAE9D0055EF0A /* Build configuration list for PBXProject "iOS Example" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = D80ECBA31BDEAE9D0055EF0A; + productRefGroup = D80ECBAD1BDEAE9D0055EF0A /* Products */; + projectDirPath = ""; + projectReferences = ( + { + ProductGroup = D80ECBFD1BDEB0FE0055EF0A /* Products */; + ProjectRef = D80ECBFC1BDEB0FE0055EF0A /* Zxcvbn.xcodeproj */; + }, + ); + projectRoot = ""; + targets = ( + D80ECBAB1BDEAE9D0055EF0A /* iOS Example */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXReferenceProxy section */ + D80ECC021BDEB0FE0055EF0A /* Zxcvbn.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = Zxcvbn.framework; + remoteRef = D80ECC011BDEB0FE0055EF0A /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + D80ECC041BDEB0FE0055EF0A /* ZxcvbnTests.xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = ZxcvbnTests.xctest; + remoteRef = D80ECC031BDEB0FE0055EF0A /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; +/* End PBXReferenceProxy section */ + +/* Begin PBXResourcesBuildPhase section */ + D80ECBAA1BDEAE9D0055EF0A /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + D8EF584A1BDEBEF30014E84B /* Main_iPhone.storyboard in Resources */, + D8EF58491BDEBEF30014E84B /* Main_iPad.storyboard in Resources */, + D80ECBBF1BDEAE9D0055EF0A /* LaunchScreen.storyboard in Resources */, + D80ECBBC1BDEAE9D0055EF0A /* Assets.xcassets in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + D80ECBA81BDEAE9D0055EF0A /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + D80ECBFB1BDEB0B10055EF0A /* DBCreateAccountViewController.m in Sources */, + D80ECBF81BDEB0890055EF0A /* DBAppDelegate.m in Sources */, + D80ECBB11BDEAE9D0055EF0A /* main.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + D8EF582C1BDEB1420014E84B /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = Zxcvbn; + targetProxy = D8EF582B1BDEB1420014E84B /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin PBXVariantGroup section */ + D80ECBBD1BDEAE9D0055EF0A /* LaunchScreen.storyboard */ = { + isa = PBXVariantGroup; + children = ( + D80ECBBE1BDEAE9D0055EF0A /* Base */, + ); + name = LaunchScreen.storyboard; + sourceTree = ""; + }; + D8EF58451BDEBEF30014E84B /* Main_iPad.storyboard */ = { + isa = PBXVariantGroup; + children = ( + D8EF58461BDEBEF30014E84B /* Base */, + ); + name = Main_iPad.storyboard; + sourceTree = ""; + }; + D8EF58471BDEBEF30014E84B /* Main_iPhone.storyboard */ = { + isa = PBXVariantGroup; + children = ( + D8EF58481BDEBEF30014E84B /* Base */, + ); + name = Main_iPhone.storyboard; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + D80ECBD71BDEAE9E0055EF0A /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + 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 = 8.0; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + D80ECBD81BDEAE9E0055EF0A /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "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 = gnu99; + 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 = 8.0; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + D80ECBDA1BDEAE9E0055EF0A /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + INFOPLIST_FILE = Example/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "com.dropbox.Zxcvbn.iOS-Example"; + PRODUCT_NAME = "$(TARGET_NAME)"; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + D80ECBDB1BDEAE9E0055EF0A /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + INFOPLIST_FILE = Example/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "com.dropbox.Zxcvbn.iOS-Example"; + PRODUCT_NAME = "$(TARGET_NAME)"; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + D80ECBA71BDEAE9D0055EF0A /* Build configuration list for PBXProject "iOS Example" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + D80ECBD71BDEAE9E0055EF0A /* Debug */, + D80ECBD81BDEAE9E0055EF0A /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + D80ECBD91BDEAE9E0055EF0A /* Build configuration list for PBXNativeTarget "iOS Example" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + D80ECBDA1BDEAE9E0055EF0A /* Debug */, + D80ECBDB1BDEAE9E0055EF0A /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = D80ECBA41BDEAE9D0055EF0A /* Project object */; +} diff --git a/iOS Example.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/iOS Example.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..bfe77a2 --- /dev/null +++ b/iOS Example.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/iOS Example.xcodeproj/xcshareddata/xcschemes/iOS Example.xcscheme b/iOS Example.xcodeproj/xcshareddata/xcschemes/iOS Example.xcscheme new file mode 100644 index 0000000..774f448 --- /dev/null +++ b/iOS Example.xcodeproj/xcshareddata/xcschemes/iOS Example.xcscheme @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Zxcvbn/zxcvbn-example.png b/zxcvbn-example.png similarity index 100% rename from Zxcvbn/zxcvbn-example.png rename to zxcvbn-example.png diff --git a/zxcvbn-ios.podspec b/zxcvbn-ios.podspec index 45dd106..1dcdc6b 100644 --- a/zxcvbn-ios.podspec +++ b/zxcvbn-ios.podspec @@ -18,8 +18,8 @@ Pod::Spec.new do |s| s.author = { "Leah Culver" => "leah@dropbox.com" } s.platform = :ios, "7.0" s.source = { :git => "https://github.com/dropbox/zxcvbn-ios.git", :tag => "v1.0.3"} - s.source_files = "Zxcvbn/**/*.{h,m}" - s.exclude_files = "Zxcvbn/main.m", "Zxcvbn/DBAppDelegate.{h,m}", "Zxcvbn/DBCreateAccountViewController.{h,m}" - s.resources = "Zxcvbn/Zxcvbn/generated/*.json" + s.source_files = "Zxcvbn/*.{h,m}" + s.exclude_files = "Zxcvbn/Zxcvbn.h" + s.resources = "Zxcvbn/generated/*.json" s.requires_arc = true end