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

Jump to bottom

Use correct path for iOS sim dependencies and update ios sim device name #1173

Merged
merged 1 commit into from
Sep 22, 2022
Merged

Use correct path for iOS sim dependencies and update ios sim device name #1173

Show file tree
Hide file tree
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
8 changes: 5 additions & 3 deletions src/main/java/com/gluonhq/substrate/util/FileDeps.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019, 2021, Gluon
* Copyright (c) 2019, 2022, Gluon
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -325,7 +325,9 @@ private boolean setupDependencies() throws IOException {
}

if (downloadJavaFXStatic) {
downloadJavaFXZip(target, isLinuxAarch64 ? "-monocle" : "");
String osarch = new Triplet(Constants.Profile.IOS_SIM).equals(configuration.getTargetTriplet()) ?
new Triplet(Constants.Profile.IOS).getOsArch() : target;
downloadJavaFXZip(osarch, isLinuxAarch64 ? "-monocle" : "");
}

if (downloadAndroidSdk) { // First we get SDK
Expand Down Expand Up @@ -397,7 +399,7 @@ private void downloadJavaFXZip(String osarch, String variant) throws IOException
javafxZip,
"javafxStaticSdk",
configuration.getJavafxStaticSdkVersion(),
configuration.getTargetTriplet().getOsArch());
osarch);
Logger.logInfo("JavaFX static libs downloaded successfully");
}

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/gluonhq/substrate/util/ios/Simulator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,12 +137,12 @@ private static SimDevice getBootedSimDevice(String deviceName) throws IOExceptio
.findFirst()
.orElse(null);
if (device == null) {
// else default to iPhone 13
// else default to iPhone 14
device = devices.stream()
.filter(d -> "iPhone 13".equals(d.getName()))
.filter(d -> "iPhone 14".equals(d.getName()))
.findFirst()
.orElseThrow(() -> new IOException("No device found. " +
"\nPossible devices are:\n " +
"\nPossible devices are:\n" +
devices.stream().map(SimDevice::getName).collect(Collectors.joining("\n"))));
}
}
Expand Down