Skip to content

Commit

Permalink
Update to 3.3
Browse files Browse the repository at this point in the history
  • Loading branch information
Ilia Udalov committed Feb 12, 2019
1 parent 6f955ff commit 267db70
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 31 deletions.
24 changes: 9 additions & 15 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
repositories {
mavenCentral()
maven {
url "http://maven.google.com/"
}
google()
}

buildscript {
Expand All @@ -11,27 +9,27 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.0'
classpath 'com.android.tools.build:gradle:3.3.1'
}
}

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 {
Expand All @@ -42,7 +40,3 @@ android {
}
}
}

task wrapper(type: Wrapper) {
gradleVersion = "4.5.1"
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 " "
}
Expand Down
15 changes: 6 additions & 9 deletions src/main/java/com/yandex/mapkitdemo/DrivingActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -102,14 +101,12 @@ private void submitRequest() {
ArrayList<RequestPoint> requestPoints = new ArrayList<>();
requestPoints.add(new RequestPoint(
ROUTE_START_LOCATION,
new ArrayList<Point>(),
new ArrayList<DrivingArrivalPoint>(),
RequestPointType.WAYPOINT));
RequestPointType.WAYPOINT,
null));
requestPoints.add(new RequestPoint(
ROUTE_END_LOCATION,
new ArrayList<Point>(),
new ArrayList<DrivingArrivalPoint>(),
RequestPointType.WAYPOINT));
RequestPointType.WAYPOINT,
null));
drivingSession = drivingRouter.requestRoutes(requestPoints, options, this);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ protected void onCreate(Bundle savedInstanceState) {
new ArrayList<String>(),
new TimeOptions());
List<RequestPoint> points = new ArrayList<RequestPoint>();
points.add(new RequestPoint(ROUTE_START_LOCATION, new ArrayList<Point>(), RequestPointType.WAYPOINT));
points.add(new RequestPoint(ROUTE_END_LOCATION, new ArrayList<Point>(), 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);
}
Expand Down

0 comments on commit 267db70

Please sign in to comment.