fix swift

Author: AGulev

server/src/main/java/com/defold/extender/services/cocoapods/PodUtils.java

@@ -103,7 +103,9 @@ public static String swiftModuleNameFromPlatform(String extenderTargetPlatform)
         switch(extenderTargetPlatform) {
             case "arm64-ios": return "arm64-apple-ios";
             case "x86_64-ios": return "x86_64-apple-ios-simulator";
+            case "arm64-osx":
             case "arm64-macos": return "arm64-apple-macos";
+            case "x86_64-osx":
             case "x86_64-macos": return "x86_64-apple-macos";
             default:
                 throw new ExtenderException(String.format("Invalid platform input for swift module name %s", extenderTargetPlatform));

server/src/test/java/com/defold/extender/ExtenderTest.java

@@ -416,12 +416,16 @@ public void testOsxCompileCommandCarriesSdkFlags() throws IOException, ExtenderE
         assertTrue(platformConfig.compileCmd.contains("-isysroot {{env.SYSROOT}}"));
         assertEquals("arm64", platformConfig.context.get("clangArch"));
         assertEquals("arm64-apple-darwin19", platformConfig.context.get("clangTarget"));
+        List<String> swiftFlags = (List<String>)platformConfig.context.get("swiftFlags");
+        assertTrue(swiftFlags.contains("arm64-apple-macosx{{osMinVersion}}"));
 
         List<String> flags = (List<String>)platformConfig.context.get("flags");
         assertFalse(flags.contains("-arch"));
         assertFalse(flags.contains("-target"));
         assertFalse(flags.contains("-isysroot"));
         assertFalse(flags.contains("{{env.SYSROOT}}"));
+        List<String> libPaths = (List<String>)platformConfig.context.get("libPaths");
+        assertTrue(libPaths.contains("{{env.PLATFORMSDK_DIR}}/XcodeDefault{{env.XCODE_VERSION}}.xctoolchain/usr/lib/swift/macosx"));
 
         Map<String, String> env = new HashMap<>();
         env.put("SYSROOT", "/opt/platformsdk/MacOSX.sdk");
@@ -451,6 +455,10 @@ public void testOsxCompileCommandCarriesSdkFlags() throws IOException, ExtenderE
         assertFalse(legacyRenderedCompileCmd.contains("-target "));
         assertFalse(legacyRenderedCompileCmd.contains("-m64 "));
         assertTrue(legacyRenderedCompileCmd.contains("-isysroot /opt/platformsdk/MacOSX.sdk"));
+
+        PlatformConfig x86_64PlatformConfig = mergePlatformConfig(config, "x86_64-osx");
+        List<String> x86_64SwiftFlags = (List<String>)x86_64PlatformConfig.context.get("swiftFlags");
+        assertTrue(x86_64SwiftFlags.contains("x86_64-apple-macosx{{osMinVersion}}"));
     }
 
     @Test

server/src/test/java/com/defold/extender/services/cocoapods/PodUtilsTest.java

@@ -74,7 +74,9 @@ public void testHasSource() {
     public void testSwiftModuleName() throws ExtenderException {
         assertEquals("arm64-apple-ios", PodUtils.swiftModuleNameFromPlatform("arm64-ios"));
         assertEquals("x86_64-apple-ios-simulator", PodUtils.swiftModuleNameFromPlatform("x86_64-ios"));
+        assertEquals("arm64-apple-macos", PodUtils.swiftModuleNameFromPlatform("arm64-osx"));
         assertEquals("arm64-apple-macos", PodUtils.swiftModuleNameFromPlatform("arm64-macos"));
+        assertEquals("x86_64-apple-macos", PodUtils.swiftModuleNameFromPlatform("x86_64-osx"));
         assertEquals("x86_64-apple-macos", PodUtils.swiftModuleNameFromPlatform("x86_64-macos"));
         assertThrows(ExtenderException.class, () -> { PodUtils.swiftModuleNameFromPlatform("x86_64-linux"); });
 

server/test-data/sdk/a/defoldsdk/extender/build.yml

@@ -135,7 +135,7 @@ platforms:
     context:
         frameworks:     ["Foundation", "AppKit", "Cocoa", "OpenGL", "OpenAL", "AGL", "IOKit", "Carbon", "CoreVideo", "QuartzCore"]
         engineLibs:     ["engine", "engine_service", "mbedtls", "zip", "profile", "remotery", "profilerext", "record", "gameobject", "ddf", "resource", "gamesys", "gamesys_model", "gamesys_rig", "script_box2d", "graphics", "graphics_transcoder_basisu", "basis_transcoder", "physics", "BulletDynamics", "BulletCollision", "platform", "LinearMath", "Box2D", "render", "render_font_default", "script", "luajit-5.1", "extension", "hid", "input", "particle", "rig", "dlib", "image", "glfw3", "gui", "crashext", "sound", "tremolo", "vpx", "liveupdate"]
-        libPaths:       ["{{env.SYSROOT}}/usr/lib/swift", "{{env.PLATFORMSDK_DIR}}/XcodeDefault{{env.XCODE_VERSION}}.xctoolchain/usr/lib/swift-{{env.SWIFT_VERSION}}/macosx", "{{env.PLATFORMSDK_DIR}}/XcodeDefault{{env.XCODE_VERSION}}.xctoolchain/usr/lib/clang/{{env.XCODE_CLANG_VERSION}}/lib/darwin"]
+        libPaths:       ["{{env.SYSROOT}}/usr/lib/swift", "{{env.PLATFORMSDK_DIR}}/XcodeDefault{{env.XCODE_VERSION}}.xctoolchain/usr/lib/swift-{{env.SWIFT_VERSION}}/macosx", "{{env.PLATFORMSDK_DIR}}/XcodeDefault{{env.XCODE_VERSION}}.xctoolchain/usr/lib/swift/macosx", "{{env.PLATFORMSDK_DIR}}/XcodeDefault{{env.XCODE_VERSION}}.xctoolchain/usr/lib/clang/{{env.XCODE_CLANG_VERSION}}/lib/darwin"]
         defines:        ["DM_PLATFORM_MACOS", "DM_PLATFORM_OSX", "GL_DO_NOT_WARN_IF_MULTI_GL_VERSION_HEADERS_INCLUDED"]
         systemIncludes: ["{{env.SYSROOT}}/usr/include/c++/v1"]
         flags:          ["-fno-exceptions", "-fvisibility=hidden", "-Werror=format"]
@@ -181,7 +181,7 @@ platforms:
         linkFlags:      ["-arch", "arm64", "-target", "arm64-apple-darwin19", "-m64"]
         cxxLinkShFlags: ["-arch", "arm64", "-target", "arm64-apple-darwin19", "-m64"]
         zig-target:     'aarch64-macos'
-        swiftFlags:     ["-target", "arm-apple-darwin19"]
+        swiftFlags:     ["-target", "arm64-apple-macosx{{osMinVersion}}"]
 
   x86_64-osx:
     context:
@@ -191,7 +191,7 @@ platforms:
         linkFlags:      ["-arch", "x86_64", "-target", "x86_64-apple-darwin19", "-m64"]
         cxxLinkShFlags: ["-arch", "x86_64", "-target", "x86_64-apple-darwin19", "-m64"]
         zig-target:     'x86_64-macos'
-        swiftFlags:     ["-target", "x86_64-apple-darwin19"]
+        swiftFlags:     ["-target", "x86_64-apple-macosx{{osMinVersion}}"]
 
   ios:
     env: