diff --git a/build.gradle b/build.gradle index e74aac9..4a8c4b3 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,6 @@ repositories { mavenCentral() - maven { - url "http://maven.google.com/" - } + google() } buildscript { @@ -11,7 +9,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.0' + classpath 'com.android.tools.build:gradle:3.3.1' } } @@ -19,19 +17,19 @@ apply plugin: "com.android.application" android { dependencies { - implementation 'com.yandex.android:mapkit:3.2.0' - implementation 'com.yandex.android:search:3.2.0' - implementation 'com.yandex.android:directions:3.2.0' - implementation 'com.yandex.android:transport:3.2.0' - implementation 'com.yandex.android:places:3.2.0' + implementation 'com.yandex.android:mapkit:3.3.1' + implementation 'com.yandex.android:search:3.3.1' + implementation 'com.yandex.android:directions:3.3.1' + implementation 'com.yandex.android:transport:3.3.1' + implementation 'com.yandex.android:places:3.3.1' } compileSdkVersion 28 - buildToolsVersion "28.0.0" + buildToolsVersion "28.0.3" defaultConfig { minSdkVersion 15 - targetSdkVersion 27 + targetSdkVersion 28 } sourceSets { @@ -42,7 +40,3 @@ android { } } } - -task wrapper(type: Wrapper) { - gradleVersion = "4.5.1" -} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 19ae699..c44b679 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b874371..663c448 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Mon Dec 18 12:21:44 MSK 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.5.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip diff --git a/gradlew b/gradlew index 4453cce..cccdd3d 100755 --- a/gradlew +++ b/gradlew @@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS="" # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" -warn ( ) { +warn () { echo "$*" } -die ( ) { +die () { echo echo "$*" echo @@ -155,7 +155,7 @@ if $cygwin ; then fi # Escape application args -save ( ) { +save () { for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done echo " " } diff --git a/src/main/java/com/yandex/mapkitdemo/DrivingActivity.java b/src/main/java/com/yandex/mapkitdemo/DrivingActivity.java index 0f6dab7..275484e 100644 --- a/src/main/java/com/yandex/mapkitdemo/DrivingActivity.java +++ b/src/main/java/com/yandex/mapkitdemo/DrivingActivity.java @@ -9,13 +9,12 @@ import com.yandex.mapkit.MapKitFactory; import com.yandex.mapkit.directions.DirectionsFactory; -import com.yandex.mapkit.directions.driving.DrivingArrivalPoint; import com.yandex.mapkit.directions.driving.DrivingRouter; import com.yandex.mapkit.directions.driving.DrivingOptions; import com.yandex.mapkit.directions.driving.DrivingSession; import com.yandex.mapkit.directions.driving.DrivingRoute; -import com.yandex.mapkit.directions.driving.RequestPoint; -import com.yandex.mapkit.directions.driving.RequestPointType; +import com.yandex.mapkit.RequestPoint; +import com.yandex.mapkit.RequestPointType; import com.yandex.mapkit.geometry.Point; import com.yandex.mapkit.map.CameraPosition; import com.yandex.mapkit.map.MapObjectCollection; @@ -102,14 +101,12 @@ private void submitRequest() { ArrayList requestPoints = new ArrayList<>(); requestPoints.add(new RequestPoint( ROUTE_START_LOCATION, - new ArrayList(), - new ArrayList(), - RequestPointType.WAYPOINT)); + RequestPointType.WAYPOINT, + null)); requestPoints.add(new RequestPoint( ROUTE_END_LOCATION, - new ArrayList(), - new ArrayList(), - RequestPointType.WAYPOINT)); + RequestPointType.WAYPOINT, + null)); drivingSession = drivingRouter.requestRoutes(requestPoints, options, this); } } diff --git a/src/main/java/com/yandex/mapkitdemo/MasstransitRoutingActivity.java b/src/main/java/com/yandex/mapkitdemo/MasstransitRoutingActivity.java index 0dfd07e..ef1c753 100644 --- a/src/main/java/com/yandex/mapkitdemo/MasstransitRoutingActivity.java +++ b/src/main/java/com/yandex/mapkitdemo/MasstransitRoutingActivity.java @@ -78,8 +78,8 @@ protected void onCreate(Bundle savedInstanceState) { new ArrayList(), new TimeOptions()); List points = new ArrayList(); - points.add(new RequestPoint(ROUTE_START_LOCATION, new ArrayList(), RequestPointType.WAYPOINT)); - points.add(new RequestPoint(ROUTE_END_LOCATION, new ArrayList(), RequestPointType.WAYPOINT)); + points.add(new RequestPoint(ROUTE_START_LOCATION, RequestPointType.WAYPOINT, null)); + points.add(new RequestPoint(ROUTE_END_LOCATION, RequestPointType.WAYPOINT, null)); mtRouter = TransportFactory.getInstance().createMasstransitRouter(); mtRouter.requestRoutes(points, options, this); }