Update Gradle to version 8.5 (#27)

4 files changed, 15 insertions, 6 deletions

diff --git a/baksmali/build.gradle b/baksmali/build.gradle
index 7a44f93b..1644c09d 100644
--- a/baksmali/build.gradle
+++ b/baksmali/build.gradle
@@ -61,10 +61,13 @@ processResources.expand('version': version)
 
 // Build a separate jar that contains all dependencies
 task fatJar(type: Jar) {
+    dependsOn ':dexlib2:jar'
+    dependsOn ':util:jar'
     from sourceSets.main.output
     from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } }
 
-    classifier = 'fat'
+    duplicatesStrategy = 'exclude'
+    archiveClassifier = 'fat'
 
     manifest {
         attributes('Main-Class': 'com.android.tools.smali.baksmali.Main')
@@ -132,4 +135,4 @@ tasks.getByPath('javadoc').onlyIf({
 
 tasks.getByPath('test').onlyIf({
     !gradle.taskGraph.hasTask(fastbuild)
-})
\ No newline at end of file
+})
diff --git a/build.gradle b/build.gradle
index c7581637..370ffbda 100644
--- a/build.gradle
+++ b/build.gradle
@@ -105,7 +105,7 @@ subprojects {
                 antlr: 'org.antlr:antlr:3.5.2',
                 stringtemplate: 'org.antlr:stringtemplate:3.2.1',
                 jflex_plugin: 'org.xbib.gradle.plugin:gradle-plugin-jflex:1.1.0',
-                proguard_gradle: 'net.sf.proguard:proguard-gradle:6.2.2',
+                proguard_gradle: 'com.guardsquare:proguard-gradle:7.1.0',
                 dx: 'com.google.android.tools:dx:1.7',
                 gson: 'com.google.code.gson:gson:2.3.1',
                 jcommander: jcommanderVersion
@@ -205,6 +205,6 @@ buildscript {
 }
 
 wrapper {
-    gradleVersion = '6.8.2'
+    gradleVersion = '8.5'
     distributionType = Wrapper.DistributionType.ALL
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 25d32653..d0d403e2 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/smali/build.gradle b/smali/build.gradle
index cbc2e7ed..fbb6394e 100644
--- a/smali/build.gradle
+++ b/smali/build.gradle
@@ -94,13 +94,17 @@ dependencies {
 
 processResources.inputs.property('version', version)
 processResources.expand('version': version)
+processResources.dependsOn('generateGrammarSource')
 
 // Build a separate jar that contains all dependencies
 task fatJar(type: Jar, dependsOn: jar) {
+    dependsOn ':dexlib2:jar'
+    dependsOn ':util:jar'
     from sourceSets.main.output
     from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } }
 
-    classifier = 'fat'
+    duplicatesStrategy = 'exclude'
+    archiveClassifier = 'fat'
 
     manifest {
         attributes('Main-Class': 'com.android.tools.smali.smali.Main')
@@ -168,5 +172,7 @@ task proguard(type: proguard.gradle.ProGuardTask, dependsOn: fatJar) {
 sourcesJar {
     duplicatesStrategy = DuplicatesStrategy.INCLUDE
 }
+sourcesJar.dependsOn('generateGrammarSource')
+sourcesJar.dependsOn('jflex')
 
 tasks.getByPath(':release').dependsOn(proguard)