diff --git a/.jazzy.yaml b/.jazzy.yaml index 3cc2c58..ccc1a39 100644 --- a/.jazzy.yaml +++ b/.jazzy.yaml @@ -1,6 +1,6 @@ module: SwiftKueryORM -author: IBM -github_url: https://github.com/IBM-Swift/Swift-Kuery-ORM +author: IBM & Kitura Project Authors +github_url: https://github.com/Kitura/Swift-Kuery-ORM theme: fullwidth clean: true @@ -10,5 +10,3 @@ readme: README.md skip_undocumented: false hide_documentation_coverage: false - -xcodebuild_arguments: [-project, SwiftKueryORM.xcodeproj, -target, SwiftKueryORM, LIBRARY_SEARCH_PATHS=.build/debug] diff --git a/.travis.yml b/.travis.yml index 8b444b3..987a274 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,58 +16,31 @@ matrix: dist: xenial sudo: required services: docker - env: DOCKER_IMAGE=swift:4.0.3 SWIFT_SNAPSHOT=4.0.3 + env: DOCKER_IMAGE=docker.kitura.net/kitura/swift-ci-ubuntu16.04:5.1.5 - os: linux - dist: xenial - sudo: required - services: docker - env: DOCKER_IMAGE=swift:4.1.3 SWIFT_SNAPSHOT=4.1.3 - - os: linux - dist: xenial - sudo: required - services: docker - env: DOCKER_IMAGE=swift:4.2.4 SWIFT_SNAPSHOT=4.2.4 - - os: linux - dist: xenial - sudo: required - services: docker - env: DOCKER_IMAGE=swift:5.0.3-xenial SWIFT_SNAPSHOT=5.0.3 - - os: linux - dist: xenial + dist: bionic sudo: required services: docker - env: DOCKER_IMAGE=swift:5.1 + env: DOCKER_IMAGE=docker.kitura.net/kitura/swift-ci-ubuntu18.04:5.4 - os: linux dist: xenial sudo: required services: docker - env: DOCKER_IMAGE=swift:5.1 SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT - - os: osx - osx_image: xcode9.2 - sudo: required - env: SWIFT_SNAPSHOT=4.0.3 - - os: osx - osx_image: xcode9.4 - sudo: required - env: SWIFT_SNAPSHOT=4.1.2 + env: DOCKER_IMAGE=docker.kitura.net/kitura/swift-ci-ubuntu18.04:latest USE_SWIFT_DEVELOPMENT_SNAPSHOT=1 - os: osx - osx_image: xcode10.1 + osx_image: xcode11 sudo: required - env: SWIFT_SNAPSHOT=4.2.1 + env: SWIFT_SNAPSHOT=5.1.5 JAZZY_ELIGIBLE=true - os: osx - osx_image: xcode10.2 + osx_image: xcode12.2 sudo: required - env: SWIFT_SNAPSHOT=5.0.1 JAZZY_ELIGIBLE=true - os: osx - osx_image: xcode11 - sudo: required - - os: osx - osx_image: xcode11 + osx_image: xcode12.5 sudo: required - env: SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT + env: USE_SWIFT_DEVELOPMENT_SNAPSHOT=1 before_install: - - git clone https://github.com/IBM-Swift/Package-Builder.git + - git clone https://github.com/Kitura/Package-Builder.git script: - ./Package-Builder/build-package.sh -projectDir $TRAVIS_BUILD_DIR diff --git a/Package.swift b/Package.swift index d203b62..4e18c30 100644 --- a/Package.swift +++ b/Package.swift @@ -30,9 +30,9 @@ let package = Package( ], dependencies: [ // Dependencies declare other packages that this package depends on. - .package(url:"https://github.com/Kitura/Swift-Kuery.git", from: "3.0.200"), - .package(url:"https://github.com/Kitura/KituraContracts.git", from: "1.2.200"), - .package(url:"https://github.com/Kitura/TypeDecoder.git", from: "1.3.200") + .package(url:"https://github.com/Kitura/Swift-Kuery.git", from: "4.0.0"), + .package(url:"https://github.com/Kitura/KituraContracts.git", from: "2.0.0"), + .package(url:"https://github.com/Kitura/TypeDecoder.git", from: "2.0.0") ], targets: [ // Targets are the basic building blocks of a package. A target can define a module or a test suite. diff --git a/Package@swift-4.swift b/Package@swift-4.swift deleted file mode 100644 index f07b818..0000000 --- a/Package@swift-4.swift +++ /dev/null @@ -1,49 +0,0 @@ -// swift-tools-version:4.0 -// The swift-tools-version declares the minimum version of Swift required to build this package. - -/** - * Copyright IBM Corporation and the Kitura project authors 2016-2020 - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - **/ - -import PackageDescription - -let package = Package( - name: "SwiftKueryORM", - products: [ - // Products define the executables and libraries produced by a package, and make them visible to other packages. - .library( - name: "SwiftKueryORM", - targets: ["SwiftKueryORM"] - ) - ], - dependencies: [ - // Dependencies declare other packages that this package depends on. - .package(url:"https://github.com/Kitura/Swift-Kuery.git", from: "3.0.200"), - .package(url:"https://github.com/Kitura/KituraContracts.git", from: "1.2.200"), - .package(url:"https://github.com/Kitura/TypeDecoder.git", from: "1.3.200") - ], - targets: [ - // Targets are the basic building blocks of a package. A target can define a module or a test suite. - // Targets can depend on other targets in this package, and on products in packages which this package depends on. - .target( - name: "SwiftKueryORM", - dependencies: ["SwiftKuery", "KituraContracts", "TypeDecoder"] - ), - .testTarget( - name: "SwiftKueryORMTests", - dependencies: ["SwiftKueryORM", "KituraContracts"] - ) - ] -) diff --git a/README.md b/README.md index 5477bec..75ba9d2 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@

- Kitura + Kitura

- + APIDoc @@ -424,7 +424,7 @@ struct Person: Model { * [MySQL](https://github.com/Kitura/SwiftKueryMySQL) ## API Documentation -For more information visit our [API reference](https://ibm-swift.github.io/Swift-Kuery-ORM/index.html). +For more information visit our [API reference](https://kitura.github.io/Swift-Kuery-ORM/index.html). ## Community diff --git a/Sources/SwiftKueryORM/Database.swift b/Sources/SwiftKueryORM/Database.swift index 33653f9..6cbfdc4 100644 --- a/Sources/SwiftKueryORM/Database.swift +++ b/Sources/SwiftKueryORM/Database.swift @@ -20,7 +20,7 @@ public typealias ConnectionPoolOptions = SwiftKuery.ConnectionPoolOptions /// Class defining the connection to the database. /// -/// To setup the database, in this case using [PostgreSQL](https://github.com/IBM-Swift/Swift-Kuery-PostgreSQL): +/// To setup the database, in this case using [PostgreSQL](https://github.com/Kitura/Swift-Kuery-PostgreSQL): /// ``` /// import SwiftKueryORM /// import SwiftKueryPostgreSQL diff --git a/Sources/SwiftKueryORM/Model.swift b/Sources/SwiftKueryORM/Model.swift index de11b21..b8579a9 100644 --- a/Sources/SwiftKueryORM/Model.swift +++ b/Sources/SwiftKueryORM/Model.swift @@ -1141,7 +1141,7 @@ public extension Model { } /** - Extension of the RequestError from [KituraContracts](https://github.com/IBM-Swift/KituraContracts.git) + Extension of the RequestError from [KituraContracts](https://github.com/Kitura/KituraContracts.git) */ extension RequestError { init(_ base: RequestError, reason: String) { diff --git a/Sources/SwiftKueryORM/TypeAliases.swift b/Sources/SwiftKueryORM/TypeAliases.swift index 1da2bb3..17b9d6d 100644 --- a/Sources/SwiftKueryORM/TypeAliases.swift +++ b/Sources/SwiftKueryORM/TypeAliases.swift @@ -22,10 +22,10 @@ import SwiftKuery The purpose is to expose these types at the top level without having to import a specific dependency. */ -/// Type Alias for RequestError from [KituraContracts](https://github.com/IBM-Swift/KituraContracts) +/// Type Alias for RequestError from [KituraContracts](https://github.com/Kitura/KituraContracts) public typealias RequestError = KituraContracts.RequestError -/// Type Alias for SQLDataType from [SwiftKuery](https://github.com/IBM-Swift/Swift-Kuery) +/// Type Alias for SQLDataType from [SwiftKuery](https://github.com/Kitura/Swift-Kuery) public typealias SQLDataType = SwiftKuery.SQLDataType /// Public TypeAlias for QueryParams Type from KituraContracts diff --git a/docs/Classes.html b/docs/Classes.html index f9bcd01..b307c34 100644 --- a/docs/Classes.html +++ b/docs/Classes.html @@ -14,6 +14,7 @@ + @@ -32,7 +33,7 @@

- + View on GitHub @@ -66,6 +67,14 @@ +

+ + + + + + + + + + + + + + + + + +