1
0
mirror of https://github.com/nerzhul/ownCloud-SMS-App.git synced 2025-06-20 06:16:24 +00:00

Merge pull request #100 from est31/master

Fix gradle build, remove unused library
This commit is contained in:
Ner'zhul 2016-03-18 14:37:25 +01:00
commit 8805869542
3 changed files with 21 additions and 2 deletions

1
.gitignore vendored
View File

@ -3,3 +3,4 @@ ownCloudSMS.iml
/build/ /build/
ownCloudSMS-release.apk ownCloudSMS-release.apk
lint.xml lint.xml
.gradle/

View File

@ -1,3 +1,12 @@
buildscript {
repositories {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.5.0'
}
}
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
android { android {
@ -5,6 +14,10 @@ android {
buildToolsVersion "23.0.2" buildToolsVersion "23.0.2"
useLibrary 'org.apache.http.legacy' useLibrary 'org.apache.http.legacy'
lintOptions {
abortOnError false
}
defaultConfig { defaultConfig {
applicationId "fr.unix_experience.owncloud_sms" applicationId "fr.unix_experience.owncloud_sms"
minSdkVersion 14 minSdkVersion 14
@ -17,16 +30,21 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
} }
} }
packagingOptions {
exclude 'META-INF/LICENSE.txt'
}
} }
repositories { repositories {
maven { maven {
url 'https://oss.sonatype.org/content/repositories/snapshots' url "https://jitpack.io"
} }
mavenCentral()
} }
dependencies { dependencies {
compile project(':owncloudAndroidLibrary') compile 'com.github.owncloud:android-library:oc-android-library-0.9.10'
compile 'com.android.support:support-v13:23.1.1' compile 'com.android.support:support-v13:23.1.1'
compile 'com.android.support:appcompat-v7:23.1.1' compile 'com.android.support:appcompat-v7:23.1.1'
compile 'com.android.support:design:23.1.1' compile 'com.android.support:design:23.1.1'

Binary file not shown.