Skip to content
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

Migrate away deprecated methods #245

Merged
merged 1 commit into from
Nov 3, 2023
Merged

Migrate away deprecated methods #245

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
6 changes: 3 additions & 3 deletions diffuse/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def fatJarProvider = tasks.register('fatJar', Jar) { task ->
task.exclude 'api_database/*'
}

def r8File = new File("$buildDir/libs/$archivesBaseName-$version-r8.jar")
def r8File = layout.buildDirectory.file("libs/$archivesBaseName-$version-r8.jar").get().asFile
def rulesFile = project.file("src/main/rules.pro")
def r8JarProvider = tasks.register('r8Jar', JavaExec) { task ->
task.javaLauncher.set(javaToolchains.launcherFor { spec ->
Expand All @@ -72,14 +72,14 @@ def r8JarProvider = tasks.register('r8Jar', JavaExec) { task ->
task.args = [
'--release',
'--classfile',
'--output', r8File.toString(),
'--output', r8File.path,
'--pg-conf', rulesFile.path,
'--lib', System.getProperty('java.home').toString(),
fatJarFile.get().toString(),
]
}

def binaryFile = new File(buildDir, "libs/$archivesBaseName-$version-binary.jar")
def binaryFile = layout.buildDirectory.file("libs/$archivesBaseName-$version-binary.jar").get().asFile
def binaryJar = tasks.register('binaryDiffuseJar') { task ->
task.dependsOn(r8JarProvider)

Expand Down