diff --git a/activiti-intellij-plugin/build.gradle b/activiti-intellij-plugin/build.gradle index 91cbdf099..31b28bcac 100644 --- a/activiti-intellij-plugin/build.gradle +++ b/activiti-intellij-plugin/build.gradle @@ -43,7 +43,7 @@ intellij { } runPluginVerifier { - ideVersions = ["IU-2022.3", "IC-2022.3"] + ideVersions = ["IU-2023.3", "IC-2023.3"] } verifyPlugin { @@ -54,19 +54,6 @@ publishPlugin { token = System.getenv("INTELLIJ_PLUGIN_PUBLISH_TOKEN") } -compileKotlin { - kotlinOptions { - jvmTarget = "17" - apiVersion = kotlinApiVersion - } -} -compileTestKotlin { - kotlinOptions { - jvmTarget = "17" - apiVersion = kotlinApiVersion - } -} - clean { delete 'out' } diff --git a/activiti-intellij-plugin/src/main/resources/META-INF/plugin.xml b/activiti-intellij-plugin/src/main/resources/META-INF/plugin.xml index cd1ab6afa..4f28e57d9 100644 --- a/activiti-intellij-plugin/src/main/resources/META-INF/plugin.xml +++ b/activiti-intellij-plugin/src/main/resources/META-INF/plugin.xml @@ -101,7 +101,7 @@ - + diff --git a/activiti-xml-parser/build.gradle b/activiti-xml-parser/build.gradle index a7eb156e4..414f61ffd 100644 --- a/activiti-xml-parser/build.gradle +++ b/activiti-xml-parser/build.gradle @@ -36,19 +36,6 @@ dependencies { testImplementation "org.amshove.kluent:kluent:$kluent" } -compileKotlin { - kotlinOptions { - jvmTarget = "17" - apiVersion = kotlinApiVersion - } -} -compileTestKotlin { - kotlinOptions { - jvmTarget = "17" - apiVersion = kotlinApiVersion - } -} - test { jvmArgs "--add-opens=java.base/java.nio.charset=ALL-UNNAMED" diff --git a/bpmn-intellij-plugin-common-tests/build.gradle b/bpmn-intellij-plugin-common-tests/build.gradle index c13b133f3..b8780ffa4 100644 --- a/bpmn-intellij-plugin-common-tests/build.gradle +++ b/bpmn-intellij-plugin-common-tests/build.gradle @@ -38,19 +38,6 @@ sourceSets { main.kotlin.srcDirs += 'src/main/kotlin' } -compileKotlin { - kotlinOptions { - jvmTarget = "17" - apiVersion = kotlinApiVersion - } -} -compileTestKotlin { - kotlinOptions { - jvmTarget = "17" - apiVersion = kotlinApiVersion - } -} - clean { delete 'out' } diff --git a/bpmn-intellij-plugin-commons/build.gradle b/bpmn-intellij-plugin-commons/build.gradle index 681c2b8a7..f0564c5ae 100644 --- a/bpmn-intellij-plugin-commons/build.gradle +++ b/bpmn-intellij-plugin-commons/build.gradle @@ -45,19 +45,6 @@ patchPluginXml.enabled = false verifyPlugin.enabled = false publishPlugin.enabled = false -compileKotlin { - kotlinOptions { - jvmTarget = "17" - apiVersion = kotlinApiVersion - } -} -compileTestKotlin { - kotlinOptions { - jvmTarget = "17" - apiVersion = kotlinApiVersion - } -} - clean { delete 'out' } diff --git a/bpmn-intellij-plugin-core/build.gradle b/bpmn-intellij-plugin-core/build.gradle index c3843ed2d..b76a71bcc 100644 --- a/bpmn-intellij-plugin-core/build.gradle +++ b/bpmn-intellij-plugin-core/build.gradle @@ -51,19 +51,6 @@ patchPluginXml.enabled = false verifyPlugin.enabled = false publishPlugin.enabled = false -compileKotlin { - kotlinOptions { - jvmTarget = "17" - apiVersion = kotlinApiVersion - } -} -compileTestKotlin { - kotlinOptions { - jvmTarget = "17" - apiVersion = kotlinApiVersion - } -} - clean { delete 'out' } diff --git a/bpmn-intellij-plugin-core/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/core/actions/copypaste/CopyPasteActionHandler.kt b/bpmn-intellij-plugin-core/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/core/actions/copypaste/CopyPasteActionHandler.kt index a2d9f7314..1cd934352 100644 --- a/bpmn-intellij-plugin-core/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/core/actions/copypaste/CopyPasteActionHandler.kt +++ b/bpmn-intellij-plugin-core/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/core/actions/copypaste/CopyPasteActionHandler.kt @@ -114,12 +114,12 @@ class CopyPasteActionHandler(private val clipboard: SystemClipboard) { val updatedIds = mutableMapOf(BpmnElementId(ROOT_NAME) to parent) val updatedDiagramIds = mutableMapOf() - val minX = context.shapes.map { it.shape.rectBounds().x }.min() + val minX = context.shapes.map { it.shape.rectBounds().x }.minOrNull() ?: context.edges.map { min(it.edge.waypoint[0].x, it.edge.waypoint[it.edge.waypoint.size - 1].x) } - .min() ?: 0.0f - val minY = context.shapes.map { it.shape.rectBounds().y }.min() + .minOrNull() ?: 0.0f + val minY = context.shapes.map { it.shape.rectBounds().y }.minOrNull() ?: context.edges.map { min(it.edge.waypoint[0].y, it.edge.waypoint[it.edge.waypoint.size - 1].y) } - .min() + .minOrNull() ?: 0.0f val delta = Point2D.Float(sceneLocation.x - minX, sceneLocation.y - minY) diff --git a/bpmn-intellij-plugin-core/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/core/events/ProcessModelUpdateEvents.kt b/bpmn-intellij-plugin-core/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/core/events/ProcessModelUpdateEvents.kt index 8070f7208..d2d19dd8e 100644 --- a/bpmn-intellij-plugin-core/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/core/events/ProcessModelUpdateEvents.kt +++ b/bpmn-intellij-plugin-core/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/core/events/ProcessModelUpdateEvents.kt @@ -270,7 +270,7 @@ class ProcessModelUpdateEvents(private val committer: FileCommitter, private val private fun lastDeletion(elementId: BpmnElementId): Order { val cursorValue = allBeforeThis return deletionsByStaticBpmnId[elementId]?.filter { it.order < cursorValue } - ?.maxBy { it: Order -> it.order } + ?.maxByOrNull { it: Order -> it.order } ?: Order(-1, NullEvent(elementId.id)) } diff --git a/bpmn-intellij-plugin-core/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/core/render/Canvas.kt b/bpmn-intellij-plugin-core/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/core/render/Canvas.kt index 74afb90d6..d4b64e2d9 100644 --- a/bpmn-intellij-plugin-core/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/core/render/Canvas.kt +++ b/bpmn-intellij-plugin-core/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/core/render/Canvas.kt @@ -161,10 +161,10 @@ open class Canvas(private val project: Project, private val settings: CanvasCons val interactionContext = ElementInteractionContext(emptySet(), emptySet(), mutableMapOf(), null, mutableMapOf(), mutableMapOf(), null, Point2D.Float(), Point2D.Float()) val dummyImage = UIUtil.createImage(1, 1, BufferedImage.TYPE_INT_RGB) val dimensions = doRender(dummyImage, interactionContext, Camera(Point2D.Float(0.0f, 0.0f), Point2D.Float(1.0f, 1.0f)))?.areas ?: return null - val maxX = dimensions.map { it.value.area.bounds2D.maxX }.max()?.toInt() ?: return null - val minX = dimensions.map { it.value.area.bounds2D.minX }.min()?.toInt() ?: return null - val maxY = dimensions.map { it.value.area.bounds2D.maxY }.max()?.toInt() ?: return null - val minY = dimensions.map { it.value.area.bounds2D.minY }.min()?.toInt() ?: return null + val maxX = dimensions.map { it.value.area.bounds2D.maxX }.maxOrNull()?.toInt() ?: return null + val minX = dimensions.map { it.value.area.bounds2D.minX }.minOrNull()?.toInt() ?: return null + val maxY = dimensions.map { it.value.area.bounds2D.maxY }.maxOrNull()?.toInt() ?: return null + val minY = dimensions.map { it.value.area.bounds2D.minY }.minOrNull()?.toInt() ?: return null val width = maxX - minX val height = maxY - minY @@ -305,11 +305,11 @@ open class Canvas(private val project: Project, private val settings: CanvasCons } val pointAnchor = anchors.filter { it.type == AnchorType.POINT } - .minBy { it.anchor.distance(it.objectAnchor) } + .minByOrNull { it.anchor.distance(it.objectAnchor) } val anchorX = anchors.filter { it.type == AnchorType.HORIZONTAL } - .minBy { it.anchor.distance(it.objectAnchor) } + .minByOrNull { it.anchor.distance(it.objectAnchor) } val anchorY = anchors.filter { it.type == AnchorType.VERTICAL } - .minBy { it.anchor.distance(it.objectAnchor) } + .minByOrNull { it.anchor.distance(it.objectAnchor) } val selectedAnchors: AnchorHit = if (null == pointAnchor) { applyOrthoOrNoneAnchors(anchorX, anchorY, ctx) @@ -326,9 +326,9 @@ open class Canvas(private val project: Project, private val settings: CanvasCons private fun draggedElement(ctx: ElementInteractionContext): DiagramElementId? { val cameraPoint = camera.toCameraView(ctx.dragCurrent) - val dragged = ctx.draggedIds.minBy { + val dragged = ctx.draggedIds.minByOrNull { val bounds = areaByElement?.get(it)?.area?.bounds2D ?: Rectangle2D.Float() - return@minBy Point2D.Float(bounds.centerX.toFloat(), bounds.centerY.toFloat()).distance(cameraPoint) + return@minByOrNull Point2D.Float(bounds.centerX.toFloat(), bounds.centerY.toFloat()).distance(cameraPoint) } return dragged } @@ -361,7 +361,7 @@ open class Canvas(private val project: Project, private val settings: CanvasCons return dragTargettableElements(cursorRect(point)) .filter { !ctx.draggedIds.contains(it) } .filter { areas[it]?.areaType == AreaType.SHAPE || areas[it]?.areaType == AreaType.SHAPE_THAT_NESTS } - .maxBy { areas[it]?.index ?: ICON_Z_INDEX } + .maxByOrNull { areas[it]?.index ?: ICON_Z_INDEX } } fun dragWithWheel(previous: Point2D.Float, current: Point2D.Float) { @@ -551,13 +551,13 @@ open class Canvas(private val project: Project, private val settings: CanvasCons private fun elemUnderCursor(cursorPoint: Point2D.Float, excludeAreas: Set = setOf(AreaType.PARENT_PROCESS_SHAPE)): List { val withinRect = cursorRect(cursorPoint) val intersection = areaByElement?.filter { it.value.area.intersects(withinRect) } - val maxZindex = intersection?.maxBy { it: Map.Entry -> it.value.index } + val maxZindex = intersection?.maxByOrNull { it: Map.Entry -> it.value.index } val result = mutableListOf() val centerRect = Point2D.Float(withinRect.centerX.toFloat(), withinRect.centerY.toFloat()) intersection ?.filter { !excludeAreas.contains(it.value.areaType) } ?.filter { it.value.index == maxZindex?.value?.index } - ?.minBy { it: Map.Entry -> + ?.minByOrNull { it: Map.Entry -> Point2D.Float( it.value.area.bounds2D.centerX.toFloat(), it.value.area.bounds2D.centerY.toFloat() @@ -596,7 +596,7 @@ open class Canvas(private val project: Project, private val settings: CanvasCons return@groupBy parent } val maxSize = - groupedByParent.maxBy { it: Map.Entry> -> it.value.size } + groupedByParent.maxByOrNull { it: Map.Entry> -> it.value.size } result.clear() result.addAll(maxSize?.value ?: emptyList()) } diff --git a/bpmn-intellij-plugin-core/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/core/render/DefaultBpmnProcessRenderer.kt b/bpmn-intellij-plugin-core/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/core/render/DefaultBpmnProcessRenderer.kt index 9d997d3d7..12cecaf35 100644 --- a/bpmn-intellij-plugin-core/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/core/render/DefaultBpmnProcessRenderer.kt +++ b/bpmn-intellij-plugin-core/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/core/render/DefaultBpmnProcessRenderer.kt @@ -291,10 +291,10 @@ class DefaultBpmnProcessRenderer(private val project: Project, val icons: IconPr val areas = state.ctx.selectedIds.mapNotNull { renderedArea[it] } - val minX = areas.map { it.area.bounds2D.minX }.min()?.toFloat() - val minY = areas.map { it.area.bounds2D.minY }.min()?.toFloat() - val maxX = areas.map { it.area.bounds2D.maxX }.max()?.toFloat() - val maxY = areas.map { it.area.bounds2D.maxY }.max()?.toFloat() + val minX = areas.map { it.area.bounds2D.minX }.minOrNull()?.toFloat() + val minY = areas.map { it.area.bounds2D.minY }.minOrNull()?.toFloat() + val maxX = areas.map { it.area.bounds2D.maxX }.maxOrNull()?.toFloat() + val maxY = areas.map { it.area.bounds2D.maxY }.maxOrNull()?.toFloat() // TODO: This currently does not support event cascading, so only plain elements can be removed if (null != minX && null != minY && null != maxX && null != maxY) { @@ -392,10 +392,10 @@ class DefaultBpmnProcessRenderer(private val project: Project, val icons: IconPr private fun computeModelRect(allRendered: Collection): Rectangle2D.Float { val filter = { it: AreaWithZindex -> it.areaType != AreaType.PARENT_PROCESS_SHAPE } val areaBounds = allRendered.filter(filter).map { it.area.bounds2D } - val minX = areaBounds.map { it.bounds2D.x }.min() ?: 0.0 - val minY = areaBounds.map { it.bounds2D.y }.min() ?: 0.0 - val maxX = areaBounds.map { it.bounds2D.x + it.bounds2D.width }.max() ?: 0.0 - val maxY = areaBounds.map { it.bounds2D.y + it.bounds2D.height }.max() ?: 0.0 + val minX = areaBounds.map { it.bounds2D.x }.minOrNull() ?: 0.0 + val minY = areaBounds.map { it.bounds2D.y }.minOrNull() ?: 0.0 + val maxX = areaBounds.map { it.bounds2D.x + it.bounds2D.width }.maxOrNull() ?: 0.0 + val maxY = areaBounds.map { it.bounds2D.y + it.bounds2D.height }.maxOrNull() ?: 0.0 val cx = (maxX + minX).toFloat() / 2.0f val cy = (maxY + minY).toFloat() / 2.0f diff --git a/bpmn-intellij-plugin-core/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/core/render/elements/anchors/PhysicalWaypoint.kt b/bpmn-intellij-plugin-core/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/core/render/elements/anchors/PhysicalWaypoint.kt index baaf7f61b..624a44f5b 100644 --- a/bpmn-intellij-plugin-core/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/core/render/elements/anchors/PhysicalWaypoint.kt +++ b/bpmn-intellij-plugin-core/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/core/render/elements/anchors/PhysicalWaypoint.kt @@ -164,8 +164,8 @@ class PhysicalWaypoint( val prev = edge.waypoint[pos - 2] val next = edge.waypoint[pos + 2] val selectedCandidates = listOf(Point2D.Float(prev.x, next.y), Point2D.Float(next.x, prev.y)) - if (selectedCandidates.map { it.distanceSq(prev.x.toDouble(), prev.y.toDouble()) }.min()!! < DefaultCanvasConstants().epsilon - || selectedCandidates.map { it.distanceSq(next.x.toDouble(), next.y.toDouble()) }.min()!! < DefaultCanvasConstants().epsilon) { + if (selectedCandidates.map { it.distanceSq(prev.x.toDouble(), prev.y.toDouble()) }.minOrNull()!! < DefaultCanvasConstants().epsilon + || selectedCandidates.map { it.distanceSq(next.x.toDouble(), next.y.toDouble()) }.minOrNull()!! < DefaultCanvasConstants().epsilon) { return deleteBounds } val displacements = selectedCandidates.map { Point2D.Float(it.x - location.x, it.y - location.y) } @@ -176,7 +176,7 @@ class PhysicalWaypoint( val rightAngleIcon = state().ctx.canvas.drawIcon(bounds, state().icons.rightAngle) val orthoIconId = DiagramElementId(orthoIconIdPrefix + elementId.id) state().ctx.interactionContext.clickCallbacks[orthoIconId] = { dest -> - val selectedOrtho = displacements.minBy { it.distanceSq(0.0, 0.0) }!! + val selectedOrtho = displacements.minByOrNull { it.distanceSq(0.0, 0.0) }!! dest.addEvents(listOf(DraggedToEvent(elementId, selectedOrtho.x, selectedOrtho.y, parentElementId, physicalPos))) } diff --git a/bpmn-intellij-plugin-core/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/core/render/elements/edges/BaseEdgeRenderElement.kt b/bpmn-intellij-plugin-core/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/core/render/elements/edges/BaseEdgeRenderElement.kt index 8497c381e..43eef12fb 100644 --- a/bpmn-intellij-plugin-core/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/core/render/elements/edges/BaseEdgeRenderElement.kt +++ b/bpmn-intellij-plugin-core/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/core/render/elements/edges/BaseEdgeRenderElement.kt @@ -90,10 +90,10 @@ abstract class BaseEdgeRenderElement( } override fun currentOnScreenRect(camera: Camera): Rectangle2D.Float { - val minX = edge.waypoint.minBy { it.x }?.x ?: 0.0f - val minY = edge.waypoint.minBy { it.y }?.y ?: 0.0f - val maxX = edge.waypoint.maxBy { it.x }?.x ?: 0.0f - val maxY = edge.waypoint.maxBy { it.y }?.y ?: 0.0f + val minX = edge.waypoint.minByOrNull { it.x }?.x ?: 0.0f + val minY = edge.waypoint.minByOrNull { it.y }?.y ?: 0.0f + val maxX = edge.waypoint.maxByOrNull { it.x }?.x ?: 0.0f + val maxY = edge.waypoint.maxByOrNull { it.y }?.y ?: 0.0f // Edge itself can't be translated, so no viewTransform return Rectangle2D.Float( @@ -112,7 +112,7 @@ abstract class BaseEdgeRenderElement( val name = state().currentState.elemPropertiesByStaticElementId[bpmnElementId]?.get(PropertyType.NAME)?.value as String? ?: return val longestSegment = waypoints .mapIndexedNotNull {pos, it -> if (0 == pos) null else Pair(waypoints[pos - 1], it)} - .maxBy { it.first.distance(it.second) } ?: return + .maxByOrNull { it.first.distance(it.second) } ?: return state().ctx.canvas.drawWrappedSingleLine(longestSegment.first, longestSegment.second, name, color) } diff --git a/bpmn-intellij-plugin-core/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/core/render/elements/shapes/ShapeRenderElement.kt b/bpmn-intellij-plugin-core/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/core/render/elements/shapes/ShapeRenderElement.kt index 26d69f8e1..6664c7209 100644 --- a/bpmn-intellij-plugin-core/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/core/render/elements/shapes/ShapeRenderElement.kt +++ b/bpmn-intellij-plugin-core/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/core/render/elements/shapes/ShapeRenderElement.kt @@ -405,7 +405,7 @@ abstract class ShapeRenderElement( return cartesianProduct(startAvailable, endAvailable) .filter { if (allowShapeIntersection) true else doesNotIntersectArea(it) } - .minBy { it: Pair -> it.first.point.distance(it.second.point) } + .minByOrNull { it: Pair -> it.first.point.distance(it.second.point) } ?.let { Pair(it.first.point, it.second.point) } } diff --git a/bpmn-intellij-plugin-core/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/core/render/elements/viewtransform/ViewTransform.kt b/bpmn-intellij-plugin-core/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/core/render/elements/viewtransform/ViewTransform.kt index efe4e8f29..738150779 100644 --- a/bpmn-intellij-plugin-core/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/core/render/elements/viewtransform/ViewTransform.kt +++ b/bpmn-intellij-plugin-core/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/core/render/elements/viewtransform/ViewTransform.kt @@ -311,7 +311,7 @@ class ViewTransformInverter { minimizeGradientDescent(elementId, target, guess, batch, introspection) } - return result.minBy { it: PointWithResidual -> it.residual }!!.point + return result.minByOrNull { it: PointWithResidual -> it.residual }!!.point } private fun minimizeGradientDescent(elementId: DiagramElementId, target: Point2D.Float, initialGuess: Point2D.Float, batch: ViewTransformBatch, introspection: PointTransformationIntrospection): PointWithResidual { diff --git a/build.gradle b/build.gradle index 3956ccab0..7f0edd244 100644 --- a/build.gradle +++ b/build.gradle @@ -1,16 +1,18 @@ +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + plugins { id 'java' - id 'org.jetbrains.intellij' version '1.11.0' - id 'org.jetbrains.kotlin.jvm' version '1.6.0' - id 'org.jetbrains.kotlin.kapt' version '1.6.0' + id 'org.jetbrains.intellij' version '1.17.4' + id 'org.jetbrains.kotlin.jvm' version '2.1.0' + id 'org.jetbrains.kotlin.kapt' version '2.1.0' } ext { - intellijPlatform = 'IU-2023.1' + intellijPlatform = 'IU-2023.3' intellijPlatformPlugins = ['java', 'DatabaseTools'] // DatabaseTools is for BPMN process 'debugging' - kotlinStdlib = '1.5.30' - kotlinApiVersion = '1.3' // It must be same as JB supplied Kotlin STDLIB i.e. for 2018 = 1.3. See https://youtrack.jetbrains.com/issue/KT-37435 + kotlinStdlib = '2.1.0' + kotlinApiVersion = '1.8' // It must be same as JB supplied Kotlin STDLIB i.e. for 2018 = 1.3. See https://youtrack.jetbrains.com/issue/KT-37435 mapstruct = '1.4.2.Final' jackson = '2.15.2' @@ -49,8 +51,17 @@ allprojects { } } + + subprojects { tasks.withType(Test) { useJUnitPlatform() } + + tasks.withType(KotlinCompile).configureEach { + kotlinOptions { + jvmTarget = "17" + apiVersion = kotlinApiVersion + } + } } diff --git a/camunda-intellij-plugin/build.gradle b/camunda-intellij-plugin/build.gradle index f04614205..b04b1529c 100644 --- a/camunda-intellij-plugin/build.gradle +++ b/camunda-intellij-plugin/build.gradle @@ -43,7 +43,7 @@ intellij { } runPluginVerifier { - ideVersions = ["IU-2022.3", "IC-2022.3"] + ideVersions = ["IU-2023.3", "IC-2023.3"] } verifyPlugin { @@ -54,19 +54,6 @@ publishPlugin { token = System.getenv("INTELLIJ_PLUGIN_PUBLISH_TOKEN") } -compileKotlin { - kotlinOptions { - jvmTarget = "17" - apiVersion = kotlinApiVersion - } -} -compileTestKotlin { - kotlinOptions { - jvmTarget = "17" - apiVersion = kotlinApiVersion - } -} - clean { delete 'out' } diff --git a/camunda-intellij-plugin/src/main/resources/META-INF/plugin.xml b/camunda-intellij-plugin/src/main/resources/META-INF/plugin.xml index a2517c51a..4119fa317 100644 --- a/camunda-intellij-plugin/src/main/resources/META-INF/plugin.xml +++ b/camunda-intellij-plugin/src/main/resources/META-INF/plugin.xml @@ -107,7 +107,7 @@ - + diff --git a/camunda-xml-parser/build.gradle b/camunda-xml-parser/build.gradle index 2517dd99f..fcfebcab6 100644 --- a/camunda-xml-parser/build.gradle +++ b/camunda-xml-parser/build.gradle @@ -36,19 +36,6 @@ dependencies { testImplementation "org.amshove.kluent:kluent:$kluent" } -compileKotlin { - kotlinOptions { - jvmTarget = "17" - apiVersion = kotlinApiVersion - } -} -compileTestKotlin { - kotlinOptions { - jvmTarget = "17" - apiVersion = kotlinApiVersion - } -} - test { jvmArgs "--add-opens=java.base/java.nio.charset=ALL-UNNAMED" diff --git a/flowable-intellij-plugin/build.gradle b/flowable-intellij-plugin/build.gradle index aad017f6f..f020fe5aa 100644 --- a/flowable-intellij-plugin/build.gradle +++ b/flowable-intellij-plugin/build.gradle @@ -43,7 +43,7 @@ intellij { } runPluginVerifier { - ideVersions = ["IU-2022.3", "IC-2022.3"] + ideVersions = ["IU-2023.3", "IC-2023.3"] } verifyPlugin { @@ -54,19 +54,6 @@ publishPlugin { token = System.getenv("INTELLIJ_PLUGIN_PUBLISH_TOKEN") } -compileKotlin { - kotlinOptions { - jvmTarget = "17" - apiVersion = kotlinApiVersion - } -} -compileTestKotlin { - kotlinOptions { - jvmTarget = "17" - apiVersion = kotlinApiVersion - } -} - clean { delete 'out' } diff --git a/flowable-intellij-plugin/src/main/resources/META-INF/plugin.xml b/flowable-intellij-plugin/src/main/resources/META-INF/plugin.xml index a326e9d28..06104d13d 100644 --- a/flowable-intellij-plugin/src/main/resources/META-INF/plugin.xml +++ b/flowable-intellij-plugin/src/main/resources/META-INF/plugin.xml @@ -101,7 +101,7 @@ - + diff --git a/flowable-xml-parser/build.gradle b/flowable-xml-parser/build.gradle index 73c71f2af..dbe67ef9b 100644 --- a/flowable-xml-parser/build.gradle +++ b/flowable-xml-parser/build.gradle @@ -36,19 +36,6 @@ dependencies { testImplementation "org.amshove.kluent:kluent:$kluent" } -compileKotlin { - kotlinOptions { - jvmTarget = "17" - apiVersion = kotlinApiVersion - } -} -compileTestKotlin { - kotlinOptions { - jvmTarget = "17" - apiVersion = kotlinApiVersion - } -} - test { jvmArgs "--add-opens=java.base/java.nio.charset=ALL-UNNAMED" diff --git a/gradle.properties b/gradle.properties index 7f3680244..4374e1595 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1,2 @@ intellijPublishToken= +kotlin.daemon.jvmargs=-Xmx1024M \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 68c4db4b3..e0fd02028 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/xml-parser-core/build.gradle b/xml-parser-core/build.gradle index ba3941f64..e03e4162d 100644 --- a/xml-parser-core/build.gradle +++ b/xml-parser-core/build.gradle @@ -22,19 +22,6 @@ dependencies { implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:$jackson" } -compileKotlin { - kotlinOptions { - jvmTarget = "17" - apiVersion = kotlinApiVersion - } -} -compileTestKotlin { - kotlinOptions { - jvmTarget = "17" - apiVersion = kotlinApiVersion - } -} - test { jacoco { destinationFile = file("${buildDir}/jacoco/test.exec")