Merge branch 'release/1.1.6'

.gitignore

@@ -1,2 +1,7 @@
-xcuserdata
 .DS_Store
+
+*.xcscmblueprint
+xcuserdata
+
+archive
+build

Framework/Sources/NSBundle+SRGAppearance.m

@@ -18,12 +18,14 @@ @implementation NSBundle (SRGAppearance)
 
 + (NSBundle *)srg_appearanceBundle
 {
-    static NSBundle *bundle;
-    static dispatch_once_t once;
-    dispatch_once(&once, ^{
-        bundle = [NSBundle bundleForClass:[SRGAppearanceBundle class]];
+    static NSBundle *s_bundle;
+    static dispatch_once_t s_onceToken;
+    dispatch_once(&s_onceToken, ^{
+        NSString *bundlePath = [[NSBundle bundleForClass:[SRGAppearanceBundle class]].bundlePath stringByAppendingPathComponent:@"SRGAppearance.bundle"];
+        s_bundle = [NSBundle bundleWithPath:bundlePath];
+        NSAssert(s_bundle, @"Please add SRGAppearance.bundle to your project resources");
     });
-    return bundle;
+    return s_bundle;
 }
 
 @end

Makefile

@@ -0,0 +1,30 @@
+#!/usr/bin/xcrun make -f
+
+.PHONY: all
+all:
+	@echo "Building the project..."
+	@xcodebuild build
+	@echo "... done.\n"
+
+.PHONY: package
+package:
+	@echo "Packaging binaries..."
+	@mkdir -p archive
+	@carthage build --no-skip-current
+	@carthage archive --output archive
+	@echo "... done.\n"
+
+.PHONY: clean
+clean:
+	@echo "Cleaning up build products..."
+	@xcodebuild clean
+	@rm -rf $(CARTHAGE_FOLDER)
+	@echo "... done.\n"
+
+.PHONY: help
+help:
+	@echo "The following targets are available:"
+	@echo "   all                         Build project dependencies and the project"
+	@echo "   package                     Build and package the framework for attaching to github releases"
+	@echo "   clean                       Clean the project and its dependencies"
+	@echo "   help                        Display this message"

SRGAppearance-bundle/Info.plist

@@ -0,0 +1,26 @@
+<?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>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2018 SRG SSR. All rights reserved.</string>
+	<key>NSPrincipalClass</key>
+	<string></string>
+</dict>
+</plist>