Merge pull request #107 from theappbusiness/release/1.6.1

Release/1.6.1

.travis.yml

@@ -1,11 +1,17 @@
+language: swift
+
 os:
   - osx
+
 osx_image: xcode10.3
-language: swift
-before_install: 
-  - brew update
-  - brew bundle
+env: IPHONE_SIMULATOR_SDK='iphonesimulator12.4' OS_VERSION='12.4' IPHONE_NAME='iPhone Xs'
+
+addons:
+  homebrew:
+    brewfile: true
+    update: false
+
 script:
-- set -o pipefail && xcodebuild test -enableCodeCoverage YES -workspace Example/TABTestKit.xcworkspace -scheme TABTestKit_ExampleUITests -sdk iphonesimulator12.4 -destination "OS=12.4,name=iPhone Xs" | xcpretty
+- set -o pipefail && xcodebuild test -enableCodeCoverage YES -workspace Example/TABTestKit.xcworkspace -scheme TABTestKit_ExampleUITests -sdk $IPHONE_SIMULATOR_SDK -destination "OS=$OS_VERSION,name=$IPHONE_NAME" | xcpretty
 - carthage build --archive
 - pod lib lint

Brewfile.lock.json

@@ -54,6 +54,14 @@
         "CLT": "10.3.0.0.1.1562985497",
         "Xcode": "11.3",
         "macOS": "10.14.6"
+      },
+      "catalina": {
+        "HOMEBREW_VERSION": "2.4.2",
+        "HOMEBREW_PREFIX": "/usr/local",
+        "Homebrew/homebrew-core": "7007f55d45d89fcf9d3b3402b11b0870e8c21c05",
+        "CLT": "",
+        "Xcode": "11.5",
+        "macOS": "10.15.5"
       }
     }
   }

CHANGELOG.md

@@ -4,6 +4,15 @@
 
 ---
 
+## 1.6.1
+
+### Fixed
+
+- `Image.swift` wasn't added to the main framework meaning it wouldn't work for Carthage
+- Build issue with brew on Travis' 12.4 image
+
+---
+
 ## 1.6.0
 
 - Added `Image` element which can be used to represent images (and anything else that XCUI sees as a `.image` type). (issue #100)
@@ -12,7 +21,6 @@
 - Adds a step script for building carthage framework in Travis CI. This should report to CI if the TABTestKit can be build as a Carthage framework.
 - Adds a step script for linting cocoapods project in Travis CI. This should report to CI if the TABTestKit can be safe to be published as Cocoapods framework.
 
-
 ---
 
 ## 1.5.0

TABTestKit.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'TABTestKit'
-  s.version          = '1.6.0'
+  s.version          = '1.6.1'
   s.summary          = 'Strongly typed Swift wrapper around XCTest / XCUI, enabling you to write BDD-style automation tests, without writing much code at all.'
   s.homepage         = 'https://github.com/theappbusiness/TABTestKit'
   s.license          = { :type => 'MIT', :file => 'LICENSE' }

TABTestKit.xcodeproj/project.pbxproj

@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		70D1C4DD24BDEFE70047A2EB /* Image.swift in Sources */ = {isa = PBXBuildFile; fileRef = 70D1C4DC24BDEFE70047A2EB /* Image.swift */; };
 		9536C80D2412A7D100D4B362 /* ActivitySheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9536C80C2412A7D100D4B362 /* ActivitySheet.swift */; };
 		957289A72481452C00DBC55D /* Icon.swift in Sources */ = {isa = PBXBuildFile; fileRef = 957289A62481452C00DBC55D /* Icon.swift */; };
 		95D471C22397C8C1002BEFCA /* SheetContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95D4716B2397C8C1002BEFCA /* SheetContext.swift */; };
@@ -80,6 +81,7 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		70D1C4DC24BDEFE70047A2EB /* Image.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Image.swift; sourceTree = "<group>"; };
 		9536C80C2412A7D100D4B362 /* ActivitySheet.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ActivitySheet.swift; sourceTree = "<group>"; };
 		957289A62481452C00DBC55D /* Icon.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Icon.swift; sourceTree = "<group>"; };
 		95D471462397C1A9002BEFCA /* TABTestKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = TABTestKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -263,6 +265,7 @@
 				95D471892397C8C1002BEFCA /* CollectionView.swift */,
 				95D4718F2397C8C1002BEFCA /* Header.swift */,
 				957289A62481452C00DBC55D /* Icon.swift */,
+				70D1C4DC24BDEFE70047A2EB /* Image.swift */,
 				95D471992397C8C1002BEFCA /* Keyboard.swift */,
 				95D471842397C8C1002BEFCA /* Label.swift */,
 				95D471932397C8C1002BEFCA /* NavBar.swift */,
@@ -482,6 +485,7 @@
 				95D471E92397C8C1002BEFCA /* Slider.swift in Sources */,
 				95D471EA2397C8C1002BEFCA /* PageIndicator.swift in Sources */,
 				95D471C72397C8C1002BEFCA /* SystemPreferencesContext.swift in Sources */,
+				70D1C4DD24BDEFE70047A2EB /* Image.swift in Sources */,
 				95D471DF2397C8C1002BEFCA /* Attributes.swift in Sources */,
 				95D471F72397C8C1002BEFCA /* Springboard.swift in Sources */,
 				95D471E02397C8C1002BEFCA /* SegmentedControl.swift in Sources */,