Skip to content

Commit

Permalink
bump support libraries version to match the one used in mapbox-androi…
Browse files Browse the repository at this point in the history
…d-sdk
  • Loading branch information
Guardiola31337 committed Nov 8, 2017
1 parent cf2af6d commit a2e596d
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 9 deletions.
4 changes: 2 additions & 2 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,13 +110,13 @@ jobs:
- deploy:
name: Publish Java Services To Maven Central
command: |
if [ "${CIRCLE_BRANCH}" == "master" ]; then
if [ "${CIRCLE_BRANCH}" == "pg-downgrade-min-sdk-14" ]; then
make publish-java ;
fi
- deploy:
name: Publish Android Services To Maven Central
command: |
if [ "${CIRCLE_BRANCH}" == "master" ]; then
if [ "${CIRCLE_BRANCH}" == "pg-downgrade-min-sdk-14" ]; then
make publish-android ;
fi
- store_artifacts:
Expand Down
2 changes: 1 addition & 1 deletion mapbox/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ buildscript {
allprojects {
repositories {
jcenter()
mavenCentral()
maven { url 'https://maven.google.com' }
maven { url "http://oss.sonatype.org/content/repositories/snapshots/" }
}

Expand Down
11 changes: 6 additions & 5 deletions mapbox/dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,15 @@ ext {
targetSdkVersion = 25
compileSdkVersion = 25
buildToolsVersion = "25.0.3"
supportLibVersion = "25.4.0"

dep = [
// Support
supportAppcompat : 'com.android.support:appcompat-v7:25.3.1',
supportCompat : 'com.android.support:support-compat:25.3.1',
supportDesign : 'com.android.support:design:25.3.1',
supportRecyclerview : 'com.android.support:recyclerview-v7:25.3.1',
supportCardView : 'com.android.support:cardview-v7:25.3.1',
supportAppcompat : "com.android.support:appcompat-v7:${supportLibVersion}",
supportCompat : "com.android.support:support-compat:${supportLibVersion}",
supportDesign : "com.android.support:design:${supportLibVersion}",
supportRecyclerview : "com.android.support:recyclerview-v7:${supportLibVersion}",
supportCardView : "com.android.support:cardview-v7:${supportLibVersion}",

// mapbox
mapbox : 'com.mapbox.mapboxsdk:mapbox-android-sdk:5.2.0-SNAPSHOT@aar',
Expand Down
6 changes: 5 additions & 1 deletion mapbox/libandroid-telemetry/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
<manifest package="com.mapbox.services.android.telemetry" />
<manifest xmlns:tools="http://schemas.android.com/tools"
package="com.mapbox.services.android.telemetry">

<uses-sdk tools:overrideLibrary="com.mapzen.lost"/>
</manifest>

0 comments on commit a2e596d

Please sign in to comment.