diff options
| author | steckbrief <steckbrief@chefmail.de> | 2015-03-30 22:12:49 +0200 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2015-03-30 22:12:49 +0200 |
| commit | 75c5275f7e9a27019b9517770603ca4c77f1fbd9 (patch) | |
| tree | 567d10bd9e559089487f5627c436000e2a1a8fc8 /build.gradle | |
| parent | c8fe93cf0a99481bfe7a30bbc1cd98383205bcaa (diff) | |
| parent | 7eabdfd80f50634282307f45c5f99ab46181805d (diff) | |
Merge tag '1.2.0' into trz/master
Conflicts:
src/main/java/eu/siacs/conversations/parser/AbstractParser.java
src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
src/main/res/values-de/strings.xml
src/main/res/xml/preferences.xml
Diffstat (limited to 'build.gradle')
| -rw-r--r-- | build.gradle | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/build.gradle b/build.gradle index 4b695b0d..8f7bb914 100644 --- a/build.gradle +++ b/build.gradle @@ -20,9 +20,6 @@ allprojects { apply plugin: 'com.android.application' repositories { - maven { - url "http://jitsi.github.com/otr4j/repository/" - } jcenter() mavenCentral() } @@ -31,8 +28,8 @@ 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.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' @@ -46,8 +43,8 @@ android { defaultConfig { minSdkVersion 14 targetSdkVersion 21 - versionCode 46 - versionName "1.0.1" + versionCode 56 + versionName "1.2.0" } compileOptions { |