From fab767da9de0c6dccbb999385d22e3b31e79d767 Mon Sep 17 00:00:00 2001 From: "Sam (@HandstandSam) Edwards" Date: Fri, 9 Feb 2018 10:21:36 -0500 Subject: [PATCH 1/4] Using Gradle ext --- app/build.gradle | 20 ++++++++++---------- build.gradle | 31 ++++++++++++++++++++++++++++++- module_a/build.gradle | 26 +++++++++++++------------- module_b/build.gradle | 20 ++++++++++---------- 4 files changed, 63 insertions(+), 34 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index bffab35..a572dec 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,13 +3,13 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' android { - compileSdkVersion 26 + compileSdkVersion versions.compile_sdk defaultConfig { applicationId "com.handstandsam.androiddependencymanagement" - minSdkVersion 21 - targetSdkVersion 26 - versionCode 1 - versionName "1.0" + minSdkVersion versions.min_sdk + targetSdkVersion versions.target_sdk + versionCode versions.version_code + versionName versions.vesion_name testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } buildTypes { @@ -22,11 +22,11 @@ android { dependencies { implementation project(":module_a") implementation project(":module_b") - implementation "com.android.support:appcompat-v7:26.1.0" - implementation "com.android.support:support-v4:26.1.0" - implementation "com.android.support:design:26.1.0" - implementation "com.android.support:recyclerview-v7:26.1.0" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.21" + implementation deps.app_compat_v7 + implementation deps.support_v4 + implementation deps.design + implementation deps.recyclerview_v7 + implementation deps.kotlin_stdlib } repositories { mavenCentral() diff --git a/build.gradle b/build.gradle index 715e895..1a1fd45 100644 --- a/build.gradle +++ b/build.gradle @@ -1,13 +1,42 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { + + ext.versions = [ + "kotlin" : "1.2.21", + "support_lib" : "26.1.0", + "retrofit" : "2.3.0", + "rxjava" : "2.1.9", + "min_sdk" : 21, + "target_sdk" : 26, + "compile_sdk" : 26, + "version_code": 1, + "version_name": "1.0" + ] + + ext.deps = [ + "kotlin_gradle_plugin": "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}", + "kotlin_stdlib" : "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}", + + //Support Library + "app_compat_v7" : "com.android.support:appcompat-v7:${versions.support_lib}", + "support_v4" : "com.android.support:support-v4:${versions.support_lib}", + "design" : "com.android.support:design:${versions.support_lib}", + "recyclerview_v7" : "com.android.support:recyclerview-v7:${versions.support_lib}", + + + "retrofit" : "com.squareup.retrofit2:retrofit:${versions.retrofit}", + "retrofit_rxjava" : "com.squareup.retrofit2:adapter-rxjava2:${versions.retrofit}", + "rxjava" : "io.reactivex.rxjava2:rxjava:${versions.rxjava}" + ] + repositories { google() jcenter() } dependencies { classpath 'com.android.tools.build:gradle:3.0.1' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.21" + classpath deps.kotlin_gradle_plugin // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/module_a/build.gradle b/module_a/build.gradle index f79a8ed..21e47b5 100644 --- a/module_a/build.gradle +++ b/module_a/build.gradle @@ -2,13 +2,13 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' android { - compileSdkVersion 26 + compileSdkVersion versions.compile_sdk defaultConfig { - minSdkVersion 21 - targetSdkVersion 26 - versionCode 1 - versionName "1.0" + minSdkVersion versions.min_sdk + targetSdkVersion versions.target_sdk + versionCode versions.version_code + versionName versions.vesion_name testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } @@ -21,14 +21,14 @@ android { } dependencies { - implementation "com.android.support:appcompat-v7:26.1.0" - implementation "com.android.support:support-v4:26.1.0" - implementation "com.android.support:design:26.1.0" - implementation "com.android.support:recyclerview-v7:26.1.0" - implementation "com.squareup.retrofit2:retrofit:2.3.0" - implementation "com.squareup.retrofit2:adapter-rxjava2:2.3.0" - implementation "io.reactivex.rxjava2:rxjava:2.1.9" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.21" + implementation deps.app_compat_v7 + implementation deps.support_v4 + implementation deps.design + implementation deps.recyclerview_v7 + implementation deps.retrofit + implementation deps.retrofit_rxjava + implementation deps.rxjava + implementation deps.kotlin_stdlib } repositories { mavenCentral() diff --git a/module_b/build.gradle b/module_b/build.gradle index 6ef54dc..877bc8f 100644 --- a/module_b/build.gradle +++ b/module_b/build.gradle @@ -2,13 +2,13 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' android { - compileSdkVersion 26 + compileSdkVersion versions.compile_sdk defaultConfig { - minSdkVersion 21 - targetSdkVersion 26 - versionCode 1 - versionName "1.0" + minSdkVersion versions.min_sdk + targetSdkVersion versions.target_sdk + versionCode versions.version_code + versionName versions.vesion_name testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } @@ -21,11 +21,11 @@ android { } dependencies { - implementation "com.android.support:appcompat-v7:26.1.0" - implementation "com.android.support:support-v4:26.1.0" - implementation "com.android.support:design:26.1.0" - implementation "com.android.support:recyclerview-v7:26.1.0" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.21" + implementation deps.app_compat_v7 + implementation deps.support_v4 + implementation deps.design + implementation deps.recyclerview_v7 + implementation deps.kotlin_stdlib } repositories { mavenCentral() From 37c2a5d66f9055ca2784b56e19f869a74ba48f90 Mon Sep 17 00:00:00 2001 From: Sam Edwards Date: Fri, 9 Feb 2018 11:16:29 -0500 Subject: [PATCH 2/4] Update build.gradle --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index a572dec..ce758c2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,7 +9,7 @@ android { minSdkVersion versions.min_sdk targetSdkVersion versions.target_sdk versionCode versions.version_code - versionName versions.vesion_name + versionName versions.version_name testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } buildTypes { From c75c6906dc6b8e54c7a7e001f83738d7e949f16a Mon Sep 17 00:00:00 2001 From: Sam Edwards Date: Fri, 9 Feb 2018 11:16:49 -0500 Subject: [PATCH 3/4] Update build.gradle --- module_a/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module_a/build.gradle b/module_a/build.gradle index 21e47b5..dab239f 100644 --- a/module_a/build.gradle +++ b/module_a/build.gradle @@ -8,7 +8,7 @@ android { minSdkVersion versions.min_sdk targetSdkVersion versions.target_sdk versionCode versions.version_code - versionName versions.vesion_name + versionName versions.version_name testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } From b013ae165d7d0f978ef5b6d658410f40f059cad0 Mon Sep 17 00:00:00 2001 From: Sam Edwards Date: Fri, 9 Feb 2018 11:17:34 -0500 Subject: [PATCH 4/4] Update build.gradle --- module_b/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module_b/build.gradle b/module_b/build.gradle index 877bc8f..1644996 100644 --- a/module_b/build.gradle +++ b/module_b/build.gradle @@ -8,7 +8,7 @@ android { minSdkVersion versions.min_sdk targetSdkVersion versions.target_sdk versionCode versions.version_code - versionName versions.vesion_name + versionName versions.version_name testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" }