Skip to content

Commit 18b77e4

Browse files
Merge pull request #54 from 3sidedcube/release/v1.9.0
Release/v1.9.0
2 parents 76d8858 + b17a286 commit 18b77e4

File tree

4 files changed

+10
-9
lines changed

4 files changed

+10
-9
lines changed

.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
language: swift
22
xcode_project: ThunderBasics.xcodeproj # path to your xcodeproj folder
3-
osx_image: xcode11.6
3+
osx_image: xcode12
44
env:
55
global:
66
- LC_CTYPE=en_US.UTF-8
77
- LANG=en_US.UTF-8
88
matrix:
99
include:
1010
- xcode_scheme: ThunderBasics-iOS
11-
xcode_destination: platform=iOS Simulator,OS=13.6,name=iPhone 11 Pro Max
11+
xcode_destination: platform=iOS Simulator,OS=14.0,name=iPhone 11 Pro Max
1212
- xcode_scheme: ThunderBasics-macOS
1313
xcode_destination: platform=macOS

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Thunder Basics
22

3-
[![Build Status](https://travis-ci.org/3sidedcube/ThunderBasics.svg)](https://travis-ci.org/3sidedcube/ThunderBasics) [![Swift 5.2](http://img.shields.io/badge/swift-5.2-brightgreen.svg)](https://swift.org/blog/swift-5-2-released/) [![Apache 2](https://img.shields.io/badge/license-Apache%202-brightgreen.svg)](LICENSE.md)
3+
[![Build Status](https://travis-ci.org/3sidedcube/ThunderBasics.svg)](https://travis-ci.org/3sidedcube/ThunderBasics) [![Swift 5.3](http://img.shields.io/badge/swift-5.3-brightgreen.svg)](https://swift.org/blog/swift-5-3-released/) [![Apache 2](https://img.shields.io/badge/license-Apache%202-brightgreen.svg)](LICENSE.md)
44

55
Thunder Basics is a set of useful utilities for handling basic iOS development tasks.
66

@@ -10,7 +10,7 @@ Setting up your app to use ThunderBasics is a simple and quick process. You can
1010

1111
## Carthage
1212

13-
- Add `github "3sidedcube/ThunderBasics" == 1.8.0` to your Cartfile.
13+
- Add `github "3sidedcube/ThunderBasics" == 1.9.0` to your Cartfile.
1414
- Run `carthage update --platform ios` to fetch the framework.
1515
- Drag `ThunderBasics` into your project's _Linked Frameworks and Libraries_ section from the `Carthage/Build` folder.
1616
- Add the Build Phases script step as defined [here](https://github.com/Carthage/Carthage#if-youre-building-for-ios-tvos-or-watchos).

ThunderBasics.xcodeproj/project.pbxproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -854,7 +854,7 @@
854854
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
855855
MACH_O_TYPE = mh_dylib;
856856
MACOSX_DEPLOYMENT_TARGET = 10.12;
857-
MARKETING_VERSION = 1.7.0;
857+
MARKETING_VERSION = 1.9.0;
858858
PRODUCT_BUNDLE_IDENTIFIER = com.threesidedcube.ThunderBasicsMac;
859859
PRODUCT_NAME = ThunderBasics;
860860
SDKROOT = macosx;
@@ -884,7 +884,7 @@
884884
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
885885
MACH_O_TYPE = mh_dylib;
886886
MACOSX_DEPLOYMENT_TARGET = 10.12;
887-
MARKETING_VERSION = 1.7.0;
887+
MARKETING_VERSION = 1.9.0;
888888
PRODUCT_BUNDLE_IDENTIFIER = com.threesidedcube.ThunderBasicsMac;
889889
PRODUCT_NAME = ThunderBasics;
890890
SDKROOT = macosx;
@@ -1080,7 +1080,7 @@
10801080
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
10811081
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
10821082
MACH_O_TYPE = mh_dylib;
1083-
MARKETING_VERSION = 1.8.0;
1083+
MARKETING_VERSION = 1.9.0;
10841084
ONLY_ACTIVE_ARCH = NO;
10851085
PRODUCT_BUNDLE_IDENTIFIER = "com.threesidedcube.$(PRODUCT_NAME:rfc1034identifier)";
10861086
PRODUCT_NAME = ThunderBasics;
@@ -1109,7 +1109,7 @@
11091109
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
11101110
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
11111111
MACH_O_TYPE = mh_dylib;
1112-
MARKETING_VERSION = 1.8.0;
1112+
MARKETING_VERSION = 1.9.0;
11131113
PRODUCT_BUNDLE_IDENTIFIER = "com.threesidedcube.$(PRODUCT_NAME:rfc1034identifier)";
11141114
PRODUCT_NAME = ThunderBasics;
11151115
SKIP_INSTALL = YES;

ThunderBasics/DesignableView.swift

+2-1
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,12 @@ public class ScaleBasedConstraint: NSLayoutConstraint {
7777
open override func prepareForInterfaceBuilder() {
7878

7979
super.prepareForInterfaceBuilder()
80+
// We don't set layer.shadowColor here because it clashes when compiling
81+
// with `UILabel`'s own `shadowColor` property.
8082
layer.cornerRadius = cornerRadius
8183
layer.borderColor = borderColor?.cgColor
8284
layer.borderWidth = borderWidth
8385
layer.shadowRadius = shadowRadius
84-
layer.shadowColor = shadowColor?.cgColor
8586
layer.shadowOpacity = shadowOpacity
8687
}
8788

0 commit comments

Comments
 (0)