Skip to content

Commit 2df017c

Browse files
committed
updated docker/workflows to 5.2
1 parent df96fb2 commit 2df017c

File tree

5 files changed

+48
-27
lines changed

5 files changed

+48
-27
lines changed

.github/workflows/swift.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
jobs:
77
xenial:
88
container:
9-
image: vapor/swift:5.1-xenial
9+
image: vapor/swift:5.2-xenial
1010
services:
1111
psql:
1212
image: postgres
@@ -24,7 +24,7 @@ jobs:
2424
- run: swift test --enable-test-discovery --sanitize=thread --enable-code-coverage
2525
bionic:
2626
container:
27-
image: vapor/swift:5.1-bionic
27+
image: vapor/swift:5.2-bionic
2828
services:
2929
psql:
3030
image: postgres

Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
FROM vapor/swift:5.1-xenial
1+
FROM vapor/swift:5.2-xenial
22

33
WORKDIR /package
44
COPY . ./
55
RUN swift package resolve
66
RUN swift package clean
7-
RUN apt-get install openssl libssl-dev
8-
CMD ["swift", "test", "--enable-test-discovery"]
7+
CMD ["swift", "test", "--enable-test-discovery"]

Package.resolved

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

Package.swift

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
// swift-tools-version:5.1
2-
// The swift-tools-version declares the minimum version of Swift required to build this package.
3-
1+
// swift-tools-version:5.2
42
import PackageDescription
53

64
let package = Package(
75
name: "vii",
86
platforms: [
9-
.macOS(.v10_14)
7+
.macOS(.v10_15)
108
],
119
products: [
1210
.executable(name: "Vii", targets: ["Vii"]),
@@ -21,12 +19,24 @@ let package = Package(
2119
targets: [
2220
.target(
2321
name: "Vii",
24-
dependencies: ["ConsoleKit", "ViiLibrary"]),
22+
dependencies: [
23+
.product(name: "ConsoleKit", package: "console-kit"),
24+
.byName(name: "ViiLibrary")
25+
]
26+
),
2527
.target(
2628
name: "ViiLibrary",
27-
dependencies: ["SQLKit", "PostgresKit", "MySQLKit"]),
29+
dependencies: [
30+
.product(name: "SQLKit", package: "sql-kit"),
31+
.product(name: "PostgresKit", package: "postgres-kit"),
32+
.product(name: "MySQLKit", package: "mysql-kit")
33+
]
34+
),
2835
.testTarget(
2936
name: "ViiTests",
30-
dependencies: ["ViiLibrary"]),
37+
dependencies: [
38+
.byName(name: "ViiLibrary")
39+
]
40+
)
3141
]
3242
)

README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ So to use with Postgres DB.
3030
swift run Vii postgres
3131
```
3232

33-
# Property Wrappers
33+
## Property Wrappers
3434
The following lists the property wrappers that are currently implemented
3535

3636
## @ID
@@ -42,6 +42,9 @@ Unspecialized columns are mapped to the `@Field` property wrapper.
4242
## @NestedField
4343
Columns declared as `json` are mapped into the `@NestedField` property wrapper. Vii does not analyze the content of columns, so it is unable to infer the structure of the json. Vapor requires this to be declared. Vii will automatically declare the property of type `UnMappedType`. The user should then replace this declaration with a more fitting one.
4444

45+
## @CompoundField
46+
Vii cannot infer this from a simple scan of the database. Again, the user would have to declare this property type manually
47+
4548
## @Timestamp
4649
Vapor's `@Timestamp` propertyWrapper uses an enum called `Trigger` which helps Fluent determine whether to update this column on creation, update or deletion. Because this is not derivable from the database columns directly, Vii makes an educated guess on what case to apply to the timestamp, this is done based on the column name.
4750

0 commit comments

Comments
 (0)