tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[android] - bump gradle syntax to 4.1

Browse Source
This commit is contained in:
Tobrun
2017-11-23 14:32:35 +01:00
committed by Tobrun
parent 1b0a5f633a
commit 228aadc07e
4 changed files with 33 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
platform/android/MapboxGLAndroidSDKTestApp/build.gradle
View File

@@ -52,31 +52,32 @@ android {
}
dependencies {
compile(project(':MapboxGLAndroidSDK')) {
transitive = true
}
implementation(project(':MapboxGLAndroidSDK'))
// Support libraries
compile rootProject.ext.dep.supportAppcompatV7
compile rootProject.ext.dep.supportRecyclerView
compile rootProject.ext.dep.supportDesign
implementation rootProject.ext.dep.supportAppcompatV7
implementation rootProject.ext.dep.supportRecyclerView
implementation rootProject.ext.dep.supportDesign
// Leak Canary
debugCompile rootProject.ext.dep.leakCanaryDebug
releaseCompile rootProject.ext.dep.leakCanaryRelease
debugImplementation rootProject.ext.dep.leakCanaryDebug
releaseImplementation rootProject.ext.dep.leakCanaryRelease
// Timber
implementation rootProject.ext.dep.timber
// Mapbox Android Services (Java component)
compile(rootProject.ext.dep.mapboxJavaServices) {
implementation(rootProject.ext.dep.mapboxJavaServices) {
transitive = true
}
compile rootProject.ext.dep.lost
implementation rootProject.ext.dep.lost
// Testing dependencies
androidTestCompile rootProject.ext.dep.supportAnnotations
androidTestCompile rootProject.ext.dep.testRunner
androidTestCompile rootProject.ext.dep.testRules
androidTestCompile rootProject.ext.dep.testEspressoCore
androidTestCompile rootProject.ext.dep.testEspressoIntents
androidTestImplementation rootProject.ext.dep.supportAnnotations
androidTestImplementation rootProject.ext.dep.testRunner
androidTestImplementation rootProject.ext.dep.testRules
androidTestImplementation rootProject.ext.dep.testEspressoCore
androidTestImplementation rootProject.ext.dep.testEspressoIntents
}
apply from: 'gradle-make.gradle'

4
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/RuntimeStyleActivity.java
View File

@@ -12,8 +12,6 @@ import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
import com.mapbox.mapboxsdk.geometry.LatLng;
import com.mapbox.mapboxsdk.maps.MapView;
import com.mapbox.mapboxsdk.maps.MapboxMap;
import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
import com.mapbox.mapboxsdk.style.layers.CircleLayer;
import com.mapbox.mapboxsdk.style.layers.FillLayer;
import com.mapbox.mapboxsdk.style.layers.Layer;
@@ -40,11 +38,11 @@ import java.util.List;
import timber.log.Timber;
import static com.mapbox.mapboxsdk.style.expressions.Expression.color;
import static com.mapbox.mapboxsdk.style.expressions.Expression.exponential;
import static com.mapbox.mapboxsdk.style.expressions.Expression.interpolate;
import static com.mapbox.mapboxsdk.style.expressions.Expression.stop;
import static com.mapbox.mapboxsdk.style.expressions.Expression.zoom;
import static com.mapbox.mapboxsdk.style.expressions.Expression.color;
import static com.mapbox.mapboxsdk.style.layers.Filter.all;
import static com.mapbox.mapboxsdk.style.layers.Filter.eq;
import static com.mapbox.mapboxsdk.style.layers.Filter.gte;