From b51fa679b367d4bb27d50a5bb7df07dd064054c2 Mon Sep 17 00:00:00 2001
From: Francesco Tescari <frat@bendingspoons.com>
Date: Wed, 6 Oct 2021 14:33:35 +0200
Subject: [PATCH] refactor: switch back to groovy

---
 .idea/jarRepositories.xml |  5 +++
 build.gradle              | 58 ++++++++++++++++++++++++++++++
 build.gradle.kts          | 74 ---------------------------------------
 settings.gradle           |  1 +
 settings.gradle.kts       | 10 ------
 5 files changed, 64 insertions(+), 84 deletions(-)
 create mode 100644 build.gradle
 delete mode 100644 build.gradle.kts
 create mode 100644 settings.gradle
 delete mode 100644 settings.gradle.kts

diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index efa4625..b8b7f1c 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -16,5 +16,10 @@
       <option name="name" value="BintrayJCenter" />
       <option name="url" value="https://jcenter.bintray.com/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenRepo" />
+      <option name="name" value="MavenRepo" />
+      <option name="url" value="https://repo.maven.apache.org/maven2/" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..6585efd
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,58 @@
+plugins {
+    id 'application'
+    id 'org.openjfx.javafxplugin' version '0.0.9'
+}
+
+
+repositories {
+    flatDir {
+        dirs("lib")
+    }
+    mavenCentral()
+}
+
+sourceSets {
+    main {
+        resources {
+            srcDir("src/main/java")
+            includes.add("**/*.*")
+        }
+    }
+}
+
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
+}
+
+javafx {
+    version = '11'
+    modules = ["javafx.controls", "javafx.fxml", "javafx.web", "javafx.swing"]
+}
+
+dependencies {
+    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'
+    implementation 'commons-io:commons-io:2.6'
+    implementation 'commons-logging:commons-logging:1.2'
+    implementation 'org.apache.commons:commons-compress:1.17'
+    implementation 'org.apache.commons:commons-lang3:3.7'
+    implementation 'org.apache.httpcomponents:httpclient:4.5.5'
+    implementation 'org.json:json:20180130'
+}
+
+tasks.compileJava {
+    options.encoding = "UTF-8"
+}
+
+
+application {
+    // Define the main class for the application.
+    mainClassName = "com.xiaomitool.v2.gui.MainWindow"
+}
+
+
diff --git a/build.gradle.kts b/build.gradle.kts
deleted file mode 100644
index 5b14c43..0000000
--- a/build.gradle.kts
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * This file was generated by the Gradle 'init' task.
- *
- * This generated file contains a sample Java project to get you started.
- * For more details take a look at the Java Quickstart chapter in the Gradle
- * User Manual available at https://docs.gradle.org/6.5/userguide/tutorial_java_projects.html
- */
-
-plugins {
-    // Apply the java plugin to add support for Java
-    java
-
-    // Apply the application plugin to add support for building a CLI application.
-    application
-    id("org.openjfx.javafxplugin") version "0.0.9"
-
-}
-
-repositories {
-    // Use jcenter for resolving dependencies.
-    // You can declare any Maven/Ivy/file repository here.
-    flatDir {
-        dirs("lib")
-    }
-    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"
-}
-
-sourceSets {
-    main {
-        resources {
-            srcDir("src/main/java")
-            includes.add("**/*.*")
-        }
-    }
-}
-
-
-
-dependencies {
-    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")
-    implementation("commons-io:commons-io:2.6")
-    implementation("commons-logging:commons-logging:1.2")
-    implementation("org.apache.commons:commons-compress:1.17")
-    implementation("org.apache.commons:commons-lang3:3.7")
-    implementation("org.apache.httpcomponents:httpclient:4.5.5")
-    implementation("org.json:json:20180130")
-
-    testImplementation("junit:junit:4.13")
-}
-
-application {
-    // Define the main class for the application.
-    mainClassName = "com.xiaomitool.v2.gui.MainWindow"
-}
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..f663655
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = "XiaomiToolV2"
diff --git a/settings.gradle.kts b/settings.gradle.kts
deleted file mode 100644
index 3c2a118..0000000
--- a/settings.gradle.kts
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * This file was generated by the Gradle 'init' task.
- *
- * The settings file is used to specify which projects to include in your build.
- *
- * Detailed information about configuring a multi-project build in Gradle can be found
- * in the user manual at https://docs.gradle.org/6.5/userguide/multi_project_builds.html
- */
-
-rootProject.name = "XiaomiToolV2"
\ No newline at end of file