aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-02-10 17:33:09 +0100
committerChristian Schneppe <christian@pix-art.de>2018-02-10 17:33:09 +0100
commit30ce34b4e0299fa79ac644b108fed7614c04da06 (patch)
tree8a3c2ea90b7743fb75b839ed156438b19f31edcb
parent38eba12ddc215cb30c83f613f1d5543b61f36f74 (diff)
update build tools and libs
-rw-r--r--build.gradle13
-rw-r--r--libs/MemorizingTrustManager/build.gradle4
-rw-r--r--libs/android-transcoder/build.gradle4
-rw-r--r--src/main/java/de/pixart/messenger/Config.java6
4 files changed, 10 insertions, 17 deletions
diff --git a/build.gradle b/build.gradle
index 2bc12d633..3ce5ff6ba 100644
--- a/build.gradle
+++ b/build.gradle
@@ -43,8 +43,7 @@ dependencies {
standardPushCompile 'com.google.android.gms:play-services-gcm:11.8.0'
compile 'org.sufficientlysecure:openpgp-api:10.0'
compile 'com.soundcloud.android:android-crop:1.0.1@aar'
- compile 'org.bouncycastle:bcprov-jdk15on:1.56'
- compile 'org.bouncycastle:bcmail-jdk15on:1.56'
+ compile 'org.bouncycastle:bcmail-jdk15on:1.58'
compile 'org.jitsi:org.otr4j:0.22'
compile 'org.gnu.inet:libidn:1.15'
compile 'com.google.zxing:core:3.3.0'
@@ -77,8 +76,8 @@ ext {
android {
- compileSdkVersion 26
- buildToolsVersion "26.0.2"
+ compileSdkVersion 27
+ buildToolsVersion "27.0.3"
defaultConfig {
minSdkVersion 16
@@ -90,9 +89,6 @@ android {
archivesBaseName += "-$versionName"
applicationId "de.pixart.messenger"
multiDexEnabled true
- buildConfigField("String", "XMPP_IP", '"185.26.156.37"')
- buildConfigField("Integer[]", "XMPP_Ports", "{61000, 65000}")
- buildConfigField("String", "DOMAIN_LOCK", '"pix-art.de"')
buildConfigField("String", "UPDATE_URL", '"https://xmpp.pix-art.de/Pix-Art_Messenger/update/"')
dimension "distribution"
@@ -116,9 +112,6 @@ android {
standardPush
standard
open {
- buildConfigField("String", "XMPP_IP", "null")
- buildConfigField("Integer[]", "XMPP_Ports", "null")
- buildConfigField("String", "DOMAIN_LOCK", "null")
buildConfigField("String", "UPDATE_URL", '"https://xmpp.pix-art.de/Pix-Art_Messenger/update/open/"')
applicationId "de.pixart.openmessenger"
diff --git a/libs/MemorizingTrustManager/build.gradle b/libs/MemorizingTrustManager/build.gradle
index 712b3f80e..c45f09435 100644
--- a/libs/MemorizingTrustManager/build.gradle
+++ b/libs/MemorizingTrustManager/build.gradle
@@ -11,8 +11,8 @@ buildscript {
apply plugin: 'com.android.library'
android {
- compileSdkVersion 26
- buildToolsVersion "26.0.2"
+ compileSdkVersion 27
+ buildToolsVersion "27.0.3"
defaultConfig {
minSdkVersion 14
targetSdkVersion 26
diff --git a/libs/android-transcoder/build.gradle b/libs/android-transcoder/build.gradle
index 2ae38852e..e97fe76ff 100644
--- a/libs/android-transcoder/build.gradle
+++ b/libs/android-transcoder/build.gradle
@@ -7,8 +7,8 @@ buildscript {
apply plugin: 'com.android.library'
android {
- compileSdkVersion 26
- buildToolsVersion '26.0.2'
+ compileSdkVersion 27
+ buildToolsVersion '27.0.3'
defaultConfig {
minSdkVersion 18
diff --git a/src/main/java/de/pixart/messenger/Config.java b/src/main/java/de/pixart/messenger/Config.java
index 849e9d486..33c041d2e 100644
--- a/src/main/java/de/pixart/messenger/Config.java
+++ b/src/main/java/de/pixart/messenger/Config.java
@@ -42,9 +42,9 @@ public final class Config {
public static final String inviteUserURL = "https://jabber.pix-art.de/i/";
public static final String inviteMUCURL = "https://jabber.pix-art.de/j/";
- public static final String XMPP_IP = BuildConfig.XMPP_IP; // set to null means disable
- public static final Integer[] XMPP_Ports = BuildConfig.XMPP_Ports; // set to null means disable
- public static final String DOMAIN_LOCK = BuildConfig.DOMAIN_LOCK; //only allow account creation for this domain
+ public static final String XMPP_IP = null; //BuildConfig.XMPP_IP; // set to null means disable
+ public static final Integer[] XMPP_Ports = null; //BuildConfig.XMPP_Ports; // set to null means disable
+ public static final String DOMAIN_LOCK = null; //BuildConfig.DOMAIN_LOCK; //only allow account creation for this domain
public static final String MAGIC_CREATE_DOMAIN = "pix-art.de";
public static final boolean SINGLE_ACCOUNT = true; //set to true to allow only one account
public static final boolean DISALLOW_REGISTRATION_IN_UI = false; //hide the register checkbox