Merge pull request huri000#9 from huri000/wip/travis

Travis script change - works with codecov
williamoj · May 8, 2018 · f90a0a2 · f90a0a2
2 parents 1336be9 + 2d2b888
commit f90a0a2
Show file tree

Hide file tree

Showing 16 changed files with 140 additions and 156 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,5 @@
 language: objective-c
+osx_image: xcode9.3
 cache: cocoapods
 podfile: Example/Podfile
 
@@ -7,18 +8,10 @@ env:
     - WORKSPACE=Example/QuickLayout.xcworkspace
     - SCHEME=DemoApp
     - TEST_SDK=iphonesimulator
+    - TEST_DEST="platform=iOS Simulator,OS=11.3,name=iPhone 8"
 
-matrix:
-  include:
-    -
-      os: osx
-      osx_image: xcode9.3
-      env:
-         - BUILD="xcodebuild"
-         - TEST_DEST="platform=iOS Simulator,OS=11.3,name=iPhone 8"
 
 script:
-  - xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -destination "$TEST_DEST" -sdk "$TEST_SDK" -enableCodeCoverage YES build-for-testing
-
-after_success:
-  - bash <(curl -s https://codecov.io/bash)
+- set -o pipefail
+- xcodebuild clean build test -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 7' -configuration Debug | xcpretty
+- bash <(curl -s https://codecov.io/bash)
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -2,7 +2,7 @@ PODS:
   - LoremIpsum (1.0.0)
   - Nimble (7.0.2)
   - Quick (1.2.0)
-  - QuickLayout (1.0.12)
+  - QuickLayout (1.0.13)
 
 DEPENDENCIES:
   - LoremIpsum (~> 1.0)
@@ -24,7 +24,7 @@ SPEC CHECKSUMS:
   LoremIpsum: 9029c55d36501b2ee0b05cc9ecda11d3a0479160
   Nimble: bfe1f814edabba69ff145cb1283e04ed636a67f2
   Quick: 58d203b1c5e27fff7229c4c1ae445ad7069a7a08
-  QuickLayout: 064cd8ce1a19ed868437196d5a0ca70f110529ab
+  QuickLayout: 695acc6b2bcfdd3f72c63b0c84ccd2c001ccd26c
 
 PODFILE CHECKSUM: b2a1aaebea37b64555719a9af92405234ac54471
 

diff --git a/Example/Pods/Local Podspecs/QuickLayout.podspec.json b/Example/Pods/Local Podspecs/QuickLayout.podspec.json
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock
diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Example/Pods/Target Support Files/QuickLayout/Info.plist b/Example/Pods/Target Support Files/QuickLayout/Info.plist
diff --git a/Example/QuickLayout.xcodeproj/project.pbxproj b/Example/QuickLayout.xcodeproj/project.pbxproj
diff --git a/Example/QuickLayout.xcodeproj/xcshareddata/xcschemes/DemoApp.xcscheme b/Example/QuickLayout.xcodeproj/xcshareddata/xcschemes/DemoApp.xcscheme
@@ -14,7 +14,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "387ADB46C1C1DD0FB3DC8BF4B11A04DE"
+               BlueprintIdentifier = "79223D53A9B733A6BC58A4DF9974A81C"
                BuildableName = "Quick.framework"
                BlueprintName = "Quick"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">

diff --git a/QuickLayout.podspec b/QuickLayout.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'QuickLayout'
-  s.version          = '1.0.12'
+  s.version          = '1.0.13'
   s.summary          = 'Code based user interface'
   s.platform = :ios
   s.ios.deployment_target = '9.0'
@@ -22,17 +22,7 @@ DESC
   s.license          = { :type => 'MIT', :file => 'LICENSE' }
   s.author           = { 'Daniel Huri' => '[email protected]' }
   s.source           = { :git => 'https://github.com/huri000/QuickLayout.git', :tag => s.version.to_s }
-
   s.source_files = 'QuickLayout/**/*.{swift,h}'
-
-  # s.resource_bundles = {
-  #   'QuickLayout' => ['QuickLayout/Assets/*.png']
-  # }
-
-  # s.public_header_files = 'Pod/Classes/**/*.h'
   s.frameworks = 'UIKit'
-
-  # s.dependency 'Quick', '1.2.0'
-  # s.dependency 'Nimble', '7.0.2'
 
 end
diff --git a/QuickLayout/Assets/.gitkeep → QuickLayout/.gitkeep b/QuickLayout/Assets/.gitkeep → QuickLayout/.gitkeep
diff --git a/QuickLayout/Classes/.gitkeep b/QuickLayout/Classes/.gitkeep
diff --git a/QuickLayout/Classes/QLUtils.swift → QuickLayout/QLUtils.swift b/QuickLayout/Classes/QLUtils.swift → QuickLayout/QLUtils.swift
diff --git a/...Layout/Classes/UIView+QLContentWrap.swift → QuickLayout/UIView+QLContentWrap.swift b/...Layout/Classes/UIView+QLContentWrap.swift → QuickLayout/UIView+QLContentWrap.swift
diff --git a/QuickLayout/Classes/UIView+QuickLayout.swift → QuickLayout/UIView+QuickLayout.swift b/QuickLayout/Classes/UIView+QuickLayout.swift → QuickLayout/UIView+QuickLayout.swift
diff --git a/...out/Classes/UIViewArray+QuickLayout.swift → QuickLayout/UIViewArray+QuickLayout.swift b/...out/Classes/UIViewArray+QuickLayout.swift → QuickLayout/UIViewArray+QuickLayout.swift
diff --git a/README.md b/README.md
@@ -5,6 +5,7 @@
 )](https://developer.apple.com/swift)
 [![Version](https://img.shields.io/cocoapods/v/QuickLayout.svg?style=flat-square)](http://cocoapods.org/pods/QuickLayout)
 ![](https://travis-ci.org/huri000/QuickLayout.svg?branch=master)
+[![codecov](https://codecov.io/gh/huri000/QuickLayout/branch/master/graph/badge.svg)](https://codecov.io/gh/huri000/QuickLayout)
 [![License](https://img.shields.io/cocoapods/l/QuickLayout.svg?style=flat-square)](http://cocoapods.org/pods/QuickLayout)
 [![Total Downloads](https://img.shields.io/cocoapods/dt/QuickLayout.svg?style=social)](https://cocoapods.org/pods/QuickLayout)
 
@@ -101,7 +102,7 @@ Swift 4.0 and iOS 9.0 (or higher).
 
 #### CocoaPods
 ```
-pod 'QuickLayout', '1.0.12'
+pod 'QuickLayout', '1.0.13'
 ```
 
 #### Manually