diff --git a/build.gradle b/build.gradle index 64817816..3e57d899 100644 --- a/build.gradle +++ b/build.gradle @@ -2,6 +2,7 @@ buildscript { repositories { google() jcenter() + mavenCentral() mavenLocal() } dependencies { @@ -17,12 +18,13 @@ tasks.withType(JavaCompile) { } repositories { - jcenter() - mavenLocal() - maven { url "http://acra.googlecode.com/svn/repository/releases/" } - maven { url "https://maven.google.com" } - maven { url "http://repo.maven.apache.org/maven2" } - maven { url 'https://jitpack.io' } + jcenter() + mavenCentral() + mavenLocal() + maven { url "http://acra.googlecode.com/svn/repository/releases/" } + maven { url "https://maven.google.com" } + maven { url "http://repo.maven.apache.org/maven2" } + maven { url 'https://jitpack.io' } } android { @@ -55,7 +57,6 @@ android { dependencies { def supportVersion = "28.0.0" - implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0-alpha' implementation "com.android.support:appcompat-v7:$supportVersion" implementation "com.android.support:support-v4:$supportVersion" implementation "com.android.support:support-media-compat:28.0.0" @@ -78,9 +79,6 @@ dependencies { testImplementation group: 'com.pivotallabs', name: 'robolectric', version:'1.0' testImplementation group: 'org.mockito', name: 'mockito-all', version:'1.9.5' testImplementation group: 'org.easytesting', name: 'fest-assert', version:'1.4' - implementation(group: 'com.google.android.maps', name: 'maps', version:'7_r1') { - /* This dependency was originally in the Maven provided scope, but the project was not of type war. - This behavior is not yet supported by Gradle, so this dependency has been converted to a compile dependency. - Please review and delete this closure when resolved. */ - } + implementation files('libs/maps-7_r1.jar') + implementation files('libs/MPAndroidChart-v3.0.2.jar') } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index effee134..82314c49 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip diff --git a/libs/MPAndroidChart-v3.0.2.jar b/libs/MPAndroidChart-v3.0.2.jar new file mode 100644 index 00000000..3da6e51c Binary files /dev/null and b/libs/MPAndroidChart-v3.0.2.jar differ diff --git a/libs/maps-7_r1.jar b/libs/maps-7_r1.jar new file mode 100644 index 00000000..0bb94140 Binary files /dev/null and b/libs/maps-7_r1.jar differ