From 0a0e102da9c98dbf4f6932bdaf5743c7f3850c1e Mon Sep 17 00:00:00 2001 From: Vechro <6316604+Vechro@users.noreply.github.com> Date: Thu, 20 Oct 2022 20:11:49 +0100 Subject: [PATCH] Change arm64 to aarch64 (#274) --- .../kotlin/org/openrndr/extra/convention/FFmpegRule.kt | 8 +++++--- .../kotlin/org/openrndr/extra/convention/LwjglRule.kt | 8 +++++--- .../main/kotlin/org/openrndr/extra/convention/Utils.kt | 2 -- .../org/openrndr/extra/convention/kotlin-jvm.gradle.kts | 5 +---- .../extra/convention/kotlin-multiplatform.gradle.kts | 5 +---- 5 files changed, 12 insertions(+), 16 deletions(-) diff --git a/buildSrc/src/main/kotlin/org/openrndr/extra/convention/FFmpegRule.kt b/buildSrc/src/main/kotlin/org/openrndr/extra/convention/FFmpegRule.kt index 41039838..3a40d673 100644 --- a/buildSrc/src/main/kotlin/org/openrndr/extra/convention/FFmpegRule.kt +++ b/buildSrc/src/main/kotlin/org/openrndr/extra/convention/FFmpegRule.kt @@ -12,9 +12,11 @@ import javax.inject.Inject @CacheableRule abstract class FFmpegRule : ComponentMetadataRule { val jvmNativeVariants: List = listOf( - JvmNativeVariant("linux-arm64", OperatingSystemFamily.LINUX, "arm64"), + JvmNativeVariant("linux-arm64", OperatingSystemFamily.LINUX, "aarch64"), + JvmNativeVariant("linux-arm64", OperatingSystemFamily.LINUX, "arm64-v8"), JvmNativeVariant("linux-x86_64", OperatingSystemFamily.LINUX, "x86-64"), - JvmNativeVariant("macosx-arm64", OperatingSystemFamily.MACOS, "arm64"), + JvmNativeVariant("macosx-arm64", OperatingSystemFamily.MACOS, "aarch64"), + JvmNativeVariant("macosx-arm64", OperatingSystemFamily.MACOS, "arm64-v8"), JvmNativeVariant("macosx-x86_64", OperatingSystemFamily.MACOS, "x86-64"), JvmNativeVariant("windows-x86_64", OperatingSystemFamily.WINDOWS, "x86-64") ) @@ -30,7 +32,7 @@ abstract class FFmpegRule : ComponentMetadataRule { } } for ((targetName, os, arch) in jvmNativeVariants) { - addVariant("$targetName-runtime", "runtime") { + addVariant("$targetName-$arch-runtime", "runtime") { attributes { attributes.attribute(OperatingSystemFamily.OPERATING_SYSTEM_ATTRIBUTE, objects.named(os)) attributes.attribute(MachineArchitecture.ARCHITECTURE_ATTRIBUTE, objects.named(arch)) diff --git a/buildSrc/src/main/kotlin/org/openrndr/extra/convention/LwjglRule.kt b/buildSrc/src/main/kotlin/org/openrndr/extra/convention/LwjglRule.kt index 554aee59..42c87fc9 100644 --- a/buildSrc/src/main/kotlin/org/openrndr/extra/convention/LwjglRule.kt +++ b/buildSrc/src/main/kotlin/org/openrndr/extra/convention/LwjglRule.kt @@ -12,9 +12,11 @@ import javax.inject.Inject @CacheableRule abstract class LwjglRule : ComponentMetadataRule { val jvmNativeVariants: List = listOf( - JvmNativeVariant("natives-linux-arm64", OperatingSystemFamily.LINUX, "arm64"), + JvmNativeVariant("natives-linux-arm64", OperatingSystemFamily.LINUX, "aarch64"), + JvmNativeVariant("natives-linux-arm64", OperatingSystemFamily.LINUX, "arm64-v8"), JvmNativeVariant("natives-linux", OperatingSystemFamily.LINUX, "x86-64"), - JvmNativeVariant("natives-macos-arm64", OperatingSystemFamily.MACOS, "arm64"), + JvmNativeVariant("natives-macos-arm64", OperatingSystemFamily.MACOS, "aarch64"), + JvmNativeVariant("natives-macos-arm64", OperatingSystemFamily.MACOS, "arm64-v8"), JvmNativeVariant("natives-macos", OperatingSystemFamily.MACOS, "x86-64"), JvmNativeVariant("natives-windows", OperatingSystemFamily.WINDOWS, "x86-64") ) @@ -32,7 +34,7 @@ abstract class LwjglRule : ComponentMetadataRule { } } for ((targetName, os, arch) in jvmNativeVariants) { - addVariant("$targetName-runtime", "runtime") { + addVariant("$targetName-$arch-runtime", "runtime") { attributes { attributes.attribute(OperatingSystemFamily.OPERATING_SYSTEM_ATTRIBUTE, objects.named(os)) attributes.attribute(MachineArchitecture.ARCHITECTURE_ATTRIBUTE, objects.named(arch)) diff --git a/buildSrc/src/main/kotlin/org/openrndr/extra/convention/Utils.kt b/buildSrc/src/main/kotlin/org/openrndr/extra/convention/Utils.kt index 3677c258..93a8cff9 100644 --- a/buildSrc/src/main/kotlin/org/openrndr/extra/convention/Utils.kt +++ b/buildSrc/src/main/kotlin/org/openrndr/extra/convention/Utils.kt @@ -1,12 +1,10 @@ package org.openrndr.extra.convention import org.gradle.api.Project -import org.gradle.kotlin.dsl.get import org.gradle.kotlin.dsl.named import org.gradle.nativeplatform.MachineArchitecture import org.gradle.nativeplatform.OperatingSystemFamily import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform -import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation data class JvmNativeVariant(val targetName: String, val os: String, val arch: String) diff --git a/buildSrc/src/main/kotlin/org/openrndr/extra/convention/kotlin-jvm.gradle.kts b/buildSrc/src/main/kotlin/org/openrndr/extra/convention/kotlin-jvm.gradle.kts index 49b6b184..44332eea 100644 --- a/buildSrc/src/main/kotlin/org/openrndr/extra/convention/kotlin-jvm.gradle.kts +++ b/buildSrc/src/main/kotlin/org/openrndr/extra/convention/kotlin-jvm.gradle.kts @@ -42,10 +42,7 @@ dependencies { } kotlin { - jvmToolchain { - this as JavaToolchainSpec - languageVersion.set(JavaLanguageVersion.of(libs.versions.jvmTarget.get())) - } + jvmToolchain(libs.versions.jvmTarget.get().toInt()) } tasks { diff --git a/buildSrc/src/main/kotlin/org/openrndr/extra/convention/kotlin-multiplatform.gradle.kts b/buildSrc/src/main/kotlin/org/openrndr/extra/convention/kotlin-multiplatform.gradle.kts index 6df9a830..a086c26d 100644 --- a/buildSrc/src/main/kotlin/org/openrndr/extra/convention/kotlin-multiplatform.gradle.kts +++ b/buildSrc/src/main/kotlin/org/openrndr/extra/convention/kotlin-multiplatform.gradle.kts @@ -32,10 +32,7 @@ tasks.withType() { kotlin { jvm { - jvmToolchain { - this as JavaToolchainSpec - languageVersion.set(JavaLanguageVersion.of(libs.versions.jvmTarget.get())) - } + jvmToolchain(libs.versions.jvmTarget.get().toInt()) compilations { val main by getting @Suppress("UNUSED_VARIABLE")