Skip to content

Commit

Permalink
Upgrade of dependencies and SDK levels.
Browse files Browse the repository at this point in the history
  • Loading branch information
MKergall committed Dec 1, 2018
1 parent 72ebc76 commit f2c42a1
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 18 deletions.
11 changes: 5 additions & 6 deletions OSMBonusPack/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
apply plugin: 'com.android.library'

android {
compileSdkVersion 23
buildToolsVersion '25.0.2'
compileSdkVersion 26
buildToolsVersion '26.0.3'

defaultConfig {
minSdkVersion 10
targetSdkVersion 23
minSdkVersion 16
targetSdkVersion 26
versionCode 65
versionName "6.5-SNAPSHOT"
}
Expand All @@ -28,11 +28,10 @@ repositories {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])

compile "com.android.support:support-v4:23.4.0"
compile 'org.osmdroid:osmdroid-android:6.0.3'
compile 'org.apache.commons:commons-lang3:3.4'
compile 'com.google.code.gson:gson:2.8.5'
compile 'com.squareup.okhttp3:okhttp:3.7.0'
compile 'com.squareup.okhttp3:okhttp:3.10.0'

}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
import android.graphics.Paint;
import android.graphics.Rect;
import android.graphics.drawable.BitmapDrawable;
import android.support.v4.util.LongSparseArray;

import android.util.LongSparseArray;
import org.osmdroid.util.BoundingBox;
import org.osmdroid.views.MapView;
import org.osmdroid.views.overlay.Marker;
Expand Down
8 changes: 4 additions & 4 deletions OSMBonusPackTuto/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 23
buildToolsVersion '25.0.2'
compileSdkVersion 26
buildToolsVersion '26.0.3'

defaultConfig {
applicationId "com.example.osmbonuspacktuto"
minSdkVersion 10
targetSdkVersion 22 //the limit to avoid implementing new permissions granting.
minSdkVersion 16
targetSdkVersion 26 //22 = the limit to avoid implementing new permissions granting.
versionCode 1
versionName "1.0"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ public class MainActivity extends Activity implements MapEventsReceiver, MapView
Marker nodeMarker = new Marker(map);
nodeMarker.setPosition(node.mLocation);
nodeMarker.setIcon(nodeIcon);
nodeMarker.setAnchor(Marker.ANCHOR_CENTER, Marker.ANCHOR_CENTER);

//4. Filling the bubbles
nodeMarker.setTitle("Step " + i);
Expand Down Expand Up @@ -186,6 +187,7 @@ public class MainActivity extends Activity implements MapEventsReceiver, MapView
poiMarker.setSnippet(poi.mDescription);
poiMarker.setPosition(poi.mLocation);
poiMarker.setIcon(poiIcon);
poiMarker.setAnchor(Marker.ANCHOR_CENTER, Marker.ANCHOR_BOTTOM);
if (poi.mThumbnail != null) {
poiMarker.setImage(new BitmapDrawable(getResources(), poi.mThumbnail));
}
Expand Down
13 changes: 7 additions & 6 deletions OSMNavigator/build.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 23
buildToolsVersion '25.0.2'
compileSdkVersion 26
buildToolsVersion '26.0.3'

defaultConfig {
applicationId "com.osmnavigator"
minSdkVersion 10
targetSdkVersion 23
versionCode 21
versionName "2.1"
minSdkVersion 16
targetSdkVersion 26
versionCode 22
versionName "2.2"
}
buildTypes {
release {
Expand Down Expand Up @@ -41,4 +41,5 @@ dependencies {
compile 'org.mapsforge:mapsforge-map-android:0.8.0'
compile 'org.mapsforge:mapsforge-map:0.8.0'
compile 'org.mapsforge:mapsforge-themes:0.8.0'
compile "com.android.support:support-v4:26.1.0"
}
8 changes: 8 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
buildscript {
repositories {
jcenter()
maven {
url 'https://maven.google.com/'
name 'Google'
}
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.3'
Expand All @@ -17,5 +21,9 @@ allprojects {
repositories {
jcenter()
maven { url "https://jitpack.io" }
maven {
url 'https://maven.google.com/'
name 'Google'
}
}
}

0 comments on commit f2c42a1

Please sign in to comment.