Skip to content
This repository was archived by the owner on Jan 16, 2023. It is now read-only.

Commit f2738b8

Browse files
authored
Merge pull request #432 from clappr/chore/cocoapods
Replace carthage with cocoapods as dependency manager
2 parents 542c86b + 4f739cd commit f2738b8

File tree

13 files changed

+419
-106
lines changed

13 files changed

+419
-106
lines changed

Cartfile

Whitespace-only changes.

Cartfile.private

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

Cartfile.resolved

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

Clappr.xcodeproj/project.pbxproj

Lines changed: 285 additions & 66 deletions
Large diffs are not rendered by default.

Clappr.xcworkspace/contents.xcworkspacedata

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
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>

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source "https://rubygems.org"
22

3-
gem 'cocoapods', '~> 1.9.3'
3+
gem 'cocoapods', '~> 1.9.1'
44
gem 'fastlane', '~> 2.156.1'
55
gem 'xcov', '~> 1.7.4'
66

Gemfile.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ GEM
3131
aws-eventstream (~> 1, >= 1.0.2)
3232
babosa (1.0.3)
3333
claide (1.0.3)
34-
cocoapods (1.9.3)
34+
cocoapods (1.9.1)
3535
activesupport (>= 4.0.2, < 5)
3636
claide (>= 1.0.2, < 2.0)
37-
cocoapods-core (= 1.9.3)
37+
cocoapods-core (= 1.9.1)
3838
cocoapods-deintegrate (>= 1.0.3, < 2.0)
3939
cocoapods-downloader (>= 1.2.2, < 2.0)
4040
cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -50,7 +50,7 @@ GEM
5050
nap (~> 1.0)
5151
ruby-macho (~> 1.4)
5252
xcodeproj (>= 1.14.0, < 2.0)
53-
cocoapods-core (1.9.3)
53+
cocoapods-core (1.9.1)
5454
activesupport (>= 4.0.2, < 6)
5555
algoliasearch (~> 1.0)
5656
concurrent-ruby (~> 1.1)
@@ -245,7 +245,7 @@ PLATFORMS
245245
ruby
246246

247247
DEPENDENCIES
248-
cocoapods (~> 1.9.3)
248+
cocoapods (~> 1.9.1)
249249
fastlane (~> 2.156.1)
250250
fastlane-plugin-versioning
251251
xcov (~> 1.7.4)

Makefile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,14 @@ setup: ## Install dependencies requied to start development
1515
rbenv rehash
1616
$(BUNDLE) install
1717

18+
clear_cache:
19+
rm -rf "Pods/"
20+
rm -rf "${HOME}/Library/Caches/CocoaPods"
21+
rm -rf Podfile.lock
22+
23+
install_dependencies: ## Install dependencies. Similar but better than `pod install`.
24+
$(FASTLANE) run cocoapods try_repo_update_on_error:true
25+
1826
wipe: ## Clean the Xcode temp files and kills simulators
1927
killall "Simulator" || true
2028
rm -rf ~/Library/Developer/Xcode/{DerivedData,Archives,Products}

Podfile

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
use_frameworks!
2+
inhibit_all_warnings!
3+
4+
$iOS_version = '11.0'
5+
$tvOS_version = '11.0'
6+
7+
def platform_iOS
8+
platform :ios, $iOS_version
9+
end
10+
11+
def platform_tvOS
12+
platform :tvos, $tvOS_version
13+
end
14+
15+
def shared_test_pods
16+
pod 'Quick', '2.2.0'
17+
pod 'Nimble', '8.0.7'
18+
pod 'OHHTTPStubs', '8.0.0'
19+
pod 'OHHTTPStubs/Swift', '8.0.0'
20+
pod 'Swifter', '1.5.0'
21+
end
22+
23+
target 'Clappr' do
24+
# Pods for Clappr
25+
platform_iOS
26+
27+
target 'Clappr_Tests' do
28+
# Pods for testing
29+
platform_iOS
30+
shared_test_pods
31+
end
32+
33+
target 'Clappr_UITests' do
34+
# Pods for testing
35+
platform_iOS
36+
shared_test_pods
37+
end
38+
end
39+
40+
target 'Clappr_Example' do
41+
# Pods for Clappr_Example
42+
platform_iOS
43+
end
44+
45+
target 'Clappr_tvOS' do
46+
# Pods for Clappr_tvOS
47+
platform_tvOS
48+
49+
target 'Clappr_tvOS_Tests' do
50+
# Pods for testing
51+
platform_tvOS
52+
shared_test_pods
53+
end
54+
end
55+
56+
target 'Clappr_tvOS_Example' do
57+
# Pods for Clappr_tvOS_Example
58+
platform_tvOS
59+
end

0 commit comments

Comments
 (0)