Update TCA to latest version #228
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,21 +14,40 @@ concurrency: | |
| cancel-in-progress: true | ||
|
|
||
| jobs: | ||
| library-macos-14: | ||
| name: Build and Run Unit Tests | ||
| runs-on: macos-14 | ||
| strategy: | ||
| matrix: | ||
| xcode: ['15.2', '15.4'] | ||
| config: ['debug', 'release'] | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - name: Select Xcode ${{ matrix.xcode }} | ||
| run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app | ||
| - name: Run ${{ matrix.config }} tests | ||
| run: make XCODE=${{ matrix.xcode }} CONFIG=${{ matrix.config }} test-library | ||
|
|
||
| - uses: slidoapp/xcresulttool@v3.1.0 | ||
| with: | ||
| path: TestResults-${{ matrix.xcode }}-${{ matrix.config }}.xcresult | ||
| if: success() || failure() | ||
|
|
||
| library-macos-15: | ||
| name: Build and Run Unit Tests | ||
| runs-on: macos-15 | ||
| strategy: | ||
| matrix: | ||
| xcode: ['16.0'] | ||
| config: ['debug', 'release'] | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - name: Select Xcode ${{ matrix.xcode }} | ||
| run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app | ||
| - name: Run ${{ matrix.config }} tests | ||
| run: make XCODE=${{ matrix.xcode }} CONFIG=${{ matrix.config }} test-library | ||
|
|
||
| - uses: slidoapp/[email protected] | ||
| with: | ||
| path: TestResults-${{ matrix.xcode }}-${{ matrix.config }}.xcresult | ||
| if: success() || failure() | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,7 +10,7 @@ Pod::Spec.new do |s| | |
| s.author = { "Mobile @ Klaviyo" => "[email protected]" } | ||
| s.source = { :git => "https://github.com/klaviyo/klaviyo-swift-sdk.git", :tag => s.version.to_s } | ||
| s.swift_version = '5.7' | ||
| s.platform = :ios, '15.0' | ||
| s.source_files = 'Sources/KlaviyoCore/**/*.swift' | ||
ndurell marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| s.dependency 'KlaviyoSDKDependencies', '~>4.0.0' | ||
| end | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| Pod::Spec.new do |s| | ||
| s.name = "KlaviyoSDKDependencies" | ||
| s.version = "4.0.0" | ||
| s.summary = "Dependency for the Klaviyo SDK" | ||
| s.description = <<-DESC | ||
| Klaviyo external dependencies all rolled in one package | ||
| DESC | ||
| s.homepage = "https://github.com/klaviyo/klaviyo-swift-sdk" | ||
| s.license = { :type => "MIT", :file => "LICENSE" } | ||
| s.author = { "Mobile @ Klaviyo" => "[email protected]" } | ||
| s.source = { :git => "https://github.com/klaviyo/klaviyo-swift-sdk.git", :tag => s.version.to_s } | ||
|
There was a problem hiding this comment. I'm probably not looking in the right file, but I am curious what dependencies are going in this. I saw in a lower file that both core and this were imported, why is that? Is this where the dependencies of our SDK live? There was a problem hiding this comment. We shouldn't have any dependencies after this change in the sdk properly. I've internned pretty much everything except in tests which uses combine schedulers and a few other misc things. |
||
| s.swift_version = '5.7' | ||
| s.platform = :ios, '15.0' | ||
| s.source_files = 'Sources/KlaviyoCore/**/*.swift' | ||
| end | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,7 +10,7 @@ Pod::Spec.new do |s| | |
| s.author = { "Mobile @ Klaviyo" => "[email protected]" } | ||
| s.source = { :git => "https://github.com/klaviyo/klaviyo-swift-sdk.git", :tag => s.version.to_s } | ||
| s.swift_version = '5.7' | ||
| s.platform = :ios, '15.0' | ||
| s.source_files = 'Sources/KlaviyoUI/**/*.swift' | ||
| # update once modularization changes are merged in. | ||
| s.dependency 'KlaviyoSwift', '~> 4.0.0' | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| // swift-tools-version:6.0 | ||
|
|
||
| import CompilerPluginSupport | ||
| import PackageDescription | ||
|
|
||
| let package = Package( | ||
| name: "klaviyo-swift-sdk", | ||
| platforms: [.iOS(.v15)], | ||
| products: [ | ||
| .library( | ||
| name: "KlaviyoSwift", | ||
| targets: ["KlaviyoSwift"]), | ||
| .library( | ||
| name: "KlaviyoUI", | ||
| targets: ["KlaviyoUI"]), | ||
| .library( | ||
| name: "KlaviyoSwiftExtension", | ||
| targets: ["KlaviyoSwiftExtension"]) | ||
| ], | ||
| dependencies: [ | ||
| .package(url: "https://github.com/pointfreeco/swift-snapshot-testing", from: "1.10.0"), | ||
| .package(url: "https://github.com/pointfreeco/combine-schedulers", from: "1.0.2"), | ||
| .package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "1.3.0") | ||
| ], | ||
| targets: [ | ||
| .target( | ||
| name: "KlaviyoCore", | ||
| dependencies: ["KlaviyoSDKDependencies"], | ||
| path: "Sources/KlaviyoCore"), | ||
| .testTarget( | ||
| name: "KlaviyoCoreTests", | ||
| dependencies: [ | ||
| "KlaviyoCore", | ||
| .product(name: "SnapshotTesting", package: "swift-snapshot-testing"), | ||
| "KlaviyoSDKDependencies" | ||
| ]), | ||
| .target( | ||
| name: "KlaviyoSwift", | ||
| dependencies: [ | ||
| "KlaviyoSDKDependencies", | ||
| "KlaviyoCore" | ||
| ], | ||
| path: "Sources/KlaviyoSwift", | ||
| resources: [.copy("PrivacyInfo.xcprivacy")]), | ||
| .testTarget( | ||
| name: "KlaviyoSwiftTests", | ||
| dependencies: [ | ||
| "KlaviyoSwift", | ||
| .product(name: "SnapshotTesting", package: "swift-snapshot-testing"), | ||
| "KlaviyoSDKDependencies", | ||
| .product(name: "CombineSchedulers", package: "combine-schedulers"), | ||
| "KlaviyoCore", | ||
| .product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay") | ||
| ], | ||
| exclude: [ | ||
| "__Snapshots__" | ||
| ]), | ||
| .target( | ||
| name: "KlaviyoUI", | ||
| dependencies: ["KlaviyoSwift"], | ||
| path: "Sources/KlaviyoUI", | ||
| resources: [.process("KlaviyoWebView/Resources")]), | ||
| .testTarget( | ||
| name: "KlaviyoUITests", | ||
| dependencies: [ | ||
| "KlaviyoSwift", | ||
| "KlaviyoCore", | ||
| "KlaviyoSDKDependencies" | ||
| ]), | ||
| .target( | ||
| name: "KlaviyoSwiftExtension", | ||
| dependencies: [], | ||
| path: "Sources/KlaviyoSwiftExtension"), | ||
|
|
||
| // Vendorized Things | ||
| .target( | ||
| name: "KlaviyoSDKDependencies", | ||
| dependencies: [], | ||
| path: "Sources/KlaviyoSDKDependencies") | ||
| ], | ||
| swiftLanguageModes: [.v6]) |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
Test results need to be unique.
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.
Ripped these changes into my Github actions deprecation branch which has since been merged to master so if you were to rebase/merge changes to this branch the swift.yml and makefile changes would likely match master now