migrate

build.gradle

@@ -0,0 +1,48 @@
+group 'org.frice'
+version '1.0'
+
+allprojects {
+	repositories {
+		maven { url 'https://jitpack.io' }
+	}
+}
+
+buildscript {
+	ext.kotlin_version = '1.1.60'
+	repositories {
+		mavenCentral()
+	}
+	dependencies {
+		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+	}
+}
+
+apply plugin: 'java'
+apply plugin: 'kotlin'
+
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
+
+repositories {
+	mavenCentral()
+}
+
+sourceSets {
+	main.kotlin.srcDirs += 'demo'
+	main.java.srcDirs += 'demo'
+}
+
+dependencies {
+	compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
+	compile group: 'org.jetbrains', name: 'annotations', version: '15.0'
+	compile 'com.github.icela:FriceEngine:v1.6.0-1'
+
+	testCompile group: 'junit', name: 'junit', version: '4.12'
+	testCompile "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
+}
+
+task fatJar(type: Jar) {
+	baseName = project.name + '-all'
+	from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
+	with jar
+}

demo/Demo16.kt

@@ -11,8 +11,8 @@ import org.frice.resource.image.ImageResource
 import org.frice.resource.image.WebImageResource
 import org.frice.utils.message.FDialog
 import org.frice.utils.message.FLog
-import org.frice.utils.misc.unless
 import org.frice.utils.shape.FRectangle
+import org.frice.utils.unless
 import java.awt.MouseInfo
 import java.util.*
 

demo/Demo19.kt

@@ -1,8 +1,6 @@
 import org.frice.platform.adapter.JvmImage
-import org.frice.utils.data.image2File
+import org.frice.utils.*
 import org.frice.utils.message.FLog
-import org.frice.utils.misc.forceRun
-import org.frice.utils.web.*
 import java.util.*
 
 /**

demo/Demo7.java

@@ -1,12 +1,14 @@
 import org.frice.Game;
-import org.frice.anim.move.*;
+import org.frice.anim.move.AccelerateMove;
+import org.frice.anim.move.SimpleMove;
 import org.frice.obj.SideEffect;
 import org.frice.obj.sub.ShapeObject;
 import org.frice.platform.adapter.JvmImage;
 import org.frice.resource.graphics.ColorResource;
-import org.frice.utils.data.FileUtils;
+import org.frice.utils.FileUtils;
 import org.frice.utils.message.FDialog;
-import org.frice.utils.shape.*;
+import org.frice.utils.shape.FCircle;
+import org.frice.utils.shape.FRectangle;
 import org.frice.utils.time.FTimer;
 
 import static org.frice.Initializer.launch;

settings.gradle

@@ -0,0 +1 @@
+rootProject.name = 'demos'