diff options
author | Tobrun <tobrun.van.nuland@gmail.com> | 2017-02-15 19:56:31 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-15 19:56:31 +0100 |
commit | 0c0d7ceaebf822ababc7147c494e88f4c16e18e3 (patch) | |
tree | 024437c194098cd9c8049cb0573c026df50e4328 /platform/android/MapboxGLAndroidSDKWearTestApp | |
parent | 8f1c580ea164b47644e4dd935e7d30afe5872a96 (diff) | |
download | qtlocation-mapboxgl-0c0d7ceaebf822ababc7147c494e88f4c16e18e3.tar.gz |
[android] - use project wide configurations for all modules + fixup wear compile error (#8066)
Diffstat (limited to 'platform/android/MapboxGLAndroidSDKWearTestApp')
-rw-r--r-- | platform/android/MapboxGLAndroidSDKWearTestApp/build.gradle | 32 | ||||
-rw-r--r-- | platform/android/MapboxGLAndroidSDKWearTestApp/src/main/java/com/mapbox/weartestapp/utils/OffsettingHelper.java | 2 |
2 files changed, 14 insertions, 20 deletions
diff --git a/platform/android/MapboxGLAndroidSDKWearTestApp/build.gradle b/platform/android/MapboxGLAndroidSDKWearTestApp/build.gradle index c02b869953..e08d5a9a03 100644 --- a/platform/android/MapboxGLAndroidSDKWearTestApp/build.gradle +++ b/platform/android/MapboxGLAndroidSDKWearTestApp/build.gradle @@ -1,20 +1,15 @@ apply plugin: 'com.android.application' -ext { - wearableVersion = '2.0.0-alpha3' - leakCanaryVersion = '1.5' -} - android { - compileSdkVersion 25 - buildToolsVersion "25.0.2" + compileSdkVersion rootProject.ext.compileSdkVersion + buildToolsVersion rootProject.ext.buildToolsVersion defaultConfig { applicationId "com.mapbox.mapboxsdk.testapp" - minSdkVersion 21 - targetSdkVersion 25 - versionCode 11 - versionName "5.0.0" + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion + versionCode rootProject.ext.versionCode + versionName rootProject.ext.versionName } buildTypes { @@ -34,18 +29,17 @@ dependencies { } // Wear - compile fileTree(dir: 'libs', include: ['*.jar']) - compile "com.google.android.support:wearable:${wearableVersion}" - provided "com.google.android.wearable:wearable:${wearableVersion}" + compile rootProject.ext.dep.wearCompile + provided rootProject.ext.dep.wearProvided // Leak Canary - debugCompile "com.squareup.leakcanary:leakcanary-android:${leakCanaryVersion}" - releaseCompile "com.squareup.leakcanary:leakcanary-android-no-op:${leakCanaryVersion}" - testCompile "com.squareup.leakcanary:leakcanary-android-no-op:${leakCanaryVersion}" + debugCompile rootProject.ext.dep.leakCanaryDebug + releaseCompile rootProject.ext.dep.leakCanaryRelease + testCompile rootProject.ext.dep.leakCanaryTest // Testing dependencies - testCompile 'junit:junit:4.12' - testCompile 'org.mockito:mockito-core:2.2.27' + testCompile rootProject.ext.dep.junit + testCompile rootProject.ext.dep.mockito } apply from: 'gradle-config.gradle' diff --git a/platform/android/MapboxGLAndroidSDKWearTestApp/src/main/java/com/mapbox/weartestapp/utils/OffsettingHelper.java b/platform/android/MapboxGLAndroidSDKWearTestApp/src/main/java/com/mapbox/weartestapp/utils/OffsettingHelper.java index 5b5d512c45..8550d0d016 100644 --- a/platform/android/MapboxGLAndroidSDKWearTestApp/src/main/java/com/mapbox/weartestapp/utils/OffsettingHelper.java +++ b/platform/android/MapboxGLAndroidSDKWearTestApp/src/main/java/com/mapbox/weartestapp/utils/OffsettingHelper.java @@ -34,7 +34,7 @@ public class OffsettingHelper extends DefaultOffsettingHelper { } @Override - protected void adjustAnchorOffsetXY(View child, float[] anchorOffsetXY) { + public void adjustAnchorOffsetXY(View child, float[] anchorOffsetXY) { anchorOffsetXY[0] = child.getHeight() / 2.0f; } } |