Skip to content

Commit 6470990

Browse files
committed
move basic rxjava kotlin sample to versions.gradle
1 parent 872673a commit 6470990

File tree

3 files changed

+53
-60
lines changed

3 files changed

+53
-60
lines changed

BasicRxJavaSampleKotlin/app/build.gradle

Lines changed: 40 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ apply plugin: 'kotlin-kapt'
2020
apply plugin: 'kotlin-android-extensions'
2121

2222
android {
23-
compileSdkVersion rootProject.ext.compileSdkVersion
24-
buildToolsVersion rootProject.ext.buildToolsVersion
23+
compileSdkVersion build_versions.target_sdk
24+
buildToolsVersion build_versions.build_tools
2525

2626
defaultConfig {
2727
applicationId "com.example.android.observability"
28-
minSdkVersion rootProject.ext.minSdkVersion
29-
targetSdkVersion rootProject.ext.targetSdkVersion
28+
minSdkVersion build_versions.min_sdk
29+
targetSdkVersion build_versions.targetSdkVersion
3030
versionCode 1
3131
versionName "1.0"
3232
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -41,58 +41,53 @@ android {
4141

4242
dependencies {
4343
// Support libraries
44-
implementation "com.android.support:appcompat-v7:$rootProject.supportLibraryVersion"
45-
implementation "com.android.support:support-v4:$rootProject.supportLibraryVersion"
46-
implementation "com.android.support:design:$rootProject.supportLibraryVersion"
44+
implementation deps.support.app_compat
45+
implementation deps.support.v4
46+
implementation deps.support.design
47+
4748
// Architecture components
48-
implementation "android.arch.lifecycle:runtime:$rootProject.architectureComponentsVersion"
49-
implementation "android.arch.lifecycle:extensions:$rootProject.architectureComponentsVersion"
50-
kapt "android.arch.lifecycle:compiler:$rootProject.architectureComponentsVersion"
51-
implementation "android.arch.persistence.room:runtime:$rootProject.architectureComponentsVersion"
52-
kapt "android.arch.persistence.room:compiler:$rootProject.architectureComponentsVersion"
53-
implementation "android.arch.persistence.room:rxjava2:$rootProject.architectureComponentsVersion"
49+
implementation deps.lifecycle.runtime
50+
implementation deps.lifecycle.extensions
51+
kapt deps.lifecycle.compiler
52+
implementation deps.room.runtime
53+
kapt deps.room.compiler
54+
implementation deps.room.rxjava2
5455

5556
// RxJava
56-
implementation "io.reactivex.rxjava2:rxandroid:$rootProject.rxandroidVersion"
57-
implementation "io.reactivex.rxjava2:rxjava:$rootProject.rxjavaVersion"
57+
implementation deps.rx_android
58+
implementation deps.rxjava2
59+
60+
// kotlin
61+
// Kotlin
62+
implementation deps.kotlin.stdlib
5863

5964
// Dependencies for local unit tests
60-
testImplementation "junit:junit:$rootProject.ext.junitVersion"
61-
testImplementation "org.mockito:mockito-all:$rootProject.ext.mockitoVersion"
62-
testImplementation "org.hamcrest:hamcrest-all:$rootProject.ext.hamcrestVersion"
63-
testImplementation "android.arch.core:core-testing:$rootProject.architectureComponentsVersion"
64-
testImplementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
65-
testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
65+
testImplementation deps.junit
66+
testImplementation deps.mockito.all
67+
testImplementation deps.hamcrest
68+
testImplementation deps.arch_core.testing
69+
testImplementation deps.kotlin.stdlib
70+
testImplementation deps.kotlin.test
6671

6772
// Android Testing Support Library's runner and rules
68-
androidTestImplementation "com.android.support.test:runner:$rootProject.ext.runnerVersion"
69-
androidTestImplementation "com.android.support.test:rules:$rootProject.ext.runnerVersion"
70-
androidTestImplementation "android.arch.persistence.room:testing:$rootProject.architectureComponentsVersion"
71-
androidTestImplementation "android.arch.core:core-testing:$rootProject.architectureComponentsVersion"
73+
androidTestCompile deps.atsl.runner
74+
androidTestCompile deps.atsl.rules
75+
androidTestCompile deps.room.testing
76+
androidTestCompile deps.arch_core.testing
7277

7378
// Dependencies for Android unit tests
74-
androidTestImplementation "junit:junit:$rootProject.ext.junitVersion"
75-
androidTestImplementation "org.mockito:mockito-core:$rootProject.ext.mockitoVersion"
76-
androidTestImplementation 'com.google.dexmaker:dexmaker:1.2'
77-
androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.2'
79+
androidTestCompile deps.junit
80+
androidTestCompile deps.mockito.core, { exclude group: 'net.bytebuddy' }
81+
androidTestCompile deps.dexmaker
7882

7983
// Espresso UI Testing
80-
androidTestImplementation "com.android.support.test.espresso:espresso-core:$rootProject.espressoVersion"
81-
androidTestImplementation "com.android.support.test.espresso:espresso-contrib:$rootProject.espressoVersion"
82-
androidTestImplementation "com.android.support.test.espresso:espresso-intents:$rootProject.espressoVersion"
84+
androidTestCompile deps.espresso.core
85+
androidTestCompile deps.espresso.contrib
86+
androidTestCompile deps.espresso.intents
8387

8488
// Resolve conflicts between main and test APK:
85-
androidTestImplementation "com.android.support:support-annotations:$rootProject.supportLibraryVersion"
86-
androidTestImplementation "com.android.support:support-v4:$rootProject.supportLibraryVersion"
87-
androidTestImplementation "com.android.support:appcompat-v7:$rootProject.supportLibraryVersion"
88-
androidTestImplementation "com.android.support:design:$rootProject.supportLibraryVersion"
89-
90-
// Kotlin
91-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
89+
androidTestCompile deps.support.annotations
90+
androidTestCompile deps.support.v4
91+
androidTestCompile deps.support.app_compat
92+
androidTestCompile deps.support.design
9293
}
93-
94-
configurations.all {
95-
resolutionStrategy {
96-
force "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
97-
}
98-
}

BasicRxJavaSampleKotlin/build.gradle

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,27 +17,19 @@
1717
// Top-level build file where you can add configuration options common to all sub-projects/modules.
1818

1919
buildscript {
20-
ext.kotlin_version = '1.1.4-2'
21-
22-
repositories {
23-
google()
24-
jcenter()
25-
mavenCentral()
26-
}
20+
apply from: '../versions.gradle'
21+
addRepos(repositories)
2722
dependencies {
28-
classpath 'com.android.tools.build:gradle:3.0.0-beta4'
29-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
23+
classpath deps.android_gradle_plugin
24+
classpath deps.kotlin.plugin
3025

3126
// NOTE: Do not place your application dependencies here; they belong
3227
// in the individual module build.gradle files
3328
}
3429
}
3530

3631
allprojects {
37-
repositories {
38-
google()
39-
jcenter()
40-
}
32+
addRepos(repositories)
4133
}
4234

4335
task clean(type: Delete) {

versions.gradle

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ versions.rx_android = "2.0.1"
2020
versions.atsl_runner = "1.0.1"
2121
versions.atsl_rules = "1.0.1"
2222
versions.hamcrest = "1.3"
23-
23+
versions.kotlin = "1.1.4-2"
2424
def deps = [:]
2525

2626
def support = [:]
@@ -82,8 +82,14 @@ mockito.core = "org.mockito:mockito-core:$versions.mockito"
8282
mockito.all = "org.mockito:mockito-all:$versions.mockito_all"
8383
deps.mockito = mockito
8484

85-
deps.glide = "com.github.bumptech.glide:glide:$versions.glide"
85+
def kotlin = [:]
86+
kotlin.stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jre7:$versions.kotlin"
87+
kotlin.test = "org.jetbrains.kotlin:kotlin-test-junit:$versions.kotlin"
88+
kotlin.plugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlin"
8689

90+
deps.kotlin = kotlin
91+
92+
deps.glide = "com.github.bumptech.glide:glide:$versions.glide"
8793
deps.dexmaker = "com.linkedin.dexmaker:dexmaker-mockito:$versions.dexmaker"
8894
deps.constraint_layout = "com.android.support.constraint:constraint-layout:$versions.constraint_layout"
8995
deps.timber = "com.jakewharton.timber:timber:$versions.timber"

0 commit comments

Comments
 (0)