mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 01:41:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6940 from bisq-network/v1.9.14_macOS

Browse Source 
Release/v1.9.14-macOS
This commit is contained in:
Gabriel Bernard 2023-11-01 16:55:39 +00:00 committed by GitHub
commit 0b59f583ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
build-logic/packaging/src/main/kotlin/bisq/gradle/packaging/PackagingPlugin.kt
View File

@ -42,7 +42,7 @@ class PackagingPlugin @Inject constructor(private val javaToolchainService: Java
project.tasks.register<JPackageTask>("generateInstallers") { project.tasks.register<JPackageTask>("generateInstallers") {
dependsOn(generateHashesTask) dependsOn(generateHashesTask)
jdkDirectory.set(getJdk17Directory()) jdkDirectory.set(getJPackageJdkDirectory())
distDirFile.set(installDistTask.map { it.destinationDir }) distDirFile.set(installDistTask.map { it.destinationDir })
mainJarFile.set(jarTask.flatMap { it.archiveFile }) mainJarFile.set(jarTask.flatMap { it.archiveFile })
@ -55,7 +55,11 @@ class PackagingPlugin @Inject constructor(private val javaToolchainService: Java
val packageResourcesDirFile = File(project.projectDir, "package") val packageResourcesDirFile = File(project.projectDir, "package")
packageResourcesDir.set(packageResourcesDirFile) packageResourcesDir.set(packageResourcesDirFile)
runtimeImageDirectory.set(getProjectJdkDirectory(project)) runtimeImageDirectory.set(
if (getOS() == OS.MAC_OS) getJPackageJdkDirectory()
else getProjectJdkDirectory(project)
)
outputDirectory.set(project.layout.buildDirectory.dir("packaging/jpackage/packages")) outputDirectory.set(project.layout.buildDirectory.dir("packaging/jpackage/packages"))
} }
} }
@ -79,12 +83,13 @@ class PackagingPlugin @Inject constructor(private val javaToolchainService: Java
return projectLauncherProvider.map { it.metadata.installationPath } return projectLauncherProvider.map { it.metadata.installationPath }
} }
private fun getJdk17Directory(): Provider<Directory> { private fun getJPackageJdkDirectory(): Provider<Directory> {
val jdk17LauncherProvider = javaToolchainService.launcherFor { val javaVersion = if (getOS() == OS.MAC_OS) 15 else 17
languageVersion.set(JavaLanguageVersion.of(17)) val launcherProvider = javaToolchainService.launcherFor {
languageVersion.set(JavaLanguageVersion.of(javaVersion))
vendor.set(JvmVendorSpec.AZUL) vendor.set(JvmVendorSpec.AZUL)
implementation.set(JvmImplementation.VENDOR_SPECIFIC) implementation.set(JvmImplementation.VENDOR_SPECIFIC)
} }
return jdk17LauncherProvider.map { it.metadata.installationPath } return launcherProvider.map { it.metadata.installationPath }
} }
} }

1
build-logic/toolchain-resolver/src/main/kotlin/bisq/gradle/toolchain_resolver/BisqToolchainResolver.kt
View File

@ -37,6 +37,7 @@ abstract class BisqToolchainResolver : JavaToolchainResolver {
private fun getToolchainUrlForMacOs(javaVersion: Int): String? = private fun getToolchainUrlForMacOs(javaVersion: Int): String? =
when (javaVersion) { when (javaVersion) {
11 -> "https://cdn.azul.com/zulu/bin/zulu11.66.15_1-ca-jdk11.0.20-macosx_x64.tar.gz" 11 -> "https://cdn.azul.com/zulu/bin/zulu11.66.15_1-ca-jdk11.0.20-macosx_x64.tar.gz"
15 -> "https://cdn.azul.com/zulu/bin/zulu15.46.17-ca-jdk15.0.10-macosx_x64.tar.gz"
17 -> "https://cdn.azul.com/zulu/bin/zulu17.44.15_1-ca-jdk17.0.8-macosx_x64.tar.gz" 17 -> "https://cdn.azul.com/zulu/bin/zulu17.44.15_1-ca-jdk17.0.8-macosx_x64.tar.gz"
else -> null else -> null
} }