Skip to content

Commit

Permalink
Update gradle and build scripts to handle publishing new modules (#250)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
LeHaine authored Jul 2, 2024
1 parent 0c0534b commit 33a2a18
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 5 deletions.
3 changes: 1 addition & 2 deletions core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ plugins {
}

kotlin {
applyDefaultHierarchyTemplate()
tasks.withType<Test> {
var env = project.properties["env"] as? String
if (env == null) {
Expand Down Expand Up @@ -80,8 +81,6 @@ kotlin {

jvmAndroidMain.dependsOn(commonMain)
jvmMain.dependsOn(jvmAndroidMain)
jvmTest.dependsOn(commonTest)
jsTest.dependsOn(commonTest)

all {
languageSettings.apply {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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?)
}
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
2 changes: 2 additions & 0 deletions wgpu-ffm/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,5 @@ java {
targetCompatibility = JavaVersion.VERSION_21
withSourcesJar()
}

publishing { publications { create<MavenPublication>("wgpu-ffm") { from(components["java"]) } } }
4 changes: 4 additions & 0 deletions wgpu-natives/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -73,3 +73,7 @@ kotlin {

tasks.test { useJUnitPlatform() }
}

publishing {
publications { create<MavenPublication>("wgpu-natives") { from(components["java"]) } }
}

0 comments on commit 33a2a18

Please sign in to comment.