diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..fb7f4a8 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..611e7c8 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,17 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..efa4625 --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/kotlinScripting.xml b/.idea/kotlinScripting.xml new file mode 100644 index 0000000..e56386c --- /dev/null +++ b/.idea/kotlinScripting.xml @@ -0,0 +1,9 @@ + + + + + 2147483647 + true + + + \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 0000000..e69de29 diff --git a/.idea/libraries-with-intellij-classes.xml b/.idea/libraries-with-intellij-classes.xml new file mode 100644 index 0000000..9fa3156 --- /dev/null +++ b/.idea/libraries-with-intellij-classes.xml @@ -0,0 +1,65 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 3efbb6e..5d98256 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/XiaoMiTool.iml b/XiaoMiTool.iml deleted file mode 100644 index 45832ae..0000000 --- a/XiaoMiTool.iml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 0f72305..5b14c43 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,6 +12,8 @@ plugins { // Apply the application plugin to add support for building a CLI application. application + id("org.openjfx.javafxplugin") version "0.0.9" + } repositories { @@ -23,10 +25,20 @@ repositories { jcenter() } + +java { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 +} + +javafx { + version = "11.0.2" + modules = listOf("javafx.controls", "javafx.fxml", "javafx.web", "javafx.swing") +} + + tasks.compileJava { options.encoding = "UTF-8" - options.isFork = true - options.forkOptions.javaHome = File("C:\\Program Files (x86)\\Java\\jdk1.8.0_281") } sourceSets { @@ -34,8 +46,6 @@ sourceSets { resources { srcDir("src/main/java") includes.add("**/*.*") - println(srcDirs) - println(includes) } } } @@ -43,10 +53,8 @@ sourceSets { dependencies { - // This dependency is used by the application. - implementation("com.google.guava:guava:29.0-jre") - implementation(files("./lib/apktool_2.4.0.jar")) + implementation("com.google.guava:guava:29.0-jre") implementation("com.google.protobuf:protobuf-java:3.7.0") implementation("com.mortennobel:java-image-scaling:0.8.6") implementation("commons-codec:commons-codec:1.11") @@ -57,9 +65,6 @@ dependencies { implementation("org.apache.httpcomponents:httpclient:4.5.5") implementation("org.json:json:20180130") - - - // Use JUnit test framework testImplementation("junit:junit:4.13") } diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..f79c746 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,2 @@ +org.gradle.jvmargs='-Dfile.encoding=UTF-8' +systemProp.file.encoding=utf-8 \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index 54a3fd3..3c2a118 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -7,4 +7,4 @@ * in the user manual at https://docs.gradle.org/6.5/userguide/multi_project_builds.html */ -rootProject.name = "XiaomiToolV2" +rootProject.name = "XiaomiToolV2" \ No newline at end of file