diff --git a/.gitignore b/.gitignore index 40d2361..2601791 100644 --- a/.gitignore +++ b/.gitignore @@ -53,7 +53,7 @@ playground.xcworkspace # Carthage/Checkouts Carthage/* -Cartfile.resolved +#Cartfile.resolved # fastlane # diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..006f83d --- /dev/null +++ b/.travis.yml @@ -0,0 +1,52 @@ +os: osx +osx_image: xcode10.1 +cache: + directories: + - Carthage +env: + global: + - WORKSPACE=RxGitLabKit.xcworkspace + - IOS_FRAMEWORK_SCHEME="RxGitLabKit-iOS" + - MACOS_FRAMEWORK_SCHEME="RxGitLabKit-macOS" + - TVOS_FRAMEWORK_SCHEME="RxGitLabKit-tvOS" + - WATCHOS_FRAMEWORK_SCHEME="RxGitLabKit-watchOS" + - DEMO_APP_SCHEME="RxGitLabKitDemoApp" + matrix: + - DESTINATION="OS=12.1,name=iPhone XS" SCHEME="$IOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="YES" + - DESTINATION="arch=x86_64" SCHEME="$MACOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO" + - DESTINATION="OS=12.1,name=Apple TV" SCHEME="$TVOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO" + - DESTINATION="OS=5.1,name=Apple Watch Series 4 - 44mm" SCHEME="$WATCHOS_FRAMEWORK_SCHEME" RUN_TESTS="NO" BUILD_EXAMPLE="NO" + +before_install: + - brew outdated carthage || brew upgrade carthage || true + +before_script: + - | + if [ $SCHEME == $IOS_FRAMEWORK_SCHEME ]; then + carthage bootstrap --cache-builds --platform ios + elif [ $SCHEME == $MACOS_FRAMEWORK_SCHEME ]; then + carthage bootstrap --cache-builds --platform macos + elif [ $SCHEME == $TVOS_FRAMEWORK_SCHEME ]; then + carthage bootstrap --cache-builds --platform tvos + elif [ $SCHEME == $WATCHOS_FRAMEWORK_SCHEME ]; then + carthage bootstrap --cache-builds --platform watchos + fi + +script: + - set -o pipefail + - xcodebuild -version + - xcodebuild -showsdks + + # Build Framework in Release and Run Tests if specified + - | + if [ $RUN_TESTS == "YES" ]; then + xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES CODE_SIGN_IDENTITY="" CODE_SIGN_REQUIRED=NO test | xcpretty -f `xcpretty-travis-formatter` + else + xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO CODE_SIGN_IDENTITY="" CODE_SIGN_REQUIRED=NO build | xcpretty -f `xcpretty-travis-formatter` + fi + + # Build Example in Debug if specified + - | + if [ $BUILD_EXAMPLE == "YES" ]; then + xcodebuild -workspace "$WORKSPACE" -scheme "$DEMO_APP_SCHEME" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO build | xcpretty -f `xcpretty-travis-formatter` + fi diff --git a/Cartfile.resolved b/Cartfile.resolved new file mode 100644 index 0000000..5659023 --- /dev/null +++ b/Cartfile.resolved @@ -0,0 +1,2 @@ +github "ReactiveX/RxSwift" "4.4.1" +github "SnapKit/SnapKit" "4.2.0" diff --git a/README.md b/README.md index d93a6f9..9207be3 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,9 @@ # RxGitLabKit +[![Build Status](https://travis-ci.org/Qase/RxGitLabKit.svg?branch=master)](https://travis-ci.org/Qase/RxGitLabKit) +[![Platform](https://img.shields.io/badge/platform-iOS%20%7C%20macOS%20%7C%20watchOS%20%7C%20tvOS-lightgrey.svg)](https://qase.github.io/RxGitLabKit/) +[![pod](https://img.shields.io/cocoapods/v/RxGitLabKit.svg)](https://cocoapods.org/) +[![Carthage](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) +[![Swift Package Manager](https://img.shields.io/badge/Swift%20Package%20Manager-compatible-brightgreen.svg)](https://github.com/apple/swift-package-manager) ## Description Swift Reactive [GitLab API](https://gitlab.com/help/api/README.md) v4 client using @@ -11,7 +16,7 @@ This library currently supports these endpoint groups: - [Commits](https://docs.gitlab.com/ee/api/commits.html) - [Group and Project members](https://docs.gitlab.com/ee/api/members.html) -The HTML documentation generated using [Jazzy](https://github.com/realm/jazzy) can be found on GitLab Pages [here](https://dagytran.gitlab.io/RxGitLabKit). +The HTML documentation generated using [Jazzy](https://github.com/realm/jazzy) can be found on GitHub pages [here](https://qase.github.io/RxGitLabKit/). Before running the demo app or the tests, download the dependencies using: ```bash diff --git a/RxGitLabKit.xcodeproj/project.pbxproj b/RxGitLabKit.xcodeproj/project.pbxproj index 8667806..519ad88 100644 --- a/RxGitLabKit.xcodeproj/project.pbxproj +++ b/RxGitLabKit.xcodeproj/project.pbxproj @@ -1620,7 +1620,7 @@ ); inputPaths = ( "$(SRCROOT)/Carthage/Build/tvOS/RxSwift.framework", - "$(SRCROOT)/Carthage/Build/Mac/RxCocoa.framework", + "$(SRCROOT)/Carthage/Build/tvOS/RxCocoa.framework", ); outputFileListPaths = ( ); @@ -1862,14 +1862,14 @@ files = ( ); inputPaths = ( - "$(SRCROOT)/Carthage/Build/iOS/RxSwift.framework", - "$(SRCROOT)/Carthage/Build/iOS/RxCocoa.framework", + "$(SRCROOT)/Carthage/Build/Mac/RxSwift.framework", + "$(SRCROOT)/Carthage/Build/Mac/RxCocoa.framework", ); outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "/usr/local/bin/carthage copy-frameworks"; + shellScript = "/usr/local/bin/carthage copy-frameworks\n"; }; /* End PBXShellScriptBuildPhase section */ @@ -3020,6 +3020,7 @@ CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "-"; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_NO_COMMON_BLOCKS = YES; @@ -3054,6 +3055,7 @@ CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "-"; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -4086,7 +4088,7 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = ""; + CODE_SIGN_IDENTITY = "-"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; @@ -4172,7 +4174,7 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = ""; + CODE_SIGN_IDENTITY = "-"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; diff --git a/RxGitLabKit.xcodeproj/xcshareddata/xcschemes/RxGitLabKit-macOS.xcscheme b/RxGitLabKit.xcodeproj/xcshareddata/xcschemes/RxGitLabKit-macOS.xcscheme index 5e0fe58..82ecfea 100644 --- a/RxGitLabKit.xcodeproj/xcshareddata/xcschemes/RxGitLabKit-macOS.xcscheme +++ b/RxGitLabKit.xcodeproj/xcshareddata/xcschemes/RxGitLabKit-macOS.xcscheme @@ -21,7 +21,7 @@ + + + + - - - -