From 2ca07886f957e2d538507f3c700a62aa569b70f5 Mon Sep 17 00:00:00 2001 From: Carlos Ballesteros Velasco Date: Sun, 3 May 2020 08:23:24 +0200 Subject: [PATCH] Bump versions --- gradle.properties | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- .../com/soywiz/korge/intellij/debug/DebugKorimExt.kt | 12 ++++++------ .../intellij/editor/KorgeBaseFileEditorProvider.kt | 2 +- src/main/resources/META-INF/plugin.xml | 6 +++++- .../gradle/wrapper/gradle-wrapper.properties | 2 +- 6 files changed, 16 insertions(+), 12 deletions(-) diff --git a/gradle.properties b/gradle.properties index 5fece2c..a9fea36 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,5 +2,5 @@ kotlin.code.style=official # version -kotlinVersion=1.3.71 -korgeVersion=1.11.3.0 \ No newline at end of file +kotlinVersion=1.3.72 +korgeVersion=1.12.2.2 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 84a9066..6623300 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/kotlin/com/soywiz/korge/intellij/debug/DebugKorimExt.kt b/src/main/kotlin/com/soywiz/korge/intellij/debug/DebugKorimExt.kt index b3a5cf5..7434813 100644 --- a/src/main/kotlin/com/soywiz/korge/intellij/debug/DebugKorimExt.kt +++ b/src/main/kotlin/com/soywiz/korge/intellij/debug/DebugKorimExt.kt @@ -5,7 +5,7 @@ import com.soywiz.korim.color.* import com.soywiz.korim.vector.* import com.sun.jdi.* -fun Type.isKorimBitmapOrDrawable() = this.instanceOf() || this.instanceOf() || this.instanceOf() || this.instanceOf() +fun Type.isKorimBitmapOrDrawable() = this.instanceOf() || this.instanceOf() || this.instanceOf() || this.instanceOf() fun ObjectReference.readKorimBitmap32(hintWidth: Int, hintHeight: Int, thread: ThreadReference?): Bitmap32 { val value = this @@ -14,8 +14,8 @@ fun ObjectReference.readKorimBitmap32(hintWidth: Int, hintHeight: Int, thread: T type.instanceOf() -> readKorimBitmap32Internal(thread) type.instanceOf() -> readKorimBmpSliceInternal(thread) type.instanceOf() -> readKorgeImageInternal(thread) - type.instanceOf() -> { - val isSizedDrawable = type.instanceOf() + type.instanceOf() -> { + val isSizedDrawable = type.instanceOf() val width = if (isSizedDrawable) value.invoke("getWidth", listOf(), thread = thread).int(hintWidth) else hintWidth val height = if (isSizedDrawable) value.invoke("getHeight", listOf(), thread = thread).int(hintHeight) else hintHeight readKorimDrawableInternal(width, height, thread) @@ -55,9 +55,9 @@ fun ObjectReference.readKorimDrawableInternal(requestedWidth: Int, requestedHeig val value = this val type = value.type() val vm = virtualMachine() - if (!type.instanceOf()) error("Not a korim Context2d.Drawable") - val isSizedDrawable = type.instanceOf() - val isBoundsDrawable = type.instanceOf() + if (!type.instanceOf()) error("Not a korim Context2d.Drawable") + val isSizedDrawable = type.instanceOf() + val isBoundsDrawable = type.instanceOf() val width = if (isSizedDrawable) value.invoke("getWidth", thread = thread).int(requestedWidth) else requestedWidth val height = if (isSizedDrawable) value.invoke("getHeight", thread = thread).int(requestedHeight) else requestedHeight diff --git a/src/main/kotlin/com/soywiz/korge/intellij/editor/KorgeBaseFileEditorProvider.kt b/src/main/kotlin/com/soywiz/korge/intellij/editor/KorgeBaseFileEditorProvider.kt index 6f05993..d84fcf3 100644 --- a/src/main/kotlin/com/soywiz/korge/intellij/editor/KorgeBaseFileEditorProvider.kt +++ b/src/main/kotlin/com/soywiz/korge/intellij/editor/KorgeBaseFileEditorProvider.kt @@ -183,7 +183,7 @@ abstract class KorgeBaseFileEditorProvider : com.intellij.openapi.fileEditor.Fil views, defaultConfig = SWFExportConfig( mipmaps = false, antialiasing = true, - rasterizerMethod = Context2d.ShapeRasterizerMethod.X4, + rasterizerMethod = ShapeRasterizerMethod.X4, exportScale = 1.0, exportPaths = false ) diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index 55f8213..ae34f6f 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -5,7 +5,7 @@ com.soywiz.korge.korge-intellij-plugin Korge - 1.11.3.0 + 1.12.2.2 Korge 1.12.2.2 +
    +
  • Updated versions: Korge 1.12.2.2, Kotlin 1.3.72.
    • +

1.11.3.0

  • Updated versions: Korge 1.11.3.0, Kotlin 1.3.71.
    • diff --git a/src/main/resources/com/soywiz/korge/intellij/generator/gradle/wrapper/gradle-wrapper.properties b/src/main/resources/com/soywiz/korge/intellij/generator/gradle/wrapper/gradle-wrapper.properties index 84a9066..6623300 100644 --- a/src/main/resources/com/soywiz/korge/intellij/generator/gradle/wrapper/gradle-wrapper.properties +++ b/src/main/resources/com/soywiz/korge/intellij/generator/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists