Avoid Objective-C dependency for clean target outputs

Author: shai-almog

vm/ByteCodeTranslator/src/com/codename1/tools/translator/ByteCodeTranslator.java

@@ -242,13 +242,13 @@ private static void handleCleanOutput(ByteCodeTranslator b, File[] sources, File
         }
         File xmlvm = new File(srcRoot, "xmlvm.h");
         copy(ByteCodeTranslator.class.getResourceAsStream("/xmlvm.h"), new FileOutputStream(xmlvm));
-        File nativeMethods = new File(srcRoot, "nativeMethods.m");
+        File nativeMethods = new File(srcRoot, "nativeMethods.c");
         copy(ByteCodeTranslator.class.getResourceAsStream("/nativeMethods.m"), new FileOutputStream(nativeMethods));
-        File cn1GlobalsM = new File(srcRoot, "cn1_globals.m");
+        File cn1GlobalsM = new File(srcRoot, "cn1_globals.c");
         copy(ByteCodeTranslator.class.getResourceAsStream("/cn1_globals.m"), new FileOutputStream(cn1GlobalsM));
-        File javaIoFileM = new File(srcRoot, "java_io_File.m");
+        File javaIoFileM = new File(srcRoot, "java_io_File.c");
         copy(ByteCodeTranslator.class.getResourceAsStream("/java_io_File.m"), new FileOutputStream(javaIoFileM));
-        File javaIoFileStreamsM = new File(srcRoot, "java_io_FileStreams.m");
+        File javaIoFileStreamsM = new File(srcRoot, "java_io_FileStreams.c");
         copy(ByteCodeTranslator.class.getResourceAsStream("/java_io_FileStreams.m"), new FileOutputStream(javaIoFileStreamsM));
 
         Parser.writeOutput(srcRoot);

vm/tests/src/test/java/com/codename1/tools/translator/CleanTargetIntegrationTest.java

@@ -108,8 +108,7 @@ void generatesRunnableHelloWorldUsingCleanTarget(CompilerHelper.CompilerConfig c
                 "cmake",
                 "-S", distDir.toString(),
                 "-B", buildDir.toString(),
-                "-DCMAKE_C_COMPILER=clang",
-                "-DCMAKE_OBJC_COMPILER=clang"
+                "-DCMAKE_C_COMPILER=clang"
         ), distDir);
 
         runCommand(Arrays.asList("cmake", "--build", buildDir.toString()), distDir);

vm/tests/src/test/java/com/codename1/tools/translator/FileStreamsIntegrationTest.java

@@ -76,7 +76,7 @@ public void testFileStreams(CompilerHelper.CompilerConfig config) throws Excepti
         Path srcRoot = distDir.resolve("FileStreamApp-src");
         CleanTargetIntegrationTest.patchCn1Globals(srcRoot);
 
-        assertTrue(Files.exists(srcRoot.resolve("java_io_FileStreams.m")), "java_io_FileStreams.m should exist");
+        assertTrue(Files.exists(srcRoot.resolve("java_io_FileStreams.c")), "java_io_FileStreams.c should exist");
 
         replaceLibraryWithExecutableTarget(cmakeLists);
 
@@ -87,8 +87,7 @@ public void testFileStreams(CompilerHelper.CompilerConfig config) throws Excepti
                 "cmake",
                 "-S", distDir.toString(),
                 "-B", buildDir.toString(),
-                "-DCMAKE_C_COMPILER=clang",
-                "-DCMAKE_OBJC_COMPILER=clang"
+                "-DCMAKE_C_COMPILER=clang"
         ), distDir);
 
         CleanTargetIntegrationTest.runCommand(Arrays.asList("cmake", "--build", buildDir.toString()), distDir);
@@ -142,7 +141,7 @@ private void replaceLibraryWithExecutableTarget(Path cmakeLists) throws IOExcept
         String content = new String(Files.readAllBytes(cmakeLists), StandardCharsets.UTF_8);
         String replacement = content.replace(
                 "add_library(${PROJECT_NAME} ${TRANSLATOR_SOURCES} ${TRANSLATOR_HEADERS})",
-                "add_executable(${PROJECT_NAME} ${TRANSLATOR_SOURCES} ${TRANSLATOR_HEADERS})\ntarget_link_libraries(${PROJECT_NAME} m objc)"
+                "add_executable(${PROJECT_NAME} ${TRANSLATOR_SOURCES} ${TRANSLATOR_HEADERS})\ntarget_link_libraries(${PROJECT_NAME} m)"
         );
         Files.write(cmakeLists, replacement.getBytes(StandardCharsets.UTF_8));
     }