Skip to content

Commit f829919

Browse files
authored
Travis to circle (#14)
1 parent 1614752 commit f829919

File tree

6 files changed

+43
-31
lines changed

6 files changed

+43
-31
lines changed

.travis.yml

-13
This file was deleted.

Example/Podfile.lock

+6-6
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ PODS:
2525
- OCHamcrest (7.0.1)
2626
- OCMockito (5.0.0):
2727
- OCHamcrest (~> 7.0)
28-
- Segment-Firebase (1.0.0):
28+
- Segment-Firebase (2.0.0):
2929
- Analytics (~> 3.2)
3030
- Firebase/Core (~> 4.0)
31-
- Segment-Firebase/Core (= 1.0.0)
32-
- Segment-Firebase/Core (1.0.0):
31+
- Segment-Firebase/Core (= 2.0.0)
32+
- Segment-Firebase/Core (2.0.0):
3333
- Analytics (~> 3.2)
3434
- Firebase/Core (~> 4.0)
3535
- Specta (1.0.6)
@@ -42,7 +42,7 @@ DEPENDENCIES:
4242

4343
EXTERNAL SOURCES:
4444
Segment-Firebase:
45-
:path: "../"
45+
:path: ../
4646

4747
SPEC CHECKSUMS:
4848
Analytics: 2c09a50e3478a3a7ced08a22d00c43ba6f7011e6
@@ -55,9 +55,9 @@ SPEC CHECKSUMS:
5555
nanopb: 5601e6bca2dbf1ed831b519092ec110f66982ca3
5656
OCHamcrest: 7c2229e7ea96eecd6e43dbef7c68e1dfbd6928b8
5757
OCMockito: 2598f5d43f6e74964d3ec3b9dea8b4fde3ea2c43
58-
Segment-Firebase: b3415b6693aafddc087c91c38d0f11d59284bbcf
58+
Segment-Firebase: faaadea4a778f8df3d35a2e4027b213ddbd645d4
5959
Specta: f506f3a8361de16bc0dcf3b17b75e269072ba465
6060

6161
PODFILE CHECKSUM: 1c8bf179e541ce3ecce2debc2adb17511929041e
6262

63-
COCOAPODS: 1.2.1
63+
COCOAPODS: 1.3.1

Example/Segment-Firebase.xcodeproj/project.pbxproj

+8-2
Original file line numberDiff line numberDiff line change
@@ -324,13 +324,16 @@
324324
files = (
325325
);
326326
inputPaths = (
327+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
328+
"${PODS_ROOT}/Manifest.lock",
327329
);
328330
name = "[CP] Check Pods Manifest.lock";
329331
outputPaths = (
332+
"$(DERIVED_FILE_DIR)/Pods-Segment-Firebase_Tests-checkManifestLockResult.txt",
330333
);
331334
runOnlyForDeploymentPostprocessing = 0;
332335
shellPath = /bin/sh;
333-
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
336+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
334337
showEnvVarsInLog = 0;
335338
};
336339
63C7821D83AAD02D070CC6C1 /* [CP] Copy Pods Resources */ = {
@@ -384,13 +387,16 @@
384387
files = (
385388
);
386389
inputPaths = (
390+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
391+
"${PODS_ROOT}/Manifest.lock",
387392
);
388393
name = "[CP] Check Pods Manifest.lock";
389394
outputPaths = (
395+
"$(DERIVED_FILE_DIR)/Pods-Segment-Firebase_Example-checkManifestLockResult.txt",
390396
);
391397
runOnlyForDeploymentPostprocessing = 0;
392398
shellPath = /bin/sh;
393-
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
399+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
394400
showEnvVarsInLog = 0;
395401
};
396402
/* End PBXShellScriptBuildPhase section */

Makefile

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
XCPRETTY := xcpretty -c && exit ${PIPESTATUS[0]}
2-
31
SDK ?= "iphonesimulator"
42
DESTINATION ?= "platform=iOS Simulator,name=iPhone 5"
53
PROJECT := Segment-Firebase
64
XC_ARGS := -scheme $(PROJECT)-Example -workspace Example/$(PROJECT).xcworkspace -sdk $(SDK) -destination $(DESTINATION) ONLY_ACTIVE_ARCH=NO
75

8-
install: Example/Podfile Segment-Firebase.podspec
6+
install: Example/Podfile $(PROJECT).podspec
97
pod repo update
108
pod install --project-directory=Example
119

10+
lint:
11+
pod lib lint --use-libraries --allow-warnings
12+
1213
clean:
13-
xcodebuild $(XC_ARGS) clean | $(XCPRETTY)
14+
set -o pipefail && xcodebuild $(XC_ARGS) clean | xcpretty
1415

1516
build:
16-
xcodebuild $(XC_ARGS) | $(XCPRETTY)
17+
set -o pipefail && xcodebuild $(XC_ARGS) | xcpretty
1718

1819
test:
19-
xcodebuild test $(XC_ARGS) | $(XCPRETTY)
20+
set -o pipefail && xcodebuild test $(XC_ARGS) | xcpretty --report junit
2021

21-
.PHONY: test build xctest xcbuild clean
22-
.SILENT:
22+
.PHONY: clean install build test

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Segment-Firebase
22

3-
[![CI Status](http://img.shields.io/travis/segment-integrations/analytics-ios-integration-firebase.svg?style=flat)](https://travis-ci.org/segment-integrations/analytics-ios-integration-firebase)
3+
[![CircleCI](https://circleci.com/gh/segment-integrations/analytics-ios-integration-firebase.svg?style=svg)](https://circleci.com/gh/segment-integrations/analytics-ios-integration-firebase)
44
[![Version](https://img.shields.io/cocoapods/v/Segment-Firebase.svg?style=flat)](http://cocoapods.org/pods/Segment-Firebase)
55
[![License](https://img.shields.io/cocoapods/l/Segment-Firebase.svg?style=flat)](http://cocoapods.org/pods/Segment-Firebase)
66
[![Platform](https://img.shields.io/cocoapods/p/Segment-Firebase.svg?style=flat)](https://cocoapods.org/pods/Segment-Firebase)
@@ -20,7 +20,7 @@ Register your app in the [Firebase console](https://console.firebase.google.com/
2020
Add the following dependency to your Podfile:
2121

2222
```
23-
pod 'Segment-Firebase'
23+
pod 'Segment-Firebase'
2424
```
2525

2626
After adding the dependency and running `pod install`, import the integration:

circle.yml

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
machine:
2+
xcode:
3+
version: "9.0"
4+
5+
dependencies:
6+
pre:
7+
- gem install xcpretty
8+
- gem install cocoapods -v 1.3.1
9+
override:
10+
- make install
11+
cache_directories:
12+
- Example/Pods
13+
- ~/.cocoapods
14+
15+
test:
16+
override:
17+
- make build
18+
- make test
19+
- make lint

0 commit comments

Comments
 (0)