Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit 743f24c

Browse files
author
Kaushik Gopal
committed
chore: add kotlin dependencies
1 parent bab7abd commit 743f24c

File tree

2 files changed

+22
-8
lines changed

2 files changed

+22
-8
lines changed

‎app/build.gradle

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ buildscript {
88
// can be removed with android-gradle plugin is upgraded to 2.2
99
// https://twitter.com/JakeWharton/status/760836175586267136
1010
classpath 'me.tatarka.retrolambda.projectlombok:lombok.ast:0.2.3.a2'
11+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}"
1112
}
1213

1314
// Exclude the lombok version that the android plugin depends on.
@@ -16,13 +17,7 @@ buildscript {
1617

1718
apply plugin: 'com.android.application'
1819
apply plugin: 'me.tatarka.retrolambda'
19-
20-
ext {
21-
okhttpVersion = "3.0.1"
22-
retrofitVersion = "2.0.0"
23-
sdkVersion = 24
24-
supportLibVersion = "24.2.1"
25-
}
20+
apply plugin: 'kotlin-android'
2621

2722
dependencies {
2823
compile "com.android.support:support-v13:${supportLibVersion}"
@@ -38,6 +33,9 @@ dependencies {
3833
compile "com.squareup.okhttp3:okhttp-urlconnection:${okhttpVersion}"
3934
compile 'com.mcxiaoke.volley:library:1.0.19'
4035

36+
compile "org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}"
37+
compile "com.nhaarman:mockito-kotlin:${mockitoKotlinVersion}"
38+
4139
// ----------------------------------
4240
// Rx dependencies
4341

@@ -63,7 +61,7 @@ dependencies {
6361

6462
android {
6563
compileSdkVersion sdkVersion
66-
buildToolsVersion '25.0.0'
64+
buildToolsVersion buildToolsVrs
6765

6866
defaultConfig {
6967
applicationId "com.morihacky.android.rxjava"
@@ -72,12 +70,18 @@ android {
7270
versionCode 2
7371
versionName "1.2"
7472
}
73+
7574
buildTypes {
7675
release {
7776
minifyEnabled true
7877
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
7978
}
8079
}
80+
81+
sourceSets {
82+
main.java.srcDirs += 'src/main/kotlin'
83+
}
84+
8185
compileOptions {
8286
sourceCompatibility JavaVersion.VERSION_1_8
8387
targetCompatibility JavaVersion.VERSION_1_8

‎build.gradle

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,14 @@ allprojects {
2020
url "https://jitpack.io"
2121
}
2222
}
23+
24+
ext {
25+
okhttpVersion = "3.0.1"
26+
retrofitVersion = "2.0.0"
27+
sdkVersion = 24
28+
buildToolsVrs = "25.0.0"
29+
supportLibVersion = "25.3.1"
30+
kotlinVersion = "1.1.2-4"
31+
mockitoKotlinVersion = "1.4.0"
32+
}
2333
}

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /