From 1e2f67a76dfed974f0b266f2ba123c0ff2062edb Mon Sep 17 00:00:00 2001 From: Nga Pham Date: Thu, 18 Jul 2019 17:41:49 -0700 Subject: [PATCH] Preparing for 1.9.1 release --- README.md | 2 +- gradle.properties | 2 +- library/gradle-maven-push.gradle | 1 + .../java/com/airbnb/android/airmapview/AirMapView.java | 6 ++---- .../android/airmapview/NativeGoogleMapFragment.java | 2 +- .../airmapview/listeners/OnMapMarkerClickListener.java | 9 +-------- sample/build.gradle | 4 ++-- .../java/com/airbnb/airmapview/sample/MainActivity.java | 3 +-- 8 files changed, 10 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 19bb7f0..4f91610 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ will fallback to a web based map provider (currently Google Maps). Easy to integ Grab via Gradle: ```groovy -compile 'com.airbnb.android:airmapview:1.8.0' +compile 'com.airbnb.android:airmapview:1.9.1' ``` Snapshots of the development version are available in [Sonatype's `snapshots` repository](https://oss.sonatype.org/content/repositories/snapshots/). diff --git a/gradle.properties b/gradle.properties index ae7efc7..c5b2a87 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,7 +18,7 @@ # org.gradle.parallel=true VERSION_CODE=16 -VERSION_NAME=1.9.0-SNAPSHOT +VERSION_NAME=1.9.1 GROUP=com.airbnb.android POM_DESCRIPTION=A view abstraction to provide a map user interface with varying underlying map providers. diff --git a/library/gradle-maven-push.gradle b/library/gradle-maven-push.gradle index 48f1156..066849e 100644 --- a/library/gradle-maven-push.gradle +++ b/library/gradle-maven-push.gradle @@ -93,6 +93,7 @@ afterEvaluate { project -> } task androidJavadocs(type: Javadoc) { + excludes = ['**/*.kt'] source = android.sourceSets.main.java.srcDirs classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) } diff --git a/library/src/main/java/com/airbnb/android/airmapview/AirMapView.java b/library/src/main/java/com/airbnb/android/airmapview/AirMapView.java index 53ace34..dc58356 100644 --- a/library/src/main/java/com/airbnb/android/airmapview/AirMapView.java +++ b/library/src/main/java/com/airbnb/android/airmapview/AirMapView.java @@ -365,11 +365,9 @@ public void setMyLocationButtonEnabled(boolean enabled) { } } - @Override public boolean onMapMarkerClick(AirMapMarker airMarker) { + @Override public void onMapMarkerClick(AirMapMarker airMarker) { if (onMapMarkerClickListener != null) { - return onMapMarkerClickListener.onMapMarkerClick(airMarker); - } else { - return false; + onMapMarkerClickListener.onMapMarkerClick(airMarker); } } diff --git a/library/src/main/java/com/airbnb/android/airmapview/NativeGoogleMapFragment.java b/library/src/main/java/com/airbnb/android/airmapview/NativeGoogleMapFragment.java index f936f34..93f6485 100644 --- a/library/src/main/java/com/airbnb/android/airmapview/NativeGoogleMapFragment.java +++ b/library/src/main/java/com/airbnb/android/airmapview/NativeGoogleMapFragment.java @@ -223,7 +223,7 @@ public void setOnCameraChangeListener(final OnCameraChangeListener onCameraChang @Override public boolean onMarkerClick(Marker marker) { AirMapMarker airMarker = markers.get(marker); if (airMarker != null) { - return listener.onMapMarkerClick(airMarker); + listener.onMapMarkerClick(airMarker); } return false; } diff --git a/library/src/main/java/com/airbnb/android/airmapview/listeners/OnMapMarkerClickListener.java b/library/src/main/java/com/airbnb/android/airmapview/listeners/OnMapMarkerClickListener.java index 98cec4f..a6e7e3b 100644 --- a/library/src/main/java/com/airbnb/android/airmapview/listeners/OnMapMarkerClickListener.java +++ b/library/src/main/java/com/airbnb/android/airmapview/listeners/OnMapMarkerClickListener.java @@ -4,12 +4,5 @@ public interface OnMapMarkerClickListener { - /* - * Called when an airMarker has been clicked or tapped. - * Return true if the listener has consumed the event (i.e., the default behavior should not occur); - * false otherwise (i.e., the default behavior should occur). - * The default behavior is for the camera to move to the marker and an info window to appear. - * See: https://developers.google.com/android/reference/com/google/android/gms/maps/GoogleMap.OnMarkerClickListener - * */ - boolean onMapMarkerClick(AirMapMarker airMarker); + void onMapMarkerClick(AirMapMarker airMarker); } diff --git a/sample/build.gradle b/sample/build.gradle index bbf3395..706922c 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -16,8 +16,8 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } } diff --git a/sample/src/main/java/com/airbnb/airmapview/sample/MainActivity.java b/sample/src/main/java/com/airbnb/airmapview/sample/MainActivity.java index 224112f..ca66c79 100644 --- a/sample/src/main/java/com/airbnb/airmapview/sample/MainActivity.java +++ b/sample/src/main/java/com/airbnb/airmapview/sample/MainActivity.java @@ -299,9 +299,8 @@ private void appendBitmap(Bitmap bitmap) { logsRecyclerView.smoothScrollToPosition(adapter.getItemCount() - 1); } - @Override public boolean onMapMarkerClick(AirMapMarker airMarker) { + @Override public void onMapMarkerClick(AirMapMarker airMarker) { appendLog("Map onMapMarkerClick triggered with id " + airMarker.getId()); - return false; } @Override public void onInfoWindowClick(AirMapMarker airMarker) {