Refactoried build script

h0n3ycl0ud · Jan 14, 2020 · ef31487 · ef31487
1 parent 7af4b7c
commit ef31487
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 23 deletions.
diff --git 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
@@ -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
diff --git 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