-
Notifications
You must be signed in to change notification settings - Fork 81
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix: Delete the Package.swift
in AWSClientRuntime/
#621
Conversation
…its function to the main Package.swift
As a retest, I re-generated the |
@@ -70,7 +70,7 @@ func appendLibTarget(name: String, path: String) { | |||
), | |||
.product( | |||
name: "AWSClientRuntime", | |||
package: "AWSClientRuntime" | |||
package: "AWSSwiftSDK" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this seems incorrect. Why AWSSwiftSDK is not defined as package.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is indeed correct.
Instead of being a product published from its own package, i.e. package=AWSClientRuntime
& product=AWSClientRuntime
, AWSClientRuntime
is now a product published from the AWSSwiftSDK
package, i.e. package=AWSSwiftSDK
and product=AWSClientRuntime
.
This is similar to how the service clients are products published by the AWSSwiftSDK
package. The only difference here is that AWSClientRuntime
is not auto-generated.
As proof that this configuration is correct, if you generate files and run swift test
from within the codegen/
directory, it resolves dependencies & runs tests successfully.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
awesome, thanks for verifying it.
@@ -99,11 +99,11 @@ if let smithySwiftDir = ProcessInfo.processInfo.environment["SMITHY_SWIFT_CI_DIR | |||
let sdkDir = ProcessInfo.processInfo.environment["AWS_SDK_SWIFT_CI_DIR"] { | |||
package.dependencies += [ | |||
.package(name: "ClientRuntime", path: smithySwiftDir), | |||
.package(name: "AWSClientRuntime", path: "\(sdkDir)/AWSClientRuntime"), | |||
.package(name: "AWSSwiftSDK", path: sdkDir), |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
same as above.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See my comment above, this package dependency is correct.
@ganeshnj Please re-review in light of my comments |
Description of changes
Delete the
Package.swift
in theAWSClientRuntime/
subdirectory & move its function to the mainPackage.swift
.The
AWSClientRuntime
library is now available only as a product published by this package's mainPackage.swift
.This will simplify the package definitions in this project, and allow for editing of
AWSClientRuntime
source files from within Xcode.New/existing dependencies impact assessment, if applicable
No new dependencies were added to this change.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.