diff --git a/CHANGELOG b/CHANGELOG index 30d0fb9..de31b18 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,8 +3,10 @@ ## v1.0.0 * updates apksigner to v28.0.3 +* update zipalign to 28.0.3 win/linux binary * updates maven plugin versions * use maven wrapper +* slightly improved debugging output ## v0.8.4 * add file size info to log output diff --git a/pom.xml b/pom.xml index cfe855e..653664b 100644 --- a/pom.xml +++ b/pom.xml @@ -160,7 +160,7 @@ - false + true ${project.basedir}/keystore.jks pfopensource ${env.OPENSOURCE_PROJECTS_KS_PW} diff --git a/src/main/java/at/favre/tools/apksigner/SignTool.java b/src/main/java/at/favre/tools/apksigner/SignTool.java index 2dbcc7e..3b878f9 100644 --- a/src/main/java/at/favre/tools/apksigner/SignTool.java +++ b/src/main/java/at/favre/tools/apksigner/SignTool.java @@ -216,7 +216,7 @@ private static File zipAlign(File targetApkFile, File rootTargetFile, File outFo if (executor.isExecutableFound()) { String logMsg = "\t- "; - CmdUtil.Result zipAlignResult = CmdUtil.runCmd(CmdUtil.concat(executor.getZipAlignExecutable(), new String[]{ZIPALIGN_ALIGNMENT, targetApkFile.getAbsolutePath(), outFile.getAbsolutePath()})); + CmdUtil.Result zipAlignResult = CmdUtil.runCmd(CmdUtil.concat(executor.getZipAlignExecutable(), new String[]{"-v", ZIPALIGN_ALIGNMENT, targetApkFile.getAbsolutePath(), outFile.getAbsolutePath()})); cmdList.add(zipAlignResult); if (zipAlignResult.success()) { logMsg += "zipalign success"; diff --git a/src/main/java/at/favre/tools/apksigner/signing/ZipAlignExecutor.java b/src/main/java/at/favre/tools/apksigner/signing/ZipAlignExecutor.java index 63d8594..f079146 100644 --- a/src/main/java/at/favre/tools/apksigner/signing/ZipAlignExecutor.java +++ b/src/main/java/at/favre/tools/apksigner/signing/ZipAlignExecutor.java @@ -51,13 +51,13 @@ private void findLocation(Arg arg) { String fileName, lib = null; if (osType == CmdUtil.OS.WIN) { - fileName = "win-zipalign_25_0_0.exe"; + fileName = "win-zipalign_28_0_3.exe"; } else if (osType == CmdUtil.OS.MAC) { fileName = "mac-zipalign-24_0_3"; - lib = "linux64-libc++-25_0_0.so"; //TODO test if this works on mac + lib = "linux64-libc++-28_0_3.so"; //TODO test if this works on mac } else { - fileName = "linux-zipalign-25_0_0"; - lib = "linux64-libc++-25_0_0.so"; + fileName = "linux-zipalign-28_0_3"; + lib = "linux64-libc++-28_0_3.so"; } tmpFolder = Files.createTempDirectory("uapksigner-").toFile(); diff --git a/src/main/java/at/favre/tools/apksigner/util/CmdUtil.java b/src/main/java/at/favre/tools/apksigner/util/CmdUtil.java index 2dd7119..1d617af 100644 --- a/src/main/java/at/favre/tools/apksigner/util/CmdUtil.java +++ b/src/main/java/at/favre/tools/apksigner/util/CmdUtil.java @@ -101,7 +101,7 @@ public Result(String out, Exception exception, String[] cmd, int exitValue) { @Override public String toString() { - return cmd + "\n" + out + "\n"; + return cmd + "\n" + out + " (" + exitValue + ")\n"; } public boolean success() { diff --git a/src/main/resources/linux-zipalign-25_0_0 b/src/main/resources/linux-zipalign-25_0_0 deleted file mode 100755 index c62d294..0000000 Binary files a/src/main/resources/linux-zipalign-25_0_0 and /dev/null differ diff --git a/src/main/resources/linux-zipalign-28_0_3 b/src/main/resources/linux-zipalign-28_0_3 new file mode 100644 index 0000000..6d9ae88 Binary files /dev/null and b/src/main/resources/linux-zipalign-28_0_3 differ diff --git a/src/main/resources/linux64-libc++-25_0_0.so b/src/main/resources/linux64-libc++-25_0_0.so deleted file mode 100755 index fa84063..0000000 Binary files a/src/main/resources/linux64-libc++-25_0_0.so and /dev/null differ diff --git a/src/main/resources/linux64-libc++-28_0_3.so b/src/main/resources/linux64-libc++-28_0_3.so new file mode 100644 index 0000000..7daa576 Binary files /dev/null and b/src/main/resources/linux64-libc++-28_0_3.so differ diff --git a/src/main/resources/win-zipalign_25_0_0.exe b/src/main/resources/win-zipalign_25_0_0.exe deleted file mode 100644 index 74ea5c9..0000000 Binary files a/src/main/resources/win-zipalign_25_0_0.exe and /dev/null differ diff --git a/src/main/resources/win-zipalign_28_0_3.exe b/src/main/resources/win-zipalign_28_0_3.exe new file mode 100644 index 0000000..dae92e0 Binary files /dev/null and b/src/main/resources/win-zipalign_28_0_3.exe differ