diff --git a/client/src/main/java/com/defold/extender/client/ExtenderClient.java b/client/src/main/java/com/defold/extender/client/ExtenderClient.java index 587aaf45..9ff045de 100644 --- a/client/src/main/java/com/defold/extender/client/ExtenderClient.java +++ b/client/src/main/java/com/defold/extender/client/ExtenderClient.java @@ -331,7 +331,8 @@ HttpEntity createBuildRequestPayload(List sourceResources) thr try (ZipOutputStream zipStream = new ZipOutputStream(byteStream)) { sourceResources.stream() .filter(res -> { - return !cachedFiles.contains(res.getPath()); + return !cachedFiles.contains(res.getPath()) + && !res.getPath().endsWith(".DS_Store"); }) .forEach(res -> { Path path = Path.of(res.getPath()); diff --git a/client/src/test/java/com/defold/extender/client/ExtenderClientTest.java b/client/src/test/java/com/defold/extender/client/ExtenderClientTest.java index bfa674a5..c9f66fe1 100644 --- a/client/src/test/java/com/defold/extender/client/ExtenderClientTest.java +++ b/client/src/test/java/com/defold/extender/client/ExtenderClientTest.java @@ -137,8 +137,7 @@ private static Stream uploadData() { Arguments.of(null, List.of("build/a", "build/b", "build/c")) ); } - - @ParameterizedTest() + @ParameterizedTest @MethodSource("uploadData") public void testUploadStructure(String cacheResponse, List expectedFilenames) throws Exception { try { @@ -149,23 +148,27 @@ public void testUploadStructure(String cacheResponse, List expectedFilen File a = new File("build/a"); File b = new File("build/b"); File c = new File("build/c"); + File e = new File("build/.DS_Store"); FileExtenderResource aRes = new FileExtenderResource(a); FileExtenderResource bRes = new FileExtenderResource(b); FileExtenderResource cRes = new FileExtenderResource(c); + FileExtenderResource eRes = new FileExtenderResource(e); a.deleteOnExit(); b.deleteOnExit(); c.deleteOnExit(); + e.deleteOnExit(); TestUtils.writeToFile("build/a", "a"); TestUtils.writeToFile("build/b", "b"); TestUtils.writeToFile("build/c", "c"); + TestUtils.writeToFile("build/e", "e"); List inputFiles = new ArrayList<>(); inputFiles.add(aRes); inputFiles.add(bRes); inputFiles.add(cRes); - + inputFiles.add(eRes); HttpEntity entity = extenderClient.createBuildRequestPayload(inputFiles); assertNotNull(entity);