Skip to content

Commit

Permalink
Merge pull request #8 from dtrenz/develop
Browse files Browse the repository at this point in the history 
0.1.0 Release Candidate
  • Loading branch information
@dtrenz
dtrenz committed Mar 4, 2016
2 parents 6e4a4e9 + deb75b5 commit 2ab6820
Show file tree
Hide file tree
Showing 43 changed files with 874 additions and 153 deletions.
3 changes: 3 additions & 0 deletions .gitignore
View file
Expand Up @@ -36,3 +36,6 @@ xcuserdata
Pods/

*.xcuserstate

# Jazzy docs
docs/
2 changes: 2 additions & 0 deletions .hound.yml
View file
@@ -1,3 +1,5 @@
swift:
enabled: true
config_file: .swiftlint.yml
ruby:
enabled: false
4 changes: 4 additions & 0 deletions .slather.yml
View file
@@ -0,0 +1,4 @@
coverage_service: cobertura_xml
xcodeproj: SettingsKit.xcodeproj
source_directory: Sources
output_directory: .
5 changes: 0 additions & 5 deletions .swiftlint.yml
View file
@@ -1,7 +1,3 @@
# disabled_rules: # rule identifiers to exclude from running
# - valid_docs
# Find all the available rules by running:
# swiftlint rules
included: # paths to include during linting. `--path` is ignored if present.
- Sources
# parameterized rules can be customized from this configuration file
Expand All @@ -10,4 +6,3 @@ line_length: 120
type_body_length:
- 300 # warning
- 400 # error
# reporter: "csv" # reporter type (xcode, json, csv, checkstyle)
2 changes: 2 additions & 0 deletions .travis.yml
View file
Expand Up @@ -16,6 +16,8 @@ before_install:
- rvm use $RVM_RUBY_VERSION
- gem install cocoapods
- pod install
after_success:
- bash <(curl -s https://codecov.io/bash)
script:
- set -o pipefail && xcodebuild clean test -workspace SettingsKit.xcworkspace -scheme SettingsKit -destination 'platform=iOS Simulator,name=iPhone 6s' ONLY_ACTIVE_ARCH=YES | xcpretty
- pod lib lint
6 changes: 3 additions & 3 deletions CHANGELOG.md
View file
Expand Up @@ -7,9 +7,9 @@ Released on 2016-02-26.

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

---
149 changes: 90 additions & 59 deletions Example/Example.xcodeproj/project.pbxproj
View file
Expand Up @@ -7,58 +7,71 @@
objects = {

/* Begin PBXBuildFile section */
92DF00B9CDC2B6E743B19AFF /* Settings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16C05B7ADB503F56F194536E /* Settings.swift */; };
C5C8ED421C80C3AD001BC3F7 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C5C8ED411C80C3AD001BC3F7 /* LaunchScreen.storyboard */; };
C5C8ED441C80C3BE001BC3F7 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C5C8ED431C80C3BE001BC3F7 /* Main.storyboard */; };
C5D7BDB01C80B9640061D9DD /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C5D7BDA61C80B9640061D9DD /* AppDelegate.swift */; };
C5D7BDB51C80B9640061D9DD /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = C5D7BDAE1C80B9640061D9DD /* Settings.bundle */; };
C5D7BDB61C80B9640061D9DD /* Settings.swift in Sources */ = {isa = PBXBuildFile; fileRef = C5D7BDAF1C80B9640061D9DD /* Settings.swift */; };
E290B9A46F8F7A04F0BB7F4F /* Pods.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF86464863B18B629F048EE9 /* Pods.framework */; };
E57DB01B8F53140FF03745B7 /* Pods_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 48F05F7A68D93C05C48EF7C9 /* Pods_Example.framework */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
C5D7BDD11C80BE9F0061D9DD /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = C5D7BDCC1C80BE9F0061D9DD /* SettingsKit.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = C5D7BD931C80B5FD0061D9DD;
remoteInfo = SettingsKit;
};
C5D7BDD31C80BE9F0061D9DD /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = C5D7BDCC1C80BE9F0061D9DD /* SettingsKit.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = C5D7BDBC1C80BA040061D9DD;
remoteInfo = SettingsKitTests;
};
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
16C05B7ADB503F56F194536E /* Settings.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Settings.swift; path = Source/Settings.swift; sourceTree = SOURCE_ROOT; };
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>"; };
48F05F7A68D93C05C48EF7C9 /* Pods_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
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>"; };
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>"; };
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>"; };
C56921C61C765DB200CC8F56 /* Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Example.app; sourceTree = BUILT_PRODUCTS_DIR; };
C5C8ED411C80C3AD001BC3F7 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = Source/Interface/LaunchScreen.storyboard; sourceTree = SOURCE_ROOT; };
C5C8ED431C80C3BE001BC3F7 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = Main.storyboard; path = Source/Interface/Main.storyboard; sourceTree = SOURCE_ROOT; };
C5D7BDA61C80B9640061D9DD /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AppDelegate.swift; path = Source/AppDelegate.swift; sourceTree = SOURCE_ROOT; };
C5D7BDAD1C80B9640061D9DD /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Source/Info.plist; sourceTree = SOURCE_ROOT; };
C5D7BDAE1C80B9640061D9DD /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = Settings.bundle; path = Source/Settings.bundle; sourceTree = SOURCE_ROOT; };
C5D7BDAF1C80B9640061D9DD /* Settings.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Settings.swift; path = Source/Settings.swift; sourceTree = SOURCE_ROOT; };
C5D7BDCC1C80BE9F0061D9DD /* SettingsKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SettingsKit.xcodeproj; path = ../SettingsKit.xcodeproj; sourceTree = "<group>"; };
DF86464863B18B629F048EE9 /* Pods.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods.framework; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
C56921C31C765DB200CC8F56 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
E57DB01B8F53140FF03745B7 /* Pods_Example.framework in Frameworks */,
E290B9A46F8F7A04F0BB7F4F /* Pods.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
7D67E5DE028596A97467C9AC /* Frameworks */ = {
isa = PBXGroup;
children = (
48F05F7A68D93C05C48EF7C9 /* Pods_Example.framework */,
DF86464863B18B629F048EE9 /* Pods.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
BF87885EE54D31150CD1E786 /* Pods */ = {
isa = PBXGroup;
children = (
7862F4332F44F1B704BB396B /* Pods-Example.debug.xcconfig */,
A791B33752B6DAAB534A2B2D /* Pods-Example.release.xcconfig */,
827D4939CFA397AD32F0E777 /* Pods.debug.xcconfig */,
19D681994CF94AF2C19D11C2 /* Pods.release.xcconfig */,
);
name = Pods;
sourceTree = "<group>";
};
C56921BD1C765DB200CC8F56 = {
isa = PBXGroup;
children = (
C5D7BDCC1C80BE9F0061D9DD /* SettingsKit.xcodeproj */,
C56921C81C765DB200CC8F56 /* Example */,
C56921C71C765DB200CC8F56 /* Products */,
7D67E5DE028596A97467C9AC /* Frameworks */,
BF87885EE54D31150CD1E786 /* Pods */,
);
sourceTree = "<group>";
};
Expand All @@ -75,7 +88,7 @@
children = (
C5D7BDAE1C80B9640061D9DD /* Settings.bundle */,
C5D7BDA61C80B9640061D9DD /* AppDelegate.swift */,
C5D7BDAF1C80B9640061D9DD /* Settings.swift */,
16C05B7ADB503F56F194536E /* Settings.swift */,
C5C8ED451C80C3C3001BC3F7 /* Interface */,
C5D7BDB71C80B9990061D9DD /* Supporting Files */,
);
Expand All @@ -99,26 +112,20 @@
name = "Supporting Files";
sourceTree = "<group>";
};
C5D7BDCD1C80BE9F0061D9DD /* Products */ = {
isa = PBXGroup;
children = (
C5D7BDD21C80BE9F0061D9DD /* SettingsKit.framework */,
C5D7BDD41C80BE9F0061D9DD /* SettingsKitTests.xctest */,
);
name = Products;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
C56921C51C765DB200CC8F56 /* Example */ = {
isa = PBXNativeTarget;
buildConfigurationList = C56921D81C765DB200CC8F56 /* Build configuration list for PBXNativeTarget "Example" */;
buildPhases = (
E95A4735D72E990900CB7893 /* Check Pods Manifest.lock */,
C5D7BD821C7F92700061D9DD /* SettingsKit */,
C56921C21C765DB200CC8F56 /* Sources */,
C56921C31C765DB200CC8F56 /* Frameworks */,
C56921C41C765DB200CC8F56 /* Resources */,
C5D7BD821C7F92700061D9DD /* SettingsKit */,
CA95665E272F21B8600C2F2D /* Embed Pods Frameworks */,
E552EBDED7D9FB1E79869BC2 /* Copy Pods Resources */,
);
buildRules = (
);
Expand Down Expand Up @@ -155,36 +162,13 @@
mainGroup = C56921BD1C765DB200CC8F56;
productRefGroup = C56921C71C765DB200CC8F56 /* Products */;
projectDirPath = "";
projectReferences = (
{
ProductGroup = C5D7BDCD1C80BE9F0061D9DD /* Products */;
ProjectRef = C5D7BDCC1C80BE9F0061D9DD /* SettingsKit.xcodeproj */;
},
);
projectRoot = "";
targets = (
C56921C51C765DB200CC8F56 /* Example */,
);
};
/* End PBXProject section */

/* Begin PBXReferenceProxy section */
C5D7BDD21C80BE9F0061D9DD /* SettingsKit.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = SettingsKit.framework;
remoteRef = C5D7BDD11C80BE9F0061D9DD /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
C5D7BDD41C80BE9F0061D9DD /* SettingsKitTests.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = SettingsKitTests.xctest;
remoteRef = C5D7BDD31C80BE9F0061D9DD /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */

/* Begin PBXResourcesBuildPhase section */
C56921C41C765DB200CC8F56 /* Resources */ = {
isa = PBXResourcesBuildPhase;
Expand All @@ -205,15 +189,60 @@
files = (
);
inputPaths = (
"$(SRCROOT)/Example/Example/Settings.swift",
"$(SRCROOT)/Source/Settings.bundle/Root.plist",
);
name = SettingsKit;
outputPaths = (
"$(DERIVED_FILE_DIR)/SettingsKit/configure",
"$(SRCROOT)/Source/Settings.swift",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
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";
};
CA95665E272F21B8600C2F2D /* Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
E552EBDED7D9FB1E79869BC2 /* Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-resources.sh\"\n";
showEnvVarsInLog = 0;
};
E95A4735D72E990900CB7893 /* Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Check Pods Manifest.lock";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
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 && ./!!$";
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */

Expand All @@ -222,8 +251,8 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
C5D7BDB61C80B9640061D9DD /* Settings.swift in Sources */,
C5D7BDB01C80B9640061D9DD /* AppDelegate.swift in Sources */,
92DF00B9CDC2B6E743B19AFF /* Settings.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -313,6 +342,7 @@
};
C56921D91C765DB200CC8F56 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 827D4939CFA397AD32F0E777 /* Pods.debug.xcconfig */;
buildSettings = {
CLANG_ENABLE_MODULES = YES;
INFOPLIST_FILE = Source/Info.plist;
Expand All @@ -325,6 +355,7 @@
};
C56921DA1C765DB200CC8F56 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 19D681994CF94AF2C19D11C2 /* Pods.release.xcconfig */;
buildSettings = {
CLANG_ENABLE_MODULES = YES;
INFOPLIST_FILE = Source/Info.plist;
Expand Down

0 comments on commit 2ab6820

Please sign in to comment.