<pre style='margin:0'>
ra1nb0w (ra1nb0w) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f8da862245fe302e0df3df7ee259dc7ebda7a929">https://github.com/macports/macports-ports/commit/f8da862245fe302e0df3df7ee259dc7ebda7a929</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new f8da862245f apktool: update version to 2.6.0
</span>f8da862245f is described below

<span style='display:block; white-space:pre;color:#808000;'>commit f8da862245fe302e0df3df7ee259dc7ebda7a929
</span>Author: Davide Gerhard <ra1nb0w@macports.org>
AuthorDate: Fri Dec 17 09:01:38 2021 +0100

<span style='display:block; white-space:pre;color:#404040;'>    apktool: update version to 2.6.0
</span>---
 java/apktool/Portfile                 | 12 +++++-------
 java/apktool/files/patch-gradle7.diff | 16 ----------------
 2 files changed, 5 insertions(+), 23 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/apktool/Portfile b/java/apktool/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c393e819867..a42a258825b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/apktool/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/apktool/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem              1.0
</span> PortGroup               java 1.0
 PortGroup               github 1.0
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup            iBotPeaches Apktool 2.5.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup            iBotPeaches Apktool 2.6.0 v
</span> name                    apktool
 
 categories              java devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,18 +22,16 @@ long_description        Apktool is a tool for reverse engineering 3rd party, clo
</span> 
 homepage                https://ibotpeaches.github.io/Apktool/
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums               rmd160  3e134d223ce2e84846e707c8dfa70718b021defe \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        sha256  5ee9bc83561011ce6733ce94f57f2ee024d2a14cf0f81ec1728fac7e2be29bd3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        size    26624622
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums               rmd160  080dc64e0d64caacc6b8e5a45e4185bf377cad20 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        sha256  5192cae1658ade816193a213c47c395e50a2b212ba6ed217267f1b3827ca8aff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        size    26758342
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> java.version            1.8+
 java.fallback           openjdk11
 
 use_configure           no
 universal_variant       no
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append       patch-gradle7.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_build-append    port:gradle
 
 build.env-append        GRADLE_USER_HOME=${worksrcpath}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/apktool/files/patch-gradle7.diff b/java/apktool/files/patch-gradle7.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 92f220cb439..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/apktool/files/patch-gradle7.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- brut.apktool/apktool-lib/build.gradle  2020-12-02 08:04:44.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ brut.apktool/apktool-lib/build.gradle  2021-06-25 01:41:17.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19,11 +19,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- processResources {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   from('src/main/resources/properties') {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     include '**/*.properties'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     into 'properties'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     filter(ReplaceTokens, tokens: [version: project.apktool_version, gitrev: project.hash] )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   from('src/main/resources/') {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     include '**/*.jar'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   
</span></pre><pre style='margin:0'>

</pre>