Skip to content

Commit b0923b8

Browse files
fasskofreak4pc
fassko
authored and
freak4pc
committed
Update CI to Circle CI 2.0 (#68)
1 parent 1f815f6 commit b0923b8

303 files changed

Lines changed: 89 additions & 32694 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.circleci/config.yml‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
version: 2
2+
jobs:
3+
build-and-test:
4+
macos:
5+
xcode: "10.2.0"
6+
7+
steps:
8+
- checkout
9+
- restore_cache:
10+
keys:
11+
- v2-dep-{{ .Branch }}-
12+
- v2-dep-master-
13+
- v2-dep-
14+
15+
- run:
16+
name: Update ruby and cocoapods
17+
command: |
18+
sudo gem install cocoapods
19+
sudo gem cleanup
20+
curl https://cocoapods-specs.circleci.com/fetch-cocoapods-repo-from-s3.sh | bash -s cf
21+
22+
- run:
23+
name: Carthage
24+
command: carthage update
25+
26+
- run:
27+
name: Test
28+
command: |
29+
cd Demo
30+
pod install
31+
xcodebuild -workspace 'Demo.xcworkspace' -scheme 'Demo' -configuration 'Debug' -sdk iphonesimulator -destination 'name=iPhone Xs' build test | xcpretty -c
32+
33+
- run:
34+
name: Pod lib lint
35+
command: pod lib lint --allow-warnings
36+
37+
- save_cache:
38+
key: v2-dep-{{ .Branch }}-{{ epoch }}
39+
paths:
40+
- Carthage
41+
workflows:
42+
version: 2
43+
build-and-test:
44+
jobs:
45+
- build-and-test

‎.gitignore‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,24 @@ Carthage/
2929

3030
fastlane/README.md
3131
fastlane/report.xml
32+
33+
# CocoaPods
34+
#
35+
# We recommend against adding the Pods directory to your .gitignore. However
36+
# you should judge for yourself, the pros and cons are mentioned at:
37+
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
38+
#
39+
Pods/
40+
41+
# fastlane
42+
#
43+
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
44+
# screenshots whenever they are needed.
45+
# For more information about the recommended setup visit:
46+
# https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Gitignore.md
47+
48+
fastlane/report.xml
49+
fastlane/Preview.html
50+
fastlane/screenshots
51+
fastlane/test_output
52+
screenshots

‎Changelog.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ Current master
99
5.0.0
1010
-----
1111
- Update to Swift 5.0 and Xcode 10.2 See [#59](https://github.com/RxSwiftCommunity/NSObject-Rx/pull/67) - [@fassko](https://github.com/fassko)
12+
- 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)
13+
- Increase watchOS minimum version. See [#59](https://github.com/RxSwiftCommunity/NSObject-Rx/pull/68) - [@fassko](https://github.com/fassko)
1214

1315
4.4.1
1416
-----

‎Demo/Demo.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@
273273
files = (
274274
);
275275
inputPaths = (
276-
"${SRCROOT}/Pods/Target Support Files/Pods-DemoTests/Pods-DemoTests-frameworks.sh",
276+
"${PODS_ROOT}/Target Support Files/Pods-DemoTests/Pods-DemoTests-frameworks.sh",
277277
"${BUILT_PRODUCTS_DIR}/NSObject+Rx/NSObject_Rx.framework",
278278
"${BUILT_PRODUCTS_DIR}/Nimble/Nimble.framework",
279279
"${BUILT_PRODUCTS_DIR}/Quick/Quick.framework",
@@ -288,7 +288,7 @@
288288
);
289289
runOnlyForDeploymentPostprocessing = 0;
290290
shellPath = /bin/sh;
291-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-DemoTests/Pods-DemoTests-frameworks.sh\"\n";
291+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-DemoTests/Pods-DemoTests-frameworks.sh\"\n";
292292
showEnvVarsInLog = 0;
293293
};
294294
/* End PBXShellScriptBuildPhase section */

‎Demo/Demo.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

‎Demo/Podfile.lock‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
PODS:
2-
- Nimble (7.3.1)
3-
- "NSObject+Rx (4.4.0)":
4-
- RxSwift (~> 4.3)
5-
- Quick (1.3.1)
6-
- RxSwift (4.3.1)
2+
- Nimble (8.0.1)
3+
- "NSObject+Rx (5.0.0)":
4+
- RxSwift (~> 5.0)
5+
- Quick (2.1.0)
6+
- RxSwift (5.0.0)
77

88
DEPENDENCIES:
99
- Nimble
@@ -22,11 +22,11 @@ EXTERNAL SOURCES:
2222
:path: "../"
2323

2424
SPEC CHECKSUMS:
25-
Nimble: 04f732da099ea4d153122aec8c2a88fd0c7219ae
26-
"NSObject+Rx": e9d2b56cd4bf13a42f4ee326b638c49c84bf4707
27-
Quick: d17304d58d0d169dd0bd1c6e5c28e3318de32a1a
28-
RxSwift: fe0fd770a43acdb7d0a53da411c9b892e69bb6e4
25+
Nimble: 45f786ae66faa9a709624227fae502db55a8bdd0
26+
"NSObject+Rx": 8ecb1e4714f3d35ac91485d2a769b7ab4b62e697
27+
Quick: 4be43f6634acfa727dd106bdf3929ce125ffa79d
28+
RxSwift: 8b0671caa829a763bbce7271095859121cbd895f
2929

3030
PODFILE CHECKSUM: 4f420ecd33a82075e360098bbed0ccaadfeb1728
3131

32-
COCOAPODS: 1.5.3
32+
COCOAPODS: 1.6.1

‎Demo/Pods/Local Podspecs/NSObject+Rx.podspec.json‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎Demo/Pods/Manifest.lock‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)