diff --git a/.travis.yml b/.travis.yml index 472c0f6..89e38e8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,16 +9,24 @@ env: - WORKSPACE=UtiliKit.xcworkspace - IOS_FRAMEWORK_SCHEME=UtiliKit-iOS matrix: - - DESTINATION="platform=iOS Simulator,OS=11.2,name=iPhone X" SCHEME="$IOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" POD_LINT="YES" RUN_DANGER="YES" + - DESTINATION="platform=iOS Simulator,OS=12.2,name=iPhone X" SCHEME="$IOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" POD_LINT="YES" RUN_DANGER="YES" #- DESTINATION="platform=tvOS Simulator,OS=11.2,name=Apple TV 4K" SCHEME="$TVOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" POD_LINT="NO" RUN_DANGER="NO" #- DESTINATION="platform=watchOS Simulator,OS=4.2,name=Apple Watch Series 3 - 42mm" SCHEME="$WATCHOS_FRAMEWORK_SCHEME" RUN_TESTS="NO" POD_LINT="NO" RUN_DANGER="NO" +cache: + directories: + - Carthage + - ~/.danger-swift addons: homebrew: update: true taps: - danger/tap packages: + - carthage - danger-swift +before_install: + - carthage bootstrap --verbose --no-use-binaries --platform iOS,tvOS,watchOS --cache-builds + script: #- swiftlint - set -o pipefail diff --git a/CHANGELOG.md b/CHANGELOG.md index f03fafa..1a695e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ##### Enhancements +* Add `ActiveLabel` class to help show activity on a label. +[Brian Miller](https://github.com/JobsIsMyHomeboy) +[#55](https://github.com/BottleRocketStudios/iOS-UtiliKit/pull/55) + * Add support for `Configurable` types when dequeuing reusable views. [Will McGinty](https://github.com/willmcginty) [#53](https://github.com/BottleRocketStudios/iOS-UtiliKit/pull/58) diff --git a/Cartfile b/Cartfile new file mode 100755 index 0000000..36dffa4 --- /dev/null +++ b/Cartfile @@ -0,0 +1 @@ +github "pointfreeco/swift-snapshot-testing" ~> 1.5 diff --git a/Cartfile.resolved b/Cartfile.resolved new file mode 100644 index 0000000..351dd6f --- /dev/null +++ b/Cartfile.resolved @@ -0,0 +1 @@ +github "pointfreeco/swift-snapshot-testing" "1.5.0" diff --git a/Examples/UtiliKit-iOSExample/Base.lproj/Main.storyboard b/Examples/UtiliKit-iOSExample/Base.lproj/Main.storyboard index 6b3f64e..de90dd6 100644 --- a/Examples/UtiliKit-iOSExample/Base.lproj/Main.storyboard +++ b/Examples/UtiliKit-iOSExample/Base.lproj/Main.storyboard @@ -1,11 +1,11 @@ - + - + @@ -13,7 +13,7 @@ - + @@ -57,6 +57,7 @@ + @@ -66,7 +67,7 @@ - + @@ -82,7 +83,7 @@ - + @@ -120,7 +121,7 @@ - + @@ -158,10 +159,206 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -191,13 +388,13 @@ - + - +