Skip to content

Commit 432007d

Browse files
chrisnoodoeamuramoto
chrisnoodoe
authored and
amuramoto
committed
Fix build error, and upgrade dependencies. (#535)
1 parent 91c0c23 commit 432007d

16 files changed

Lines changed: 85 additions & 68 deletions

‎build.gradle‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
buildscript {
2+
ext.kotlin_version = '1.3.41'
23
repositories {
34
google()
45
jcenter()
56
}
67

78
dependencies {
8-
classpath 'com.android.tools.build:gradle:3.2.1'
9+
classpath 'com.android.tools.build:gradle:3.4.2'
10+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
911
}
1012
}
1113

@@ -25,9 +27,9 @@ project.ext.preDexLibs = !project.hasProperty('disablePreDex')
2527
subprojects {
2628
project.plugins.whenPluginAdded { plugin ->
2729
if (rootProject.ext.has('preDexLibs')) {
28-
if ("com.android.build.gradle.AppPlugin".equals(plugin.class.name)) {
30+
if ("com.android.build.gradle.AppPlugin" == plugin.class.name) {
2931
project.android.dexOptions.preDexLibraries = rootProject.ext.preDexLibs
30-
} else if ("com.android.build.gradle.LibraryPlugin".equals(plugin.class.name)) {
32+
} else if ("com.android.build.gradle.LibraryPlugin" == plugin.class.name) {
3133
project.android.dexOptions.preDexLibraries = rootProject.ext.preDexLibs
3234
}
3335
}

‎demo/AndroidManifest.xml‎

Lines changed: 40 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,63 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.google.maps.android.utils.demo"
4-
android:versionCode="1"
5-
android:versionName="1.0">
3+
package="com.google.maps.android.utils.demo"
4+
android:versionCode="1"
5+
android:versionName="1.0">
66

77
<permission
8-
android:name="com.google.maps.android.utils.permission.MAPS_RECEIVE"
9-
android:protectionLevel="signature"/>
10-
<uses-permission android:name="com.google.maps.android.utils.permission.MAPS_RECEIVE"/>
8+
android:name="com.google.maps.android.utils.permission.MAPS_RECEIVE"
9+
android:protectionLevel="signature" />
1110

12-
<uses-permission android:name="android.permission.INTERNET"/>
13-
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
14-
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
15-
<uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES"/>
11+
<uses-permission android:name="com.google.maps.android.utils.permission.MAPS_RECEIVE" />
1612

17-
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
18-
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
13+
<uses-permission android:name="android.permission.INTERNET" />
14+
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
15+
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
16+
<uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES" />
17+
18+
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
19+
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
1920

2021
<uses-feature
21-
android:glEsVersion="0x00020000"
22-
android:required="true"/>
22+
android:glEsVersion="0x00020000"
23+
android:required="true" />
2324

2425
<application
25-
android:icon="@drawable/ic_launcher"
26-
android:label="@string/app_name"
27-
android:theme="@style/LightThemeSelector"
28-
android:allowBackup="false">
26+
android:allowBackup="false"
27+
android:icon="@drawable/ic_launcher"
28+
android:label="@string/app_name"
29+
android:theme="@style/LightThemeSelector">
2930

3031
<meta-data
31-
android:name="com.google.android.gms.version"
32-
android:value="@integer/google_play_services_version" />
32+
android:name="com.google.android.gms.version"
33+
android:value="@integer/google_play_services_version" />
3334

3435
<meta-data
35-
android:name="com.google.android.geo.API_KEY"
36-
android:value="AIzaSyDCa5WRSMk3CrNSf3y5xbyQTvp1_zwuTtE"/>
36+
android:name="com.google.android.geo.API_KEY"
37+
android:value="AIzaSyDCa5WRSMk3CrNSf3y5xbyQTvp1_zwuTtE" />
3738

3839
<activity
39-
android:name=".MainActivity"
40-
android:label="@string/app_name">
40+
android:name=".MainActivity"
41+
android:label="@string/app_name">
4142
<intent-filter>
42-
<action android:name="android.intent.action.MAIN"/>
43-
<category android:name="android.intent.category.LAUNCHER"/>
43+
<action android:name="android.intent.action.MAIN" />
44+
<category android:name="android.intent.category.LAUNCHER" />
4445
</intent-filter>
4546
</activity>
4647

47-
<activity android:name=".PolyDecodeDemoActivity"/>
48-
<activity android:name=".PolySimplifyDemoActivity"/>
49-
<activity android:name=".IconGeneratorDemoActivity"/>
50-
<activity android:name=".DistanceDemoActivity"/>
51-
<activity android:name=".ClusteringDemoActivity"/>
52-
<activity android:name=".BigClusteringDemoActivity"/>
53-
<activity android:name=".VisibleClusteringDemoActivity"/>
54-
<activity android:name=".CustomMarkerClusteringDemoActivity"/>
55-
<activity android:name=".TileProviderAndProjectionDemo"/>
56-
<activity android:name=".HeatmapsDemoActivity"/>
57-
<activity android:name=".HeatmapsPlacesDemoActivity"/>
58-
<activity android:name=".GeoJsonDemoActivity"/>
59-
<activity android:name=".KmlDemoActivity"/>
48+
<activity android:name=".PolyDecodeDemoActivity" />
49+
<activity android:name=".PolySimplifyDemoActivity" />
50+
<activity android:name=".IconGeneratorDemoActivity" />
51+
<activity android:name=".DistanceDemoActivity" />
52+
<activity android:name=".ClusteringDemoActivity" />
53+
<activity android:name=".BigClusteringDemoActivity" />
54+
<activity android:name=".VisibleClusteringDemoActivity" />
55+
<activity android:name=".CustomMarkerClusteringDemoActivity" />
56+
<activity android:name=".TileProviderAndProjectionDemo" />
57+
<activity android:name=".HeatmapsDemoActivity" />
58+
<activity android:name=".HeatmapsPlacesDemoActivity" />
59+
<activity android:name=".GeoJsonDemoActivity" />
60+
<activity android:name=".KmlDemoActivity" />
6061

6162
</application>
6263

‎demo/build.gradle‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
apply plugin: 'com.android.application'
22

33
dependencies {
4-
// implementation project(':library')
4+
implementation project(':library')
5+
6+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
7+
58
// Or, fetch from Maven:
6-
implementation 'com.google.maps.android:android-maps-utils:0.3+'
7-
implementation 'com.google.android.gms:play-services-maps:16.1.0'
9+
// implementation 'com.google.maps.android:android-maps-utils:0.5'
10+
implementation 'com.google.android.gms:play-services-maps:17.0.0'
11+
12+
implementation 'androidx.appcompat:appcompat:1.0.2'
13+
implementation 'androidx.core:core-ktx:1.0.2'
814
}
915

1016
buildscript {
@@ -13,7 +19,7 @@ buildscript {
1319
jcenter()
1420
}
1521
dependencies {
16-
classpath 'com.android.tools.build:gradle:3.0.1'
22+
classpath 'com.android.tools.build:gradle:3.4.2'
1723

1824
// NOTE: Do not place your application dependencies here; they belong
1925
// in the individual module build.gradle files

‎demo/src/com/google/maps/android/utils/demo/BaseDemoActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package com.google.maps.android.utils.demo;
1818

1919
import android.os.Bundle;
20-
import android.support.v4.app.FragmentActivity;
20+
import androidx.fragment.app.FragmentActivity;
2121
import com.google.android.gms.maps.GoogleMap;
2222
import com.google.android.gms.maps.OnMapReadyCallback;
2323
import com.google.android.gms.maps.SupportMapFragment;

‎demo/src/com/google/maps/android/utils/demo/BigClusteringDemoActivity.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,26 @@
1616

1717
package com.google.maps.android.utils.demo;
1818

19-
import java.io.InputStream;
20-
import java.util.List;
21-
22-
import org.json.JSONException;
23-
2419
import android.widget.Toast;
2520

2621
import com.google.android.gms.maps.CameraUpdateFactory;
2722
import com.google.android.gms.maps.model.LatLng;
2823
import com.google.maps.android.clustering.ClusterManager;
2924
import com.google.maps.android.utils.demo.model.MyItem;
3025

26+
import org.json.JSONException;
27+
28+
import java.io.InputStream;
29+
import java.util.List;
30+
3131
public class BigClusteringDemoActivity extends BaseDemoActivity {
3232
private ClusterManager<MyItem> mClusterManager;
3333

3434
@Override
3535
protected void startDemo() {
3636
getMap().moveCamera(CameraUpdateFactory.newLatLngZoom(new LatLng(51.503186, -0.126446), 10));
3737

38-
mClusterManager = new ClusterManager<MyItem>(this, getMap());
38+
mClusterManager = new ClusterManager<>(this, getMap());
3939

4040
getMap().setOnCameraIdleListener(mClusterManager);
4141
try {

‎demo/src/com/google/maps/android/utils/demo/ClusteringDemoActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public class ClusteringDemoActivity extends BaseDemoActivity {
3838
protected void startDemo() {
3939
getMap().moveCamera(CameraUpdateFactory.newLatLngZoom(new LatLng(51.503186, -0.126446), 10));
4040

41-
mClusterManager = new ClusterManager<MyItem>(this, getMap());
41+
mClusterManager = new ClusterManager<>(this, getMap());
4242
getMap().setOnCameraIdleListener(mClusterManager);
4343

4444
try {

‎demo/src/com/google/maps/android/utils/demo/DistanceDemoActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ protected int getLayoutId() {
4343

4444
@Override
4545
protected void startDemo() {
46-
mTextView = (TextView) findViewById(R.id.textView);
46+
mTextView = findViewById(R.id.textView);
4747

4848
getMap().moveCamera(CameraUpdateFactory.newLatLngZoom(new LatLng(-33.8256, 151.2395), 10));
4949
getMap().setOnMarkerDragListener(this);

‎demo/src/com/google/maps/android/utils/demo/HeatmapsDemoActivity.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public class HeatmapsDemoActivity extends BaseDemoActivity {
8989
* Maps name of data set to data (list of LatLngs)
9090
* Also maps to the URL of the data set for attribution
9191
*/
92-
private HashMap<String, DataSet> mLists = new HashMap<String, DataSet>();
92+
private HashMap<String, DataSet> mLists = new HashMap<>();
9393

9494
@Override
9595
protected int getLayoutId() {
@@ -101,7 +101,7 @@ protected void startDemo() {
101101
getMap().moveCamera(CameraUpdateFactory.newLatLngZoom(new LatLng(-25, 143), 4));
102102

103103
// Set up the spinner/dropdown list
104-
Spinner spinner = (Spinner) findViewById(R.id.spinner);
104+
Spinner spinner = findViewById(R.id.spinner);
105105
ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(this,
106106
R.array.heatmaps_datasets_array, android.R.layout.simple_spinner_item);
107107
adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
@@ -159,7 +159,7 @@ public void onItemSelected(AdapterView<?> parent, View view,
159159
int pos, long id) {
160160
String dataset = parent.getItemAtPosition(pos).toString();
161161

162-
TextView attribution = ((TextView) findViewById(R.id.attribution));
162+
TextView attribution = findViewById(R.id.attribution);
163163

164164
// Check if need to instantiate (avoid setData etc twice)
165165
if (mProvider == null) {

‎demo/src/com/google/maps/android/utils/demo/KmlDemoActivity.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,8 @@ public void onFeatureClick(Feature feature) {
118118
e.printStackTrace();
119119
} catch (IOException e) {
120120
e.printStackTrace();
121+
} catch (NullPointerException e) {
122+
e.printStackTrace();
121123
}
122124
}
123125
}

‎demo/src/com/google/maps/android/utils/demo/VisibleClusteringDemoActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ protected void startDemo() {
4040

4141
getMap().moveCamera(CameraUpdateFactory.newLatLngZoom(new LatLng(51.503186, -0.126446), 10));
4242

43-
mClusterManager = new ClusterManager<MyItem>(this, getMap());
43+
mClusterManager = new ClusterManager<>(this, getMap());
4444
mClusterManager.setAlgorithm(new NonHierarchicalViewBasedAlgorithm<MyItem>(
4545
metrics.widthPixels, metrics.heightPixels));
4646

0 commit comments

Comments
 (0)