Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'merge-requests/44'

Browse Source
This commit is contained in:
Ciaran Gultnieks 2013-12-04 17:42:32 +00:00
commit 708518883a
4 changed files with 68 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@ -1,8 +1,10 @@
local.properties local.properties
build.properties build.properties
.classpath .classpath
bin/* /bin/
gen/* /gen/
/build
/.gradle
proguard.cfg proguard.cfg
build.xml build.xml
*~ *~

40
AndroidManifest.xml
View File

@ -78,24 +78,28 @@
<data android:scheme="http" /> <data android:scheme="http" />
<data android:scheme="https" /> <data android:scheme="https" />
<data android:host="*" /> <data android:host="*" />
<!-- the patterns are unpredictable, this is the best I could get working --> <!--
<data android:path="/repo" /> The pattern matcher here is poorly implemented, in particular the * is
<data android:path="/archive" /> non-greedy, so you have to do stupid tricks to match patterns that have
<data android:pathPattern="/repo/*" /> repeat characters in them. http://stackoverflow.com/a/8599921/306864
<data android:pathPattern="/archive/*" /> -->
<data android:pathPattern="/.*/repo" /> <data android:path="/fdroid/repo" />
<data android:pathPattern="/.*/archive" /> <data android:pathPattern="/fdroid/repo/*" />
<data android:pathPattern="/.*/repo/*" /> <data android:pathPattern="/.*/fdroid/repo" />
<data android:pathPattern="/.*/archive/*" /> <data android:pathPattern="/.*/fdroid/repo/*" />
<data android:pathPattern="/.*/.*/repo" /> <data android:pathPattern="/.*/.*/fdroid/repo" />
<data android:pathPattern="/.*/.*/archive" /> <data android:pathPattern="/.*/.*/fdroid/repo/*" />
<data android:pathPattern="/.*/.*/repo/*" /> <data android:pathPattern="/.*/.*/.*/fdroid/repo" />
<data android:pathPattern="/.*/.*/archive/*" /> <data android:pathPattern="/.*/.*/.*/fdroid/repo/*" />
<data android:pathPattern="/.*/.*/.*/repo" /> <data android:path="/fdroid/archive" />
<data android:pathPattern="/.*/.*/.*/archive" /> <data android:pathPattern="/fdroid/archive/*" />
<data android:pathPattern="/.*/.*/.*/repo/*" /> <data android:pathPattern="/.*/fdroid/archive" />
<data android:pathPattern="/.*/.*/.*/archive/*" /> <data android:pathPattern="/.*/fdroid/archive/*" />
</intent-filter> <data android:pathPattern="/.*/.*/fdroid/archive" />
<data android:pathPattern="/.*/.*/fdroid/archive/*" />
<data android:pathPattern="/.*/.*/.*/fdroid/archive" />
<data android:pathPattern="/.*/.*/.*/fdroid/archive/*" />
</intent-filter>
<intent-filter> <intent-filter>
<action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.VIEW" />

41
build.gradle Normal file
View File

@ -0,0 +1,41 @@
buildscript {
repositories {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:0.6.+'
}
}
apply plugin: 'android'
dependencies {
compile files('libs/android-support-v4.jar')
}
android {
compileSdkVersion 19
buildToolsVersion "19.0.0"
sourceSets {
main {
manifest.srcFile 'AndroidManifest.xml'
java.srcDirs = ['src', 'extern/Universal-Image-Loader/library/src']
resources.srcDirs = ['src']
aidl.srcDirs = ['src']
renderscript.srcDirs = ['src']
res.srcDirs = ['res']
assets.srcDirs = ['assets']
}
instrumentTest.setRoot('tests')
}
buildTypes {
release {
runProguard true
proguardFile 'proguard-project.txt'
proguardFile getDefaultProguardFile('proguard-android.txt')
}
}
}

2
extern/Universal-Image-Loader vendored

@ -1 +1 @@
Subproject commit 4aec203474927e98ef6da4d0f04e6e98e6d082ab Subproject commit 66042fe4a38d5e96030144546290ba0404d24e28