Skip to content

build: support Gradle 9 #107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zeldrisho wants to merge 1 commit into
base: main
Choose a base branch
from
Open

build: support Gradle 9 #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion baksmali/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ task fatJar(type: Jar) {

doLast {
if (!System.getProperty('os.name').toLowerCase().contains('windows')) {
ant.symlink(link: file("${destinationDirectory.get()}/baksmali.jar"), resource: archivePath, overwrite: true)
ant.symlink(link: file("${destinationDirectory.get()}/baksmali.jar"), resource: archiveFile.get().asFile, overwrite: true)
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions dexlib2/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ task generateAccessorTestSource(type: JavaExec) {
outputs.dir file(testAccessorOutputDir)

classpath = configurations.accessorTestGenerator
main = 'com.android.tools.smali.dexlib2.AccessorTestGenerator'
mainClass = 'com.android.tools.smali.dexlib2.AccessorTestGenerator'
args testAccessorOutputFile
}
compileAccessorTestJava.dependsOn(generateAccessorTestSource)
Expand All @@ -133,7 +133,7 @@ task generateAccessorTestDex(type: JavaExec, dependsOn: compileAccessorTestJava)
inputs.dir(project.sourceSets.accessorTest.output.classesDirs)
outputs.file outputDex

main 'com.android.dx.command.Main'
mainClass = 'com.android.dx.command.Main'
classpath = configurations.dx

args '--dex'
Expand Down
5 changes: 3 additions & 2 deletions smali/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ idea {
if (buildDir.exists()) {
excludeDirs.addAll(buildDir.listFiles())
}
for (sourceDir in (sourceDirs + testSourceDirs)) {
for (sourceDir in (sourceDirs + sourceSets.test.allSource.srcDirs)) {
excludeDirs.remove(sourceDir);
while ((sourceDir = sourceDir.getParentFile()) != null) {
excludeDirs.remove(sourceDir);
Expand Down Expand Up @@ -112,7 +112,7 @@ task fatJar(type: Jar, dependsOn: jar) {

doLast {
if (!System.getProperty('os.name').toLowerCase().contains('windows')) {
ant.symlink(link: file("${destinationDirectory.get()}/smali.jar"), resource: archivePath, overwrite: true)
ant.symlink(link: file("${destinationDirectory.get()}/smali.jar"), resource: archiveFile.get().asFile, overwrite: true)
}
}
}
Expand Down Expand Up @@ -174,5 +174,6 @@ sourcesJar {
}
sourcesJar.dependsOn('generateGrammarSource')
sourcesJar.dependsOn('jflex')
compileJava.dependsOn('generateGrammarSource')

tasks.getByPath(':release').dependsOn(proguard)
Loading