Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update gradle and build scripts to handle publishing new modules #250

Merged
merged 6 commits into from
Jul 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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"]) } }
}
Loading