diff options
| author | lookshe <github@lookshe.org> | 2015-04-11 14:15:07 +0200 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2015-04-11 14:15:07 +0200 |
| commit | df63c14617bc8d665bfeac62cde0b29e6aa98873 (patch) | |
| tree | b825c0c87bcd9833ecfad85ecc5c0901ea4d77eb /build.gradle | |
| parent | 87e56b534ad41199380c97e16ad25acbd077878c (diff) | |
| parent | e17b75511e7c9d8206939b742972021c5c9d6b86 (diff) | |
Merge branch 'trz/master' of ssh://git.fucktheforce.de/conversations into trz/master
Diffstat (limited to 'build.gradle')
| -rw-r--r-- | build.gradle | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/build.gradle b/build.gradle index 4b695b0d..79e147f8 100644 --- a/build.gradle +++ b/build.gradle @@ -20,23 +20,20 @@ allprojects { apply plugin: 'com.android.application' repositories { - maven { - url "http://jitsi.github.com/otr4j/repository/" - } jcenter() mavenCentral() } dependencies { - compile project(':libs:openpgp-api-lib') - compile project(':libs:MemorizingTrustManager') - compile 'com.android.support:support-v13:21.0.3' - compile 'org.bouncycastle:bcprov-jdk15on:1.50' - 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' + compile project(':libs:openpgp-api-lib') + compile project(':libs:MemorizingTrustManager') + compile 'com.android.support:support-v13:21.0.3' + compile 'org.bouncycastle:bcprov-jdk15on:1.51' + compile 'org.jitsi:org.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 { @@ -46,8 +43,8 @@ android { defaultConfig { minSdkVersion 14 targetSdkVersion 21 - versionCode 46 - versionName "1.0.1" + versionCode 63 + versionName "1.2.6" } compileOptions { |