Merge branch 'release/1.1.8'

.gitignore

@@ -3,5 +3,10 @@
 *.xcscmblueprint
 xcuserdata
 
-archive
-build
+/archive
+/build
+
+/Carthage
+
+/fastlane/report.xml
+/fastlane/test_output

Demo/Sources/Application/AppDelegate.m

@@ -13,7 +13,7 @@ @implementation AppDelegate
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
     self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
-    self.window.backgroundColor = [UIColor blackColor];
+    self.window.backgroundColor = UIColor.blackColor;
     [self.window makeKeyAndVisible];
 
     FontsViewController *fontsViewController = [[FontsViewController alloc] init];

Demo/Sources/Application/main.m

@@ -11,6 +11,6 @@
 int main(int argc, char * argv[])
 {
     @autoreleasepool {
-        return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
+        return UIApplicationMain(argc, argv, nil, NSStringFromClass(AppDelegate.class));
     }
 }

Demo/Sources/Fonts/FontsViewController.m

@@ -69,7 +69,7 @@ @implementation FontsViewController
 
 - (instancetype)init
 {
-    UIStoryboard *storyboard = [UIStoryboard storyboardWithName:NSStringFromClass([self class]) bundle:nil];
+    UIStoryboard *storyboard = [UIStoryboard storyboardWithName:NSStringFromClass(self.class) bundle:nil];
     return [storyboard instantiateInitialViewController];
 }
 
@@ -79,7 +79,7 @@ - (void)viewDidLoad
 {
     [super viewDidLoad];
 
-    self.tableView.rowHeight = 60.f;    
+    self.tableView.rowHeight = 60.f;
     [self reloadData];
 }
 

Framework/Sources/NSBundle+SRGAppearance.h

@@ -11,9 +11,9 @@ NS_ASSUME_NONNULL_BEGIN
 @interface NSBundle (SRGAppearance)
 
 /**
- *  The appearance resource bundle
+ *  The appearance resource bundle.
  */
-+ (NSBundle *)srg_appearanceBundle;
+@property (class, nonatomic, readonly) NSBundle *srg_appearanceBundle;
 
 @end
 

Framework/Sources/NSBundle+SRGAppearance.m

@@ -21,7 +21,7 @@ + (NSBundle *)srg_appearanceBundle
     static NSBundle *s_bundle;
     static dispatch_once_t s_onceToken;
     dispatch_once(&s_onceToken, ^{
-        NSString *bundlePath = [[NSBundle bundleForClass:[SRGAppearanceBundle class]].bundlePath stringByAppendingPathComponent:@"SRGAppearance.bundle"];
+        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");
     });

Framework/Sources/UIColor+SRGAppearance.h

@@ -19,12 +19,12 @@ OBJC_EXPORT NSValueTransformer *SRGHexadecimalColorTransformer(void);
 /**
  *  The official SRG SSR red color.
  */
-+ (UIColor *)srg_redColor;
+@property (class, nonatomic, readonly) UIColor *srg_redColor;
 
 /**
  *  The official SRG SSR blue color.
  */
-+ (UIColor *)srg_blueColor;
+@property (class, nonatomic, readonly) UIColor *srg_blueColor;
 
 /**
  *  Return the color matching a hexadecimal string (with or without leading wildcard), `nil` if the string does

Framework/Sources/UIColor+SRGAppearance.m

@@ -35,7 +35,7 @@ @implementation SRGHexadecimalColorValueTransformer
 
 + (Class)transformedValueClass
 {
-    return [UIColor class];
+    return UIColor.class;
 }
 
 + (BOOL)allowsReverseTransformation
@@ -45,7 +45,7 @@ + (BOOL)allowsReverseTransformation
 
 - (id)transformedValue:(id)value
 {
-    if (! [value isKindOfClass:[NSString class]]) {
+    if (! [value isKindOfClass:NSString.class]) {
         return nil;
     }
 
@@ -67,7 +67,7 @@ - (id)transformedValue:(id)value
 
 - (id)reverseTransformedValue:(id)value
 {
-    if (! [value isKindOfClass:[UIColor class]]) {
+    if (! [value isKindOfClass:UIColor.class]) {
         return nil;
     }
 

SRGAppearance.xcodeproj/project.pbxproj

@@ -215,9 +215,9 @@
 		6FA09D731D9E861600EDCA64 /* Sources */ = {
 			isa = PBXGroup;
 			children = (
+				6FE08CD91E8AA8E300EC4716 /* Helpers */,
 				6F5543EC20ADA2950049ECB2 /* FontsTestCase.m */,
 				6FA09D741D9E861600EDCA64 /* ColorTestCase.m */,
-				6FE08CD91E8AA8E300EC4716 /* Helpers */,
 				6F5769B01EBCBE6100F931CA /* ImageTestCase.m */,
 			);
 			path = Sources;
@@ -599,7 +599,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
-				MARKETING_VERSION = 1.1.7;
+				MARKETING_VERSION = 1.1.8;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -698,7 +698,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
-				MARKETING_VERSION = 1.1.7;
+				MARKETING_VERSION = 1.1.8;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -874,7 +874,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
-				MARKETING_VERSION = 1.1.7;
+				MARKETING_VERSION = 1.1.8;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -929,7 +929,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
-				MARKETING_VERSION = 1.1.7;
+				MARKETING_VERSION = 1.1.8;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";

SRGAppearance.xcodeproj/xcshareddata/xcschemes/SRGAppearance.xcscheme

@@ -30,7 +30,9 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
-            skipped = "NO">
+            skipped = "NO"
+            parallelizable = "YES"
+            testExecutionOrdering = "random">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "6FA09D651D9E85BC00EDCA64"

Tests/Sources/Helpers/BundleFix.m

@@ -28,7 +28,7 @@ + (void)load
 
 + (NSBundle *)swizzled_mainBundle
 {
-    return [NSBundle bundleForClass:[DummyClass class]];
+    return [NSBundle bundleForClass:DummyClass.class];
 }
 
 @end

Tests/Sources/ImageTestCase.m

@@ -49,7 +49,7 @@ - (void)testTintedImageWithColor
     UIImage *image = [UIImage imageWithContentsOfFile:TestImagePath()];
     XCTAssertEqualObjects([image srg_imageTintedWithColor:nil], image);
 
-    UIImage *tintedImage = [image srg_imageTintedWithColor:[UIColor blueColor]];
+    UIImage *tintedImage = [image srg_imageTintedWithColor:UIColor.blueColor];
     XCTAssertTrue(CGSizeEqualToSize(image.size, tintedImage.size));
 }
 

docs/CODE_OF_CONDUCT.md

@@ -0,0 +1,46 @@
+# Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

docs/CONTRIBUTING.md

@@ -0,0 +1,41 @@
+## Introduction
+
+Thank you for very much for your interest in contributing to our project! As a public service company, we want to shape a product that better matches our user needs and desires. Ideas or direct contributions are therefore warmly welcome and will be considered with great care, provided they fulfill a few requirements listed in this document. Please read it first before you decide to contribute.
+
+### Why guidelines?
+
+Our development team is small, our ability to quickly evaluate a need or a code submission is therefore critical. Please follow the present contributing guidelines so that we can efficiently consider your proposal. You should also read or our [code of conduct](CODE_OF_CONDUCT.md), providing a few guidelines to keep interactions as respectful as possible.
+
+### Contributions we are looking for
+
+Any kind of contribution is welcome, as long as it improves the overall quality of our product, for example:
+
+* Requests for new features or ideas.
+* Bug reports or fixes.
+* Documentation improvements.
+* Translation improvements.
+
+Contributions can either take the form of simple issues where you describe the problem you face or what you would like to see in our products. If you feel up to the challenge, you can even submit code in the form of pull requests which our team will review.
+
+### Contributions we are not looking for
+
+Requests which are too vague or not related to our product will not be taken into account. We also have no editorial influence, any issue related to the content available on our platform will simply be closed.
+
+## Contributing
+
+You can use issues to report bugs, submit ideas or request features. People with a programming background can also submit changes directly via pull requests. Creating issues or pull requests requires you to own or [open](https://github.com/join) a GitHub account.
+
+If you are not sure about the likelihood of a change you propose to be accepted, please open an issue first. We can discuss it there, especially whether it is compatible with our product or not. This way you can avoid creating an entire pull request we will never be able to merge.
+
+Templates are available when you want to contribute:
+
+* [Issues](https://github.com/SRGSSR/playsrg-ios/issues/new): Please follow our issue template. You can omit information which does not make sense but, in general, the more details you can provide, the better. This ensures we can quickly reproduce the problem you are facing, increasing the likelihood we can fix it. 
+* [Pull requests](https://github.com/SRGSSR/playsrg-ios/compare): Please follow our code conventions, test your code well, and write unit tests when this makes sense. We will review your work and, if successful, merge it back into the main development branch.
+
+## Code conventions
+
+We currently have no formal code conventions, but we try to keep our codebase consistent. In general, having a look at the code itself should be enough for you to discover how you should write your changes.
+
+## Code review
+
+Pull requests, once complete, can be submitted for review by our team. Depending on the complexity of the involved changes, a few iterations might be needed. Once a pull request has been approved, it will be rebased, merged back into the development trunk and delivered with the next release.

docs/README.md

@@ -12,7 +12,11 @@ SRG Appearance is a lightweight library providing unified SRG SSR appearance to
 
 ## Compatibility
 
-The library is suitable for applications running on iOS 9 and above. The project is meant to be opened with the latest Xcode version (currently Xcode 9).
+The library is suitable for applications running on iOS 9 and above. The project is meant to be opened with the latest Xcode version (currently Xcode 10).
+
+## Contributing
+
+If you want to contribute to the project, have a look at our [contributing guide](CONTRIBUTING.md).
 
 ## Installation
 
@@ -22,8 +26,6 @@ The library can be added to a project using [Carthage](https://github.com/Cartha
 github "SRGSSR/srgappearance-ios"
 ```
 
-Until Carthage 0.30, only dynamic frameworks could be integrated. Starting with Carthage 0.30, though, frameworks can be integrated statically as well, which avoids slow application startups usually associated with the use of too many dynamic frameworks.
-
 For more information about Carthage and its use, refer to the [official documentation](https://github.com/Carthage/Carthage).
 
 ### Dependencies

fastlane/Fastfile

@@ -0,0 +1,42 @@
+# Customise this file, documentation can be found here:
+# https://github.com/fastlane/fastlane/tree/master/fastlane/docs
+# All available actions: https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Actions.md
+# can also be listed using the `fastlane actions` command
+
+# Change the syntax highlighting to Ruby
+# All lines starting with a # are ignored when running `fastlane`
+
+# This is the minimum version number required.
+fastlane_version "1.95.0"
+
+default_platform :ios
+
+platform :ios do
+  before_all do |lane|
+    ensure_git_status_clean
+  end
+
+  desc "Run library tests"
+  lane :test do
+    scan(
+      scheme: "SRGAppearance",
+      clean: true
+    ) 
+  end
+
+  after_all do |lane|
+    reset_git_repo(skip_clean: true)
+  end
+
+  error do |lane, exception|
+    clean_build_artifacts
+    reset_git_repo(skip_clean: true, force: true)
+  end
+end
+
+
+# More information about multiple platforms in fastlane: https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Platforms.md
+# All available actions: https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Actions.md
+
+# fastlane reports which actions are used
+# No personal data is recorded. Learn more at https://github.com/fastlane/enhancer

fastlane/README.md

@@ -0,0 +1,29 @@
+fastlane documentation
+================
+# Installation
+
+Make sure you have the latest version of the Xcode command line tools installed:
+
+```
+xcode-select --install
+```
+
+Install _fastlane_ using
+```
+[sudo] gem install fastlane -NV
+```
+or alternatively using `brew cask install fastlane`
+
+# Available Actions
+## iOS
+### ios test
+```
+fastlane ios test
+```
+Run library tests
+
+----
+
+This README.md is auto-generated and will be re-generated every time [fastlane](https://fastlane.tools) is run.
+More information about fastlane can be found on [fastlane.tools](https://fastlane.tools).
+The documentation of fastlane can be found on [docs.fastlane.tools](https://docs.fastlane.tools).