Reorganized multiplatform folders

soywiz-archive · Oct 15, 2017 · 228fa1a · 228fa1a
1 parent 9b3aea5
commit 228fa1a
Show file tree

Hide file tree

Showing 34 changed files with 10 additions and 5 deletions.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Aug 27 17:46:56 CEST 2017
+#Sun Oct 15 02:25:14 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
diff --git a/korui-android/.gitignore → korui/android/.gitignore b/korui-android/.gitignore → korui/android/.gitignore
diff --git a/korui-android/build.gradle → korui/android/build.gradle b/korui-android/build.gradle → korui/android/build.gradle
diff --git a/...kotlin/com/soywiz/korui/KoruiEventLoop.kt → ...kotlin/com/soywiz/korui/KoruiEventLoop.kt b/...kotlin/com/soywiz/korui/KoruiEventLoop.kt → ...kotlin/com/soywiz/korui/KoruiEventLoop.kt
diff --git a/...wiz/korui/light/AndroidLightComponents.kt → ...wiz/korui/light/AndroidLightComponents.kt b/...wiz/korui/light/AndroidLightComponents.kt → ...wiz/korui/light/AndroidLightComponents.kt
diff --git a/...soywiz/korui/light/KoruiAbsoluteLayout.kt → ...soywiz/korui/light/KoruiAbsoluteLayout.kt b/...soywiz/korui/light/KoruiAbsoluteLayout.kt → ...soywiz/korui/light/KoruiAbsoluteLayout.kt
diff --git a/...n/com/soywiz/korui/light/KoruiActivity.kt → ...n/com/soywiz/korui/light/KoruiActivity.kt b/...n/com/soywiz/korui/light/KoruiActivity.kt → ...n/com/soywiz/korui/light/KoruiActivity.kt
diff --git a/korui-common/.gitignore → korui/common/.gitignore b/korui-common/.gitignore → korui/common/.gitignore
diff --git a/korui-common/build.gradle → korui/common/build.gradle b/korui-common/build.gradle → korui/common/build.gradle
diff --git a/...in/kotlin/com/soywiz/korui/Application.kt → ...in/kotlin/com/soywiz/korui/Application.kt b/...in/kotlin/com/soywiz/korui/Application.kt → ...in/kotlin/com/soywiz/korui/Application.kt
diff --git a/...kotlin/com/soywiz/korui/KoruiEventLoop.kt → ...kotlin/com/soywiz/korui/KoruiEventLoop.kt b/...kotlin/com/soywiz/korui/KoruiEventLoop.kt → ...kotlin/com/soywiz/korui/KoruiEventLoop.kt
diff --git a/...rc/main/kotlin/com/soywiz/korui/Screen.kt → ...rc/main/kotlin/com/soywiz/korui/Screen.kt b/...rc/main/kotlin/com/soywiz/korui/Screen.kt → ...rc/main/kotlin/com/soywiz/korui/Screen.kt
diff --git a/...otlin/com/soywiz/korui/geom/len/Length.kt → ...otlin/com/soywiz/korui/geom/len/Length.kt b/...otlin/com/soywiz/korui/geom/len/Length.kt → ...otlin/com/soywiz/korui/geom/len/Length.kt
diff --git a/...tlin/com/soywiz/korui/geom/len/Padding.kt → ...tlin/com/soywiz/korui/geom/len/Padding.kt b/...tlin/com/soywiz/korui/geom/len/Padding.kt → ...tlin/com/soywiz/korui/geom/len/Padding.kt
diff --git a/...lin/com/soywiz/korui/geom/len/Position.kt → ...lin/com/soywiz/korui/geom/len/Position.kt b/...lin/com/soywiz/korui/geom/len/Position.kt → ...lin/com/soywiz/korui/geom/len/Position.kt
diff --git a/.../kotlin/com/soywiz/korui/geom/len/Size.kt → .../kotlin/com/soywiz/korui/geom/len/Size.kt b/.../kotlin/com/soywiz/korui/geom/len/Size.kt → .../kotlin/com/soywiz/korui/geom/len/Size.kt
diff --git a/...in/kotlin/com/soywiz/korui/light/light.kt → ...in/kotlin/com/soywiz/korui/light/light.kt b/...in/kotlin/com/soywiz/korui/light/light.kt → ...in/kotlin/com/soywiz/korui/light/light.kt
diff --git a/...wiz/korui/light/log/LogLightComponents.kt → ...wiz/korui/light/log/LogLightComponents.kt b/...wiz/korui/light/log/LogLightComponents.kt → ...wiz/korui/light/log/LogLightComponents.kt
diff --git a/...in/kotlin/com/soywiz/korui/style/Style.kt → ...in/kotlin/com/soywiz/korui/style/Style.kt b/...in/kotlin/com/soywiz/korui/style/Style.kt → ...in/kotlin/com/soywiz/korui/style/Style.kt
diff --git a/...n/kotlin/com/soywiz/korui/ui/Component.kt → ...n/kotlin/com/soywiz/korui/ui/Component.kt b/...n/kotlin/com/soywiz/korui/ui/Component.kt → ...n/kotlin/com/soywiz/korui/ui/Component.kt
diff --git a/...om/soywiz/korui/ui/ComponentHandlerExt.kt → ...om/soywiz/korui/ui/ComponentHandlerExt.kt b/...om/soywiz/korui/ui/ComponentHandlerExt.kt → ...om/soywiz/korui/ui/ComponentHandlerExt.kt
diff --git a/...main/kotlin/com/soywiz/korui/ui/Layout.kt → ...main/kotlin/com/soywiz/korui/ui/Layout.kt b/...main/kotlin/com/soywiz/korui/ui/Layout.kt → ...main/kotlin/com/soywiz/korui/ui/Layout.kt
diff --git a/...kotlin/com/soywiz/korui/ui/VectorImage.kt → ...kotlin/com/soywiz/korui/ui/VectorImage.kt b/...kotlin/com/soywiz/korui/ui/VectorImage.kt → ...kotlin/com/soywiz/korui/ui/VectorImage.kt
diff --git a/...test/kotlin/com/soywiz/korui/BasicTest.kt → ...test/kotlin/com/soywiz/korui/BasicTest.kt b/...test/kotlin/com/soywiz/korui/BasicTest.kt → ...test/kotlin/com/soywiz/korui/BasicTest.kt
@@ -4,8 +4,8 @@ import com.soywiz.korio.async.EventLoopTest
 import com.soywiz.korio.async.sync
 import com.soywiz.korui.light.log.LogLightComponents
 import com.soywiz.korui.ui.button
-import org.junit.Assert
 import org.junit.Test
+import kotlin.test.assertEquals
 
 class BasicTest {
 	val eventLoop = EventLoopTest()
@@ -21,7 +21,7 @@ class BasicTest {
 		eventLoop.step(60)
 		eventLoop.step(60)
 
-		Assert.assertEquals(
+		assertEquals(
 			"""
 				create(FRAME)=0
 				setProperty(0,LightProperty[TEXT],Title)

diff --git a/korui-js/.gitignore → korui/js/.gitignore b/korui-js/.gitignore → korui/js/.gitignore
diff --git a/korui-js/build.gradle → korui/js/build.gradle b/korui-js/build.gradle → korui/js/build.gradle
diff --git a/...kotlin/com/soywiz/korui/KoruiEventLoop.kt → ...kotlin/com/soywiz/korui/KoruiEventLoop.kt b/...kotlin/com/soywiz/korui/KoruiEventLoop.kt → ...kotlin/com/soywiz/korui/KoruiEventLoop.kt
diff --git a/...soywiz/korui/light/HtmlLightComponents.kt → ...soywiz/korui/light/HtmlLightComponents.kt b/...soywiz/korui/light/HtmlLightComponents.kt → ...soywiz/korui/light/HtmlLightComponents.kt
diff --git a/korui/.gitignore → korui/jvm/.gitignore b/korui/.gitignore → korui/jvm/.gitignore
diff --git a/korui/build.gradle → korui/jvm/build.gradle b/korui/build.gradle → korui/jvm/build.gradle
diff --git a/...kotlin/com/soywiz/korui/KoruiEventLoop.kt → ...kotlin/com/soywiz/korui/KoruiEventLoop.kt b/...kotlin/com/soywiz/korui/KoruiEventLoop.kt → ...kotlin/com/soywiz/korui/KoruiEventLoop.kt
diff --git a/.../soywiz/korui/light/AwtLightComponents.kt → .../soywiz/korui/light/AwtLightComponents.kt b/.../soywiz/korui/light/AwtLightComponents.kt → .../soywiz/korui/light/AwtLightComponents.kt
diff --git a/...in/com/soywiz/korui/light/EventLoopAwt.kt → ...in/com/soywiz/korui/light/EventLoopAwt.kt b/...in/com/soywiz/korui/light/EventLoopAwt.kt → ...in/com/soywiz/korui/light/EventLoopAwt.kt
diff --git a/settings.gradle b/settings.gradle
@@ -5,4 +5,9 @@ include(
 		'korui-android',
 		'korui-js',
 		//'korui-jtransc-example',
-)
+)
+
+project(':korui-common').projectDir = file('korui/common')
+project(':korui').projectDir = file('korui/jvm')
+project(':korui-android').projectDir = file('korui/android')
+project(':korui-js').projectDir = file('korui/js')