Updated to 0.12.0

.gitignore

@@ -1,6 +1,9 @@
-.idea
-.gradle
+/.idea
+/.gradle
 /build
 /classes
+/out
+/genresources
 RECUP_*.fla
 game.storage
+*.iml

gradle.properties

@@ -1,4 +1,4 @@
-korVersion=0.11.0
-jtranscVersion=0.6.4
-kotlinVersion=1.1.3-2
-vertxVersion=3.3.3
+korVersion=0.12.0
+jtranscVersion=0.6.7
+kotlinVersion=1.1.4-2
+vertxVersion=3.4.2

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Apr 27 14:52:16 CEST 2017
+#Sun Aug 27 17:47:24 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-bin.zip

include.gradle

@@ -1,64 +1,64 @@
-group 'com.soywiz'
-version "$korVersion"
-
-apply plugin: 'java'
-apply plugin: 'kotlin'
-apply plugin: 'maven'
-apply plugin: 'signing'
-apply plugin: "korge"
-
-compileJava.options.encoding = 'UTF-8'
-compileTestJava.options.encoding = 'UTF-8'
-
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
-
-kotlin { experimental { coroutines 'enable' } }
-
-repositories {
-    mavenLocal()
-    mavenCentral()
-}
-
-sourceSets {
-    main.java.srcDirs = ['src']
-    test.java.srcDirs = ['test']
-    main.resources.srcDirs = ['resources']
-    test.resources.srcDirs = ['testresources']
-    main.java.srcDirs += 'src/main/kotlin'
-}
-
-dependencies {
-    compile "com.soywiz:korio-core:$korVersion"
-    compile "com.soywiz:korim-core:$korVersion"
-    compile "com.soywiz:korag-core:$korVersion"
-    compile "com.soywiz:korau-core:$korVersion"
-    compile "com.soywiz:korui-core:$korVersion"
-    //compile "com.soywiz:korte:$korVersion"
-    testCompile group: 'junit', name: 'junit', version: '4.11'
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
-}
-
-task javadoc2(type: Javadoc) {
-    failOnError = false
-}
-
-task javadocJar(type: Jar, dependsOn: javadoc2) {
-    classifier = 'javadoc'
-    from 'build/docs/javadoc'
-}
-
-task sourcesJar(type: Jar) {
-    from sourceSets.main.allSource
-    classifier = 'sources'
-}
-
-artifacts {
-    archives jar
-    archives javadocJar
-    archives sourcesJar
-}
-
-task deploy(dependsOn: ['install', 'uploadArchives']) {
-}
-
+group 'com.soywiz'
+version "$korVersion"
+
+apply plugin: 'java'
+apply plugin: 'kotlin'
+apply plugin: 'maven'
+apply plugin: 'signing'
+apply plugin: "korge"
+
+compileJava.options.encoding = 'UTF-8'
+compileTestJava.options.encoding = 'UTF-8'
+
+sourceCompatibility = 1.7
+targetCompatibility = 1.7
+
+kotlin { experimental { coroutines 'enable' } }
+
+repositories {
+	mavenLocal()
+	mavenCentral()
+}
+
+sourceSets {
+	main.java.srcDirs = ['src']
+	test.java.srcDirs = ['test']
+	main.resources.srcDirs = ['resources']
+	test.resources.srcDirs = ['testresources']
+	main.java.srcDirs += 'src/main/kotlin'
+}
+
+dependencies {
+	compile "com.soywiz:korio-core:$korVersion"
+	compile "com.soywiz:korim-core:$korVersion"
+	compile "com.soywiz:korag-core:$korVersion"
+	compile "com.soywiz:korau-core:$korVersion"
+	compile "com.soywiz:korui-core:$korVersion"
+	//compile "com.soywiz:korte:$korVersion"
+	testCompile group: 'junit', name: 'junit', version: '4.11'
+	compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
+}
+
+task javadoc2(type: Javadoc) {
+	failOnError = false
+}
+
+task javadocJar(type: Jar, dependsOn: javadoc2) {
+	classifier = 'javadoc'
+	from 'build/docs/javadoc'
+}
+
+task sourcesJar(type: Jar) {
+	from sourceSets.main.allSource
+	classifier = 'sources'
+}
+
+artifacts {
+	archives jar
+	archives javadocJar
+	archives sourcesJar
+}
+
+task deploy(dependsOn: ['install', 'uploadArchives']) {
+}
+

korge-coffee/.gitignore

@@ -1,2 +1,6 @@
+/.idea
+/.gradle
 /build
+/classes
+/out
 /genresources

korge-coffee/src/com/soywiz/korge/games/coffee/main.kt

@@ -30,6 +30,7 @@ import com.soywiz.korio.inject.Singleton
 import com.soywiz.korio.util.closeable
 import com.soywiz.korma.geom.Anchor
 import com.soywiz.korma.geom.Point2d
+import com.soywiz.korma.geom.SizeInt
 import com.soywiz.korma.random.get
 import java.net.URL
 import java.util.*
@@ -50,10 +51,8 @@ object KorgeCoffeeModule : Module() {
 
 	override val title: String = "KorGE Coffee"
 	override val mainScene: Class<out Scene> = MainScene::class.java
-	override val width: Int = (720 * 0.75).toInt()
-	override val height: Int = (1280 * 0.75).toInt()
-	override val virtualHeight: Int = 1280
-	override val virtualWidth: Int = 720
+	override val size: SizeInt = SizeInt(720, 1280)
+	override val windowSize: SizeInt = size * 0.75
 	override val icon: String = "icon.png"
 
 	@Singleton

korge-simon/.gitignore

@@ -1,2 +1,6 @@
+/.idea
+/.gradle
 /build
+/classes
+/out
 /genresources

korge-simon/build.gradle

@@ -25,7 +25,8 @@ dependencies {
 }
 
 jtransc {
-    minimizeNames = true
+    //minimizeNames = true
+	minimizeNames = false
     treeshaking = true
 
     assets("resources")

korge-simon/src/com/soywiz/korge/samples/simon/Simon.kt

@@ -24,6 +24,7 @@ import com.soywiz.korio.async.waitOne
 import com.soywiz.korio.inject.Optional
 import com.soywiz.korio.util.substr
 import com.soywiz.korma.geom.ISize
+import com.soywiz.korma.geom.SizeInt
 import com.soywiz.korma.random.get
 import com.soywiz.korui.geom.len.Padding
 import com.soywiz.korui.geom.len.em
@@ -36,11 +37,8 @@ import java.util.*
 object Simon : Module() {
 	@JvmStatic fun main(args: Array<String>) = Korge(this)
 
-	override val virtualWidth: Int = 1280
-	override val virtualHeight: Int = 720
-
-	override val width: Int = (virtualWidth * 0.75).toInt()
-	override val height: Int = (virtualHeight * 0.75).toInt()
+	override val size: SizeInt = SizeInt(1280, 720)
+	override val windowSize: SizeInt = size * 0.75
 
 	override val title: String = "Kotlin Simon"
 

korge-tic-tac-toe/.gitignore

@@ -1,2 +1,6 @@
+/.idea
+/.gradle
 /build
+/classes
+/out
 /genresources