Skip to content

Commit

Permalink
Updated libraries, added Kotlin to project - Issue #39
Browse files Browse the repository at this point in the history
  • Loading branch information
anthony-hermet committed Jun 1, 2018
1 parent 0a2b8e1 commit b12de64
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 14 deletions.
29 changes: 20 additions & 9 deletions app/build.gradle
@@ -1,8 +1,9 @@
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'io.fabric'

ext {
supportLibraryVersion = "27.0.2"
supportLibraryVersion = "27.1.1"
}

android {
Expand Down Expand Up @@ -39,30 +40,40 @@ android {
}
}

kotlin {
experimental {
coroutines 'enable'
}
}

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])

// Kotlin
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:0.22.5'

// Google & Android libraries
implementation "com.android.support:support-v4:${supportLibraryVersion}"
implementation "com.android.support:appcompat-v7:${supportLibraryVersion}"
implementation "com.android.support:design:${supportLibraryVersion}"
implementation "com.android.support:cardview-v7:${supportLibraryVersion}"
implementation "com.android.support.constraint:constraint-layout:1.1.0-beta5"
withPlayServicesImplementation('com.crashlytics.sdk.android:crashlytics:2.9.0@aar') {
withPlayServicesImplementation('com.crashlytics.sdk.android:crashlytics:2.9.3@aar') {
transitive = true
}
withPlayServicesImplementation 'com.google.firebase:firebase-core:11.8.0'
withPlayServicesImplementation 'com.google.firebase:firebase-config:11.8.0'
withPlayServicesImplementation 'com.google.firebase:firebase-core:16.0.0'
withPlayServicesImplementation 'com.google.firebase:firebase-config:16.0.0'

// Other libraries
implementation "com.squareup.retrofit2:retrofit:2.3.0"
implementation "com.squareup.retrofit2:converter-gson:2.3.0"
implementation 'com.jakewharton.timber:timber:4.6.1'
implementation "com.squareup.retrofit2:retrofit:2.4.0"
implementation "com.squareup.retrofit2:converter-gson:2.4.0"
implementation 'com.jakewharton.timber:timber:4.7.0'

// Tests
testImplementation "junit:junit:4.12"
androidTestImplementation "com.android.support.test:runner:1.0.1"
androidTestImplementation "com.android.support.test.espresso:espresso-core:3.0.1"
androidTestImplementation "com.android.support.test:runner:1.0.2"
androidTestImplementation "com.android.support.test.espresso:espresso-core:3.0.2"
}

apply plugin: 'com.google.gms.google-services'
8 changes: 5 additions & 3 deletions build.gradle
@@ -1,6 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlin_version = "1.2.41"
repositories {
google()
jcenter()
Expand All @@ -9,9 +10,10 @@ buildscript {
}
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'com.google.gms:google-services:3.1.2'
classpath 'io.fabric.tools:gradle:1.24.4'
classpath 'com.android.tools.build:gradle:3.1.2'
classpath 'com.google.gms:google-services:3.3.1'
classpath 'io.fabric.tools:gradle:1.25.4'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}

Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
#Sun Jan 07 16:14:43 CET 2018
#Fri Jun 01 08:53:12 CEST 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

0 comments on commit b12de64

Please sign in to comment.