Skip to content

Commit

Permalink
Merge pull request #6 from dukhanov/feature/rearrange-android-lib-folder
Browse files Browse the repository at this point in the history
Feature/rearrange android lib folder
  • Loading branch information
dukhanov authored Oct 31, 2017
2 parents 111450b + 235e842 commit 37eaefc
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 26 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cordova-plugin-flic",
"version": "1.0.3",
"version": "1.0.4",
"description": "A Cordova plugin providing access to the Flic SDK",
"cordova": {
"id": "cordova-plugin-flic",
Expand Down
8 changes: 3 additions & 5 deletions plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
xmlns:android="http://schemas.android.com/apk/res/android"
id="cordova-plugin-flic"
version="1.0.3">
version="1.0.4">
<name>Flic</name>
<description>A Cordova plugin providing access to the Flic SDK</description>
<license>Apache 2.0</license>
Expand All @@ -12,8 +12,6 @@

<engines>
<engine name="cordova" version=">=7.1.0"/>
<engine name="cordova-android" version=">=6.3.0"/>
<engine name="cordova-ios" version=">=4.4.0"/>
</engines>

<js-module src="www/Flic.js" name="Flic">
Expand All @@ -23,8 +21,8 @@
<!-- android -->
<platform name="android">
<!-- Add plugin dependencies -->
<framework src="src/android/cordovaFlic.gradle" custom="true" type="gradleReference" />
<resource-file src="libs/fliclib-release.aar" target="libs/fliclib-release.aar" />
<framework src="src/android/build.gradle" custom="true" type="gradleReference" />
<resource-file src="src/android/libs/fliclib.aar" target="src/android/libs/fliclib.aar" />
<config-file target="res/xml/config.xml" parent="/*">
<!-- The feature's name attribute should match what you specify as the JavaScript exec call's service parameter.
The value attribute should match the name of the plugin's Java class.
Expand Down
16 changes: 13 additions & 3 deletions src/android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,17 @@
repositories {
maven { url "https://jitpack.io" }
repositories{
jcenter()
flatDir{
dirs 'src/android/libs'
}
}

dependencies {
compile 'com.github.50ButtonsEach:fliclib-android:ec1cdc3fbe'
compile(name:'fliclib', ext:'aar')
}

android {
packagingOptions {
exclude 'META-INF/NOTICE'
exclude 'META-INF/LICENSE'
}
}
17 changes: 0 additions & 17 deletions src/android/cordovaFlic.gradle

This file was deleted.

File renamed without changes.

0 comments on commit 37eaefc

Please sign in to comment.