diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..0da8639 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,7 @@ +language: objective-c +before_install: + - cd Tablet +script: + - xctool test -project Tablet.xcodeproj -scheme Tablet -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 6' GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES +after_success: + - cd $TRAVIS_BUILD_DIR \ No newline at end of file diff --git a/README.md b/README.md index d6086ef..4dc8199 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ ![Tablet](https://raw.githubusercontent.com/maxsokolov/tablet/assets/tablet.png)

+Build Status Swift 2 compatible Platform iOS CocoaPods compatible diff --git a/Tablet.xcworkspace/contents.xcworkspacedata b/Tablet.xcworkspace/contents.xcworkspacedata index 94b2795..64eb7dc 100644 --- a/Tablet.xcworkspace/contents.xcworkspacedata +++ b/Tablet.xcworkspace/contents.xcworkspacedata @@ -1,4 +1,7 @@ + + diff --git a/Tablet.xcworkspace/xcuserdata/maxsokolov.xcuserdatad/UserInterfaceState.xcuserstate b/Tablet.xcworkspace/xcuserdata/maxsokolov.xcuserdatad/UserInterfaceState.xcuserstate index 145551c..de3e9e8 100644 Binary files a/Tablet.xcworkspace/xcuserdata/maxsokolov.xcuserdatad/UserInterfaceState.xcuserstate and b/Tablet.xcworkspace/xcuserdata/maxsokolov.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/Tablet/Tablet.h b/Tablet/Tablet.h index a1d2602..c09efa2 100644 --- a/Tablet/Tablet.h +++ b/Tablet/Tablet.h @@ -1,10 +1,22 @@ // -// Tablet.h -// Tablet +// Copyright (c) 2015 Max Sokolov https://twitter.com/max_sokolov // -// Created by Max Sokolov on 19/03/16. -// Copyright © 2016 Tablet. All rights reserved. +// Permission is hereby granted, free of charge, to any person obtaining a copy of +// this software and associated documentation files (the "Software"), to deal in +// the Software without restriction, including without limitation the rights to +// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +// the Software, and to permit persons to whom the Software is furnished to do so, +// subject to the following conditions: // +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @import Foundation; diff --git a/Tablet/Tablet.xcodeproj/project.pbxproj b/Tablet/Tablet.xcodeproj/project.pbxproj index f178aa9..49ea0b1 100644 --- a/Tablet/Tablet.xcodeproj/project.pbxproj +++ b/Tablet/Tablet.xcodeproj/project.pbxproj @@ -342,7 +342,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.tablet.tablet.Tablet; + PRODUCT_BUNDLE_IDENTIFIER = com.tablet.tablet; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -361,7 +361,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.tablet.tablet.Tablet; + PRODUCT_BUNDLE_IDENTIFIER = com.tablet.tablet; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; }; diff --git a/Tablet/Tablet.xcodeproj/project.xcworkspace/xcuserdata/maxsokolov.xcuserdatad/UserInterfaceState.xcuserstate b/Tablet/Tablet.xcodeproj/project.xcworkspace/xcuserdata/maxsokolov.xcuserdatad/UserInterfaceState.xcuserstate index 32c36f8..71cef90 100644 Binary files a/Tablet/Tablet.xcodeproj/project.xcworkspace/xcuserdata/maxsokolov.xcuserdatad/UserInterfaceState.xcuserstate and b/Tablet/Tablet.xcodeproj/project.xcworkspace/xcuserdata/maxsokolov.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/Tablet/Tablet.xcodeproj/xcuserdata/maxsokolov.xcuserdatad/xcschemes/Tablet.xcscheme b/Tablet/Tablet.xcodeproj/xcshareddata/xcschemes/Tablet.xcscheme similarity index 100% rename from Tablet/Tablet.xcodeproj/xcuserdata/maxsokolov.xcuserdatad/xcschemes/Tablet.xcscheme rename to Tablet/Tablet.xcodeproj/xcshareddata/xcschemes/Tablet.xcscheme diff --git a/Tablet/Tablet.xcodeproj/xcuserdata/maxsokolov.xcuserdatad/xcschemes/xcschememanagement.plist b/Tablet/Tablet.xcodeproj/xcuserdata/maxsokolov.xcuserdatad/xcschemes/xcschememanagement.plist index 942caa5..96dcbf8 100644 --- a/Tablet/Tablet.xcodeproj/xcuserdata/maxsokolov.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/Tablet/Tablet.xcodeproj/xcuserdata/maxsokolov.xcuserdatad/xcschemes/xcschememanagement.plist @@ -4,7 +4,7 @@ SchemeUserState - Tablet.xcscheme + Tablet.xcscheme_^#shared#^_ orderHint 0 diff --git a/Tests/TabletTests.swift b/Tests/TabletTests.swift index 984e507..e62c2b1 100644 --- a/Tests/TabletTests.swift +++ b/Tests/TabletTests.swift @@ -1,10 +1,22 @@ // -// TableDirectorTests.swift -// TabletDemo +// Copyright (c) 2015 Max Sokolov https://twitter.com/max_sokolov // -// Created by Max Sokolov on 19/03/16. -// Copyright © 2016 Tablet. All rights reserved. +// Permission is hereby granted, free of charge, to any person obtaining a copy of +// this software and associated documentation files (the "Software"), to deal in +// the Software without restriction, including without limitation the rights to +// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +// the Software, and to permit persons to whom the Software is furnished to do so, +// subject to the following conditions: // +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. import XCTest import Tablet @@ -49,7 +61,7 @@ class TabletTests: XCTestCase { let row = TableRowBuilder(items: source) .action(.configure) { data -> Void in - XCTAssertNotNil(data.cell, "Action should have cell") + XCTAssertNotNil(data.cell, "Action should have a cell") data.cell?.textLabel?.text = "\(data.item)" }