diff options
| author | steckbrief <steckbrief@chefmail.de> | 2015-02-20 22:19:31 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2015-02-20 22:19:31 +0100 |
| commit | 20eae3955700341188bc1907a506970f5817a153 (patch) | |
| tree | 6e50d9083a4392875b5f9dbe92b38973cf95c332 /build.gradle | |
| parent | 980a84a6ce4358e8662addf203695e01d9f931dc (diff) | |
| parent | ecbceae88b7a7aa871e5396efec1e2ff8d056d46 (diff) | |
Merge master-origin
Conflicts:
src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
src/main/java/eu/siacs/conversations/ui/XmppActivity.java
src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
src/main/java/eu/siacs/conversations/utils/UIHelper.java
src/main/res/values-de/strings.xml
Diffstat (limited to 'build.gradle')
| -rw-r--r-- | build.gradle | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/build.gradle b/build.gradle index 29cb3840..4b695b0d 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:1.0.0' + classpath 'com.android.tools.build:gradle:1.0.1' } } @@ -28,26 +28,26 @@ repositories { } dependencies { - compile project(':libs:minidns') compile project(':libs:openpgp-api-lib') compile project(':libs:MemorizingTrustManager') - compile 'com.android.support:support-v13:19.1.0' + compile 'com.android.support:support-v13:21.0.3' compile 'org.bouncycastle:bcprov-jdk15on:1.50' - compile 'net.java:otr4j:0.21' + compile 'net.java:otr4j:0.22' compile 'org.gnu.inet:libidn:1.15' compile 'com.google.zxing:core:3.1.0' compile 'com.google.zxing:android-integration:3.1.0' + compile 'de.measite.minidns:minidns:0.1.3' } android { - compileSdkVersion 19 - buildToolsVersion "19.1" + compileSdkVersion 21 + buildToolsVersion "21.1.2" defaultConfig { minSdkVersion 14 - targetSdkVersion 19 - versionCode 41 - versionName "0.10" + targetSdkVersion 21 + versionCode 46 + versionName "1.0.1" } compileOptions { @@ -94,7 +94,7 @@ android { } lintOptions { - disable 'MissingTranslation', 'InvalidPackage' + disable 'ExtraTranslation', 'MissingTranslation', 'InvalidPackage' } subprojects { |