Skip to content

Commit

Permalink
Merge pull request #26 from BlinkID/feature/androidMaven
Browse files Browse the repository at this point in the history
Feature/androidMaven
  • Loading branch information
lirfu authored Sep 22, 2017
2 parents aedc3ac + 0f8eb8e commit 91d98af
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 14 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
[submodule "BlinkID/src/android/blinkid-android"]
path = BlinkID/src/android/blinkid-android
url = https://github.com/BlinkID/blinkid-android.git
[submodule "BlinkID/src/ios/blinkid-ios"]
path = BlinkID/src/ios/blinkid-ios
url = [email protected]:BlinkID/blinkid-ios.git
4 changes: 1 addition & 3 deletions BlinkID/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,10 @@
<source-file src="src/android/java/com/phonegap/plugins/blinkid/BlinkIdScanner.java" target-dir="src/com/phonegap/plugins/blinkid" />
<source-file src="src/android/java/com/phonegap/plugins/blinkid/FakeR.java" target-dir="src/com/phonegap/plugins/blinkid" />

<source-file src="src/android/blinkid-android/beep.mp3" target-dir="res/raw" />

<source-file src="src/android/res/raw/beep.mp3" target-dir="res/raw" />
<source-file src="src/android/res/layout/splash_screen.xml" target-dir="res/layout" />

<framework src="src/android/libBlinkID.gradle" custom="true" type="gradleReference" />
<resource-file src="src/android/blinkid-android/LibBlinkID.aar" target="aar/LibBlinkID.aar" />

<hook type="after_prepare" src="scripts/fix-largeheap.js" />
</platform>
Expand Down
1 change: 0 additions & 1 deletion BlinkID/src/android/blinkid-android
Submodule blinkid-android deleted from 53f569
15 changes: 8 additions & 7 deletions BlinkID/src/android/libBlinkID.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
repositories{
jcenter()
flatDir{
dirs 'aar'
}
repositories {
jcenter()
mavenCentral()
maven { url 'http://maven.microblink.com' }
}

dependencies {
compile(name:'LibBlinkID', ext:'aar')
compile 'com.android.support:appcompat-v7:25.0.0'
compile 'com.android.support:appcompat-v7:25.0.0'
compile('com.microblink:blinkid:3.11.0@aar') {
transitive = false
}
}

android {
Expand Down
Binary file added BlinkID/src/android/res/raw/beep.mp3
Binary file not shown.
4 changes: 4 additions & 0 deletions Release notes.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 1.2.0
- replaced BlinkID Android submodule dependency with Maven dependency
- updated Android SDK to [v3.11.0](https://github.com/BlinkID/blinkid-android/releases/tag/v3.11.0)

## 1.1.9
- update Android SDK to [v3.10.1](https://github.com/BlinkID/blinkid-android/releases/tag/v3.10.1)

Expand Down

0 comments on commit 91d98af

Please sign in to comment.