diff --git a/build.gradle.kts b/build.gradle.kts index 6ef1334..99c18fa 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -62,7 +62,7 @@ dependencies { testImplementation("io.kotest:kotest-assertions-core-jvm:$kotestVersion") } -java { modularity.inferModulePath.set(true) } +//java { modularity.inferModulePath.set(true) } tasks { dokkaHtml { @@ -83,11 +83,14 @@ tasks { sourceCompatibility = "11" } - compileJava { // this is needed because we have a separate compile step in this example with the 'module-info.java' is in 'main/java' and the Kotlin code is in 'main/kotlin' - options.compilerArgs = listOf("--patch-module", "$moduleName=${sourceSets.main.get().output.asPath}") - } +// compileJava { // this is needed because we have a separate compile step in this example with the 'module-info.java' is in 'main/java' and the Kotlin code is in 'main/kotlin' +// options.compilerArgs = listOf("--patch-module", "$moduleName=${sourceSets.main.get().output.asPath}") +// } - withType { useJUnitPlatform() } + withType { + useJUnitPlatform() + maxHeapSize = "1g" // set heap size for the test JVM(s) + } } val dokkaJavadocJar by tasks.register("dokkaJavadocJar") { diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index af6c7f2..251c999 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -1,30 +1,30 @@ -module com.github.kotlin_graphics.assimp { - - requires kotlin.stdlib; - - requires java.xml; - - requires com.github.kotlin_graphics.uno_core; - requires com.github.kotlin_graphics.gli; - requires com.github.kotlin_graphics.glm; - requires com.github.kotlin_graphics.kotlin_unsigned; - requires com.github.kotlin_graphics.kool; - - requires kotlin.logging.jvm; - - exports assimp; - exports assimp.format; - exports assimp.format.assbin; - exports assimp.format.assxml; - exports assimp.format.blender; - exports assimp.format.collada; - exports assimp.format.fbx; - exports assimp.format.md2; - exports assimp.format.md3; - exports assimp.format.md5; - exports assimp.format.obj; - exports assimp.format.ply; - exports assimp.format.stl; - exports assimp.format.X; - exports assimp.postProcess; -} \ No newline at end of file +//module com.github.kotlin_graphics.assimp { +// +// requires kotlin.stdlib; +// +// requires java.xml; +// +// requires com.github.kotlin_graphics.uno_core; +// requires com.github.kotlin_graphics.gli; +// requires com.github.kotlin_graphics.glm; +// requires com.github.kotlin_graphics.kotlin_unsigned; +// requires com.github.kotlin_graphics.kool; +// +// requires kotlin.logging.jvm; +// +// exports assimp; +// exports assimp.format; +// exports assimp.format.assbin; +// exports assimp.format.assxml; +// exports assimp.format.blender; +// exports assimp.format.collada; +// exports assimp.format.fbx; +// exports assimp.format.md2; +// exports assimp.format.md3; +// exports assimp.format.md5; +// exports assimp.format.obj; +// exports assimp.format.ply; +// exports assimp.format.stl; +// exports assimp.format.X; +// exports assimp.postProcess; +//} \ No newline at end of file diff --git a/src/test/kotlin/assimp/obj/obj.kt b/src/test/kotlin/assimp/obj/obj.kt index ce463c9..8dd97d6 100644 --- a/src/test/kotlin/assimp/obj/obj.kt +++ b/src/test/kotlin/assimp/obj/obj.kt @@ -11,8 +11,7 @@ class obj : StringSpec() { "box"{ box("$path/box.obj") } "cube"{ cube("$path/cube.obj") } "nanosuit" { nanosuit("$path/nanosuit") } - // fires "java.lang.OutOfMemoryError: Java heap space" if run together with the others -// "wall"{ wall("$path/wall.obj") } + "wall"{ wall("$path/wall.obj") } "spider"{ spider.obj("$path/spider") } "shelter" { shelter("$path/shelter") } "car" { car("$path/car") }