Commit 371e0399 by Daniel Dahan

Merge branch 'master' into development

parents 65d8767b 78da12cd
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = 'Material' s.name = 'Material'
s.version = '2.4.16' s.version = '2.4.17'
s.license = 'BSD-3-Clause' s.license = 'BSD-3-Clause'
s.summary = 'An animation and graphics framework for Material Design in Swift.' s.summary = 'An animation and graphics framework for Material Design in Swift.'
s.homepage = 'http://materialswift.com' s.homepage = 'http://materialswift.com'
...@@ -14,7 +14,7 @@ Pod::Spec.new do |s| ...@@ -14,7 +14,7 @@ Pod::Spec.new do |s|
s.subspec 'Core' do |s| s.subspec 'Core' do |s|
s.ios.deployment_target = '8.0' s.ios.deployment_target = '8.0'
s.ios.source_files = 'Sources/iOS/*.swift' s.ios.source_files = 'Sources/iOS/*.swift'
s.osx.deployment_target = '10.9' s.osx.deployment_target = '10.12'
s.osx.source_files = 'Sources/macOS/**/*.swift' s.osx.source_files = 'Sources/macOS/**/*.swift'
s.requires_arc = true s.requires_arc = true
s.resource_bundles = { s.resource_bundles = {
......
...@@ -1189,7 +1189,7 @@ ...@@ -1189,7 +1189,7 @@
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.0; IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MACOSX_DEPLOYMENT_TARGET = 10.9; MACOSX_DEPLOYMENT_TARGET = 10.12;
MTL_ENABLE_DEBUG_INFO = YES; MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
PRODUCT_NAME = Material; PRODUCT_NAME = Material;
...@@ -1236,7 +1236,7 @@ ...@@ -1236,7 +1236,7 @@
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.0; IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MACOSX_DEPLOYMENT_TARGET = 10.9; MACOSX_DEPLOYMENT_TARGET = 10.12;
MTL_ENABLE_DEBUG_INFO = NO; MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_NAME = Material; PRODUCT_NAME = Material;
SDKROOT = iphoneos; SDKROOT = iphoneos;
......
...@@ -43,7 +43,7 @@ Take a look at a sample [Photo Collection](https://github.com/CosmicMind/Samples ...@@ -43,7 +43,7 @@ Take a look at a sample [Photo Collection](https://github.com/CosmicMind/Samples
## Requirements ## Requirements
* iOS 8.0+ / Mac OS X 10.9+ * iOS 8.0+ / macOS 10.12+
* Xcode 8.0+ * Xcode 8.0+
## Communication ## Communication
...@@ -56,7 +56,7 @@ Take a look at a sample [Photo Collection](https://github.com/CosmicMind/Samples ...@@ -56,7 +56,7 @@ Take a look at a sample [Photo Collection](https://github.com/CosmicMind/Samples
## Installation ## Installation
> **Embedded frameworks require a minimum deployment target of iOS 8 or OS X Mavericks (10.9).** > **Embedded frameworks require a minimum deployment target of iOS 8+ or macOS (10.12+).**
> - [Download Material](https://github.com/CosmicMind/Material/archive/master.zip) > - [Download Material](https://github.com/CosmicMind/Material/archive/master.zip)
Visit the [Installation](https://github.com/CosmicMind/Material/wiki/Installation) page to learn how to install Material using [CocoaPods](http://cocoapods.org) and [Carthage](https://github.com/Carthage/Carthage). Visit the [Installation](https://github.com/CosmicMind/Material/wiki/Installation) page to learn how to install Material using [CocoaPods](http://cocoapods.org) and [Carthage](https://github.com/Carthage/Carthage).
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>FMWK</string> <string>FMWK</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>2.4.16</string> <string>2.4.17</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment