Skip to content

Commit 2ab6820

Browse files
dtrenzdtrenz
committed
Merge pull request #8 from dtrenz/develop
0.1.0 Release Candidate
2 parents 6e4a4e9 + deb75b5 commit 2ab6820

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+874
-153
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,6 @@ xcuserdata
3636
Pods/
3737

3838
*.xcuserstate
39+
40+
# Jazzy docs
41+
docs/

‎.hound.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
swift:
22
enabled: true
33
config_file: .swiftlint.yml
4+
ruby:
5+
enabled: false

‎.slather.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
coverage_service: cobertura_xml
2+
xcodeproj: SettingsKit.xcodeproj
3+
source_directory: Sources
4+
output_directory: .

‎.swiftlint.yml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
# disabled_rules: # rule identifiers to exclude from running
2-
# - valid_docs
3-
# Find all the available rules by running:
4-
# swiftlint rules
51
included: # paths to include during linting. `--path` is ignored if present.
62
- Sources
73
# parameterized rules can be customized from this configuration file
@@ -10,4 +6,3 @@ line_length: 120
106
type_body_length:
117
- 300 # warning
128
- 400 # error
13-
# reporter: "csv" # reporter type (xcode, json, csv, checkstyle)

‎.travis.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ before_install:
1616
- rvm use $RVM_RUBY_VERSION
1717
- gem install cocoapods
1818
- pod install
19+
after_success:
20+
- bash <(curl -s https://codecov.io/bash)
1921
script:
2022
- set -o pipefail && xcodebuild clean test -workspace SettingsKit.xcworkspace -scheme SettingsKit -destination 'platform=iOS Simulator,name=iPhone 6s' ONLY_ACTIVE_ARCH=YES | xcpretty
2123
- pod lib lint

‎CHANGELOG.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ Released on 2016-02-26.
77

88
#### Added
99
- Core feature set for initial release:
10-
- Creates version string using Major.Minor.Build
11-
- Displays version string in Settings screen
12-
- Documentation & Screenshots
10+
- Store & Retrieve settings
11+
- Observe settings to be able to respond to changes
12+
- Documentation
1313
- Example iOS project
1414

1515
---

‎Example/Example.xcodeproj/project.pbxproj‎

Lines changed: 90 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -7,58 +7,71 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
92DF00B9CDC2B6E743B19AFF /* Settings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16C05B7ADB503F56F194536E /* Settings.swift */; };
1011
C5C8ED421C80C3AD001BC3F7 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C5C8ED411C80C3AD001BC3F7 /* LaunchScreen.storyboard */; };
1112
C5C8ED441C80C3BE001BC3F7 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C5C8ED431C80C3BE001BC3F7 /* Main.storyboard */; };
1213
C5D7BDB01C80B9640061D9DD /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C5D7BDA61C80B9640061D9DD /* AppDelegate.swift */; };
1314
C5D7BDB51C80B9640061D9DD /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = C5D7BDAE1C80B9640061D9DD /* Settings.bundle */; };
14-
C5D7BDB61C80B9640061D9DD /* Settings.swift in Sources */ = {isa = PBXBuildFile; fileRef = C5D7BDAF1C80B9640061D9DD /* Settings.swift */; };
15+
E290B9A46F8F7A04F0BB7F4F /* Pods.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF86464863B18B629F048EE9 /* Pods.framework */; };
16+
E57DB01B8F53140FF03745B7 /* Pods_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 48F05F7A68D93C05C48EF7C9 /* Pods_Example.framework */; };
1517
/* End PBXBuildFile section */
1618

17-
/* Begin PBXContainerItemProxy section */
18-
C5D7BDD11C80BE9F0061D9DD /* PBXContainerItemProxy */ = {
19-
isa = PBXContainerItemProxy;
20-
containerPortal = C5D7BDCC1C80BE9F0061D9DD /* SettingsKit.xcodeproj */;
21-
proxyType = 2;
22-
remoteGlobalIDString = C5D7BD931C80B5FD0061D9DD;
23-
remoteInfo = SettingsKit;
24-
};
25-
C5D7BDD31C80BE9F0061D9DD /* PBXContainerItemProxy */ = {
26-
isa = PBXContainerItemProxy;
27-
containerPortal = C5D7BDCC1C80BE9F0061D9DD /* SettingsKit.xcodeproj */;
28-
proxyType = 2;
29-
remoteGlobalIDString = C5D7BDBC1C80BA040061D9DD;
30-
remoteInfo = SettingsKitTests;
31-
};
32-
/* End PBXContainerItemProxy section */
33-
3419
/* Begin PBXFileReference section */
20+
16C05B7ADB503F56F194536E /* Settings.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Settings.swift; path = Source/Settings.swift; sourceTree = SOURCE_ROOT; };
21+
19D681994CF94AF2C19D11C2 /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
22+
48F05F7A68D93C05C48EF7C9 /* Pods_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
23+
7862F4332F44F1B704BB396B /* 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>"; };
24+
827D4939CFA397AD32F0E777 /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; };
25+
A791B33752B6DAAB534A2B2D /* 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>"; };
3526
C56921C61C765DB200CC8F56 /* Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Example.app; sourceTree = BUILT_PRODUCTS_DIR; };
3627
C5C8ED411C80C3AD001BC3F7 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = Source/Interface/LaunchScreen.storyboard; sourceTree = SOURCE_ROOT; };
3728
C5C8ED431C80C3BE001BC3F7 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = Main.storyboard; path = Source/Interface/Main.storyboard; sourceTree = SOURCE_ROOT; };
3829
C5D7BDA61C80B9640061D9DD /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AppDelegate.swift; path = Source/AppDelegate.swift; sourceTree = SOURCE_ROOT; };
3930
C5D7BDAD1C80B9640061D9DD /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Source/Info.plist; sourceTree = SOURCE_ROOT; };
4031
C5D7BDAE1C80B9640061D9DD /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = Settings.bundle; path = Source/Settings.bundle; sourceTree = SOURCE_ROOT; };
41-
C5D7BDAF1C80B9640061D9DD /* Settings.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Settings.swift; path = Source/Settings.swift; sourceTree = SOURCE_ROOT; };
42-
C5D7BDCC1C80BE9F0061D9DD /* SettingsKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SettingsKit.xcodeproj; path = ../SettingsKit.xcodeproj; sourceTree = "<group>"; };
32+
DF86464863B18B629F048EE9 /* Pods.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods.framework; sourceTree = BUILT_PRODUCTS_DIR; };
4333
/* End PBXFileReference section */
4434

4535
/* Begin PBXFrameworksBuildPhase section */
4636
C56921C31C765DB200CC8F56 /* Frameworks */ = {
4737
isa = PBXFrameworksBuildPhase;
4838
buildActionMask = 2147483647;
4939
files = (
40+
E57DB01B8F53140FF03745B7 /* Pods_Example.framework in Frameworks */,
41+
E290B9A46F8F7A04F0BB7F4F /* Pods.framework in Frameworks */,
5042
);
5143
runOnlyForDeploymentPostprocessing = 0;
5244
};
5345
/* End PBXFrameworksBuildPhase section */
5446

5547
/* Begin PBXGroup section */
48+
7D67E5DE028596A97467C9AC /* Frameworks */ = {
49+
isa = PBXGroup;
50+
children = (
51+
48F05F7A68D93C05C48EF7C9 /* Pods_Example.framework */,
52+
DF86464863B18B629F048EE9 /* Pods.framework */,
53+
);
54+
name = Frameworks;
55+
sourceTree = "<group>";
56+
};
57+
BF87885EE54D31150CD1E786 /* Pods */ = {
58+
isa = PBXGroup;
59+
children = (
60+
7862F4332F44F1B704BB396B /* Pods-Example.debug.xcconfig */,
61+
A791B33752B6DAAB534A2B2D /* Pods-Example.release.xcconfig */,
62+
827D4939CFA397AD32F0E777 /* Pods.debug.xcconfig */,
63+
19D681994CF94AF2C19D11C2 /* Pods.release.xcconfig */,
64+
);
65+
name = Pods;
66+
sourceTree = "<group>";
67+
};
5668
C56921BD1C765DB200CC8F56 = {
5769
isa = PBXGroup;
5870
children = (
59-
C5D7BDCC1C80BE9F0061D9DD /* SettingsKit.xcodeproj */,
6071
C56921C81C765DB200CC8F56 /* Example */,
6172
C56921C71C765DB200CC8F56 /* Products */,
73+
7D67E5DE028596A97467C9AC /* Frameworks */,
74+
BF87885EE54D31150CD1E786 /* Pods */,
6275
);
6376
sourceTree = "<group>";
6477
};
@@ -75,7 +88,7 @@
7588
children = (
7689
C5D7BDAE1C80B9640061D9DD /* Settings.bundle */,
7790
C5D7BDA61C80B9640061D9DD /* AppDelegate.swift */,
78-
C5D7BDAF1C80B9640061D9DD /* Settings.swift */,
91+
16C05B7ADB503F56F194536E /* Settings.swift */,
7992
C5C8ED451C80C3C3001BC3F7 /* Interface */,
8093
C5D7BDB71C80B9990061D9DD /* Supporting Files */,
8194
);
@@ -99,26 +112,20 @@
99112
name = "Supporting Files";
100113
sourceTree = "<group>";
101114
};
102-
C5D7BDCD1C80BE9F0061D9DD /* Products */ = {
103-
isa = PBXGroup;
104-
children = (
105-
C5D7BDD21C80BE9F0061D9DD /* SettingsKit.framework */,
106-
C5D7BDD41C80BE9F0061D9DD /* SettingsKitTests.xctest */,
107-
);
108-
name = Products;
109-
sourceTree = "<group>";
110-
};
111115
/* End PBXGroup section */
112116

113117
/* Begin PBXNativeTarget section */
114118
C56921C51C765DB200CC8F56 /* Example */ = {
115119
isa = PBXNativeTarget;
116120
buildConfigurationList = C56921D81C765DB200CC8F56 /* Build configuration list for PBXNativeTarget "Example" */;
117121
buildPhases = (
122+
E95A4735D72E990900CB7893 /* Check Pods Manifest.lock */,
123+
C5D7BD821C7F92700061D9DD /* SettingsKit */,
118124
C56921C21C765DB200CC8F56 /* Sources */,
119125
C56921C31C765DB200CC8F56 /* Frameworks */,
120126
C56921C41C765DB200CC8F56 /* Resources */,
121-
C5D7BD821C7F92700061D9DD /* SettingsKit */,
127+
CA95665E272F21B8600C2F2D /* Embed Pods Frameworks */,
128+
E552EBDED7D9FB1E79869BC2 /* Copy Pods Resources */,
122129
);
123130
buildRules = (
124131
);
@@ -155,36 +162,13 @@
155162
mainGroup = C56921BD1C765DB200CC8F56;
156163
productRefGroup = C56921C71C765DB200CC8F56 /* Products */;
157164
projectDirPath = "";
158-
projectReferences = (
159-
{
160-
ProductGroup = C5D7BDCD1C80BE9F0061D9DD /* Products */;
161-
ProjectRef = C5D7BDCC1C80BE9F0061D9DD /* SettingsKit.xcodeproj */;
162-
},
163-
);
164165
projectRoot = "";
165166
targets = (
166167
C56921C51C765DB200CC8F56 /* Example */,
167168
);
168169
};
169170
/* End PBXProject section */
170171

171-
/* Begin PBXReferenceProxy section */
172-
C5D7BDD21C80BE9F0061D9DD /* SettingsKit.framework */ = {
173-
isa = PBXReferenceProxy;
174-
fileType = wrapper.framework;
175-
path = SettingsKit.framework;
176-
remoteRef = C5D7BDD11C80BE9F0061D9DD /* PBXContainerItemProxy */;
177-
sourceTree = BUILT_PRODUCTS_DIR;
178-
};
179-
C5D7BDD41C80BE9F0061D9DD /* SettingsKitTests.xctest */ = {
180-
isa = PBXReferenceProxy;
181-
fileType = wrapper.cfbundle;
182-
path = SettingsKitTests.xctest;
183-
remoteRef = C5D7BDD31C80BE9F0061D9DD /* PBXContainerItemProxy */;
184-
sourceTree = BUILT_PRODUCTS_DIR;
185-
};
186-
/* End PBXReferenceProxy section */
187-
188172
/* Begin PBXResourcesBuildPhase section */
189173
C56921C41C765DB200CC8F56 /* Resources */ = {
190174
isa = PBXResourcesBuildPhase;
@@ -205,15 +189,60 @@
205189
files = (
206190
);
207191
inputPaths = (
208-
"$(SRCROOT)/Example/Example/Settings.swift",
192+
"$(SRCROOT)/Source/Settings.bundle/Root.plist",
209193
);
210194
name = SettingsKit;
211195
outputPaths = (
212-
"$(DERIVED_FILE_DIR)/SettingsKit/configure",
196+
"$(SRCROOT)/Source/Settings.swift",
197+
);
198+
runOnlyForDeploymentPostprocessing = 0;
199+
shellPath = /bin/sh;
200+
shellScript = "PATH=$(bash -l -c 'echo $PATH')\n$PODS_ROOT/SettingsKit/build -p $PROJECT_FILE_PATH -s $SCRIPT_INPUT_FILE_0 -o $SCRIPT_OUTPUT_FILE_0\n";
201+
};
202+
CA95665E272F21B8600C2F2D /* Embed Pods Frameworks */ = {
203+
isa = PBXShellScriptBuildPhase;
204+
buildActionMask = 2147483647;
205+
files = (
206+
);
207+
inputPaths = (
208+
);
209+
name = "Embed Pods Frameworks";
210+
outputPaths = (
211+
);
212+
runOnlyForDeploymentPostprocessing = 0;
213+
shellPath = /bin/sh;
214+
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-frameworks.sh\"\n";
215+
showEnvVarsInLog = 0;
216+
};
217+
E552EBDED7D9FB1E79869BC2 /* Copy Pods Resources */ = {
218+
isa = PBXShellScriptBuildPhase;
219+
buildActionMask = 2147483647;
220+
files = (
221+
);
222+
inputPaths = (
223+
);
224+
name = "Copy Pods Resources";
225+
outputPaths = (
226+
);
227+
runOnlyForDeploymentPostprocessing = 0;
228+
shellPath = /bin/sh;
229+
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-resources.sh\"\n";
230+
showEnvVarsInLog = 0;
231+
};
232+
E95A4735D72E990900CB7893 /* Check Pods Manifest.lock */ = {
233+
isa = PBXShellScriptBuildPhase;
234+
buildActionMask = 2147483647;
235+
files = (
236+
);
237+
inputPaths = (
238+
);
239+
name = "Check Pods Manifest.lock";
240+
outputPaths = (
213241
);
214242
runOnlyForDeploymentPostprocessing = 0;
215243
shellPath = /bin/sh;
216-
shellScript = "echo \"SettingsKit: Configuring Settings.bundle\"\n#cat ~/Dev/src/About/Sources/About.swift $(SCRIPT_INPUT_FILE_0) ~/Dev/src/About/Sources/generate.swift | swiftc - -o $(DERIVED_FILE_DIR)/SettingsKit/configure && ./!!$";
244+
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";
245+
showEnvVarsInLog = 0;
217246
};
218247
/* End PBXShellScriptBuildPhase section */
219248

@@ -222,8 +251,8 @@
222251
isa = PBXSourcesBuildPhase;
223252
buildActionMask = 2147483647;
224253
files = (
225-
C5D7BDB61C80B9640061D9DD /* Settings.swift in Sources */,
226254
C5D7BDB01C80B9640061D9DD /* AppDelegate.swift in Sources */,
255+
92DF00B9CDC2B6E743B19AFF /* Settings.swift in Sources */,
227256
);
228257
runOnlyForDeploymentPostprocessing = 0;
229258
};
@@ -313,6 +342,7 @@
313342
};
314343
C56921D91C765DB200CC8F56 /* Debug */ = {
315344
isa = XCBuildConfiguration;
345+
baseConfigurationReference = 827D4939CFA397AD32F0E777 /* Pods.debug.xcconfig */;
316346
buildSettings = {
317347
CLANG_ENABLE_MODULES = YES;
318348
INFOPLIST_FILE = Source/Info.plist;
@@ -325,6 +355,7 @@
325355
};
326356
C56921DA1C765DB200CC8F56 /* Release */ = {
327357
isa = XCBuildConfiguration;
358+
baseConfigurationReference = 19D681994CF94AF2C19D11C2 /* Pods.release.xcconfig */;
328359
buildSettings = {
329360
CLANG_ENABLE_MODULES = YES;
330361
INFOPLIST_FILE = Source/Info.plist;

0 commit comments

Comments
 (0)