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.

Sign up for GitHub

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

Jump to bottom

Fix the CI, plus other small updates #539

Merged
merged 4 commits into from
Jul 21, 2023
Merged

Fix the CI, plus other small updates #539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0f6e691
Update scijava BOM to 36.0.0
ctrueden Jul 20, 2023
14cc7a1
CI: rename master to main
ctrueden Jul 21, 2023
18c168e
Remove unneeded service declarations from context
ctrueden Jul 21, 2023
50e6c75
Fix Gradle config to reflect new main branch name
ctrueden Jul 21, 2023
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
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: build
on:
push:
branches:
- master
- main
pull_request:
branches:
- master
- main

jobs:
linux:
Expand Down
4 changes: 2 additions & 2 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ dependencies {
// Graphics dependencies

// Attention! Manual version increment necessary here!
val scijavaCommonVersion = "2.94.1"
val scijavaCommonVersion = "2.94.2"
annotationProcessor("org.scijava:scijava-common:$scijavaCommonVersion")
kapt("org.scijava:scijava-common:$scijavaCommonVersion") {
exclude("org.lwjgl")
Expand Down Expand Up @@ -310,7 +310,7 @@ tasks {
dokkaSourceSets.configureEach {
sourceLink {
localDirectory.set(file("src/main/kotlin"))
remoteUrl.set(URL("https://github.com/scenerygraphics/sciview/tree/master/src/main/kotlin"))
remoteUrl.set(URL("https://github.com/scenerygraphics/sciview/tree/main/src/main/kotlin"))
remoteLineSuffix.set("#L")
}
}
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ jvmTarget=11
#useLocalScenery=true
kotlinVersion=1.8.22
dokkaVersion=1.8.20
scijavaParentPOMVersion=35.1.1
scijavaParentPOMVersion=36.0.0
7 changes: 2 additions & 5 deletions src/main/kotlin/sc/iview/SciView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1882,11 +1882,8 @@ class SciView : SceneryBase, CalibratedRealInterval<CalibratedAxis> {
@Throws(Exception::class)
fun create(): SciView {
xinitThreads()
val context = Context(ImageJService::class.java, SciJavaService::class.java, SCIFIOService::class.java,
ThreadService::class.java, ObjectService::class.java, LogService::class.java, MenuService::class.java,
IOService::class.java, EventService::class.java, LUTService::class.java, UnitService::class.java,
DatasetIOService::class.java)
val objectService = context.getService(ObjectService::class.java)
val context = Context(ImageJService::class.java, SciJavaService::class.java, SCIFIOService::class.java)
val objectService = context.service(ObjectService::class.java)
objectService.addObject(Utils.SciviewStandalone())
val sciViewService = context.service(SciViewService::class.java)
return sciViewService.orCreateActiveSciView
Expand Down
Loading