Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

[android] remove unnecessary @jar and @aar dependencies suffixes #11161

Merged
merged 2 commits into from
Feb 9, 2018
Merged

[android] remove unnecessary @jar and @aar dependencies suffixes #11161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0f02f6
[android] remove unnecessary @jar and @aar dependencies suffixes
Guardiola31337 Feb 9, 2018
83d7536
[android] remove lint baseline file from mapbox gl android sdk module…
Guardiola31337 Feb 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions platform/android/MapboxGLAndroidSDK/.gitignore
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions platform/android/MapboxGLAndroidSDK/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ android {

lintOptions {
disable 'MissingTranslation', 'TypographyQuotes', 'ObsoleteLintCustomCheck', 'MissingPermission'
baseline file("lint-baseline-local.xml")
checkAllWarnings true
warningsAsErrors false
}
Expand Down Expand Up @@ -148,4 +147,3 @@ apply from: "${rootDir}/gradle/gradle-javadoc.gradle"
apply from: "${rootDir}/gradle/gradle-publish.gradle"
apply from: "${rootDir}/gradle/gradle-checkstyle.gradle"
apply from: "${rootDir}/gradle/gradle-tests-staticblockremover.gradle"
apply from: "${rootDir}/gradle/gradle-lint.gradle"
37 changes: 0 additions & 37 deletions platform/android/MapboxGLAndroidSDK/lint-baseline-local.xml
View file
Open in desktop

This file was deleted.

44 changes: 0 additions & 44 deletions platform/android/MapboxGLAndroidSDK/lint/lint-baseline-ci.xml
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions ...droid/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/CompassView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
import android.support.v4.view.ViewCompat;
import android.support.v4.view.ViewPropertyAnimatorCompat;
import android.support.v4.view.ViewPropertyAnimatorListenerAdapter;
import android.support.v7.widget.AppCompatImageView;
import android.util.AttributeSet;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;

import com.mapbox.mapboxsdk.maps.MapboxMap;

Expand All @@ -22,7 +22,7 @@
* use {@link com.mapbox.mapboxsdk.maps.UiSettings}.
* </p>
*/
public final class CompassView extends ImageView implements Runnable {
public final class CompassView extends AppCompatImageView implements Runnable {

public static final long TIME_WAIT_IDLE = 500;
public static final long TIME_MAP_NORTH_ANIMATION = 150;
Expand Down
0 ...oidSDK/src/main/res/values-he/strings.xml → ...oidSDK/src/main/res/values-iw/strings.xml
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions platform/android/gradle/dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ ext {
]

dependenciesList = [
mapboxJavaServices : "com.mapbox.mapboxsdk:mapbox-sdk-services:${versions.mapboxServices}@jar",
mapboxJavaGeoJSON : "com.mapbox.mapboxsdk:mapbox-sdk-geojson:${versions.mapboxServices}@jar",
mapboxAndroidTelemetry: "com.mapbox.mapboxsdk:mapbox-android-telemetry:${versions.mapboxTelemetry}@aar",
mapboxJavaServices : "com.mapbox.mapboxsdk:mapbox-sdk-services:${versions.mapboxServices}",
mapboxJavaGeoJSON : "com.mapbox.mapboxsdk:mapbox-sdk-geojson:${versions.mapboxServices}",
mapboxAndroidTelemetry: "com.mapbox.mapboxsdk:mapbox-android-telemetry:${versions.mapboxTelemetry}",

// for testApp
mapboxJavaTurf : "com.mapbox.mapboxsdk:mapbox-sdk-turf:${versions.mapboxServices}@jar",
mapboxJavaTurf : "com.mapbox.mapboxsdk:mapbox-sdk-turf:${versions.mapboxServices}",

junit : "junit:junit:${versions.junit}",
mockito : "org.mockito:mockito-core:${versions.mockito}",
Expand Down