Skip to content

Commit 2ba73c3

Browse files
paulofariapaulofaria
authored
Merge pull request #45 from SportlabsTechnology/master
Update .swift-version and travis config to swift 4.2
2 parents ce90650 + 2920ee6 commit 2ba73c3

File tree

6 files changed

+29
-76
lines changed

6 files changed

+29
-76
lines changed

‎.swift-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.1
1+
4.2

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ matrix:
55
include:
66
- os: osx
77
env: JOB=SwiftPM_OSX
8-
osx_image: xcode9.3beta
8+
osx_image: xcode10.1
99
- os: linux
1010
env: JOB=SwiftPM_linux
1111
dist: trusty

‎Package.resolved

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,35 @@
66
"repositoryURL": "https://github.com/vapor/core.git",
77
"state": {
88
"branch": null,
9-
"revision": "3b72f2cc3fb21d505fbe97215418951a8e4a2871",
10-
"version": "3.2.1"
9+
"revision": "1794ff138bd669175a2528d27695028d7cb30471",
10+
"version": "3.5.0"
11+
}
12+
},
13+
{
14+
"package": "CRuntime",
15+
"repositoryURL": "https://github.com/wickwirew/CRuntime.git",
16+
"state": {
17+
"branch": null,
18+
"revision": "8d0dd0ca3787d15682c1f44de3d298459870b121",
19+
"version": "1.0.0"
1120
}
1221
},
1322
{
1423
"package": "Runtime",
1524
"repositoryURL": "https://github.com/wickwirew/Runtime.git",
1625
"state": {
1726
"branch": null,
18-
"revision": "23357609f0df427d870bb4bd22ac14e0a4ea1346",
19-
"version": "0.7.1"
27+
"revision": "40cdfbad9650512507c060824e1c4e9fc2ca721d",
28+
"version": "1.1.0"
2029
}
2130
},
2231
{
2332
"package": "swift-nio",
2433
"repositoryURL": "https://github.com/apple/swift-nio.git",
2534
"state": {
2635
"branch": null,
27-
"revision": "77dc77b9b5cdddfb3c385c5ee6cb74153d284967",
28-
"version": "1.7.2"
36+
"revision": "03c541a24dd0558c942b15d8464eb75d70a921c4",
37+
"version": "1.12.1"
2938
}
3039
},
3140
{

‎Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ let package = Package(
99
],
1010

1111
dependencies: [
12-
.package(url: "https://github.com/wickwirew/Runtime.git", from: "0.6.0"),
12+
.package(url: "https://github.com/wickwirew/Runtime.git", from: "1.1.0"),
1313

1414
// ⏱ Promises and reactive-streams in Swift built for high-performance and scalability.
1515
.package(url: "https://github.com/vapor/core.git", from: "3.0.0"),

‎Tests/GraphQLTests/FieldExecutionStrategyTests/FieldExecutionStrategyTests.swift

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class FieldExecutionStrategyTests: XCTestCase {
7676
"locations": [
7777
["column": 3, "line": 1]
7878
],
79-
"message": "exampleError(\"bang: bang\")",
79+
"message": "exampleError(msg: \"bang: bang\")",
8080
"path":["bang"]
8181
]
8282
]
@@ -100,70 +100,70 @@ class FieldExecutionStrategyTests: XCTestCase {
100100
"locations": [
101101
["column": 3, "line": 1]
102102
],
103-
"message": "exampleError(\"bang: a\")",
103+
"message": "exampleError(msg: \"bang: a\")",
104104
"path":["a"]
105105
],
106106
[
107107
"locations": [
108108
["column": 11, "line": 1]
109109
],
110-
"message": "exampleError(\"bang: b\")",
110+
"message": "exampleError(msg: \"bang: b\")",
111111
"path":["b"]
112112
],
113113
[
114114
"locations": [
115115
["column": 19, "line": 1]
116116
],
117-
"message": "exampleError(\"bang: c\")",
117+
"message": "exampleError(msg: \"bang: c\")",
118118
"path":["c"]
119119
],
120120
[
121121
"locations": [
122122
["column": 27, "line": 1]
123123
],
124-
"message": "exampleError(\"bang: d\")",
124+
"message": "exampleError(msg: \"bang: d\")",
125125
"path":["d"]
126126
],
127127
[
128128
"locations": [
129129
["column": 35, "line": 1]
130130
],
131-
"message": "exampleError(\"bang: e\")",
131+
"message": "exampleError(msg: \"bang: e\")",
132132
"path":["e"]
133133
],
134134
[
135135
"locations": [
136136
["column": 43, "line": 1]
137137
],
138-
"message": "exampleError(\"bang: f\")",
138+
"message": "exampleError(msg: \"bang: f\")",
139139
"path":["f"]
140140
],
141141
[
142142
"locations": [
143143
["column": 51, "line": 1]
144144
],
145-
"message": "exampleError(\"bang: g\")",
145+
"message": "exampleError(msg: \"bang: g\")",
146146
"path":["g"]
147147
],
148148
[
149149
"locations": [
150150
["column": 59, "line": 1]
151151
],
152-
"message": "exampleError(\"bang: h\")",
152+
"message": "exampleError(msg: \"bang: h\")",
153153
"path":["h"]
154154
],
155155
[
156156
"locations": [
157157
["column": 67, "line": 1]
158158
],
159-
"message": "exampleError(\"bang: i\")",
159+
"message": "exampleError(msg: \"bang: i\")",
160160
"path":["i"]
161161
],
162162
[
163163
"locations": [
164164
["column": 75, "line": 1]
165165
],
166-
"message": "exampleError(\"bang: j\")",
166+
"message": "exampleError(msg: \"bang: j\")",
167167
"path":["j"]
168168
],
169169
]

‎Tests/GraphQLTests/StarWarsTests/StarWarsIntrospectionTests.swift

Lines changed: 0 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ class StarWarsIntrospectionTests : XCTestCase {
1919
" }" +
2020
"}"
2121

22-
#if os(macOS)
2322
let expected: Map = [
2423
"data": [
2524
"__schema": [
@@ -73,61 +72,6 @@ class StarWarsIntrospectionTests : XCTestCase {
7372
],
7473
],
7574
]
76-
#else
77-
let expected: Map = [
78-
"data": [
79-
"__schema": [
80-
"types": [
81-
[
82-
"name": "__Directive",
83-
],
84-
[
85-
"name": "__DirectiveLocation",
86-
],
87-
[
88-
"name": "__EnumValue",
89-
],
90-
[
91-
"name": "__Field",
92-
],
93-
[
94-
"name": "__InputValue",
95-
],
96-
[
97-
"name": "__Schema",
98-
],
99-
[
100-
"name": "__Type",
101-
],
102-
[
103-
"name": "__TypeKind",
104-
],
105-
[
106-
"name": "Boolean",
107-
],
108-
[
109-
"name": "Character",
110-
],
111-
[
112-
"name": "Droid",
113-
],
114-
[
115-
"name": "Episode",
116-
],
117-
[
118-
"name": "Human",
119-
],
120-
[
121-
"name": "Query",
122-
],
123-
[
124-
"name": "String",
125-
],
126-
],
127-
],
128-
],
129-
]
130-
#endif
13175

13276
let result = try graphql(schema: StarWarsSchema, request: query, eventLoopGroup: eventLoopGroup).wait()
13377
XCTAssertEqual(result, expected)

0 commit comments

Comments
 (0)