diff --git a/build.gradle.kts b/build.gradle.kts index d768ae1..32adc44 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -17,8 +17,8 @@ repositories { mavenCentral() } -val structurizrVersion = "1.24.0" -val structurizrExportVersion = "1.14.0" +val structurizrVersion = "1.26.1" +val structurizrExportVersion = "1.16.1" val junitVersion = "5.10.0" val assertJVersion = "3.24.2" val detektVersion = "1.23.1" diff --git a/src/main/kotlin/com/github/chriskn/structurizrextension/view/DynamicView.kt b/src/main/kotlin/com/github/chriskn/structurizrextension/view/DynamicView.kt index a82edeb..bb081bc 100644 --- a/src/main/kotlin/com/github/chriskn/structurizrextension/view/DynamicView.kt +++ b/src/main/kotlin/com/github/chriskn/structurizrextension/view/DynamicView.kt @@ -3,6 +3,7 @@ package com.github.chriskn.structurizrextension.view import com.structurizr.model.StaticStructureElement import com.structurizr.view.DynamicView import com.structurizr.view.RelationshipView +import com.structurizr.view.publicOrder /** * Adds a dependency to the [NestedParallelSequenceContext] from [source] to [destination] with the given properties @@ -23,7 +24,7 @@ fun DynamicView.add( technology: String? = null, ): RelationshipView { val relationshipView = this.add(source, description, technology, destination) - relationshipView.order = (relationshipView.order.toInt() + this.numberOfEndedParallelFlows).toString() + relationshipView.publicOrder = (relationshipView.order.toInt() + this.numberOfEndedParallelFlows).toString() return relationshipView } diff --git a/src/main/kotlin/com/github/chriskn/structurizrextension/view/NestedParallelSequenceContext.kt b/src/main/kotlin/com/github/chriskn/structurizrextension/view/NestedParallelSequenceContext.kt index 63f3316..48ac20e 100644 --- a/src/main/kotlin/com/github/chriskn/structurizrextension/view/NestedParallelSequenceContext.kt +++ b/src/main/kotlin/com/github/chriskn/structurizrextension/view/NestedParallelSequenceContext.kt @@ -3,6 +3,7 @@ package com.github.chriskn.structurizrextension.view import com.structurizr.model.StaticStructureElement import com.structurizr.view.DynamicView import com.structurizr.view.RelationshipView +import com.structurizr.view.publicOrder /** * Wrapper around [DynamicView] to manage nested numbering for parallel sequences. @@ -44,7 +45,7 @@ data class NestedParallelSequenceContext( description = description, technology = technology ) - view.order = getNextOder() + view.publicOrder = getNextOder() return view } diff --git a/src/main/kotlin/com/structurizr/view/RelationshipViewExtension.kt b/src/main/kotlin/com/structurizr/view/RelationshipViewExtension.kt new file mode 100644 index 0000000..12dcde6 --- /dev/null +++ b/src/main/kotlin/com/structurizr/view/RelationshipViewExtension.kt @@ -0,0 +1,5 @@ +package com.structurizr.view + +var RelationshipView.publicOrder: String + get() = this.order + set(order) { this.order = order }