Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
helje5 committed Jan 2, 2023
2 parents a2755a3 + b66006c commit 30b9cd5
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 13 deletions.
15 changes: 7 additions & 8 deletions .github/workflows/swift.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,13 @@ jobs:
fail-fast: false
matrix:
image:
- swift:5.2.5-xenial
- swift:5.3.2-xenial
- swift:5.3.2-bionic
- swift:5.5.0-focal
- swift:5.5.3-xenial
- swift:5.6.1-bionic
- swift:5.7.2-focal
container: ${{ matrix.image }}
steps:
- name: Checkout Repository
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Build Swift Debug Package
run: swift build -c debug
- name: Build Swift Release Package
Expand All @@ -29,11 +28,11 @@ jobs:
runs-on: macos-latest
steps:
- name: Select latest available Xcode
uses: maxim-lobanov/setup-xcode@v1.2.1
uses: maxim-lobanov/setup-xcode@v1.5.1
with:
xcode-version: 13
xcode-version: 13.2.1
- name: Checkout Repository
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Build Swift Debug Package
run: swift build -c debug
- name: Build Swift Release Package
Expand Down
12 changes: 7 additions & 5 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:5.2
// swift-tools-version:5.5

import PackageDescription

Expand All @@ -13,12 +13,11 @@ let package = Package(

dependencies: [
.package(url: "https://github.com/Macro-swift/Macro.git",
from: "0.8.11"),
from: "1.0.0"),
.package(url: "https://github.com/Macro-swift/MacroExpress.git",
from: "0.8.8"),
from: "1.0.0"),
.package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git",
// b0rked release:.upToNextMajor(from:"0.5.1"))
.exact("0.4.0"))
from: "0.5.2")
],

targets: [
Expand All @@ -28,6 +27,9 @@ let package = Package(
.product(name: "express" , package: "MacroExpress"),
.product(name: "AWSLambdaRuntime" , package: "swift-aws-lambda-runtime"),
.product(name: "AWSLambdaEvents" , package: "swift-aws-lambda-runtime")
],
exclude: [
"README.md"
]),
.target(name: "MacroLambda", dependencies: [
"MacroLambdaCore",
Expand Down

0 comments on commit 30b9cd5

Please sign in to comment.