Skip to content
Permalink
Browse files

Update Travis for RxRelay

  • Loading branch information...
freak4pc authored and kzaher committed Apr 9, 2019
1 parent 7a79298 commit f26d0cc26443e65febe7bf606a82ce2312585634
@@ -17,6 +17,7 @@ env:
- TEST=SPM
- BUILD="TARGET=RxSwift SWIFT_VERSION=5.0 ./scripts/validate-podspec.sh"
- BUILD="TARGET=RxCocoa SWIFT_VERSION=5.0 ./scripts/validate-podspec.sh"
- BUILD="TARGET=RxRelay SWIFT_VERSION=5.0 ./scripts/validate-podspec.sh"
- BUILD="TARGET=RxBlocking SWIFT_VERSION=5.0 ./scripts/validate-podspec.sh"
- BUILD="TARGET=RxTest SWIFT_VERSION=5.0 ./scripts/validate-podspec.sh"

@@ -963,11 +963,11 @@
9BA1CBD11C0F7C0A0044B50A /* UIActivityIndicatorView+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIActivityIndicatorView+Rx.swift"; sourceTree = "<group>"; };
A111CE961B91C97C00D0DCEE /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
A2897D53225CA1E7004EA481 /* RxRelay.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RxRelay.framework; sourceTree = BUILT_PRODUCTS_DIR; };
A2897D54225CA1E7004EA481 /* RxRelay-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "RxRelay-Info.plist"; path = "/Users/shai.mishali/Work/OSS/RxSwift/RxRelay-Info.plist"; sourceTree = "<absolute>"; };
A2897D61225CA3F3004EA481 /* Observable+Bind.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Observable+Bind.swift"; sourceTree = "<group>"; };
A2897D65225D0182004EA481 /* PublishRelay+Signal.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "PublishRelay+Signal.swift"; sourceTree = "<group>"; };
A2897D68225D023A004EA481 /* Utils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Utils.swift; sourceTree = "<group>"; };
A2FD4E9B225D04FF00288525 /* Observable+RelayBindTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Observable+RelayBindTests.swift"; sourceTree = "<group>"; };
A2FD4EA4225D0A8100288525 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
A520FFF61F0D258E00573734 /* RxPickerViewDataSourceType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxPickerViewDataSourceType.swift; sourceTree = "<group>"; };
A520FFFB1F0D291500573734 /* RxPickerViewDataSourceProxy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxPickerViewDataSourceProxy.swift; sourceTree = "<group>"; };
A5CD03891F1660F40005A376 /* RxPickerViewAdapter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxPickerViewAdapter.swift; sourceTree = "<group>"; };
@@ -1518,6 +1518,7 @@
C8C8BCCE1F8944B800501D4D /* BehaviorRelay.swift */,
A2897D61225CA3F3004EA481 /* Observable+Bind.swift */,
A2897D68225D023A004EA481 /* Utils.swift */,
A2FD4EA4225D0A8100288525 /* Info.plist */,
);
path = RxRelay;
sourceTree = "<group>";
@@ -2349,7 +2350,6 @@
C83508D31C38706D0027C24C /* Tests */,
C8A56AD81AD7424700B4673B /* Products */,
D27B5DA41F78C4F100797776 /* Frameworks */,
A2897D54225CA1E7004EA481 /* RxRelay-Info.plist */,
);
sourceTree = "<group>";
};
@@ -3851,7 +3851,7 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = "RxRelay-Info.plist";
INFOPLIST_FILE = "$(SRCROOT)/RxRelay/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "io.rx.$(PRODUCT_NAME:rfc1034identifier)";
@@ -3867,7 +3867,7 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = "RxRelay-Info.plist";
INFOPLIST_FILE = "$(SRCROOT)/RxRelay/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "io.rx.$(PRODUCT_NAME:rfc1034identifier)";
@@ -3883,7 +3883,7 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = "RxRelay-Info.plist";
INFOPLIST_FILE = "$(SRCROOT)/RxRelay/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "io.rx.$(PRODUCT_NAME:rfc1034identifier)";
File renamed without changes.
@@ -1,6 +1,6 @@
//
// Observable+RelayBindTests.swift
// RxSwift
// Tests
//
// Created by Shai Mishali on 09/04/2019.
// Copyright © 2019 Krunoslav Zaher. All rights reserved.
@@ -11,7 +11,7 @@ import RxRelay
import RxTest
import XCTest

final class ObservableRelayBindTest: RxTest {
class ObservableRelayBindTest: RxTest {

}

@@ -95,7 +95,7 @@ function ensureNoGitChanges() {
function checkPlistVersions() {
RXSWIFT_VERSION=`cat RxSwift.podspec | grep -E "s.version\s+=" | cut -d '"' -f 2`
echo "RxSwift version: ${RXSWIFT_VERSION}"
PROJECTS=(RxSwift RxCocoa RxBlocking RxTest)
PROJECTS=(RxSwift RxCocoa RxRelay RxBlocking RxTest)
for project in ${PROJECTS[@]}
do
echo "Checking version for ${project}"
@@ -222,7 +222,7 @@ if [ "${VALIDATE_WATCHOS}" -eq 1 ]; then
if [[ "${UNIX_NAME}" == "${DARWIN}" ]]; then
# make sure watchos builds
# temporary solution
WATCH_OS_BUILD_TARGETS=(RxSwift RxCocoa RxBlocking)
WATCH_OS_BUILD_TARGETS=(RxSwift RxCocoa RxRelay RxBlocking)
for scheme in ${WATCH_OS_BUILD_TARGETS[@]}
do
for configuration in ${CONFIGURATIONS[@]}
@@ -22,7 +22,7 @@ fi;

VERSION=`cat RxSwift.podspec | grep -E "s.version\s+=" | cut -d '"' -f 2`
ROOTS=(2/e/c 3/c/1 8/5/5 f/7/9 a/b/1)
TARGETS=(RxTest RxCocoa RxBlocking RxSwift)
TARGETS=(RxTest RxCocoa RxRelay RxBlocking RxSwift)

SWIFT_VERSION="--swift-version=${SWIFT_VERSION}"

0 comments on commit f26d0cc

Please sign in to comment.
You can’t perform that action at this time.