diff --git a/app/build.gradle b/app/build.gradle index 06d147f..beeb15f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,14 +1,13 @@ apply plugin: 'com.android.application' -apply plugin: 'com.neenbedankt.android-apt' android { - compileSdkVersion 23 - buildToolsVersion "23.0.1" + compileSdkVersion 28 + buildToolsVersion "28.0.3" defaultConfig { applicationId "com.macoscpoe.roombooker" minSdkVersion 16 - targetSdkVersion 23 + targetSdkVersion 28 versionCode 1 versionName "1.0" //Using AVD localhost can be reached at 10.0.2.2 ip address (for Genymotion 10.0.3.2) @@ -30,21 +29,21 @@ android { } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') - testCompile 'junit:junit:4.12' - compile project(':mvp') - compile 'com.android.support:appcompat-v7:23.1.1' - compile 'com.android.support:design:23.1.1' - compile 'com.jakewharton:butterknife:7.0.1' - compile 'com.android.support:cardview-v7:23.1.1' - compile 'com.google.dagger:dagger:2.0' - apt 'com.google.dagger:dagger-compiler:2.0' - provided 'org.glassfish:javax.annotation:10.0-b28' - compile 'io.reactivex:rxjava:1.0.14' - compile 'io.reactivex:rxandroid:1.0.1' - compile 'io.reactivex:rxjava-joins:0.22.0' - compile 'com.squareup.retrofit:converter-gson:2.0.0-beta2' - compile 'com.squareup.retrofit:retrofit:2.0.0-beta2' - compile 'com.squareup.retrofit:adapter-rxjava:2.0.0-beta2' - compile 'com.squareup.okhttp:logging-interceptor:2.6.0' + implementation fileTree(include: ['*.jar'], dir: 'libs') + testImplementation 'junit:junit:4.12' + implementation project(':mvp') + implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'com.android.support:design:28.0.0' + implementation 'com.jakewharton:butterknife:7.0.1' + implementation 'com.android.support:cardview-v7:28.0.0' + implementation 'com.google.dagger:dagger:2.0' + annotationProcessor 'com.google.dagger:dagger-compiler:2.0' + compileOnly 'org.glassfish:javax.annotation:10.0-b28' + implementation 'io.reactivex:rxjava:1.0.14' + implementation 'io.reactivex:rxandroid:1.0.1' + implementation 'io.reactivex:rxjava-joins:0.22.0' + implementation 'com.squareup.retrofit:converter-gson:2.0.0-beta2' + implementation 'com.squareup.retrofit:retrofit:2.0.0-beta2' + implementation 'com.squareup.retrofit:adapter-rxjava:2.0.0-beta2' + implementation 'com.squareup.okhttp:logging-interceptor:2.6.0' } diff --git a/build.gradle b/build.gradle index 9222225..06b0f5f 100644 --- a/build.gradle +++ b/build.gradle @@ -3,9 +3,10 @@ buildscript { repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:1.5.0' + classpath 'com.android.tools.build:gradle:3.5.3' classpath 'com.neenbedankt.gradle.plugins:android-apt:1.4' // NOTE: Do not place your application dependencies here; they belong @@ -16,6 +17,7 @@ buildscript { allprojects { repositories { jcenter() + google() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f23df6e..5b28349 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Oct 21 11:34:03 PDT 2015 +#Fri Jan 17 07:32:54 BRST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip diff --git a/mvp/build.gradle b/mvp/build.gradle index abdcc79..f98b53f 100644 --- a/mvp/build.gradle +++ b/mvp/build.gradle @@ -4,8 +4,8 @@ sourceCompatibility = 1.7 targetCompatibility = 1.7 dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'io.reactivex:rxjava:1.0.14' - compile 'io.reactivex:rxjava-joins:0.22.0' - compile 'com.google.code.gson:gson:2.5' + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'io.reactivex:rxjava:1.0.14' + implementation 'io.reactivex:rxjava-joins:0.22.0' + implementation 'com.google.code.gson:gson:2.8.5' } \ No newline at end of file