update build tools and libs

This commit is contained in:
Christian Schneppe 2018-02-10 17:33:09 +01:00
parent 38eba12ddc
commit 30ce34b4e0
4 changed files with 10 additions and 17 deletions
build.gradle
libs
MemorizingTrustManager
android-transcoder
src/main/java/de/pixart/messenger

View file

@ -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"

View file

@ -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

View file

@ -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

View file

@ -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