Skip to content

Commit c324aaf

Browse files
committed
force include static libs from xcFrameworks
1 parent f026c70 commit c324aaf

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Diff for: compiler/compiler/src/main/java/org/robovm/compiler/config/ResolvedLocations.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ private void processXCFramework(File xcFrameworkLocation, List<File> destLocatio
206206
} else if (libPath.endsWith(".a")) {
207207
// static library inside .xcframework, add it to libs
208208
File staticLibFile = new File(new File(xcFrameworkLocation, library.getIdentifier()), libPath);
209-
destLibs.add(new Config.Lib(staticLibFile.getAbsolutePath(), false));
209+
destLibs.add(new Config.Lib(staticLibFile.getAbsolutePath(), true));
210210
} else {
211211
String message = String.format(
212212
"Unsupported library type %s matched %s %s, in '%s'",

Diff for: compiler/compiler/src/test/java/org/robovm/compiler/config/ConfigTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@ public void testXCFrameworkLookupResolvedIntoStaticLib() throws Exception {
560560
assertEquals(Collections.singletonList(frameworkLocation), config.getFrameworkPaths());
561561
assertEquals(Collections.emptyList(), config.getFrameworks());
562562
assertEquals(Arrays.asList(
563-
new Lib(new File(xcFramework, "ios-x86_64-simulator/library-static3.a").getAbsolutePath(), false)),
563+
new Lib(new File(xcFramework, "ios-x86_64-simulator/library-static3.a").getAbsolutePath(), true)),
564564
config.getLibs());
565565
}
566566

@@ -591,7 +591,7 @@ public void testXCFrameworkResolved() throws Exception {
591591
assertEquals(Collections.singletonList(frameworkLocation), config.getFrameworkPaths());
592592
assertEquals(Collections.emptyList(), config.getFrameworks());
593593
assertEquals(Arrays.asList(
594-
new Lib(new File(xcFramework, "ios-x86_64-simulator/library-static3.a").getAbsolutePath(), false)),
594+
new Lib(new File(xcFramework, "ios-x86_64-simulator/library-static3.a").getAbsolutePath(), true)),
595595
config.getLibs());
596596
}
597597

0 commit comments

Comments
 (0)