Skip to content

Commit 24fa606

Browse files
authored
Merge pull request #112 from EbenezerGH/cleanup-dependency-tree
pull out versions to seperate gradle file
2 parents 95082ff + 1a3041d commit 24fa606

File tree

4 files changed

+59
-32
lines changed

4 files changed

+59
-32
lines changed

build.gradle

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.2.30'
4+
apply from: "${project.rootDir}/versions.gradle"
5+
56
repositories {
67
google()
78
jcenter()
89
}
910
dependencies {
10-
classpath 'com.android.tools.build:gradle:3.0.1'
11-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
11+
classpath "com.android.tools.build:gradle:$project.android_gradle_version"
12+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$project.kotlin_plugin_version"
1213

1314
// NOTE: Do not place your application dependencies here; they belong
1415
// in the individual module build.gradle files

etherscanapi/build.gradle

+22-27
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,25 @@ apply plugin: 'com.android.library'
22
apply plugin: 'kotlin-android'
33

44
android {
5-
compileSdkVersion 26
5+
compileSdkVersion project.compile_sdk_version
66

77
defaultConfig {
8-
minSdkVersion 14
9-
targetSdkVersion 26
10-
versionCode 1
11-
versionName "1.0.0"
8+
minSdkVersion project.min_sdk
9+
targetSdkVersion project.target_sdk_version
10+
versionCode project.version_code
11+
versionName project.version_name
1212

1313
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
1414
}
1515

1616
buildTypes {
1717
release {
18-
minifyEnabled false
18+
minifyEnabled true
1919
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
2020
}
21+
debug {
22+
minifyEnabled false
23+
}
2124
}
2225

2326
}
@@ -26,33 +29,25 @@ android {
2629
dependencies {
2730
implementation fileTree(include: ['*.jar'], dir: 'libs')
2831

29-
/**
30-
Because RxAndroid releases are few and far between, it is recommended you also
31-
explicitly depend on RxKotlin's latest version for bug fixes and new features.
32-
*/
33-
implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
34-
implementation 'io.reactivex.rxjava2:rxkotlin:2.2.0'
32+
// kotlin
33+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$project.kotlin_version"
34+
35+
// rx
36+
implementation "io.reactivex.rxjava2:rxkotlin:$project.reactivex_rxjava2_rxkotlin_version"
3537

3638
// gson
37-
implementation 'com.google.code.gson:gson:2.8.2'
39+
implementation "com.google.code.gson:gson:$project.gson_version"
3840

3941
// retrofit
40-
implementation 'com.squareup.retrofit2:retrofit:2.4.0'
41-
implementation 'com.squareup.retrofit2:converter-gson:2.4.0'
42-
implementation 'com.squareup.retrofit2:adapter-rxjava2:2.4.0'
43-
44-
// kotlin
45-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
46-
47-
// timber
48-
implementation 'com.jakewharton.timber:timber:4.7.0'
42+
implementation "com.squareup.retrofit2:retrofit:$project.retrofit2_core_version"
43+
implementation "com.squareup.retrofit2:converter-gson:$project.retrofit2_converter_gson_version"
44+
implementation "com.squareup.retrofit2:adapter-rxjava2:$project.retrofit2_adapter_version"
4945

5046
// tests
51-
testImplementation 'junit:junit:4.12'
52-
testImplementation 'org.mockito:mockito-core:2.17.0'
53-
testImplementation 'com.squareup.okhttp3:mockwebserver:3.10.0'
54-
testImplementation 'com.android.support.test:runner:1.0.1'
55-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
47+
testImplementation "junit:junit:$project.junit_version"
48+
testImplementation "org.mockito:mockito-core:$project.mockito_core_version"
49+
testImplementation "com.squareup.okhttp3:mockwebserver:$project.mockwebserver_version"
50+
androidTestImplementation "com.android.support.test.espresso:espresso-core:$project.espresso_core_version"
5651

5752
repositories {
5853
mavenCentral()
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Apr 11 19:07:44 EDT 2018
1+
#Thu Jun 14 15:26:50 EDT 2018
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

versions.gradle

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
ext {
2+
min_sdk = 15
3+
target_sdk_version = 26
4+
compile_sdk_version = 26
5+
build_tools_version = "27.0.3"
6+
version_code= 1
7+
version_name = "1.0.0"
8+
9+
10+
// plugins
11+
android_gradle_version = "3.1.3"
12+
kotlin_plugin_version = "1.2.30"
13+
14+
15+
// libs
16+
kotlin_version = "1.2.31"
17+
gson_version = "2.8.2"
18+
retrofit2_core_version = "2.4.0"
19+
retrofit2_converter_gson_version = "2.4.0"
20+
retrofit2_adapter_version = "2.4.0"
21+
reactivex_rxjava2_rxkotlin_version = "2.2.0"
22+
23+
24+
// testlibs
25+
kluent_version = "1.34" // todo #111
26+
espresso_core_version = "3.0.2"
27+
junit_version = "4.12"
28+
mockito_core_version = "2.18.3"
29+
mockwebserver_version = "3.10.0"
30+
31+
}

0 commit comments

Comments
 (0)