Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build in Circle CI 2.0 #68

Merged
merged 21 commits into from
May 4, 2019
Merged
Show file tree
Hide file tree
Changes from 12 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
55 changes: 55 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
version: 2
jobs:
build-and-test:
macos:
xcode: "10.2.0"

steps:
- checkout
- restore_cache:
keys:
- v2-dep-{{ .Branch }}-
- v2-dep-master-
- v2-dep-

- run:
name: Update ruby and cocoapods
command: |
sudo gem install cocoapods
sudo gem cleanup
curl https://cocoapods-specs.circleci.com/fetch-cocoapods-repo-from-s3.sh | bash -s cf

- run:
name: Carthage
command: carthage update

- run:
name: Test
command: |
cd Demo
pod install
xcodebuild -workspace 'Demo.xcworkspace' -scheme 'Demo' -configuration 'Debug' -sdk iphonesimulator -destination 'name=iPhone Xs' build test | xcpretty -c

- run:
name: Pod lib lint
command: pod lib lint --allow-warnings

- save_cache:
key: v2-dep-{{ .Branch }}-{{ epoch }}
paths:
- Carthage
workflows:
version: 2
nightly:
triggers:
- schedule:
cron: "0 0 * * *"
fassko marked this conversation as resolved.
Show resolved Hide resolved
filters:
branches:
only:
- master
jobs:
- build-and-test
build-and-test:
jobs:
- build-and-test
21 changes: 21 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,24 @@ Carthage/

fastlane/README.md
fastlane/report.xml

# CocoaPods
#
# We recommend against adding the Pods directory to your .gitignore. However
# you should judge for yourself, the pros and cons are mentioned at:
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
#
Pods/

# fastlane
#
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
# screenshots whenever they are needed.
# For more information about the recommended setup visit:
# https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Gitignore.md

fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots
fastlane/test_output
screenshots
2 changes: 2 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ Current master
5.0.0
-----
- Update to Swift 5.0 and Xcode 10.2 See [#59](https://github.com/RxSwiftCommunity/NSObject-Rx/pull/67) - [@fassko](https://github.com/fassko)
- Build in Circle CI 2.0 and remove Pods from repo. See [#59](https://github.com/RxSwiftCommunity/NSObject-Rx/pull/68) - [@fassko](https://github.com/fassko)
- Increase watchOS minimum version. See [#59](https://github.com/RxSwiftCommunity/NSObject-Rx/pull/68) - [@fassko](https://github.com/fassko)

4.4.1
-----
Expand Down
4 changes: 2 additions & 2 deletions Demo/Demo.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-DemoTests/Pods-DemoTests-frameworks.sh",
"${PODS_ROOT}/Target Support Files/Pods-DemoTests/Pods-DemoTests-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/NSObject+Rx/NSObject_Rx.framework",
"${BUILT_PRODUCTS_DIR}/Nimble/Nimble.framework",
"${BUILT_PRODUCTS_DIR}/Quick/Quick.framework",
Expand All @@ -288,7 +288,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-DemoTests/Pods-DemoTests-frameworks.sh\"\n";
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-DemoTests/Pods-DemoTests-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
Expand Down
8 changes: 8 additions & 0 deletions Demo/Demo.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
20 changes: 10 additions & 10 deletions Demo/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
PODS:
- Nimble (7.3.1)
- "NSObject+Rx (4.4.0)":
- RxSwift (~> 4.3)
- Quick (1.3.1)
- RxSwift (4.3.1)
- Nimble (8.0.1)
- "NSObject+Rx (5.0.0)":
- RxSwift (~> 5.0)
- Quick (2.1.0)
- RxSwift (5.0.0)

DEPENDENCIES:
- Nimble
Expand All @@ -22,11 +22,11 @@ EXTERNAL SOURCES:
:path: "../"

SPEC CHECKSUMS:
Nimble: 04f732da099ea4d153122aec8c2a88fd0c7219ae
"NSObject+Rx": e9d2b56cd4bf13a42f4ee326b638c49c84bf4707
Quick: d17304d58d0d169dd0bd1c6e5c28e3318de32a1a
RxSwift: fe0fd770a43acdb7d0a53da411c9b892e69bb6e4
Nimble: 45f786ae66faa9a709624227fae502db55a8bdd0
"NSObject+Rx": 8ecb1e4714f3d35ac91485d2a769b7ab4b62e697
Quick: 4be43f6634acfa727dd106bdf3929ce125ffa79d
RxSwift: 8b0671caa829a763bbce7271095859121cbd895f

PODFILE CHECKSUM: 4f420ecd33a82075e360098bbed0ccaadfeb1728

COCOAPODS: 1.5.3
COCOAPODS: 1.6.1
32 changes: 0 additions & 32 deletions Demo/Pods/Local Podspecs/NSObject+Rx.podspec.json

This file was deleted.

32 changes: 0 additions & 32 deletions Demo/Pods/Manifest.lock

This file was deleted.

Loading