Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: migrate to gradle #284

Merged
merged 12 commits into from
Feb 3, 2020
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 0 additions & 4 deletions android/AndroidManifest.xml

This file was deleted.

6 changes: 6 additions & 0 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@

dependencies {
implementation 'com.google.android.gms:play-services-maps:17.0.0'
implementation 'com.google.maps.android:android-maps-utils:0.6.2'
implementation 'androidx.fragment:fragment:1.1.0'
}
8 changes: 0 additions & 8 deletions android/build.properties.example

This file was deleted.

10 changes: 0 additions & 10 deletions android/build.xml

This file was deleted.

Binary file removed android/lib/android-maps-utils-release.aar
Binary file not shown.
8 changes: 4 additions & 4 deletions android/manifest
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
# this is your module manifest and used by Titanium
# during compilation, packaging, distribution, etc.
#
version: 4.5.1
version: 5.0.0
apiversion: 4
architectures: arm64-v8a armeabi-v7a x86
description: External version of Map module to support new Google Map v2 sdk
architectures: arm64-v8a armeabi-v7a x86 x86_64
description: External version of Map module using native Google Maps library
author: Appcelerator
license: Apache Public License v2
copyright: Copyright (c) 2013-present by Axway, Inc.
Expand All @@ -15,5 +15,5 @@ name: map
moduleid: ti.map
guid: f0d8fd44-86d2-4730-b67d-bd454577aeee
platform: android
minsdk: 7.0.0
minsdk: 9.0.0
respackage: com.google.android.gms
4 changes: 2 additions & 2 deletions android/src/ti/map/MapModule.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import org.appcelerator.kroll.annotations.Kroll;
import org.appcelerator.titanium.TiApplication;

import com.google.android.gms.common.GooglePlayServicesUtil;
import com.google.android.gms.common.GoogleApiAvailability;
import com.google.android.gms.maps.GoogleMap;
import com.google.android.gms.maps.MapsInitializer;
import com.google.android.gms.maps.model.BitmapDescriptorFactory;
Expand Down Expand Up @@ -141,7 +141,7 @@ public MapModule()
@Kroll.method
public int isGooglePlayServicesAvailable()
{
return GooglePlayServicesUtil.isGooglePlayServicesAvailable(TiApplication.getAppRootOrCurrentActivity());
return GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(TiApplication.getInstance());
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion android/src/ti/map/TiStreetViewPanorama.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import com.google.android.gms.maps.model.LatLng;

import android.app.Activity;
import android.support.v4.app.Fragment;
import androidx.fragment.app.Fragment;

public class TiStreetViewPanorama extends TiUIFragment implements OnStreetViewPanoramaReadyCallback
{
Expand Down
2 changes: 1 addition & 1 deletion android/src/ti/map/TiUIMapView.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
import android.graphics.Point;
import android.location.Location;
import android.os.Build;
import android.support.v4.app.Fragment;
import android.view.MotionEvent;
import android.view.SurfaceView;
import android.view.View;
import android.view.ViewGroup;
import androidx.fragment.app.Fragment;
import com.google.android.gms.maps.CameraUpdate;
import com.google.android.gms.maps.CameraUpdateFactory;
import com.google.android.gms.maps.GoogleMap;
Expand Down
5 changes: 1 addition & 4 deletions android/timodule.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,8 @@
<ti:module xmlns:ti="http://ti.appcelerator.org" xmlns:android="http://schemas.android.com/apk/res/android">
<android>
<manifest>
<application>
<uses-library android:name="org.apache.http.legacy" android:required="false" />
</application>
<uses-feature android:glEsVersion="0x00020000" android:required="true" />
<uses-permission android:name="${tiapp.properties['id']}.permission.MAPS_RECEIVE" />
<uses-permission android:name="${applicationId}.permission.MAPS_RECEIVE" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
</manifest>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@titanium-sdk/ti.map",
"version": "4.5.0",
"version": "5.0.0",
"description": "Provides Map UI elements for Titanium applications",
"scripts": {
"commit": "git-cz",
Expand Down