Skip to content

Commit 38d9b85

Browse files
jberkeljberkel
authored
Merge pull request #502 from stephencelis/swift3-mariotaku
Swift3
2 parents 492bd66 + 6b4cb81 commit 38d9b85

Some content is hidden

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

50 files changed

+1069
-917
lines changed

‎.swift-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.0

‎.travis.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
language: objective-c
2+
rvm: 2.2
3+
osx_image: xcode8
4+
env:
5+
global:
6+
- IOS_SIMULATOR="iPhone SE"
27
matrix:
38
include:
49
- env: BUILD_SCHEME="SQLite iOS"
@@ -7,7 +12,10 @@ matrix:
712
- env: VALIDATOR_SUBSPEC="standard"
813
- env: VALIDATOR_SUBSPEC="standalone"
914
before_install:
15+
- gem update bundler
1016
- gem install xcpretty --no-document
1117
script:
1218
- ./run-tests.sh
13-
osx_image: xcode7.3
19+
after_failure:
20+
- find $HOME/Library/Developer/Xcode/DerivedData/ -name '*.log' -print0 | xargs -0 cat
21+
- cat /var/log/system.log

‎CocoaPods/iphoneos-10.0/module.modulemap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
module CSQLite [system] {
2+
header "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.0.sdk/usr/include/sqlite3.h"
3+
export *
4+
}

‎CocoaPods/iphonesimulator-10.0/module.modulemap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
module CSQLite [system] {
2+
header "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator10.0.sdk/usr/include/sqlite3.h"
3+
export *
4+
}

‎CocoaPods/macosx-10.11/module.modulemap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
module CSQLite [system] {
2+
header "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk/usr/include/sqlite3.h"
3+
export *
4+
}

‎CocoaPods/macosx-10.12/module.modulemap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
module CSQLite [system] {
2+
header "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/include/sqlite3.h"
3+
export *
4+
}

‎CocoaPods/macosx/module.modulemap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
module CSQLite [system] {
2-
header "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk/usr/include/sqlite3.h"
2+
header "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/sqlite3.h"
33
export *
44
}

‎CocoaPodsTests/Gemfile

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

3-
gem 'cocoapods'
3+
gem 'cocoapods', '~> 1.1.0.rc.2'
44
gem 'minitest'

‎CocoaPodsTests/Gemfile.lock

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,60 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (4.2.6)
4+
activesupport (4.2.7.1)
55
i18n (~> 0.7)
66
json (~> 1.7, >= 1.7.7)
77
minitest (~> 5.1)
88
thread_safe (~> 0.3, >= 0.3.4)
99
tzinfo (~> 1.1)
1010
claide (1.0.0)
11-
cocoapods (1.0.0)
12-
activesupport (>= 4.0.2)
11+
cocoapods (1.1.0.rc.2)
12+
activesupport (>= 4.0.2, < 5)
1313
claide (>= 1.0.0, < 2.0)
14-
cocoapods-core (= 1.0.0)
15-
cocoapods-deintegrate (>= 1.0.0, < 2.0)
16-
cocoapods-downloader (>= 1.0.0, < 2.0)
14+
cocoapods-core (= 1.1.0.rc.2)
15+
cocoapods-deintegrate (>= 1.0.1, < 2.0)
16+
cocoapods-downloader (>= 1.1.1, < 2.0)
1717
cocoapods-plugins (>= 1.0.0, < 2.0)
1818
cocoapods-search (>= 1.0.0, < 2.0)
1919
cocoapods-stats (>= 1.0.0, < 2.0)
2020
cocoapods-trunk (>= 1.0.0, < 2.0)
21-
cocoapods-try (>= 1.0.0, < 2.0)
21+
cocoapods-try (>= 1.1.0, < 2.0)
2222
colored (~> 1.2)
2323
escape (~> 0.0.4)
24-
fourflusher (~> 0.3.0)
25-
molinillo (~> 0.4.5)
24+
fourflusher (~> 1.0.1)
25+
gh_inspector (~> 1.0)
26+
molinillo (~> 0.5.1)
2627
nap (~> 1.0)
27-
xcodeproj (>= 1.0.0, < 2.0)
28-
cocoapods-core (1.0.0)
29-
activesupport (>= 4.0.2)
28+
xcodeproj (>= 1.3.1, < 2.0)
29+
cocoapods-core (1.1.0.rc.2)
30+
activesupport (>= 4.0.2, < 5)
3031
fuzzy_match (~> 2.0.4)
3132
nap (~> 1.0)
32-
cocoapods-deintegrate (1.0.0)
33-
cocoapods-downloader (1.0.0)
33+
cocoapods-deintegrate (1.0.1)
34+
cocoapods-downloader (1.1.1)
3435
cocoapods-plugins (1.0.0)
3536
nap
3637
cocoapods-search (1.0.0)
3738
cocoapods-stats (1.0.0)
3839
cocoapods-trunk (1.0.0)
3940
nap (>= 0.8, < 2.0)
4041
netrc (= 0.7.8)
41-
cocoapods-try (1.0.0)
42+
cocoapods-try (1.1.0)
4243
colored (1.2)
4344
escape (0.0.4)
44-
fourflusher (0.3.0)
45+
fourflusher (1.0.1)
4546
fuzzy_match (2.0.4)
47+
gh_inspector (1.0.2)
4648
i18n (0.7.0)
4749
json (1.8.3)
48-
minitest (5.8.4)
49-
molinillo (0.4.5)
50+
minitest (5.9.0)
51+
molinillo (0.5.1)
5052
nap (1.1.0)
5153
netrc (0.7.8)
5254
thread_safe (0.3.5)
5355
tzinfo (1.2.2)
5456
thread_safe (~> 0.1)
55-
xcodeproj (1.0.0)
57+
xcodeproj (1.3.1)
5658
activesupport (>= 3)
5759
claide (>= 1.0.0, < 2.0)
5860
colored (~> 1.2)
@@ -61,5 +63,8 @@ PLATFORMS
6163
ruby
6264

6365
DEPENDENCIES
64-
cocoapods
66+
cocoapods (~> 1.1.0.rc.2)
6567
minitest
68+
69+
BUNDLED WITH
70+
1.10.6

‎CocoaPodsTests/Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1-
test: install
1+
test: install repo_update
22
@set -e; \
33
for test in *_test.rb; do \
44
bundle exec ./$$test; \
55
done
66

7+
repo_update:
8+
@bundle exec pod repo update --silent
9+
710
install:
811
@bundle install --path gems
912

0 commit comments

Comments
 (0)