Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
guillaumeChb committed Apr 9, 2020
2 parents cfa3a7e + 89dac8a commit 0c56087
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 17 deletions.
1 change: 0 additions & 1 deletion .swift-version

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?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>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
22 changes: 11 additions & 11 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
PODS:
- Extra (1.2.1):
- Extra/CoreAnimation (= 1.2.1)
- Extra/Foundation (= 1.2.1)
- Extra/UIKit (= 1.2.1)
- Extra/CoreAnimation (1.2.1)
- Extra/Foundation (1.2.1)
- Extra/Realm (1.2.1):
- Extra (1.2.2):
- Extra/CoreAnimation (= 1.2.2)
- Extra/Foundation (= 1.2.2)
- Extra/UIKit (= 1.2.2)
- Extra/CoreAnimation (1.2.2)
- Extra/Foundation (1.2.2)
- Extra/Realm (1.2.2):
- RealmSwift (~> 3.10)
- Extra/UIKit (1.2.1)
- Extra/UIKit (1.2.2)
- Realm (3.11.0):
- Realm/Headers (= 3.11.0)
- Realm/Headers (3.11.0)
Expand All @@ -23,7 +23,7 @@ DEPENDENCIES:
- SwiftLint (~> 0.27.0)

SPEC REPOS:
https://github.com/cocoapods/specs.git:
https://github.com/CocoaPods/Specs.git:
- Realm
- RealmSwift
- SwiftGen
Expand All @@ -34,12 +34,12 @@ EXTERNAL SOURCES:
:path: "../"

SPEC CHECKSUMS:
Extra: c0f234a6bba4a64b3f06e7ec1ceaf183bf82ea46
Extra: 23dd35dd2ba9c05957b131d179261085a042081d
Realm: 92f09a102692b96a9a10e9617f214f15c5ab85fc
RealmSwift: 5f0481cd658bb751c509314b964a35eaa264d2cf
SwiftGen: 04bbc1fb69add82a7a471380dfbdd00b45912d17
SwiftLint: 3207c1faa2240bf8973b191820a116113cd11073

PODFILE CHECKSUM: 627a861f2ab08b839513b74566012272b9285536

COCOAPODS: 1.6.1
COCOAPODS: 1.8.4
6 changes: 4 additions & 2 deletions Extra.podspec
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
Pod::Spec.new do |s|
s.name = 'Extra'
s.version = '1.2.1'
s.version = '1.3.0'
s.summary = 'Swift library with usefull and lightfull extensions for your Cocoa Touch projects.'

s.homepage = 'https://github.com/smartnsoft/Extra'
s.license = { :type => 'MIT', :file => 'LICENSE' }
s.author = { 'Smart&Soft' => '[email protected]' }
s.source = { :git => 'https://github.com/smartnsoft/Extra.git', :tag => s.version.to_s }

s.swift_versions = '5'

s.ios.deployment_target = '9.0'
s.tvos.deployment_target = '9.0'

Expand All @@ -29,6 +31,6 @@ Pod::Spec.new do |s|

s.subspec 'Realm' do |sp|
sp.source_files = 'Extra/Classes/Extra/**/*.{swift}','Extra/Classes/Realm/**/*.{swift}'
sp.dependency 'RealmSwift', '~> 3.10'
sp.dependency 'RealmSwift', '~> 4.0.0'
end
end
11 changes: 10 additions & 1 deletion Extra/Classes/CoreAnimation/CALayer+Extra.swift
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,16 @@ extension Extra where Base: CALayer {
} else {
let deltaX = -spread
let rect = self.base.bounds.insetBy(dx: deltaX, dy: deltaX)
self.base.shadowPath = UIBezierPath(rect: rect).cgPath
self.base.shadowPath = UIBezierPath(roundedRect: rect, cornerRadius: self.base.cornerRadius).cgPath
}
}

/// Resets shadow related properties to their default values.
public func resetShadowToDefaults() {
self.base.shadowColor = UIColor.black.cgColor
self.base.shadowOpacity = 0
self.base.shadowOffset = CGSize(width:0, height:-3)
self.base.shadowRadius = 3
self.base.shadowPath = nil
}
}
4 changes: 2 additions & 2 deletions Extra/Classes/Extra/Extra.swift
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ public protocol ExtraCompatible {
}

public extension ExtraCompatible {
public static var ex: Extra<Self>.Type {
static var ex: Extra<Self>.Type {
return Extra<Self>.self
}

public var ex: Extra<Self> {
var ex: Extra<Self> {
return Extra(self)
}
}

0 comments on commit 0c56087

Please sign in to comment.