From ef31487750730a8105a8d9aa3c4c293457686ad5 Mon Sep 17 00:00:00 2001
From: "hanjoongcho\\hanjoong" <hanjoongcho@gmail.com>
Date: Wed, 15 Jan 2020 06:50:59 +0900
Subject: [PATCH] Refactoried build script

---
 app/build.gradle    | 12 +++++++++---
 build.gradle        |  5 ++---
 dependencies.gradle | 16 ----------------
 gradle.properties   |  2 +-
 4 files changed, 12 insertions(+), 23 deletions(-)
 delete mode 100644 dependencies.gradle

diff --git a/app/build.gradle b/app/build.gradle
index e79073c61..b19c56aee 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,10 +1,16 @@
-apply from: '../dependencies.gradle'
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'realm-android'
 
+ext.versions = [
+    /* Temporarily apply 'requestLegacyExternalStorage' options respond to Android Q 'Scoped Storage' policy */
+    compileSdk        : 29,
+    publishVersion    : '1.4.114-beta',
+    publishVersionCode: 180,
+]
+
 android {
     compileSdkVersion versions.compileSdk
 
@@ -21,7 +27,7 @@ android {
     
     defaultConfig {
         applicationId "me.blog.korn123.easydiary"
-        minSdkVersion MIN_SDK_VERSION
+        minSdkVersion 16
         targetSdkVersion versions.compileSdk
         versionCode versions.publishVersionCode
         versionName versions.publishVersion
@@ -123,7 +129,7 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.8.5'
 
     // jetbrains
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$versions.kotlin"
+//    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$versions.kotlin"
 
     // apache commons
     implementation 'commons-io:commons-io:2.6'
diff --git a/build.gradle b/build.gradle
index bcebb4050..f8b7c9f5d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,5 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    apply from: './dependencies.gradle'
     repositories {
         google()
         jcenter()
@@ -9,10 +8,10 @@ buildscript {
     dependencies {
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
-        classpath "com.android.tools.build:gradle:$versions.gradlePlugin" 
+        classpath "com.android.tools.build:gradle:3.3.2"
 //        classpath "io.realm:realm-gradle-plugin:4.2.0"
         classpath "io.realm:realm-gradle-plugin:5.7.1"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlin"  
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.41"
     }
 }
 
diff --git a/dependencies.gradle b/dependencies.gradle
deleted file mode 100644
index d18a9d0ba..000000000
--- a/dependencies.gradle
+++ /dev/null
@@ -1,16 +0,0 @@
-ext.versions = [
-//    minSdk            : 16,
-    /* Temporarily apply 'requestLegacyExternalStorage' options respond to Android Q 'Scoped Storage' policy */
-    compileSdk        : 29,
-    publishVersion    : '1.4.114-beta',
-    publishVersionCode: 180,
-
-    gradlePlugin      : '3.3.2',
-//    spotlessPlugin    : '3.14.0',
-//    versionPlugin     : '0.20.0',
-//    bintrayPlugin     : '0.8.1',
-
-    kotlin            : '1.3.41',
-    supportLib        : '1.0.0-beta01',
-//    gms: "16.0.0"
-]
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index d94e7eefa..ec6378361 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,6 +25,6 @@ LEAK_CANARY_VERSION = 1.5.4
 # Android configuration
 #COMPILE_SDK_VERSION     = android-27
 #TARGET_SDK_VERSION      = 27
-MIN_SDK_VERSION         = 16
+#MIN_SDK_VERSION         = 16
 android.useAndroidX=true
 android.enableJetifier=true