From 33a2a182e470dbabf6acc0debfd58aeb9c73f2bc Mon Sep 17 00:00:00 2001 From: Colt Daily Date: Tue, 2 Jul 2024 15:04:50 -0400 Subject: [PATCH] Update gradle and build scripts to handle publishing new modules (#250) * core: add features list to Adapter and new Feature enum * core: fix typo in Feature enum * core: implement fetching Limits of both JS and JVM and the rest of Feature on JS * core: update Adapter.requestDevice with new DeviceDescriptor optional param * gradle: update gradle build to handle publishing wgpu-natives and wgpu-ffm core: fix syntax errors --- core/build.gradle.kts | 3 +-- .../commonMain/kotlin/com/littlekt/log/DefaultLogOutput.kt | 4 +++- .../src/jsMain/kotlin/com/littlekt/log/DefaultLogOutput.js.kt | 2 +- .../kotlin/com/littlekt/log/DefaultLogOutput.jvmAndroid.kt | 2 +- wgpu-ffm/build.gradle.kts | 2 ++ wgpu-natives/build.gradle.kts | 4 ++++ 6 files changed, 12 insertions(+), 5 deletions(-) diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 204509674..1da745dbb 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -8,6 +8,7 @@ plugins { } kotlin { + applyDefaultHierarchyTemplate() tasks.withType { var env = project.properties["env"] as? String if (env == null) { @@ -80,8 +81,6 @@ kotlin { jvmAndroidMain.dependsOn(commonMain) jvmMain.dependsOn(jvmAndroidMain) - jvmTest.dependsOn(commonTest) - jsTest.dependsOn(commonTest) all { languageSettings.apply { diff --git a/core/src/commonMain/kotlin/com/littlekt/log/DefaultLogOutput.kt b/core/src/commonMain/kotlin/com/littlekt/log/DefaultLogOutput.kt index 7fe1761ab..87a9447a1 100644 --- a/core/src/commonMain/kotlin/com/littlekt/log/DefaultLogOutput.kt +++ b/core/src/commonMain/kotlin/com/littlekt/log/DefaultLogOutput.kt @@ -4,4 +4,6 @@ package com.littlekt.log * @author Colton Daily * @date 11/25/2021 */ -expect object DefaultLogOutput : Logger.Output +expect object DefaultLogOutput : Logger.Output { + override fun output(logger: Logger, level: Logger.Level, msg: Any?) +} diff --git a/core/src/jsMain/kotlin/com/littlekt/log/DefaultLogOutput.js.kt b/core/src/jsMain/kotlin/com/littlekt/log/DefaultLogOutput.js.kt index beb9d2cef..727762dbe 100644 --- a/core/src/jsMain/kotlin/com/littlekt/log/DefaultLogOutput.js.kt +++ b/core/src/jsMain/kotlin/com/littlekt/log/DefaultLogOutput.js.kt @@ -5,6 +5,6 @@ package com.littlekt.log * @date 11/25/2021 */ actual object DefaultLogOutput : Logger.Output { - override fun output(logger: Logger, level: Logger.Level, msg: Any?) = + actual override fun output(logger: Logger, level: Logger.Level, msg: Any?) = Logger.ConsoleLogOutput.output(logger, level, msg) } diff --git a/core/src/jvmAndroidMain/kotlin/com/littlekt/log/DefaultLogOutput.jvmAndroid.kt b/core/src/jvmAndroidMain/kotlin/com/littlekt/log/DefaultLogOutput.jvmAndroid.kt index beb9d2cef..727762dbe 100644 --- a/core/src/jvmAndroidMain/kotlin/com/littlekt/log/DefaultLogOutput.jvmAndroid.kt +++ b/core/src/jvmAndroidMain/kotlin/com/littlekt/log/DefaultLogOutput.jvmAndroid.kt @@ -5,6 +5,6 @@ package com.littlekt.log * @date 11/25/2021 */ actual object DefaultLogOutput : Logger.Output { - override fun output(logger: Logger, level: Logger.Level, msg: Any?) = + actual override fun output(logger: Logger, level: Logger.Level, msg: Any?) = Logger.ConsoleLogOutput.output(logger, level, msg) } diff --git a/wgpu-ffm/build.gradle.kts b/wgpu-ffm/build.gradle.kts index 02027f281..f49afb7b4 100644 --- a/wgpu-ffm/build.gradle.kts +++ b/wgpu-ffm/build.gradle.kts @@ -12,3 +12,5 @@ java { targetCompatibility = JavaVersion.VERSION_21 withSourcesJar() } + +publishing { publications { create("wgpu-ffm") { from(components["java"]) } } } diff --git a/wgpu-natives/build.gradle.kts b/wgpu-natives/build.gradle.kts index e028e6238..9962ec5ed 100644 --- a/wgpu-natives/build.gradle.kts +++ b/wgpu-natives/build.gradle.kts @@ -73,3 +73,7 @@ kotlin { tasks.test { useJUnitPlatform() } } + +publishing { + publications { create("wgpu-natives") { from(components["java"]) } } +}