diff --git a/.gitignore b/.gitignore index 04708b0f..dda78116 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ xcuserdata Package.resolved .serverless +*dist/ diff --git a/Examples/LocalDebugging/Example.xcworkspace/contents.xcworkspacedata b/Examples/LocalDebugging/Example.xcworkspace/contents.xcworkspacedata index e42d285c..1b719dcf 100644 --- a/Examples/LocalDebugging/Example.xcworkspace/contents.xcworkspacedata +++ b/Examples/LocalDebugging/Example.xcworkspace/contents.xcworkspacedata @@ -1,16 +1,13 @@ - - - - + + diff --git a/Examples/LocalDebugging/MyApp/MyApp.xcodeproj/project.pbxproj b/Examples/LocalDebugging/MyApp/MyApp.xcodeproj/project.pbxproj index 0ac2539a..8abb3b1e 100644 --- a/Examples/LocalDebugging/MyApp/MyApp.xcodeproj/project.pbxproj +++ b/Examples/LocalDebugging/MyApp/MyApp.xcodeproj/project.pbxproj @@ -7,11 +7,11 @@ objects = { /* Begin PBXBuildFile section */ + 00D8767929489CAF00C69C82 /* Shared in Frameworks */ = {isa = PBXBuildFile; productRef = 00D8767829489CAF00C69C82 /* Shared */; }; 7CD1174B26FE468F007DD17A /* MyApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CD1174A26FE468F007DD17A /* MyApp.swift */; }; 7CD1174D26FE468F007DD17A /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CD1174C26FE468F007DD17A /* ContentView.swift */; }; 7CD1174F26FE4692007DD17A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7CD1174E26FE4692007DD17A /* Assets.xcassets */; }; 7CD1175226FE4692007DD17A /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7CD1175126FE4692007DD17A /* Preview Assets.xcassets */; }; - 7CD1175A26FE4F44007DD17A /* Shared in Frameworks */ = {isa = PBXBuildFile; productRef = 7CD1175926FE4F44007DD17A /* Shared */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -27,7 +27,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 7CD1175A26FE4F44007DD17A /* Shared in Frameworks */, + 00D8767929489CAF00C69C82 /* Shared in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -94,7 +94,7 @@ ); name = MyApp; packageProductDependencies = ( - 7CD1175926FE4F44007DD17A /* Shared */, + 00D8767829489CAF00C69C82 /* Shared */, ); productName = MyApp; productReference = 7CD1174726FE468F007DD17A /* MyApp.app */; @@ -356,7 +356,7 @@ /* End XCConfigurationList section */ /* Begin XCSwiftPackageProductDependency section */ - 7CD1175926FE4F44007DD17A /* Shared */ = { + 00D8767829489CAF00C69C82 /* Shared */ = { isa = XCSwiftPackageProductDependency; productName = Shared; }; diff --git a/Examples/LocalDebugging/MyApp/MyApp.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Examples/LocalDebugging/MyApp/MyApp.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 00000000..919434a6 --- /dev/null +++ b/Examples/LocalDebugging/MyApp/MyApp.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/Examples/LocalDebugging/MyApp/MyApp.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Examples/LocalDebugging/MyApp/MyApp.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 00000000..18d98100 --- /dev/null +++ b/Examples/LocalDebugging/MyApp/MyApp.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/Examples/LocalDebugging/MyLambda/Lambda.swift b/Examples/LocalDebugging/MyLambda/Sources/MyLambda/Lambda.swift similarity index 100% rename from Examples/LocalDebugging/MyLambda/Lambda.swift rename to Examples/LocalDebugging/MyLambda/Sources/MyLambda/Lambda.swift diff --git a/Examples/LocalDebugging/MyLambda/Package.swift b/Examples/LocalDebugging/Package.swift similarity index 56% rename from Examples/LocalDebugging/MyLambda/Package.swift rename to Examples/LocalDebugging/Package.swift index 567d0c49..6106b73b 100644 --- a/Examples/LocalDebugging/MyLambda/Package.swift +++ b/Examples/LocalDebugging/Package.swift @@ -6,25 +6,30 @@ let package = Package( name: "MyLambda", platforms: [ .macOS(.v12), + .iOS(.v15) ], products: [ .executable(name: "MyLambda", targets: ["MyLambda"]), + .library(name: "Shared", targets: ["Shared"]), ], dependencies: [ // this is the dependency on the swift-aws-lambda-runtime library // in real-world projects this would say - // .package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "1.0.0") - .package(name: "swift-aws-lambda-runtime", path: "../../.."), - .package(name: "Shared", path: "../Shared"), + .package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", branch: "main"), +// .package(name: "swift-aws-lambda-runtime", path: "../../.."), ], targets: [ .executableTarget( name: "MyLambda", dependencies: [ .product(name: "AWSLambdaRuntime", package: "swift-aws-lambda-runtime"), - .product(name: "Shared", package: "Shared"), + .byName(name: "Shared"), ], - path: "." + path: "./MyLambda", + exclude: ["scripts/", "Dockerfile"] ), + .target(name: "Shared", + dependencies: [], + path: "./Shared") ] ) diff --git a/Examples/LocalDebugging/Shared/Package.swift b/Examples/LocalDebugging/Shared/Package.swift deleted file mode 100644 index 96eb2003..00000000 --- a/Examples/LocalDebugging/Shared/Package.swift +++ /dev/null @@ -1,16 +0,0 @@ -// swift-tools-version:5.5 -// The swift-tools-version declares the minimum version of Swift required to build this package. - -import PackageDescription - -let package = Package( - name: "Shared", - products: [ - .library(name: "Shared", targets: ["Shared"]), - ], - dependencies: [ - ], - targets: [ - .target(name: "Shared", dependencies: []), - ] -)