Fix new Gradle-related issues

ThexXTURBOXx · Dec 11, 2023 · 3dc11e6 · 3dc11e6
1 parent a74597e
commit 3dc11e6
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 19 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,4 @@
 plugins {
-    id "application"
     id "base"
     id "signing"
     id "io.github.gradle-nexus.publish-plugin" version "2.0.0-rc-1"
@@ -23,17 +22,9 @@ nexusPublishing {
     }
 }
 
-application {
-    mainClass = "com.googlecode.dex2jar.tools.Dex2jarCmd"
-}
-
-base {
-    archivesName = "dex2jar"
-}
-
 dependencies {
     api(project(":d2j-base-cmd"))
-    api(project(":d2j-external"))
+    api project(path: ':d2j-external', configuration: 'shadow')
     api(project(":d2j-jasmin"))
     api(project(":d2j-smali"))
     api(project(":dex-ir"))

diff --git a/d2j-base-cmd/build.gradle b/d2j-base-cmd/build.gradle
@@ -5,5 +5,5 @@ plugins {
 description = "Simple cmd parser for dex2jar"
 
 dependencies {
-    api project(':d2j-external')
+    api project(path: ':d2j-external', configuration: 'shadow')
 }
diff --git a/d2j-external/build.gradle b/d2j-external/build.gradle
@@ -6,7 +6,7 @@ plugins {
 description = "External and fixed libraries for dex2jar"
 
 dependencies {
-    api fileTree(dir: '../libs', include: '*.jar')
+    implementation fileTree(dir: '../libs', include: '*.jar')
 }
 
 tasks.jar.enabled = false // Don't build normal jar

diff --git a/d2j-jasmin/build.gradle b/d2j-jasmin/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     api(group: 'org.antlr', name: 'antlr-runtime', version: project.property('antlr3Version')) {
         exclude(module: 'stringtemplate')
     }
-    api project(':d2j-external')
+    api project(path: ':d2j-external', configuration: 'shadow')
     // api group: 'org.ow2.asm', name: 'asm', version: project.property('asmVersion') // Fixed MethodCodeTooLargeException
     api(group: 'org.ow2.asm', name: 'asm-tree', version: project.property('asmVersion')) {
         exclude(module: 'asm')

diff --git a/dex-reader-api/build.gradle b/dex-reader-api/build.gradle
@@ -5,6 +5,6 @@ plugins {
 description = 'Dex/Dalvik reader API for dex2jar'
 
 dependencies {
-    api project(':d2j-external')
+    api project(path: ':d2j-external', configuration: 'shadow')
     // api group: 'org.ow2.asm', name: 'asm', version: project.property('asmVersion') // Fixed MethodCodeTooLargeException
 }
diff --git a/dex-tools/build.gradle b/dex-tools/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     api project(':d2j-jasmin')
     api project(':dex-writer')
     api project(':d2j-base-cmd')
-    api project(':d2j-external')
+    api project(path: ':d2j-external', configuration: 'shadow')
     // api group: 'org.ow2.asm', name: 'asm', version: project.property('asmVersion') // Fixed MethodCodeTooLargeException
     api(group: 'org.ow2.asm', name: 'asm-tree', version: project.property('asmVersion')) {
         exclude(module: 'asm')
@@ -36,9 +36,6 @@ tasks.register('bin_gen', JavaExec) {
 
 application {
     applicationDistribution.from(bin_gen)
-    //applicationDistribution.from('src/main/jars') {
-    //  into("lib")
-    //}
     applicationDistribution.from('open-source-license.txt') {
         into("lib")
     }

diff --git a/dex-translator/build.gradle b/dex-translator/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     api project(':dex-reader')
     api project(':dex-ir')
     api project(':d2j-base-cmd')
-    api fileTree(dir: '../libs', include: '*.jar')
+    api project(path: ':d2j-external', configuration: 'shadow')
     // api group: 'org.ow2.asm', name: 'asm', version: project.property('asmVersion') // Fixed MethodCodeTooLargeException
     api(group: 'org.ow2.asm', name: 'asm-tree', version: project.property('asmVersion')) {
         exclude(module: 'asm')