Skip to content

Commit

Permalink
added kotlin support to project
Browse files Browse the repository at this point in the history
  • Loading branch information
erluxman committed Jul 12, 2017
1 parent 22bcaa6 commit 12366ab
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 1 deletion.
4 changes: 4 additions & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
*/

apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'

// query git for the SHA, Tag and commit count. Use these to automate versioning.
def gitSha = 'git rev-parse --short HEAD'.execute([], project.rootDir).text.trim()
Expand Down Expand Up @@ -72,6 +74,7 @@ dependencies {
compile "com.android.support:design:${versions.supportLibrary}"
compile "com.android.support:palette-v7:${versions.supportLibrary}"
compile "com.android.support:recyclerview-v7:${versions.supportLibrary}"

compile 'com.github.bumptech.glide:glide:3.7.0'
compile 'com.github.bumptech.glide:okhttp3-integration:1.4.0@aar'
compile 'com.google.code.gson:gson:2.8.0'
Expand All @@ -81,5 +84,6 @@ dependencies {
compile "com.squareup.retrofit2:converter-gson:${versions.retrofit}"
compile 'com.squareup.okhttp3:okhttp:3.8.0'
compile 'org.jsoup:jsoup:1.10.1'
compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:${versions.kotlin_version}"
compile project(':bypass')
}
5 changes: 4 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ buildscript {

'supportLibrary': '25.4.0',
'retrofit' : '2.2.0',
'butterknife' : '8.6.0'
'butterknife' : '8.6.0',
'kotlin_version': '1.1.3-2'
]
repositories {
jcenter()
Expand All @@ -33,6 +34,8 @@ buildscript {

dependencies {
classpath 'com.android.tools.build:gradle:2.3.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin_version}"

}

}
6 changes: 6 additions & 0 deletions third_party/bypass/build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'

android {
compileSdkVersion versions.compileSdk
Expand All @@ -19,9 +21,13 @@ android {

repositories {
google()
jcenter()

}

dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
compile "com.android.support:support-annotations:${versions.supportLibrary}"
compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:${versions.kotlin_version}"

}

0 comments on commit 12366ab

Please sign in to comment.