diff --git a/app/build.gradle b/app/build.gradle index 2872aaa..97ed08a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,12 +1,14 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 26 - buildToolsVersion '26.0.1' + + compileSdkVersion 28 + buildToolsVersion "28.0.3" + defaultConfig { applicationId "fr.mobdev.blooddonation" minSdkVersion 17 - targetSdkVersion 26 + targetSdkVersion 28 versionCode = 12 versionName = "3.4" } @@ -19,6 +21,8 @@ android { } dependencies { + implementation project(':anymaps-base') + implementation project(':anymaps-osm') compile 'com.github.car2go.AnyMaps:anymaps-base:6.0.0' compile 'com.github.car2go.AnyMaps:anymaps-osm:6.0.0' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 948fdae..f8b79f6 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,12 +3,6 @@ package="fr.mobdev.blooddonation" > - - @@ -37,10 +31,6 @@ - - diff --git a/app/src/main/java/fr/mobdev/blooddonation/fragment/MapsFragment.java b/app/src/main/java/fr/mobdev/blooddonation/fragment/MapsFragment.java index 1c61fec..b530536 100644 --- a/app/src/main/java/fr/mobdev/blooddonation/fragment/MapsFragment.java +++ b/app/src/main/java/fr/mobdev/blooddonation/fragment/MapsFragment.java @@ -262,6 +262,7 @@ public class MapsFragment extends Fragment implements OnMapReadyCallback { super.onViewCreated(view, savedInstanceState); MapsConfiguration.getInstance().initialize(getActivity()); mapView = view.findViewById(R.id.maps_mv_map); + mapView.setUserAgent(BuildConfig.APPLICATION_ID); mapView.onCreate(savedInstanceState); } diff --git a/build.gradle b/build.gradle index e532cf2..1f69e6d 100644 --- a/build.gradle +++ b/build.gradle @@ -2,9 +2,14 @@ buildscript { repositories { jcenter() + maven { + url 'https://maven.google.com/' + name 'Google' + } + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.3.2' } } @@ -12,5 +17,6 @@ allprojects { repositories { jcenter() maven { url 'https://jitpack.io' } + google() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e730913..f592b5b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Jun 14 13:37:17 CEST 2017 +#Thu Mar 21 12:04:09 CET 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip