diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000000000000000000000000000000000000..ca7f4286c705b84e0115f2ae0695c037cf4371b1
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,5 @@
+language: objective-c
+script:
+ - xctool -project Bolts.xcodeproj -sdk iphonesimulator -scheme Bolts -configuration Debug64 -destination 'name=iPhone Retina (4-inch 64-bit)' test
+ - xctool -project Bolts.xcodeproj -sdk macosx -scheme MacBolts test
+
\ No newline at end of file
diff --git a/Bolts.podspec b/Bolts.podspec
index 5c1849aff638d273f01f181882fe42d493b0682f..5b4f8cc3a0b07b91b76131fcd879b74701fea880 100644
--- a/Bolts.podspec
+++ b/Bolts.podspec
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "Bolts"
- s.version = "1.0.0"
+ s.version = "1.1.1"
s.summary = "Bolts is a collection of low-level libraries designed to make developing mobile apps easier."
s.description = <<-DESC
Bolts was designed by Parse and Facebook for our own internal use, and we have decided to open source these libraries to make them available to others. Using these libraries does not require using any Parse services. Nor do they require having a Parse or Facebook developer account.
@@ -16,6 +16,7 @@ Pod::Spec.new do |s|
s.documentation_url = 'http://boltsframework.github.io/docs/ios/'
s.social_media_url = "https://twitter.com/ParseIt"
s.requires_arc = true
+ s.platform = :ios, '5.0'
s.source_files = 'Bolts'
diff --git a/Bolts.xcodeproj/project.pbxproj b/Bolts.xcodeproj/project.pbxproj
index 882660f6d9479dc55e6ce3ba5c90735871b31661..360ee68f705953e56dc38ec9ca9dda6f5b4856f2 100644
--- a/Bolts.xcodeproj/project.pbxproj
+++ b/Bolts.xcodeproj/project.pbxproj
@@ -972,11 +972,12 @@
8EDDA63317E17DDC00655F8A /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- DSTROOT = /tmp/Bolts.dst;
EXECUTABLE_EXTENSION = dylib;
EXECUTABLE_PREFIX = "";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "Bolts/Bolts-Prefix.pch";
+ INSTALL_PATH = "@executable_path/../Frameworks";
+ LD_DYLIB_INSTALL_NAME = "$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)";
MACH_O_TYPE = mh_dylib;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = MacBolts;
@@ -988,11 +989,12 @@
8EDDA63417E17DDC00655F8A /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- DSTROOT = /tmp/Bolts.dst;
EXECUTABLE_EXTENSION = dylib;
EXECUTABLE_PREFIX = "";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "Bolts/Bolts-Prefix.pch";
+ INSTALL_PATH = "@executable_path/../Frameworks";
+ LD_DYLIB_INSTALL_NAME = "@executable_path/../Frameworks/Bolts.framework/Bolts";
MACH_O_TYPE = mh_dylib;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = MacBolts;
@@ -1051,11 +1053,12 @@
8EF746C817F26365006AF112 /* Debug64 */ = {
isa = XCBuildConfiguration;
buildSettings = {
- DSTROOT = /tmp/Bolts.dst;
EXECUTABLE_EXTENSION = dylib;
EXECUTABLE_PREFIX = "";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "Bolts/Bolts-Prefix.pch";
+ INSTALL_PATH = "@executable_path/../Frameworks";
+ LD_DYLIB_INSTALL_NAME = "$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)";
MACH_O_TYPE = mh_dylib;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = MacBolts;
@@ -1171,11 +1174,12 @@
8EF746CD17F2636F006AF112 /* Release64 */ = {
isa = XCBuildConfiguration;
buildSettings = {
- DSTROOT = /tmp/Bolts.dst;
EXECUTABLE_EXTENSION = dylib;
EXECUTABLE_PREFIX = "";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "Bolts/Bolts-Prefix.pch";
+ INSTALL_PATH = "@executable_path/../Frameworks";
+ LD_DYLIB_INSTALL_NAME = "@executable_path/../Frameworks/Bolts.framework/Bolts";
MACH_O_TYPE = mh_dylib;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = MacBolts;
diff --git a/Bolts.xcodeproj/project.xcworkspace/xcshareddata/Bolts.xccheckout b/Bolts.xcodeproj/project.xcworkspace/xcshareddata/Bolts.xccheckout
index 45f48a0c20f385f20a3eb94becf8396ff173fcff..32c18eb81250bbab88cb366e5226fff615b4b65f 100644
--- a/Bolts.xcodeproj/project.xcworkspace/xcshareddata/Bolts.xccheckout
+++ b/Bolts.xcodeproj/project.xcworkspace/xcshareddata/Bolts.xccheckout
@@ -5,36 +5,36 @@
<key>IDESourceControlProjectFavoriteDictionaryKey</key>
<false/>
<key>IDESourceControlProjectIdentifier</key>
- <string>33AFD6E3-D171-4482-B16B-FCADBB7D8BBA</string>
+ <string>76C1C527-08D6-44DC-A8CC-0003FD7B72C4</string>
<key>IDESourceControlProjectName</key>
<string>Bolts</string>
<key>IDESourceControlProjectOriginsDictionary</key>
<dict>
- <key>884C55CB-0254-40AB-86DF-DEBA8BC457B5</key>
- <string>ssh://github.com/BoltsFramework/Bolts-iOS.git</string>
+ <key>A50054DB-5A63-4B7C-AFCE-0BFADE9BB5C5</key>
+ <string>ssh://github.com/nlutsenko-fb/Bolts-iOS.git</string>
</dict>
<key>IDESourceControlProjectPath</key>
<string>Bolts.xcodeproj/project.xcworkspace</string>
<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
<dict>
- <key>884C55CB-0254-40AB-86DF-DEBA8BC457B5</key>
+ <key>A50054DB-5A63-4B7C-AFCE-0BFADE9BB5C5</key>
<string>../..</string>
</dict>
<key>IDESourceControlProjectURL</key>
- <string>ssh://github.com/BoltsFramework/Bolts-iOS.git</string>
+ <string>ssh://github.com/nlutsenko-fb/Bolts-iOS.git</string>
<key>IDESourceControlProjectVersion</key>
<integer>110</integer>
<key>IDESourceControlProjectWCCIdentifier</key>
- <string>884C55CB-0254-40AB-86DF-DEBA8BC457B5</string>
+ <string>A50054DB-5A63-4B7C-AFCE-0BFADE9BB5C5</string>
<key>IDESourceControlProjectWCConfigurations</key>
<array>
<dict>
<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
<string>public.vcs.git</string>
<key>IDESourceControlWCCIdentifierKey</key>
- <string>884C55CB-0254-40AB-86DF-DEBA8BC457B5</string>
+ <string>A50054DB-5A63-4B7C-AFCE-0BFADE9BB5C5</string>
<key>IDESourceControlWCCName</key>
- <string>Bolts-iOS</string>
+ <string>bolts</string>
</dict>
</array>
</dict>
diff --git a/Bolts/BoltsVersion.h b/Bolts/BoltsVersion.h
index b9f24ba079c9f77a3933d43bb3eaed9774c6a038..db40b1f9a7dd50d908f1720e4c6048c075fde109 100644
--- a/Bolts/BoltsVersion.h
+++ b/Bolts/BoltsVersion.h
@@ -1 +1 @@
-#define BOLTS_VERSION @"1.1.0"
+#define BOLTS_VERSION @"1.1.1"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8e62d6c19a87faa3f20a404e5cbd7edf02f217c0..abe242bb72d0d7bf54b65ce1d25b5229c25b3ca1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
# Bolts CHANGELOG
+## 1.1.1
+
+- Bolts for Mac is now a dynamic framework
+- Bug fixes
+
+## 1.1.0
+
+- Adds App Links.
+
## 1.0.0
-Initial release.
+- Initial release.
diff --git a/Readme.md b/Readme.md
index 3ca0e5eda4230b8b74676f0b62be3c50e680121d..52a17f920b1ddd13ebd4f269221af311c29d2b6d 100644
--- a/Readme.md
+++ b/Readme.md
@@ -1,5 +1,12 @@
Bolts
============
+[](https://travis-ci.org/BoltsFramework/Bolts-IOS)
+[](http://cocoadocs.org/docsets/Bolts/)
+[](http://cocoadocs.org/docsets/Bolts/)
+[](https://github.com/BoltsFramework/Bolts-iOS/blob/master/LICENSE)
+[](https://www.versioneye.com/objective-c/bolts)
+[](https://www.versioneye.com/objective-c/bolts/references)
+
Bolts is a collection of low-level libraries designed to make developing mobile
apps easier. Bolts was designed by Parse and Facebook for our own internal use,
diff --git a/scripts/build_framework.sh b/scripts/build_framework.sh
index 522ebb25e43f94af63f373dc0b57120866ae58d0..bcc1cf49741f0c223a86ad41db3b80cfbdb2e774 100755
--- a/scripts/build_framework.sh
+++ b/scripts/build_framework.sh
@@ -59,6 +59,9 @@ test -x "$LIPO" || die 'Could not find lipo in $PATH'
BOLTS_UNIVERSAL_BINARY=$BOLTS_BUILD/${BUILDCONFIGURATION}-universal/Bolts
BOLTS_OSX_BINARY=$BOLTS_BUILD/${BUILDCONFIGURATION}/MacBolts.dylib
+BOLTS_HEADERS_FOLDER_UNIVERSAL=$BOLTS_BUILD/${BUILDCONFIGURATION}-iphoneos/Bolts
+BOLTS_HEADERS_FOLDER_OSX=$BOLTS_BUILD/${BUILDCONFIGURATION}/Bolts
+
# -----------------------------------------------------------------------------
progress_message Building Framework.
@@ -119,6 +122,7 @@ $LIPO \
function build_framework() {
FRAMEWORK=$1
BINARY=$2
+ HEADERS_FOLDER=$3
FRAMEWORK_NAME=`basename $FRAMEWORK`
progress_message "Building $FRAMEWORK_NAME."
@@ -132,7 +136,7 @@ function build_framework() {
mkdir $FRAMEWORK/Versions/A/DeprecatedHeaders
\cp \
- $BOLTS_BUILD/${BUILDCONFIGURATION}-iphoneos/Bolts/*.h \
+ $HEADERS_FOLDER/*.h \
$FRAMEWORK/Versions/A/Headers \
|| die "Error building framework while copying SDK headers"
@@ -149,8 +153,8 @@ function build_framework() {
ln -s ./A ./Current
}
-build_framework "$BOLTS_IOS_FRAMEWORK" "$BOLTS_UNIVERSAL_BINARY"
-build_framework "$BOLTS_OSX_FRAMEWORK" "$BOLTS_OSX_BINARY"
+build_framework "$BOLTS_IOS_FRAMEWORK" "$BOLTS_UNIVERSAL_BINARY" "$BOLTS_HEADERS_FOLDER_UNIVERSAL"
+build_framework "$BOLTS_OSX_FRAMEWORK" "$BOLTS_OSX_BINARY" "$BOLTS_HEADERS_FOLDER_OSX"
# -----------------------------------------------------------------------------
# Run unit tests