Updated to 0.15.5

korui-android-example/gradle.properties → @old/korui-android-example/gradle.properties

@@ -1,3 +1,3 @@
-org.gradle.jvmargs=-Xmx1536m
-koruiVersion=0.12.0
-kotlinVersion=1.1.4-2
+org.gradle.jvmargs=-Xmx1536m
+koruiVersion=0.12.0
+kotlinVersion=1.1.4-2

korui-android-example/gradlew.bat → @old/korui-android-example/gradlew.bat

@@ -1,90 +1,90 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

build.gradle

@@ -1,45 +1,24 @@
 buildscript {
-	ext.kotlinVersion = '1.2.0-beta-31'
+	ext.koragVersion = '0.15.4'
+	ext.kotlinVersion = '1.2.0-beta-88'
 	ext.compilerVersion = ext.kotlinVersion
 	ext.librariesVersion = ext.kotlinVersion
-	//ext.eapChannel = 'https://dl.bintray.com/kotlin/kotlin-eap-1.1'
 	ext.eapChannel = 'http://dl.bintray.com/kotlin/kotlin-eap-1.2'
-	ext.serializationRepo = 'https://kotlin.bintray.com/kotlinx'
-	ext.serializationPluginVersion = '0.1'
 
 	repositories {
 		mavenLocal()
 		jcenter()
-		maven { url serializationRepo }
 		maven { url eapChannel }
 	}
 
 	dependencies {
 		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$compilerVersion"
 	}
-
-	ext {
-		libraries = [
-				kotlin_stdlib_common: "org.jetbrains.kotlin:kotlin-stdlib-common:$librariesVersion",
-				kotlin_stdlib_jvm   : "org.jetbrains.kotlin:kotlin-stdlib:$librariesVersion",
-				kotlin_stdlib_js    : "org.jetbrains.kotlin:kotlin-stdlib-js:$librariesVersion",
-
-				kotlin_test_common  : "org.jetbrains.kotlin:kotlin-test-common:$librariesVersion",
-				kotlin_test_jvm     : "org.jetbrains.kotlin:kotlin-test:$librariesVersion",
-				kotlin_test_js      : "org.jetbrains.kotlin:kotlin-test-js:$librariesVersion",
-
-				kotlin_reflect      : "org.jetbrains.kotlin:kotlin-reflect:$librariesVersion",
-		]
-	}
-}
-
-configurations {
-	provided
 }
 
 allprojects {
 	group 'com.soywiz'
-	version korVersion
+	version '0.15.5'
 
 	apply plugin: 'java'
 //apply plugin: 'kotlin'
@@ -52,14 +31,9 @@ allprojects {
 
 	sourceCompatibility = 1.5
 
-//kotlin { experimental { coroutines 'enable' } }
-
-//sourceSets {
-//	main.java.srcDirs = ['src']
-//	test.java.srcDirs = ['test']
-//	main.resources.srcDirs = ['resources']
-//	test.resources.srcDirs = ['testresources']
-//}
+	configurations {
+		provided
+	}
 
 	repositories {
 		mavenLocal()
@@ -70,8 +44,9 @@ allprojects {
 	it.afterEvaluate {
 		if (it.plugins.hasPlugin("kotlin-platform-common")) {
 			dependencies {
-				compile libraries.kotlin_stdlib_common
-				testCompile libraries.kotlin_test_common
+				compile "org.jetbrains.kotlin:kotlin-stdlib-common:$librariesVersion"
+				testCompile "org.jetbrains.kotlin:kotlin-test-common:$librariesVersion"
+				testCompile "org.jetbrains.kotlin:kotlin-test-annotations-common:$librariesVersion"
 			}
 
 			kotlin {
@@ -80,19 +55,27 @@ allprojects {
 		}
 		if (it.plugins.hasPlugin("kotlin-platform-jvm") || it.plugins.hasPlugin("kotlin")) {
 			dependencies {
-				compile libraries.kotlin_stdlib_jvm
-				testCompile libraries.kotlin_test_jvm
+				compile "org.jetbrains.kotlin:kotlin-stdlib:$librariesVersion"
+				testCompile "org.jetbrains.kotlin:kotlin-test:$librariesVersion"
+				testCompile "org.jetbrains.kotlin:kotlin-test-junit:$librariesVersion"
 				testCompile "junit:junit:4.12"
 			}
 
 			kotlin {
 				experimental { coroutines 'enable' }
 			}
+
+			compileJava.options.encoding = 'UTF-8'
+			compileTestJava.options.encoding = 'UTF-8'
+
+			sourceCompatibility = 1.7
+			targetCompatibility = 1.7
 		}
 		if (it.plugins.hasPlugin("kotlin-platform-js") || it.plugins.hasPlugin("kotlin2js")) {
 			dependencies {
-				compile libraries.kotlin_stdlib_js
-				testCompile libraries.kotlin_test_js
+				compile "org.jetbrains.kotlin:kotlin-stdlib-js:$librariesVersion"
+				testCompile "org.jetbrains.kotlin:kotlin-test-js:$librariesVersion"
+				testCompile "org.jetbrains.kotlin:kotlin-test-js:$librariesVersion"
 			}
 
 			kotlin {
@@ -103,18 +86,14 @@ allprojects {
 				kotlinOptions.moduleKind = "umd"
 				kotlinOptions.sourceMap = true
 			}
+
+			compileTestKotlin2Js {
+				kotlinOptions.moduleKind = "umd"
+				kotlinOptions.sourceMap = true
+			}
 		}
 	}
 
-	//dependencies {
-	//	compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
-	//	compile "com.soywiz:korio-core:$korVersion"
-	//	compile "com.soywiz:korim-core:$korVersion"
-	//	compile "com.soywiz:korag-core:$korVersion"
-	//	testCompile "junit:junit:4.11"
-	//}
-
-
 	task javadoc2(type: Javadoc) {
 		failOnError = false
 	}

korui/android/build.gradle

@@ -1,11 +1,8 @@
 apply plugin: 'kotlin-platform-jvm'
 
 dependencies {
-	implement project(":korui-common")
+	expectedBy project(":korui-common")
 
-	compile "com.soywiz:korio-android:$korVersion"
-	compile "com.soywiz:korim-android:$korVersion"
-	compile "com.soywiz:korma-android:$korVersion"
-	compile "com.soywiz:korag-android:$korVersion"
+	compile "com.soywiz:korag-android:$koragVersion"
 	compile "com.google.android:android:4.1.1.4"
 }

korui/common/build.gradle

@@ -1,8 +1,5 @@
 apply plugin: 'kotlin-platform-common'
 
 dependencies {
-	compile "com.soywiz:korio-common:$korVersion"
-	compile "com.soywiz:korim-common:$korVersion"
-	compile "com.soywiz:korma-common:$korVersion"
-	compile "com.soywiz:korag-common:$korVersion"
+	compile "com.soywiz:korag-common:$koragVersion"
 }

korui/js/build.gradle

@@ -1,11 +1,7 @@
 apply plugin: 'kotlin-platform-js'
 
 dependencies {
-	implement project(":korui-common")
+	expectedBy project(":korui-common")
 
-	compile "com.soywiz:korio-js:$korVersion"
-	compile "com.soywiz:korim-js:$korVersion"
-	compile "com.soywiz:korma-js:$korVersion"
-	compile "com.soywiz:korag-js:$korVersion"
-	testCompile libraries.kotlin_test_js
+	compile "com.soywiz:korag-js:$koragVersion"
 }

korui/js/src/main/kotlin/com/soywiz/korui/light/HtmlLightComponents.kt

@@ -7,9 +7,9 @@ import com.soywiz.korim.color.RGBA
 import com.soywiz.korim.format.CanvasNativeImage
 import com.soywiz.korim.format.HtmlImage
 import com.soywiz.korio.coroutine.korioSuspendCoroutine
-import com.soywiz.korio.lang.CancellationException
+import com.soywiz.korio.CancellationException
 import com.soywiz.korio.lang.Closeable
-import com.soywiz.korio.lang.FileNotFoundException
+import com.soywiz.korio.FileNotFoundException
 import com.soywiz.korio.lang.closeable
 import com.soywiz.korio.stream.AsyncStream
 import com.soywiz.korio.stream.AsyncStreamBase

korui/jvm/build.gradle

@@ -1,11 +1,7 @@
 apply plugin: 'kotlin-platform-jvm'
 
 dependencies {
-	implement project(":korui-common")
+	expectedBy project(":korui-common")
 	testImplementation project(":korui-common")
-
-	compile "com.soywiz:korio:$korVersion"
-	compile "com.soywiz:korim:$korVersion"
-	compile "com.soywiz:korma:$korVersion"
-	compile "com.soywiz:korag:$korVersion"
+	compile "com.soywiz:korag:$koragVersion"
 }