Remove all os/arch negotiation code

Author: edwinRNDR

build-logic/orx-convention/src/main/kotlin/org/openrndr/extra/convention/FFmpegRule.kt

@@ -6,8 +6,6 @@ import org.gradle.nativeplatform.MachineArchitecture
 import org.gradle.nativeplatform.OperatingSystemFamily
 import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
 
-data class JvmNativeVariant(val targetName: String, val os: String, val arch: String)
-
 val currentOperatingSystemName: String = DefaultNativePlatform.getCurrentOperatingSystem().toFamilyName()
 val currentArchitectureName: String = DefaultNativePlatform.getCurrentArchitecture().name
 

build-logic/orx-convention/src/main/kotlin/org/openrndr/extra/convention/LwjglRule.kt

@@ -2,10 +2,3 @@ package org.openrndr.extra.convention
 
 addHostMachineAttributesToRuntimeConfigurations()
 
-dependencies {
-    components {
-        all<LwjglRule>()
-        withModule<FFmpegRule>("org.bytedeco:javacpp")
-        withModule<FFmpegRule>("org.bytedeco:ffmpeg")
-    }
-}

build-logic/orx-convention/src/main/kotlin/org/openrndr/extra/convention/Utils.kt

@@ -11,8 +11,6 @@ val sharedLibs = extensions.getByType(VersionCatalogsExtension::class.java).name
 val openrndr = extensions.getByType(VersionCatalogsExtension::class.java).named("openrndr")
 val libs = extensions.getByType(VersionCatalogsExtension::class.java).named("libs")
 
-println("all is well")
-
 val shouldPublish = project.name !in setOf("openrndr-demos", "orx-git-archiver-gradle")
 
 plugins {
@@ -34,7 +32,6 @@ repositories {
 
 group = "org.openrndr.extra"
 
-println("getting main sourceset")
 val main: SourceSet by project.sourceSets.getting
 
 @Suppress("UNUSED_VARIABLE")
@@ -60,16 +57,12 @@ dependencies {
     testImplementation(sharedLibs.findLibrary("kotlin-test").get())
     testRuntimeOnly(sharedLibs.findLibrary("slf4j-simple").get())
     "demoImplementation"(main.output.classesDirs + main.runtimeClasspath)
-    println("set up demo impl")
     "demoImplementation"(openrndr.findLibrary("application").get())
     "demoImplementation"(openrndr.findLibrary("orextensions").get())
-    println("done part 1")
-    if (DefaultNativePlatform.getCurrentOperatingSystem().isMacOsX) {
-        "demoRuntimeOnly"(libs.findLibrary("openrndr-gl3-natives-macos-arm64").get())
-    }
-    "demoRuntimeOnly"(libs.findLibrary("openrndr-gl3-core").get())
+
+    "demoRuntimeOnly"(openrndr.findLibrary("gl3").get())
+
     "demoRuntimeOnly"(sharedLibs.findLibrary("slf4j-simple").get())
-    println("still good")
 }
 
 tasks {

build-logic/orx-convention/src/main/kotlin/org/openrndr/extra/convention/component-metadata-rule.gradle.kts

@@ -64,9 +64,8 @@ kotlin {
                     dependsOn(compileTaskProvider)
                 }
                 dependencies {
-                    if (DefaultNativePlatform.getCurrentOperatingSystem().isMacOsX) {
-                        runtimeOnly(libs.findLibrary("openrndr-gl3-natives-macos-arm64").get())
-                    }
+                        runtimeOnly(openrndr.findLibrary("gl3").get())
+
                 }
             }
         }
@@ -112,7 +111,7 @@ kotlin {
             dependencies {
                 implementation(openrndr.findLibrary("application").get())
                 implementation(openrndr.findLibrary("orextensions").get())
-                runtimeOnly(libs.findLibrary("openrndr-gl3-core").get())
+                runtimeOnly(openrndr.findLibrary("gl3").get())
                 runtimeOnly(sharedLibs.findLibrary("slf4j-simple").get())
             }
         }

build-logic/orx-convention/src/main/kotlin/org/openrndr/extra/convention/kotlin-jvm.gradle.kts

@@ -39,10 +39,6 @@ mockk = { group = "io.mockk", name = "mockk", version.ref = "mockk"}
 
 processing-core = { group = "org.processing", name = "core", version.ref = "processing"}
 
-openrndr-extensions = { group = "org.openrndr", name = "openrndr-extensions", version.ref = "openrndr" }
-openrndr-gl3-core = { group = "org.openrndr", name = "openrndr-gl3", version.ref = "openrndr" }
-openrndr-gl3-natives-macos-arm64 = { group = "org.openrndr", name = "openrndr-gl3-natives-macos-arm64", version.ref = "openrndr" }
-
 boofcv = { group = "org.boofcv", name = "boofcv-core", version.ref = "boofcv" }
 libfreenect = { group = "org.bytedeco", name = "libfreenect", version.ref = "libfreenect" }
 librealsense = { group = "org.bytedeco", name = "librealsense2", version.ref = "librealsense" }

build-logic/orx-convention/src/main/kotlin/org/openrndr/extra/convention/kotlin-multiplatform.gradle.kts

@@ -10,5 +10,5 @@ dependencies {
     implementation(project(":orx-fx"))
     implementation(project(":orx-jvm:orx-gui"))
     runtimeOnly(project(":orx-jvm:orx-kinect-v1-${(gradle as ExtensionAware).extra["openrndrClassifier"]}"))
-    runtimeOnly(libs.openrndr.gl3.core)
+    runtimeOnly(openrndr.gl3)
 }

gradle/libs.versions.toml

@@ -4,5 +4,5 @@ plugins {
 
 dependencies {
     implementation(openrndr.application)
-    implementation(libs.openrndr.gl3.core)
+    implementation(openrndr.gl3)
 }