ATL-5386: Remove cocoapods so it works on the iOS #87
Conversation
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
🦙 MegaLinter status:
|
| Descriptor | Linter | Files | Fixed | Errors | Elapsed time |
|---|---|---|---|---|---|
| bash-exec | 1 | 1 | 0.01s | ||
| shfmt | 1 | 1 | 0.01s | ||
| ✅ EDITORCONFIG | editorconfig-checker | 41 | 0 | 0.14s | |
| ✅ KOTLIN | ktlint | 25 | 0 | 59.07s | |
| devskim | yes | 6 | 1.41s | ||
| ✅ REPOSITORY | dustilock | yes | no | 0.07s | |
| ✅ REPOSITORY | gitleaks | yes | no | 2.12s | |
| ✅ REPOSITORY | git_diff | yes | no | 0.04s | |
| ✅ REPOSITORY | secretlint | yes | no | 5.03s | |
| ✅ REPOSITORY | syft | yes | no | 0.5s | |
| ✅ REPOSITORY | trivy | yes | no | 6.22s |
See detailed report in MegaLinter reports
Set VALIDATE_ALL_CODEBASE: true in mega-linter.yml to validate all sources, not only the diff
MegaLinter is graciously provided by
goncalo-frade-iohk
force-pushed
the
feature/workingIOSLibs
branch
3 times, most recently
from
6303d96
to
25b0c3a
Compare
goncalo-frade-iohk
changed the title
hamada147
reviewed
Aug 7, 2023
| @@ -7,8 +7,7 @@ val os: OperatingSystem = OperatingSystem.current() | |||
|
|
|||
| plugins { | |||
| kotlin("multiplatform") | |||
| kotlin("native.cocoapods") | |||
| id("com.chromaticnoise.multiplatform-swiftpackage") version "2.0.3" | |||
| id("io.github.luca992.multiplatform-swiftpackage") version "2.0.5-arm64" | |||
There was a problem hiding this comment.
Suggested change
| id("io.github.luca992.multiplatform-swiftpackage") version "2.0.5-arm64" | |
| val osName = System.getProperty("os.name").toLowerCase() | |
| if (osName.contains("mac os x") || osName.contains("darwin") || osName.contains("osx")) { | |
| if (System.getProperty("os.arch") != "x86_64") { // M1Chip | |
| id("io.github.luca992.multiplatform-swiftpackage") version "2.0.5-arm64" | |
| } else { | |
| id("io.github.luca992.multiplatform-swiftpackage") version("2.0.3") | |
| } | |
| } |
There was a problem hiding this comment.
Do we still need to add this? I don't think it makes a difference :) also I tried doing this and it was giving me an error when I add an If like so inside the plugins {...}
There was a problem hiding this comment.
Oh, I've update the code snippet.
There was a problem hiding this comment.
I updated to code. This version should work inside the plugins block now.
hamada147
reviewed
Aug 7, 2023
Comment on lines
54
to
85
| ios() { | ||
| swiftCinterop("IOHKCryptoKit", name) | ||
| swiftCinterop("IOHKSecureRandomGeneration", name) | ||
|
|
||
| binaries.framework { | ||
| baseName = currentModuleName | ||
| embedBitcode("disable") | ||
| } | ||
| } | ||
| macosX64() { | ||
| binaries.framework { | ||
| baseName = currentModuleName | ||
| embedBitcode("disable") | ||
| } | ||
|
|
||
| swiftCinterop("IOHKCryptoKit", name) | ||
| swiftCinterop("IOHKSecureRandomGeneration", name) | ||
| } | ||
|
|
||
| if (System.getProperty("os.arch") != "x86_64") { // M1Chip | ||
| iosSimulatorArm64() | ||
| iosSimulatorArm64() { | ||
| binaries.framework { | ||
| baseName = currentModuleName | ||
| embedBitcode("disable") | ||
| } | ||
|
|
||
| swiftCinterop("IOHKCryptoKit", name) | ||
| swiftCinterop("IOHKSecureRandomGeneration", name) | ||
| } | ||
| // tvosSimulatorArm64() | ||
| // watchosSimulatorArm64() | ||
| macosArm64() | ||
| macosArm64() { | ||
| binaries.framework { | ||
| baseName = currentModuleName | ||
| embedBitcode("disable") | ||
| } | ||
|
|
||
| swiftCinterop("IOHKCryptoKit", name) | ||
| swiftCinterop("IOHKSecureRandomGeneration", name) | ||
| } | ||
| } |
There was a problem hiding this comment.
It should be inside of
if (os.isMacOsX)There was a problem hiding this comment.
Funny enough it should not :D the linux passes fine, and I took them out of it, because on linux the build would fail with the Swift Packages plugin and no Apple target.
There was a problem hiding this comment.
I don't have a strong opinion on this. So we can ignore it.
hamada147
reviewed
Aug 7, 2023
goncalo-frade-iohk
force-pushed
the
feature/workingIOSLibs
branch
3 times, most recently
from
9af2bf2
to
d8b1be5
Compare
This change was needed because ios requires a dependency manager for any dependency. Using cocoapods for internal xcode projects would not work quite right when trying to use Apollo as a framework.
goncalo-frade-iohk
force-pushed
the
feature/workingIOSLibs
branch
from
d8b1be5
to
d16484d
Compare
hamada147
added a commit
that referenced
this pull request
May 20, 2024
Co-authored-by: Ahmed Moussa <[email protected]> Signed-off-by: Goncalo Frade <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Removed cocoapods for internal libraries and made them static.
The reason is if they are frameworks, the will not go within Apollo framework, instead they will be dependencies and expected to exist as a dependency, also Apollo itself should be a static framework so it can be easily reused on our SDK.