From 741f9d20278d6f998b0ddeb289761e9c7ec511f7 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Mon, 5 Aug 2019 01:58:50 +0200
Subject: [PATCH] Revert back from the Kotlin Gradle DSL

Do not use the Kotlin Gradle DSL as F-Droid does not support it:
https://gitlab.com/fdroid/fdroidserver/issues/613
---
 app/build.gradle                       | 28 ++++++++++++++++++
 app/build.gradle.kts                   | 41 --------------------------
 build.gradle.kts => build.gradle       |  5 +++-
 settings.gradle.kts => settings.gradle |  0
 4 files changed, 32 insertions(+), 42 deletions(-)
 create mode 100644 app/build.gradle
 delete mode 100644 app/build.gradle.kts
 rename build.gradle.kts => build.gradle (67%)
 rename settings.gradle.kts => settings.gradle (100%)

diff --git a/app/build.gradle b/app/build.gradle
new file mode 100644
index 0000000..c9b9acf
--- /dev/null
+++ b/app/build.gradle
@@ -0,0 +1,28 @@
+plugins {
+    id 'com.android.application'
+    id 'kotlin-android'
+}
+
+android {
+    compileSdkVersion 28
+
+     defaultConfig {
+        applicationId "com.termux.styling"
+        minSdkVersion 21
+        targetSdkVersion 28
+        versionCode 25
+        versionName "0.25"
+    }
+
+     buildTypes {
+        release {
+            minifyEnabled true
+            shrinkResources true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+        }
+    }
+}
+
+dependencies {
+    implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+}
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
deleted file mode 100644
index d40948f..0000000
--- a/app/build.gradle.kts
+++ /dev/null
@@ -1,41 +0,0 @@
-plugins {
-    id("com.android.application")
-    id("kotlin-android")
-}
-
-val versionCode = 24
-val versionName = "0.$versionCode"
-
-android {
-    compileSdkVersion(28)
-
-    defaultConfig {
-        applicationId = "com.termux.styling"
-        minSdkVersion(21)
-        targetSdkVersion(28)
-        this.versionCode = versionCode
-        this.versionName = versionName
-    }
-
-    buildTypes {
-        getByName("debug") {
-            isShrinkResources = true
-            isMinifyEnabled = true
-            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.txt")
-        }
-    }
-
-    compileOptions {
-        val javaVersion = JavaVersion.VERSION_1_8
-        sourceCompatibility = javaVersion
-        targetCompatibility = javaVersion
-    }
-}
-
-dependencies {
-    implementation(embeddedKotlin("stdlib-jdk8"))
-}
-
-tasks.create("versionName") {
-    doLast { println(versionName) }
-}
diff --git a/build.gradle.kts b/build.gradle
similarity index 67%
rename from build.gradle.kts
rename to build.gradle
index 6ab80c8..80b0f8e 100644
--- a/build.gradle.kts
+++ b/build.gradle
@@ -1,11 +1,14 @@
 buildscript {
+    ext.kotlin_version = '1.3.41'
+
     repositories {
         google()
         jcenter()
     }
+
     dependencies {
         classpath("com.android.tools.build:gradle:3.4.2")
-        classpath(kotlin("gradle-plugin", "1.3.41"))
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
     }
 }
 
diff --git a/settings.gradle.kts b/settings.gradle
similarity index 100%
rename from settings.gradle.kts
rename to settings.gradle