Skip to content
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.

Sign up for GitHub

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

Use iOS target for iOS-simulator #358

Merged
merged 1 commit into from
Sep 20, 2021
Merged

Use iOS target for iOS-simulator #358

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/main/java/com/gluonhq/attach/AttachArtifactResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,12 @@ public static Map<String, Artifact> findArtifactsForTarget(List<Dependency> depe
.map(d -> {
if (UTIL_ARTIFACT.equals(d.getArtifactId())) {
if (Constants.PROFILE_ANDROID.equals(target) ||
Constants.PROFILE_IOS.equals(target)||
Constants.PROFILE_IOS.equals(target) ||
Constants.PROFILE_IOS_SIM.equals(target)) {
String utilTarget = Constants.PROFILE_IOS_SIM.equals(target) ?
Constants.PROFILE_IOS : target;
return new DefaultArtifact(d.getGroupId(), d.getArtifactId(),
target, d.getType(), d.getVersion());
utilTarget, d.getType(), d.getVersion());
Copy link
Contributor

@johanvos johanvos Aug 11, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This means the same target is used for ios aarch64 and ios x86_64, but the native code is built for a different architecture. Or do we assume lipo is used to create multi-arch libraries?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We use lipo indeed.

}
return null;
}
Expand Down