Merge branch 'qdict2' into 'master'

Add QDict

This is a squashed version of merge request !1654 

Closes !1654

See merge request !1746
This commit is contained in:
Boris Kraut 2016-10-08 19:59:59 +00:00
commit 2b3d3fc56a
2 changed files with 73 additions and 0 deletions

View file

@ -0,0 +1,32 @@
Categories:Science & Education
License:Apache2
Web Site:
Source Code:https://github.com/madmanteam/QDict
Issue Tracker:https://github.com/madmanteam/QDict/issues
Summary:Stardict-compatible dictionary
Description:
Supports 3 ways to search: 'Glob-style pattern matching', 'Fuzzy query' and
'Full-text' search.
.
Repo Type:git
Repo:https://github.com/madmanteam/QDict
Build:2.1.2,20160309
commit=50a4367679c1761c47d79acf52dba076cddbfb2f
subdir=qDict
patch=qdict.diff
gradle=yes
rm=qDict/libs/nineoldandroids-2.4.0.jar
Maintainer Notes:
There one linter error we have temporarily disabled, so that the app builds.
In case something goes wrong, please complain to upstream.
Compare https://github.com/madmanteam/QDict/issues/5
.
Auto Update Mode:None
Update Check Mode:RepoManifest
Current Version:2.1.2
Current Version Code:20160309

View file

@ -0,0 +1,41 @@
diff --git a/madmanLib/build.gradle b/madmanLib/build.gradle
index 4b2e0b4..ac6f045 100644
--- a/madmanLib/build.gradle
+++ b/madmanLib/build.gradle
@@ -1,10 +1,11 @@
apply plugin: 'com.android.library'
android {
- compileSdkVersion 22
+ compileSdkVersion 23
buildToolsVersion "23.0.2"
defaultConfig {
+ minSdkVersion 4
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7
diff --git a/qDict/build.gradle b/qDict/build.gradle
index 12fd099..f10584f 100644
--- a/qDict/build.gradle
+++ b/qDict/build.gradle
@@ -26,12 +26,17 @@ android {
buildTypes {
release {
minifyEnabled true
- proguardFiles 'proguard.cfg'
+ proguardFiles getDefaultProguardFile('proguard-android.txt')
}
}
+
+ lintOptions {
+ abortOnError false
+ }
+
}
dependencies {
compile project(':madmanLib')
compile project(':appcompat')
- compile files('libs/nineoldandroids-2.4.0.jar')
+ compile 'com.nineoldandroids:library:2.4.0'
}