Merge branch 'alt_beacon_2_13_1' into petermetz_v3.x

sestienne · Jun 14, 2018 · 1a637b8 · 1a637b8
2 parents 928f9f4 + 7f5830b
commit 1a637b8
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 32 deletions.
diff --git a/libs/android/altbeacon.jar b/libs/android/altbeacon.jar
diff --git a/libs/android/android-beacon-library-2.13.1.aar b/libs/android/android-beacon-library-2.13.1.aar
diff --git a/plugin.xml b/plugin.xml
@@ -93,46 +93,16 @@
         </config-file>
 
         <config-file target="AndroidManifest.xml" parent="/manifest">
-			<uses-permission android:name="android.permission.BLUETOOTH" />
-            <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
 			<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-            <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-            <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-        </config-file>
-
-        <config-file target="AndroidManifest.xml" parent="/manifest/application">
-			<receiver android:name="org.altbeacon.beacon.startup.StartupBroadcastReceiver" >
-				<intent-filter>
-					<action android:name="android.intent.action.BOOT_COMPLETED" />
-					<action android:name="android.intent.action.ACTION_POWER_CONNECTED" />
-					<action android:name="android.intent.action.ACTION_POWER_DISCONNECTED" />
-				</intent-filter>
-			</receiver>
-            <service android:enabled="true"
-                     android:exported="true"
-                     android:isolatedProcess="false"
-                     android:label="iBeacon"
-                     android:name="org.altbeacon.beacon.service.BeaconService">
-                     <meta-data android:name="longScanForcingEnabled" android:value="true" />
-            </service>
-            <service android:enabled="true"
-                     android:name="org.altbeacon.beacon.BeaconIntentProcessor">
-                <meta-data android:name="background" android:value="true" />
-                <intent-filter android:priority="1" >
-                    <action android:name="com.unarin.cordova.beacon.IBeaconPlugin.DID_RANGING" />
-                    <action android:name="com.unarin.cordova.beacon.IBeaconPlugin.DID_MONITORING" />
-                </intent-filter>
-            </service>
-            <service android:name="org.altbeacon.beacon.service.ScanJob" 
-                     android:permission="android.permission.BIND_JOB_SERVICE" />
         </config-file>
 
         <source-file src="src/android/LocationManager.java" target-dir="src/com/unarin/cordova/beacon" />
         <source-file src="src/android/IBeaconServiceNotifier.java" target-dir="src/com/unarin/cordova/beacon" />
         <source-file src="src/android/ILocationManagerCommand.java" target-dir="src/com/unarin/cordova/beacon" />
         <source-file src="src/android/PausableThreadPoolExecutor.java" target-dir="src/com/unarin/cordova/beacon" />
+        <resource-file src="libs/android/android-beacon-library-2.13.1.aar"  target="libs/android-beacon-library-2.13.1.aar" />
 
-        <lib-file src="libs/android/altbeacon.jar" />
+        <framework src="src/android/cordova-plugin-ibeacon.gradle" custom="true" type="gradleReference" />
         <framework src="com.android.support:support-core-utils:26+" />
     </platform>
 

diff --git a/src/android/cordova-plugin-ibeacon.gradle b/src/android/cordova-plugin-ibeacon.gradle
@@ -0,0 +1,17 @@
+repositories{
+    jcenter()
+    flatDir{
+        dirs 'libs'
+    }
+}
+
+dependencies {
+    compile(name:'android-beacon-library-2.13.1', ext:'aar')
+}
+
+android {
+    packagingOptions {
+        exclude 'META-INF/NOTICE'
+        exclude 'META-INF/LICENSE'
+    }
+}