Merge branch 'master' of github.com:appcelerator-modules/ti.map into …

…feature/parity-on-addpolylines-implementation * 'master' of github.com:appcelerator-modules/ti.map: [TIMOB-25353] Android: Use ti.playservices module (tidev#216) [MOD-2371] Fix selectedAnnotation regression
jvandijk · Nov 20, 2017 · 0e38178 · 0e38178
2 parents c77c388 + d331c16
commit 0e38178
Show file tree

Hide file tree

Showing 28 changed files with 18 additions and 31 deletions.
diff --git a/.gitignore b/.gitignore
@@ -28,5 +28,6 @@ android/.classpath
 android/.settings
 android/dist/
 android/launch-*
+android/java-sources.txt
 nbproject
 /ios/metadata.json
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -3,6 +3,7 @@
 buildModule {
 	// defaults:
 	//nodeVersion = '4.7.3' // Must have version set up on Jenkins master before it can be changed
-	//sdkVersion = '6.0.3.GA'
+	// TODO: Change to 7.0.0.GA after release
+	sdkVersion = '7.0.0.v20171110104246' // Use latest master build with ti.playservices included and fixes to module build.
 	//androidAPILevel = '23' // if changed, must install on build nodes
 }
diff --git a/android/lib/google-play-services-base.jar b/android/lib/google-play-services-base.jar
diff --git a/android/lib/google-play-services-basement.jar b/android/lib/google-play-services-basement.jar
diff --git a/android/lib/google-play-services-map.jar b/android/lib/google-play-services-map.jar
diff --git a/android/lib/version b/android/lib/version
diff --git a/android/manifest b/android/manifest
@@ -2,19 +2,19 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 3.4.0
-apiversion: 3
-architectures: armeabi-v7a x86
+version: 4.0.0
+apiversion: 4
+architectures: arm64-v8a armeabi-v7a x86
 description: External version of Map module to support new Google Map v2 sdk
 author: Hieu Pham
 license: Apache Public License v2
-copyright: Copyright (c) 2013-2017 by Appcelerator, Inc.
+copyright: Copyright (c) 2013-2017 by Axway, Inc.
 
 
 # these should not be edited
 name: map
 moduleid: ti.map
 guid: f0d8fd44-86d2-4730-b67d-bd454577aeee
 platform: android
-minsdk: 6.0.0
+minsdk: 7.0.0
 respackage: com.google.android.gms
diff --git a/android/platform/android/res/drawable-hdpi/cast_ic_notification_0.png b/android/platform/android/res/drawable-hdpi/cast_ic_notification_0.png
diff --git a/android/platform/android/res/drawable-hdpi/cast_ic_notification_1.png b/android/platform/android/res/drawable-hdpi/cast_ic_notification_1.png
diff --git a/android/platform/android/res/drawable-hdpi/cast_ic_notification_2.png b/android/platform/android/res/drawable-hdpi/cast_ic_notification_2.png
diff --git a/android/platform/android/res/drawable-hdpi/cast_ic_notification_on.png b/android/platform/android/res/drawable-hdpi/cast_ic_notification_on.png
diff --git a/android/platform/android/res/drawable-hdpi/common_full_open_on_phone.png b/android/platform/android/res/drawable-hdpi/common_full_open_on_phone.png
diff --git a/android/platform/android/res/drawable-mdpi/cast_ic_notification_0.png b/android/platform/android/res/drawable-mdpi/cast_ic_notification_0.png
diff --git a/android/platform/android/res/drawable-mdpi/cast_ic_notification_1.png b/android/platform/android/res/drawable-mdpi/cast_ic_notification_1.png
diff --git a/android/platform/android/res/drawable-mdpi/cast_ic_notification_2.png b/android/platform/android/res/drawable-mdpi/cast_ic_notification_2.png
diff --git a/android/platform/android/res/drawable-mdpi/cast_ic_notification_on.png b/android/platform/android/res/drawable-mdpi/cast_ic_notification_on.png
diff --git a/android/platform/android/res/drawable-xhdpi/cast_ic_notification_0.png b/android/platform/android/res/drawable-xhdpi/cast_ic_notification_0.png
diff --git a/android/platform/android/res/drawable-xhdpi/cast_ic_notification_1.png b/android/platform/android/res/drawable-xhdpi/cast_ic_notification_1.png
diff --git a/android/platform/android/res/drawable-xhdpi/cast_ic_notification_2.png b/android/platform/android/res/drawable-xhdpi/cast_ic_notification_2.png
diff --git a/android/platform/android/res/drawable-xhdpi/cast_ic_notification_on.png b/android/platform/android/res/drawable-xhdpi/cast_ic_notification_on.png
diff --git a/android/platform/android/res/drawable-xhdpi/common_full_open_on_phone.png b/android/platform/android/res/drawable-xhdpi/common_full_open_on_phone.png
diff --git a/android/platform/android/res/drawable-xxhdpi/cast_ic_notification_0.png b/android/platform/android/res/drawable-xxhdpi/cast_ic_notification_0.png
diff --git a/android/platform/android/res/drawable-xxhdpi/cast_ic_notification_1.png b/android/platform/android/res/drawable-xxhdpi/cast_ic_notification_1.png
diff --git a/android/platform/android/res/drawable-xxhdpi/cast_ic_notification_2.png b/android/platform/android/res/drawable-xxhdpi/cast_ic_notification_2.png
diff --git a/android/platform/android/res/drawable-xxhdpi/cast_ic_notification_on.png b/android/platform/android/res/drawable-xxhdpi/cast_ic_notification_on.png
diff --git a/android/timodule.xml b/android/timodule.xml
@@ -1,27 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ti:module xmlns:ti="http://ti.appcelerator.org" xmlns:android="http://schemas.android.com/apk/res/android">
-	<!--
-		Similar to tiapp.xml, but contains module/platform specific
-		configuration in <iphone>, <android>, and <mobileweb> sections
-	-->
-	<iphone>
-	</iphone>
 	<android xmlns:android="http://schemas.android.com/apk/res/android">
-            <manifest>
-               <uses-feature android:glEsVersion="0x00020000" android:required="true"/>
-               <permission android:name="${tiapp.properties['id']}.permission.MAPS_RECEIVE" android:protectionLevel="signature"/>
-               <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES"/>
-               <uses-permission android:name="${tiapp.properties['id']}.permission.MAPS_RECEIVE"/>
-               <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
-               <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
-               <application>
-                  <meta-data
- 	                 android:name="com.google.android.gms.version"
- 	                 android:value="@integer/google_play_services_version"/>
-               </application>
-            </manifest>
-
+      <manifest>
+         <uses-feature android:glEsVersion="0x00020000" android:required="true"/>
+         <uses-permission android:name="${tiapp.properties['id']}.permission.MAPS_RECEIVE"/>
+         <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+         <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+      </manifest>
 	</android>
-	<mobileweb>
-	</mobileweb>
+   <modules>
+      <module platform="android">ti.playservices</module>
+   </modules>
 </ti:module>
diff --git a/ios/Classes/TiMapView.m b/ios/Classes/TiMapView.m
@@ -982,7 +982,6 @@ - (void)mapView:(MKMapView *)mapView didSelectAnnotationView:(MKAnnotationView *
     BOOL isSelected = [view isSelected];
     MKAnnotationView<TiMapAnnotation> *ann = (MKAnnotationView<TiMapAnnotation> *)view;
 
-    RELEASE_TO_NIL(selectedAnnotation);
     selectedAnnotation = [ann retain];
 
     // If canShowCallout == true we will try to find calloutView to hadleTap on callout

diff --git a/ios/manifest b/ios/manifest
@@ -2,7 +2,7 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 3.0.0
+version: 3.0.1
 apiversion: 2
 architectures: armv7 arm64 i386 x86_64
 description: External version of Map module