Skip to content

Commit

Permalink
Merge pull request #375 from scenerygraphics/fix-bvv-version
Browse files Browse the repository at this point in the history
Fix BigVolumeViewer version in Gradle build. Fixes issue where volume rendering would silently fail.
  • Loading branch information
skalarproduktraum authored Apr 8, 2021
2 parents c15f56b + 76dd87f commit 97d7616
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
5 changes: 3 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ val sceneryVersion = "4a0c1f7"
"ui-behaviour"("2.0.3")
"imagej-mesh"("0.8.1")
"bigdataviewer-vistools"("1.0.0-beta-21")
"bigvolumeviewer"("0.1.8") // added from Gradle conversion
//"bigvolumeviewer"("0.1.8") // added from Gradle conversion

"kotlin"("1.4.20")
"kotlinx-coroutines-core"("1.3.9")
Expand Down Expand Up @@ -116,7 +116,8 @@ dependencies {
implementation(kotlin("stdlib-jdk8"))
testImplementation(kotlin("test-junit"))

sciJava("sc.fiji"["bigdataviewer-core", "bigdataviewer-vistools", "bigvolumeviewer"])
sciJava("sc.fiji"["bigdataviewer-core", "bigdataviewer-vistools"])
implementation("com.github.skalarproduktraum:jogl-minimal:1c86442")

// this apparently is still necessary
implementation(platform("org.lwjgl:lwjgl-bom:3.2.3"))
Expand Down
3 changes: 2 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
org.gradle.jvmargs=-XX:MaxMetaspaceSize=2g
org.gradle.jvmargs=-XX:MaxMetaspaceSize=2g
org.gradle.caching=true
5 changes: 3 additions & 2 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@ gradle.rootProject {
description = "Scenery-backed 3D visualization package for ImageJ."
}

if (System.getProperty("CI") == "false")
includeBuild("../scenery")
if (System.getProperty("CI").toBoolean() != true && System.getenv("CI").toBoolean() != true) {
includeBuild("../scenery")
}

0 comments on commit 97d7616

Please sign in to comment.