diff --git a/app/build.gradle b/app/build.gradle index ce758c2..2cbb1be 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,13 +3,13 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' android { - compileSdkVersion versions.compile_sdk + compileSdkVersion Versions.compile_sdk defaultConfig { applicationId "com.handstandsam.androiddependencymanagement" - minSdkVersion versions.min_sdk - targetSdkVersion versions.target_sdk - versionCode versions.version_code - versionName versions.version_name + minSdkVersion Versions.min_sdk + targetSdkVersion Versions.target_sdk + versionCode Versions.version_code + versionName Versions.version_name testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } buildTypes { @@ -22,11 +22,11 @@ android { dependencies { implementation project(":module_a") implementation project(":module_b") - implementation deps.app_compat_v7 - implementation deps.support_v4 - implementation deps.design - implementation deps.recyclerview_v7 - implementation deps.kotlin_stdlib + 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 1a1fd45..4b98f9c 100644 --- a/build.gradle +++ b/build.gradle @@ -2,41 +2,13 @@ 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 deps.kotlin_gradle_plugin + classpath Deps.android_gradle_plugin + 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/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts new file mode 100644 index 0000000..46f9c3f --- /dev/null +++ b/buildSrc/build.gradle.kts @@ -0,0 +1,3 @@ +plugins { + `kotlin-dsl` +} \ No newline at end of file diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt new file mode 100644 index 0000000..c3f3dcb --- /dev/null +++ b/buildSrc/src/main/java/Dependencies.kt @@ -0,0 +1,25 @@ +object Versions { + val kotlin = "1.2.21" + val support_lib = "26.1.0" + val retrofit = "2.3.0" + val rxjava = "2.1.9" + val min_sdk = 21 + val target_sdk = 26 + val compile_sdk = 26 + val version_code = 1 + val version_name = "1.0" + val android_gradle_plugin = "3.0.1" +} + +object Deps { + val kotlin_stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${Versions.kotlin}" + val kotlin_gradle_plugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}" + val app_compat_v7 = "com.android.support:appcompat-v7:${Versions.support_lib}" + val support_v4 = "com.android.support:support-v4:${Versions.support_lib}" + val design = "com.android.support:design:${Versions.support_lib}" + val recyclerview_v7 = "com.android.support:recyclerview-v7:${Versions.support_lib}" + val retrofit = "com.squareup.retrofit2:retrofit:${Versions.retrofit}" + val retrofit_rxjava = "com.squareup.retrofit2:adapter-rxjava2:${Versions.retrofit}" + val rxjava = "io.reactivex.rxjava2:rxjava:${Versions.rxjava}" + val android_gradle_plugin = "com.android.tools.build:gradle:${Versions.android_gradle_plugin}" +} \ No newline at end of file diff --git a/module_a/build.gradle b/module_a/build.gradle index dab239f..3bd8fa1 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 versions.compile_sdk + compileSdkVersion Versions.compile_sdk defaultConfig { - minSdkVersion versions.min_sdk - targetSdkVersion versions.target_sdk - versionCode versions.version_code - versionName versions.version_name + minSdkVersion Versions.min_sdk + targetSdkVersion Versions.target_sdk + versionCode Versions.version_code + versionName Versions.version_name testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } @@ -21,14 +21,14 @@ android { } dependencies { - 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 + 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 1644996..26d60a0 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 versions.compile_sdk + compileSdkVersion Versions.compile_sdk defaultConfig { - minSdkVersion versions.min_sdk - targetSdkVersion versions.target_sdk - versionCode versions.version_code - versionName versions.version_name + minSdkVersion Versions.min_sdk + targetSdkVersion Versions.target_sdk + versionCode Versions.version_code + versionName Versions.version_name testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } @@ -21,11 +21,11 @@ android { } dependencies { - implementation deps.app_compat_v7 - implementation deps.support_v4 - implementation deps.design - implementation deps.recyclerview_v7 - implementation deps.kotlin_stdlib + implementation Deps.app_compat_v7 + implementation Deps.support_v4 + implementation Deps.design + implementation Deps.recyclerview_v7 + implementation Deps.kotlin_stdlib } repositories { mavenCentral()