diff --git a/korui-android-example/.gitignore b/@old/korui-android-example/.gitignore similarity index 100% rename from korui-android-example/.gitignore rename to @old/korui-android-example/.gitignore diff --git a/korui-android-example/app/.gitignore b/@old/korui-android-example/app/.gitignore similarity index 100% rename from korui-android-example/app/.gitignore rename to @old/korui-android-example/app/.gitignore diff --git a/korui-android-example/app/build.gradle b/@old/korui-android-example/app/build.gradle similarity index 100% rename from korui-android-example/app/build.gradle rename to @old/korui-android-example/app/build.gradle diff --git a/korui-android-example/app/proguard-rules.pro b/@old/korui-android-example/app/proguard-rules.pro similarity index 100% rename from korui-android-example/app/proguard-rules.pro rename to @old/korui-android-example/app/proguard-rules.pro diff --git a/korui-android-example/app/src/androidTest/java/korui/soywiz/com/koruiandroidexample1/ExampleInstrumentedTest.java b/@old/korui-android-example/app/src/androidTest/java/korui/soywiz/com/koruiandroidexample1/ExampleInstrumentedTest.java similarity index 100% rename from korui-android-example/app/src/androidTest/java/korui/soywiz/com/koruiandroidexample1/ExampleInstrumentedTest.java rename to @old/korui-android-example/app/src/androidTest/java/korui/soywiz/com/koruiandroidexample1/ExampleInstrumentedTest.java diff --git a/korui-android-example/app/src/main/AndroidManifest.xml b/@old/korui-android-example/app/src/main/AndroidManifest.xml similarity index 100% rename from korui-android-example/app/src/main/AndroidManifest.xml rename to @old/korui-android-example/app/src/main/AndroidManifest.xml diff --git a/korui-android-example/app/src/main/assets/kotlin.png b/@old/korui-android-example/app/src/main/assets/kotlin.png similarity index 100% rename from korui-android-example/app/src/main/assets/kotlin.png rename to @old/korui-android-example/app/src/main/assets/kotlin.png diff --git a/korui-android-example/app/src/main/assets/sound.mp3 b/@old/korui-android-example/app/src/main/assets/sound.mp3 similarity index 100% rename from korui-android-example/app/src/main/assets/sound.mp3 rename to @old/korui-android-example/app/src/main/assets/sound.mp3 diff --git a/korui-android-example/app/src/main/java/korui/soywiz/com/koruiandroidexample1/MainActivity.kt b/@old/korui-android-example/app/src/main/java/korui/soywiz/com/koruiandroidexample1/MainActivity.kt similarity index 100% rename from korui-android-example/app/src/main/java/korui/soywiz/com/koruiandroidexample1/MainActivity.kt rename to @old/korui-android-example/app/src/main/java/korui/soywiz/com/koruiandroidexample1/MainActivity.kt diff --git a/korui-android-example/app/src/main/res/layout/activity_main.xml b/@old/korui-android-example/app/src/main/res/layout/activity_main.xml similarity index 100% rename from korui-android-example/app/src/main/res/layout/activity_main.xml rename to @old/korui-android-example/app/src/main/res/layout/activity_main.xml diff --git a/korui-android-example/app/src/main/res/mipmap-hdpi/ic_launcher.png b/@old/korui-android-example/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from korui-android-example/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to @old/korui-android-example/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/korui-android-example/app/src/main/res/mipmap-mdpi/ic_launcher.png b/@old/korui-android-example/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from korui-android-example/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to @old/korui-android-example/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/korui-android-example/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/@old/korui-android-example/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from korui-android-example/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to @old/korui-android-example/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/korui-android-example/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/@old/korui-android-example/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from korui-android-example/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to @old/korui-android-example/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/korui-android-example/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/@old/korui-android-example/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from korui-android-example/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to @old/korui-android-example/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/korui-android-example/app/src/main/res/values-w820dp/dimens.xml b/@old/korui-android-example/app/src/main/res/values-w820dp/dimens.xml similarity index 100% rename from korui-android-example/app/src/main/res/values-w820dp/dimens.xml rename to @old/korui-android-example/app/src/main/res/values-w820dp/dimens.xml diff --git a/korui-android-example/app/src/main/res/values/colors.xml b/@old/korui-android-example/app/src/main/res/values/colors.xml similarity index 100% rename from korui-android-example/app/src/main/res/values/colors.xml rename to @old/korui-android-example/app/src/main/res/values/colors.xml diff --git a/korui-android-example/app/src/main/res/values/dimens.xml b/@old/korui-android-example/app/src/main/res/values/dimens.xml similarity index 100% rename from korui-android-example/app/src/main/res/values/dimens.xml rename to @old/korui-android-example/app/src/main/res/values/dimens.xml diff --git a/korui-android-example/app/src/main/res/values/strings.xml b/@old/korui-android-example/app/src/main/res/values/strings.xml similarity index 100% rename from korui-android-example/app/src/main/res/values/strings.xml rename to @old/korui-android-example/app/src/main/res/values/strings.xml diff --git a/korui-android-example/app/src/main/res/values/styles.xml b/@old/korui-android-example/app/src/main/res/values/styles.xml similarity index 100% rename from korui-android-example/app/src/main/res/values/styles.xml rename to @old/korui-android-example/app/src/main/res/values/styles.xml diff --git a/korui-android-example/app/src/test/java/korui/soywiz/com/koruiandroidexample1/ExampleUnitTest.java b/@old/korui-android-example/app/src/test/java/korui/soywiz/com/koruiandroidexample1/ExampleUnitTest.java similarity index 100% rename from korui-android-example/app/src/test/java/korui/soywiz/com/koruiandroidexample1/ExampleUnitTest.java rename to @old/korui-android-example/app/src/test/java/korui/soywiz/com/koruiandroidexample1/ExampleUnitTest.java diff --git a/korui-android-example/build.gradle b/@old/korui-android-example/build.gradle similarity index 100% rename from korui-android-example/build.gradle rename to @old/korui-android-example/build.gradle diff --git a/korui-android-example/gradle.properties b/@old/korui-android-example/gradle.properties similarity index 95% rename from korui-android-example/gradle.properties rename to @old/korui-android-example/gradle.properties index e683122a..631da914 100644 --- a/korui-android-example/gradle.properties +++ b/@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 diff --git a/korui-android-example/gradle/wrapper/gradle-wrapper.jar b/@old/korui-android-example/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from korui-android-example/gradle/wrapper/gradle-wrapper.jar rename to @old/korui-android-example/gradle/wrapper/gradle-wrapper.jar diff --git a/korui-android-example/gradle/wrapper/gradle-wrapper.properties b/@old/korui-android-example/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from korui-android-example/gradle/wrapper/gradle-wrapper.properties rename to @old/korui-android-example/gradle/wrapper/gradle-wrapper.properties diff --git a/korui-android-example/gradlew b/@old/korui-android-example/gradlew similarity index 100% rename from korui-android-example/gradlew rename to @old/korui-android-example/gradlew diff --git a/korui-android-example/gradlew.bat b/@old/korui-android-example/gradlew.bat similarity index 96% rename from korui-android-example/gradlew.bat rename to @old/korui-android-example/gradlew.bat index aec99730..8a0b282a 100644 --- a/korui-android-example/gradlew.bat +++ b/@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 diff --git a/korui-android-example/settings.gradle b/@old/korui-android-example/settings.gradle similarity index 100% rename from korui-android-example/settings.gradle rename to @old/korui-android-example/settings.gradle diff --git a/korui-jtransc-example/.gitignore b/@old/korui-jtransc-example/.gitignore similarity index 100% rename from korui-jtransc-example/.gitignore rename to @old/korui-jtransc-example/.gitignore diff --git a/korui-jtransc-example/build.gradle b/@old/korui-jtransc-example/build.gradle similarity index 100% rename from korui-jtransc-example/build.gradle rename to @old/korui-jtransc-example/build.gradle diff --git a/korui-jtransc-example/src/main/kotlin/KotlinLogoSvg.kt b/@old/korui-jtransc-example/src/main/kotlin/KotlinLogoSvg.kt similarity index 100% rename from korui-jtransc-example/src/main/kotlin/KotlinLogoSvg.kt rename to @old/korui-jtransc-example/src/main/kotlin/KotlinLogoSvg.kt diff --git a/korui-jtransc-example/src/main/kotlin/Sample1.kt b/@old/korui-jtransc-example/src/main/kotlin/Sample1.kt similarity index 100% rename from korui-jtransc-example/src/main/kotlin/Sample1.kt rename to @old/korui-jtransc-example/src/main/kotlin/Sample1.kt diff --git a/korui-jtransc-example/src/main/kotlin/Sample2.kt b/@old/korui-jtransc-example/src/main/kotlin/Sample2.kt similarity index 100% rename from korui-jtransc-example/src/main/kotlin/Sample2.kt rename to @old/korui-jtransc-example/src/main/kotlin/Sample2.kt diff --git a/korui-jtransc-example/src/main/kotlin/Sample3.kt b/@old/korui-jtransc-example/src/main/kotlin/Sample3.kt similarity index 100% rename from korui-jtransc-example/src/main/kotlin/Sample3.kt rename to @old/korui-jtransc-example/src/main/kotlin/Sample3.kt diff --git a/korui-jtransc-example/src/main/kotlin/Sample4.kt b/@old/korui-jtransc-example/src/main/kotlin/Sample4.kt similarity index 100% rename from korui-jtransc-example/src/main/kotlin/Sample4.kt rename to @old/korui-jtransc-example/src/main/kotlin/Sample4.kt diff --git a/korui-jtransc-example/src/main/kotlin/Sample5.kt b/@old/korui-jtransc-example/src/main/kotlin/Sample5.kt similarity index 100% rename from korui-jtransc-example/src/main/kotlin/Sample5.kt rename to @old/korui-jtransc-example/src/main/kotlin/Sample5.kt diff --git a/korui-jtransc-example/src/main/kotlin/Sample6.kt b/@old/korui-jtransc-example/src/main/kotlin/Sample6.kt similarity index 100% rename from korui-jtransc-example/src/main/kotlin/Sample6.kt rename to @old/korui-jtransc-example/src/main/kotlin/Sample6.kt diff --git a/korui-jtransc-example/src/main/kotlin/SampleAg.kt b/@old/korui-jtransc-example/src/main/kotlin/SampleAg.kt similarity index 100% rename from korui-jtransc-example/src/main/kotlin/SampleAg.kt rename to @old/korui-jtransc-example/src/main/kotlin/SampleAg.kt diff --git a/korui-jtransc-example/src/main/kotlin/SampleSvg.kt b/@old/korui-jtransc-example/src/main/kotlin/SampleSvg.kt similarity index 100% rename from korui-jtransc-example/src/main/kotlin/SampleSvg.kt rename to @old/korui-jtransc-example/src/main/kotlin/SampleSvg.kt diff --git a/korui-jtransc-example/src/main/kotlin/SampleTe.kt b/@old/korui-jtransc-example/src/main/kotlin/SampleTe.kt similarity index 100% rename from korui-jtransc-example/src/main/kotlin/SampleTe.kt rename to @old/korui-jtransc-example/src/main/kotlin/SampleTe.kt diff --git a/korui-jtransc-example/src/main/kotlin/experiments/Experiment.kt b/@old/korui-jtransc-example/src/main/kotlin/experiments/Experiment.kt similarity index 100% rename from korui-jtransc-example/src/main/kotlin/experiments/Experiment.kt rename to @old/korui-jtransc-example/src/main/kotlin/experiments/Experiment.kt diff --git a/korui-jtransc-example/src/main/kotlin/experiments/SimpleSwingBrowser.java b/@old/korui-jtransc-example/src/main/kotlin/experiments/SimpleSwingBrowser.java similarity index 100% rename from korui-jtransc-example/src/main/kotlin/experiments/SimpleSwingBrowser.java rename to @old/korui-jtransc-example/src/main/kotlin/experiments/SimpleSwingBrowser.java diff --git a/korui-jtransc-example/src/main/resources/index.html b/@old/korui-jtransc-example/src/main/resources/index.html similarity index 100% rename from korui-jtransc-example/src/main/resources/index.html rename to @old/korui-jtransc-example/src/main/resources/index.html diff --git a/korui-jtransc-example/src/main/resources/kotlin.png b/@old/korui-jtransc-example/src/main/resources/kotlin.png similarity index 100% rename from korui-jtransc-example/src/main/resources/kotlin.png rename to @old/korui-jtransc-example/src/main/resources/kotlin.png diff --git a/build.gradle b/build.gradle index 48af21e8..6ae804a5 100644 --- a/build.gradle +++ b/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 } diff --git a/gradle.properties b/gradle.properties deleted file mode 100644 index f359e99f..00000000 --- a/gradle.properties +++ /dev/null @@ -1,2 +0,0 @@ -korVersion=0.14.0 -kotlinVersion=1.2.0-beta-31 diff --git a/korui/android/build.gradle b/korui/android/build.gradle index 861c337a..e34e2287 100644 --- a/korui/android/build.gradle +++ b/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" } diff --git a/korui/common/build.gradle b/korui/common/build.gradle index 547f9651..a72cce4b 100644 --- a/korui/common/build.gradle +++ b/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" } diff --git a/korui/js/build.gradle b/korui/js/build.gradle index e3764c91..5524cc51 100644 --- a/korui/js/build.gradle +++ b/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" } diff --git a/korui/js/src/main/kotlin/com/soywiz/korui/light/HtmlLightComponents.kt b/korui/js/src/main/kotlin/com/soywiz/korui/light/HtmlLightComponents.kt index b69372a3..a101c0ed 100644 --- a/korui/js/src/main/kotlin/com/soywiz/korui/light/HtmlLightComponents.kt +++ b/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 diff --git a/korui/jvm/build.gradle b/korui/jvm/build.gradle index 7433218c..28cf2d03 100644 --- a/korui/jvm/build.gradle +++ b/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" }