Migrate from buildSrc to build-logic

Author: edwinRNDR

build-logic/build.gradle.kts

@@ -0,0 +1,7 @@
+plugins {
+    `kotlin-dsl`
+}
+
+repositories {
+    gradlePluginPortal()
+}

build-logic/orx-convention/build.gradle.kts

@@ -0,0 +1,20 @@
+plugins {
+    `kotlin-dsl`
+}
+
+val preload: SourceSet by sourceSets.creating
+
+
+repositories {
+    mavenCentral()
+    mavenLocal()
+}
+val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
+dependencies {
+    implementation(libs.findLibrary("kotlin-gradle-plugin").get())
+    implementation(libs.findLibrary("dokka-gradle-plugin").get())
+    "preloadImplementation"(openrndr.application)
+    "preloadImplementation"(openrndr.orextensions)
+}
+
+tasks.getByName("compileKotlin").dependsOn("compilePreloadKotlin")

…rc/src/main/kotlin/CollectScreenShots.kt …r/extra/convention/CollectScreenShots.ktbuildSrc/src/main/kotlin/CollectScreenShots.kt renamed to build-logic/orx-convention/src/main/kotlin/org/openrndr/extra/convention/CollectScreenShots.kt buildSrc/src/main/kotlin/CollectScreenShots.kt renamed to build-logic/orx-convention/src/main/kotlin/org/openrndr/extra/convention/CollectScreenShots.kt

@@ -1,17 +1,17 @@
 package org.openrndr.extra.convention
 
 import ScreenshotsHelper.collectScreenshots
-import org.gradle.accessors.dm.LibrariesForLibs
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
-import org.gradle.kotlin.dsl.the
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 
 val sharedLibs = extensions.getByType(VersionCatalogsExtension::class.java).named("sharedLibs")
 val openrndr = extensions.getByType(VersionCatalogsExtension::class.java).named("openrndr")
-val libs = the<LibrariesForLibs>()
+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")
 
@@ -34,10 +34,11 @@ repositories {
 
 group = "org.openrndr.extra"
 
-val main: SourceSet by sourceSets.getting
+println("getting main sourceset")
+val main: SourceSet by project.sourceSets.getting
 
 @Suppress("UNUSED_VARIABLE")
-val demo: SourceSet by sourceSets.creating {
+val demo: SourceSet by project.sourceSets.creating {
     val skipDemos = setOf(
         "openrndr-demos",
         "orx-axidraw",
@@ -59,14 +60,16 @@ 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"(libs.openrndr.extensions)
-
+    "demoImplementation"(openrndr.findLibrary("orextensions").get())
+    println("done part 1")
     if (DefaultNativePlatform.getCurrentOperatingSystem().isMacOsX) {
-        "demoRuntimeOnly"(libs.openrndr.gl3.natives.macos.arm64)
+        "demoRuntimeOnly"(libs.findLibrary("openrndr-gl3-natives-macos-arm64").get())
     }
-    "demoRuntimeOnly"(libs.openrndr.gl3.core)
-    "demoRuntimeOnly"(sharedLibs.findLibrary("slf4j.simple").get())
+    "demoRuntimeOnly"(libs.findLibrary("openrndr-gl3-core").get())
+    "demoRuntimeOnly"(sharedLibs.findLibrary("slf4j-simple").get())
+    println("still good")
 }
 
 tasks {
@@ -88,20 +91,20 @@ tasks {
     }
     withType<KotlinCompile> {
         compilerOptions {
-            jvmTarget.set(JvmTarget.valueOf("JVM_${libs.versions.jvmTarget.get()}"))
+            jvmTarget.set(JvmTarget.valueOf("JVM_${libs.findVersion("jvmTarget").get().displayName.replace(".", "_")}"))
             freeCompilerArgs.add("-Xexpect-actual-classes")
-            freeCompilerArgs.add("-Xjdk-release=${libs.versions.jvmTarget.get()}")
-            apiVersion.set(KotlinVersion.valueOf("KOTLIN_${libs.versions.kotlinApi.get().replace(".", "_")}"))
-            languageVersion.set(KotlinVersion.valueOf("KOTLIN_${libs.versions.kotlinLanguage.get().replace(".", "_")}"))
+            freeCompilerArgs.add("-Xjdk-release=${libs.findVersion("jvmTarget").get().displayName}")
+            apiVersion.set(KotlinVersion.valueOf("KOTLIN_${libs.findVersion("kotlinApi").get().displayName.replace(".", "_")}"))
+            languageVersion.set(KotlinVersion.valueOf("KOTLIN_${libs.findVersion("kotlinLanguage").get().displayName.replace(".", "_")}"))
         }
     }
 }
 
 java {
     withJavadocJar()
     withSourcesJar()
-    targetCompatibility = JavaVersion.valueOf("VERSION_${libs.versions.jvmTarget.get()}")
-    sourceCompatibility = JavaVersion.valueOf("VERSION_${libs.versions.jvmTarget.get()}")
+    targetCompatibility = JavaVersion.valueOf("VERSION_${libs.findVersion("jvmTarget").get().displayName}")
+    sourceCompatibility = JavaVersion.valueOf("VERSION_${libs.findVersion("jvmTarget").get().displayName}")
 }
 
 val isReleaseVersion = !(version.toString()).endsWith("SNAPSHOT")