Skip to content

Commit 9565272

Browse files
xudafengxudafeng
authored
replace carthage with cocoapod (#25)
* replace carthage with cocoapod * update project settings
1 parent de9ebed commit 9565272

32 files changed

+446
-65
lines changed

‎.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ build/
99
!default.mode2v3
1010
*.perspectivev3
1111
!default.perspectivev3
12-
*.xcworkspace
1312
!default.xcworkspace
1413
xcuserdata
1514
profile
@@ -30,7 +29,10 @@ screenshots/
3029
reports/
3130
reporter/
3231
package/
32+
pods/
3333
.*.sw[a-z]
3434
.sw?
3535
*.un~
3636
*.tgz
37+
*.llcov
38+
html/

‎.slather.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
ignore:
2-
- Carthage/*
3-
- build/*
4-
- data/*
5-
- coverage/*
6-
- reporter/*
2+
- Pods/*
3+
- Frameworks/*

‎Cartfile

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

‎Gemfile

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

‎Makefile

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
1-
install:
2-
carthage update --platform iOS --verbose
3-
build: install
4-
xcodebuild -project ios-app-bootstrap.xcodeproj -sdk iphonesimulator
5-
test:
6-
echo TODO
7-
coverage:
8-
macaca coverage -r ios -n ios-app-bootstrap -p ./ios-app-bootstrap.xcodeproj --html ./reporter
9-
.PHONY: coverage
1+
.DEFAULT_GOAL := build
2+
3+
# Resolve project name
4+
PROJECT_NAME = $(shell ls | grep --color=never xcodeproj | cut -d . -f 1)
5+
6+
# Repo is located in ~/.marmot_home
7+
MARMOT_HOME = $(HOME)/marmot_home
8+
AUTOMATION_HOME = $(MARMOT_HOME)/marmot-ios
9+
10+
init:
11+
@[ -d "$(MARMOT_HOME)" ] || mkdir -p "$(MARMOT_HOME)"
12+
@[ -d "$(AUTOMATION_HOME)" ] || git clone [email protected]:macacajs/marmot-ios.git "$(AUTOMATION_HOME)"
13+
14+
-include $(AUTOMATION_HOME)/Scripts/Makefile

‎Podfile

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
source 'https://github.com/CocoaPods/Specs.git'
2+
3+
platform :ios, '9.0'
4+
5+
target 'ios-app-bootstrap' do
6+
7+
pod 'Alamofire', '~> 4.7'
8+
pod 'CryptoSwift'
9+
pod 'lottie-ios'
10+
pod 'Logger.swift', :git => 'https://github.com/app-bootstrap/Logger.swift'
11+
12+
end
13+
14+
target 'ios-app-bootstrapTests' do
15+
16+
pod 'Alamofire', '~> 4.7'
17+
pod 'CryptoSwift'
18+
pod 'lottie-ios'
19+
pod 'Logger.swift', :git => 'https://github.com/app-bootstrap/Logger.swift'
20+
21+
end
22+
23+
workspace 'ios-app-bootstrap.xcworkspace'

‎ci.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,16 @@
22

33
# for Marmot CI
44

5+
pod install
6+
7+
curl -fsSL https://github.com/macacajs/marmot-ios/files/2114440/Makefile.txt -o Makefile && make init
8+
59
make build
610

11+
make test
12+
13+
make coverage ARGS="--reprt-format=html"
14+
715
npm i
816

917
MARMOT_IOS=true npm run marmot

‎ios-app-bootstrap.xcodeproj/project.pbxproj

Lines changed: 87 additions & 26 deletions
Large diffs are not rendered by default.

‎ios-app-bootstrap.xcodeproj/project.xcworkspace/contents.xcworkspacedata

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ios-app-bootstrap.xcodeproj/project.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>

0 commit comments

Comments
 (0)