Skip to content

Commit

Permalink
Updates Gradle and libraries
Browse files Browse the repository at this point in the history
Signed-off-by: Rafael Chagas <[email protected]>
  • Loading branch information
rtchagas committed Oct 6, 2019
1 parent b7c7235 commit df0f7b5
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 19 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlin_version = '1.3.41'
ext.kotlin_version = '1.3.50'

repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.4.2'
classpath 'com.android.tools.build:gradle:3.5.1'
classpath 'com.google.gms:google-services:4.3.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Thu Apr 25 22:58:32 CEST 2019
#Sun Oct 06 14:39:14 CEST 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
26 changes: 15 additions & 11 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}

kotlinOptions {
jvmTarget = "1.8"
}

defaultConfig {
minSdkVersion 19
targetSdkVersion 28
Expand All @@ -38,24 +42,24 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"

// KTX
implementation 'androidx.core:core-ktx:1.2.0-alpha02'
implementation 'androidx.core:core-ktx:1.2.0-alpha04'

// Anko Commons
implementation "org.jetbrains.anko:anko-commons:0.10.8"

// Support library
implementation 'androidx.appcompat:appcompat:1.1.0-rc01'
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta2'
implementation 'com.google.android.material:material:1.1.0-alpha09'
implementation 'com.google.android.material:material:1.1.0-beta01'

// Android architecture components
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0-alpha02'
implementation 'androidx.lifecycle:lifecycle-common-java8:2.2.0-alpha02'
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0-alpha05'
implementation 'androidx.lifecycle:lifecycle-common-java8:2.2.0-alpha05'

// Google Play Services
implementation 'com.google.android.gms:play-services-location:17.0.0'
implementation 'com.google.android.gms:play-services-maps:17.0.0'
implementation 'com.google.maps.android:android-maps-utils:0.5'
implementation 'com.google.maps.android:android-maps-utils:0.6.1'
implementation 'com.google.android.libraries.places:places:2.0.0'

// Koin for Android
Expand All @@ -72,19 +76,19 @@ dependencies {
kapt 'com.squareup.moshi:moshi-kotlin-codegen:1.8.0'

// Retrofit
implementation 'com.squareup.retrofit2:retrofit:2.6.0'
implementation 'com.squareup.retrofit2:converter-moshi:2.6.0'
implementation 'com.squareup.retrofit2:adapter-rxjava2:2.6.0'
implementation 'com.squareup.retrofit2:retrofit:2.6.2'
implementation 'com.squareup.retrofit2:converter-moshi:2.6.2'
implementation 'com.squareup.retrofit2:adapter-rxjava2:2.6.2'
implementation 'com.squareup.okhttp3:logging-interceptor:3.12.3'

// Picasso
implementation 'com.squareup.picasso:picasso:2.71828'

// 3rd party
implementation 'com.github.mcginty:material-colors:1.1.0'
implementation 'com.karumi:dexter:5.0.0'
implementation 'com.karumi:dexter:6.0.0'

testImplementation 'junit:junit:4.13-beta-2'
testImplementation 'junit:junit:4.13-beta-3'
androidTestImplementation 'androidx.test:runner:1.3.0-alpha02'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0-alpha02'
}
8 changes: 4 additions & 4 deletions sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ android {

defaultConfig {
applicationId "com.rtchagas.pingsample"
minSdkVersion 19
minSdkVersion 21
targetSdkVersion 28
versionCode 1
versionName "1.0"
Expand Down Expand Up @@ -41,14 +41,14 @@ dependencies {
implementation "org.jetbrains.anko:anko-commons:0.10.8"

// Support library
implementation 'androidx.appcompat:appcompat:1.1.0-rc01'
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta2'
implementation 'com.google.android.material:material:1.1.0-alpha09'
implementation 'com.google.android.material:material:1.1.0-beta01'

// Places library
implementation 'com.google.android.libraries.places:places:2.0.0'

testImplementation 'junit:junit:4.13-beta-2'
testImplementation 'junit:junit:4.13-beta-3'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
}

0 comments on commit df0f7b5

Please sign in to comment.