Skip to content
This repository has been archived by the owner on Oct 7, 2024. It is now read-only.

Commit

Permalink
Remove unused dependencies (#679)
Browse files Browse the repository at this point in the history
removed traffic and geojson implementation dependency lines

Removed geojson and traffic examples and adjust proguard rules

Increased wearable demo heapsize and removed services from manifest files
  • Loading branch information
Langston Smith authored Apr 13, 2018
1 parent 42f8a9f commit 8ab7c1d
Show file tree
Hide file tree
Showing 11 changed files with 70 additions and 377 deletions.
2 changes: 0 additions & 2 deletions MapboxAndroidDemo/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,6 @@ dependencies {
// Mapbox plugins
implementation dependenciesList.mapboxPluginLocationLayer
implementation dependenciesList.mapboxPluginBuilding
implementation dependenciesList.mapboxPluginTraffic
implementation dependenciesList.mapboxPluginGeoJson
implementation dependenciesList.mapboxPluginMarkerCluster
implementation dependenciesList.mapboxPluginPlaces
implementation dependenciesList.mapboxPluginLocalization
Expand Down
32 changes: 32 additions & 0 deletions MapboxAndroidDemo/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,35 @@

# MAS data models that will be serialized/deserialized over Gson
-keep class com.mapbox.services.api.directionsmatrix.v1.models.** { *; }

# --- GMS ---
-keep public class com.google.android.gms.* { public *; }
-dontwarn com.google.android.gms.**


# Consumer proguard rules for plugins

# --- AutoValue ---
# AutoValue annotations are retained but dependency is compileOnly.
-dontwarn com.google.auto.value.**

# --- Retrofit ---
# Retain generic type information for use by reflection by converters and adapters.
-keepattributes Signature
# Retain service method parameters.
-keepclassmembernames,allowobfuscation interface * {
@retrofit2.http.* <methods>;
}
# Ignore annotation used for build tooling.
-dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement

# --- OkHttp ---
-dontwarn okhttp3.**
-dontwarn okio.**
-dontwarn javax.annotation.**
-dontwarn org.conscrypt.**
# A resource is loaded with a relative path so the package of this class must be preserved.
-keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase

# --- Java ---
-dontwarn java.awt.Color
15 changes: 0 additions & 15 deletions MapboxAndroidDemo/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,6 @@
android:name="android.support.PARENT_ACTIVITY"
android:value="com.mapbox.mapboxandroiddemo.MainActivity" />
</activity>
<activity
android:name=".examples.plugins.TrafficPluginActivity"
android:label="@string/activity_plugins_traffic_plugin_title">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="com.mapbox.mapboxandroiddemo.MainActivity" />
</activity>
<activity
android:name=".examples.plugins.PlacesPluginActivity"
android:label="@string/activity_plugins_places_plugin_title">
Expand Down Expand Up @@ -153,7 +146,6 @@
android:value="com.mapbox.mapboxandroiddemo.MainActivity" />
</activity>

<service android:name="com.mapbox.services.android.telemetry.service.TelemetryService" />
<service android:name=".account.AccountRetrievalService" />

<activity
Expand Down Expand Up @@ -439,13 +431,6 @@
android:name="android.support.PARENT_ACTIVITY"
android:value="com.mapbox.mapboxandroiddemo.MainActivity" />
</activity>
<activity
android:name=".examples.plugins.GeoJsonPluginActivity"
android:label="@string/activity_plugins_geojson_plugin_title">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="com.mapbox.mapboxandroiddemo.MainActivity" />
</activity>
<activity
android:name=".examples.plugins.MarkerClustersPluginActivity"
android:label="@string/activity_plugins_marker_clusters_plugin_title">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -385,12 +385,6 @@ private void listItems(int id) {
break;

case R.id.nav_plugins:
/*exampleItemModels.add(new ExampleItemModel(
R.string.activity_plugins_traffic_plugin_title,
R.string.activity_plugins_traffic_plugin_description,
new Intent(MainActivity.this, TrafficPluginActivity.class),
R.string.activity_plugins_traffic_plugin_url, false, BuildConfig.MIN_SDK_VERSION));*/

exampleItemModels.add(new ExampleItemModel(
R.string.activity_plugins_building_plugin_title,
R.string.activity_plugins_building_plugin_description,
Expand All @@ -403,11 +397,6 @@ private void listItems(int id) {
new Intent(MainActivity.this, LocationPluginActivity.class),
R.string.activity_plugins_location_plugin_url, false, BuildConfig.MIN_SDK_VERSION));

/* exampleItemModels.add(new ExampleItemModel(
R.string.activity_plugins_geojson_plugin_title, R.string.activity_plugins_geojson_plugin_description,
new Intent(MainActivity.this, GeoJsonPluginActivity.class),
R.string.activity_plugins_geojson_plugin_url, false, BuildConfig.MIN_SDK_VERSION));*/

exampleItemModels.add(new ExampleItemModel(
R.string.activity_plugins_places_plugin_title, R.string.activity_plugins_places_plugin_description,
new Intent(MainActivity.this, PlacesPluginActivity.class),
Expand Down

This file was deleted.

Loading

0 comments on commit 8ab7c1d

Please sign in to comment.