Skip to content

Add support for Swift Package Manager #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
oliveratkinson-bc wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add support for Swift Package Manager #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb9e884
Add support for Swift Package Manager
oliveratkinson-bc Aug 13, 2021
c0db9d5
Add include folder to xcodeproj
oliveratkinson-bc Aug 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ DerivedData
.idea/
*.hmap
xcuserdata/*
.swiftpm
34 changes: 34 additions & 0 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
// swift-tools-version:5.3
// The swift-tools-version declares the minimum version of Swift required to build this package.

import PackageDescription

let package = Package(
name: "Zxcvbn",
products: [
.library(name: "Zxcvbn", targets: ["Zxcvbn"])
],
targets: [
.target(
name: "Zxcvbn",
path: "Zxcvbn",
exclude: [
"Info.plist",
"Zxcvbn.h"
],
resources: [
.copy("generated/adjacency_graphs.json"),
.copy("generated/frequency_lists.json"),
],
publicHeadersPath: "include"
),
.testTarget(
name: "ZxcvbnTests",
dependencies: ["Zxcvbn"],
path: "ZxcvbnTests",
exclude: [
"Info.plist"
]
)
]
)
41 changes: 25 additions & 16 deletions Zxcvbn.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,20 @@
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 */; };
F33A751B26C6B5EA000C2F54 /* DBMatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = F33A751726C6B5EA000C2F54 /* DBMatcher.h */; };
F33A751C26C6B5EA000C2F54 /* DBPasswordStrengthMeterView.h in Headers */ = {isa = PBXBuildFile; fileRef = F33A751826C6B5EA000C2F54 /* DBPasswordStrengthMeterView.h */; };
F33A751D26C6B5EA000C2F54 /* DBZxcvbn.h in Headers */ = {isa = PBXBuildFile; fileRef = F33A751926C6B5EA000C2F54 /* DBZxcvbn.h */; };
F33A751E26C6B5EA000C2F54 /* DBScorer.h in Headers */ = {isa = PBXBuildFile; fileRef = F33A751A26C6B5EA000C2F54 /* DBScorer.h */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand All @@ -43,16 +43,16 @@
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 = "<group>"; };
D80ECB791BDEAA420055EF0A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
D80ECB821BDEAA7D0055EF0A /* DBMatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DBMatcher.h; sourceTree = "<group>"; };
D80ECB831BDEAA7D0055EF0A /* DBMatcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DBMatcher.m; sourceTree = "<group>"; };
D80ECB841BDEAA7D0055EF0A /* DBPasswordStrengthMeterView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DBPasswordStrengthMeterView.h; sourceTree = "<group>"; };
D80ECB851BDEAA7D0055EF0A /* DBPasswordStrengthMeterView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DBPasswordStrengthMeterView.m; sourceTree = "<group>"; };
D80ECB861BDEAA7D0055EF0A /* DBScorer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DBScorer.h; sourceTree = "<group>"; };
D80ECB871BDEAA7D0055EF0A /* DBScorer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DBScorer.m; sourceTree = "<group>"; };
D80ECB881BDEAA7D0055EF0A /* DBZxcvbn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DBZxcvbn.h; sourceTree = "<group>"; };
D80ECB891BDEAA7D0055EF0A /* DBZxcvbn.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DBZxcvbn.m; sourceTree = "<group>"; };
D80ECB9A1BDEAABE0055EF0A /* adjacency_graphs.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; name = adjacency_graphs.json; path = generated/adjacency_graphs.json; sourceTree = "<group>"; };
D80ECB9B1BDEAABE0055EF0A /* frequency_lists.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; name = frequency_lists.json; path = generated/frequency_lists.json; sourceTree = "<group>"; };
F33A751726C6B5EA000C2F54 /* DBMatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DBMatcher.h; sourceTree = "<group>"; };
F33A751826C6B5EA000C2F54 /* DBPasswordStrengthMeterView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DBPasswordStrengthMeterView.h; sourceTree = "<group>"; };
F33A751926C6B5EA000C2F54 /* DBZxcvbn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DBZxcvbn.h; sourceTree = "<group>"; };
F33A751A26C6B5EA000C2F54 /* DBScorer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DBScorer.h; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -95,14 +95,11 @@
D80ECB6A1BDEAA420055EF0A /* Zxcvbn */ = {
isa = PBXGroup;
children = (
F33A751626C6B5EA000C2F54 /* include */,
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 */,
Expand All @@ -128,6 +125,17 @@
name = Generated;
sourceTree = "<group>";
};
F33A751626C6B5EA000C2F54 /* include */ = {
isa = PBXGroup;
children = (
F33A751726C6B5EA000C2F54 /* DBMatcher.h */,
F33A751826C6B5EA000C2F54 /* DBPasswordStrengthMeterView.h */,
F33A751926C6B5EA000C2F54 /* DBZxcvbn.h */,
F33A751A26C6B5EA000C2F54 /* DBScorer.h */,
);
path = include;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXHeadersBuildPhase section */
Expand All @@ -136,10 +144,10 @@
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 */,
F33A751E26C6B5EA000C2F54 /* DBScorer.h in Headers */,
F33A751D26C6B5EA000C2F54 /* DBZxcvbn.h in Headers */,
F33A751B26C6B5EA000C2F54 /* DBMatcher.h in Headers */,
F33A751C26C6B5EA000C2F54 /* DBPasswordStrengthMeterView.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -204,6 +212,7 @@
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
);
mainGroup = D80ECB5E1BDEAA420055EF0A;
Expand Down
8 changes: 8 additions & 0 deletions Zxcvbn.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
13 changes: 11 additions & 2 deletions Zxcvbn/DBMatcher.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,11 +602,20 @@ - (id)init
return self;
}

- (NSBundle *)bundle;
{
#if SWIFT_PACKAGE
return SWIFTPM_MODULE_BUNDLE;
#else
return [NSBundle bundleForClass:[self class]];
#endif
}

- (NSArray *)loadFrequencyLists
{
NSMutableArray *dictionaryMatchers = [[NSMutableArray alloc] init];

NSString *filePath = [[NSBundle bundleForClass:[self class]] pathForResource:@"frequency_lists" ofType:@"json"];
NSString *filePath = [self.bundle pathForResource:@"frequency_lists" ofType:@"json"];
NSData *data = [NSData dataWithContentsOfFile:filePath];

NSError *error;
Expand All @@ -629,7 +638,7 @@ - (NSArray *)loadFrequencyLists

- (NSDictionary *)loadAdjacencyGraphs
{
NSString *filePath = [[NSBundle bundleForClass:[self class]] pathForResource:@"adjacency_graphs" ofType:@"json"];
NSString *filePath = [self.bundle pathForResource:@"adjacency_graphs" ofType:@"json"];
NSData *data = [NSData dataWithContentsOfFile:filePath];

NSError *error;
Expand Down
0 Zxcvbn/DBMatcher.h → Zxcvbn/include/DBMatcher.h
View file
Open in desktop
File renamed without changes.
0 Zxcvbn/DBPasswordStrengthMeterView.h → Zxcvbn/include/DBPasswordStrengthMeterView.h
View file
Open in desktop
File renamed without changes.
0 Zxcvbn/DBScorer.h → Zxcvbn/include/DBScorer.h
View file
Open in desktop
File renamed without changes.
0 Zxcvbn/DBZxcvbn.h → Zxcvbn/include/DBZxcvbn.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion zxcvbn-ios.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ 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.4"}
s.source_files = "Zxcvbn/*.{h,m}"
s.source_files = "Zxcvbn/**/*.{h,m}"
s.exclude_files = "Zxcvbn/Zxcvbn.h"
s.resources = "Zxcvbn/generated/*.json"
s.requires_arc = true
Expand Down