update to build 1531000 (and pudate build tools too!)

zom · Oct 26, 2017 · 39fa77a · 39fa77a
1 parent c8e83e1
commit 39fa77a
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 6 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -17,7 +17,7 @@ android {
 
     defaultConfig {
         applicationId 'im.zom.messenger'
-        versionCode 1510042
+        versionCode 1531000
         versionName getVersionName()
         archivesBaseName = "Zom-$versionName"
         minSdkVersion project.ext.minSdkVersion
@@ -47,12 +47,17 @@ android {
         }
     }
 
+    // Specifies two flavor dimensions.
+    flavorDimensions "free"
+
     productFlavors {
         free {
+            dimension "free"
             applicationId = "org.awesomeapp.messenger"
             applicationId 'org.awesomeapp.messenger'
         }
         zomrelease {
+            dimension "free"
             applicationId = "im.zom.messenger"
             applicationId 'im.zom.messenger'
         }
@@ -80,6 +85,7 @@ android {
         verify = [
         ]
     }
+    buildToolsVersion '26.0.2'
 }
 
 ext {
@@ -90,7 +96,7 @@ ext {
 
 dependencies {
     compile fileTree(include: '*.jar', dir: 'libs')
-    compile 'com.android.support:multidex:1.0.1'
+    compile 'com.android.support:multidex:1.0.2'
     compile 'net.zetetic:android-database-sqlcipher:3.5.4@aar'
     compile project(':otr4jandroid')
     compile project(':tibetanTextLibrary')

diff --git a/build.gradle b/build.gradle
@@ -8,9 +8,10 @@ buildscript {
         mavenCentral()
         jcenter()
         maven { url "https://jitpack.io" }
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.0.0'
         classpath files('libs/gradle-witness.jar')
     }
 }
@@ -25,6 +26,7 @@ allprojects {
         }
         mavenCentral()
 
+        google()
     }
     project.ext {
         // these are common variables used in */build.gradle

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
-#Wed Dec 21 11:28:09 EST 2016
+#Thu Oct 26 12:17:20 EDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists 
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
-distributionSha256Sum=71a787faed83c4ef21e8464cc8452b941b5fcd575043aa29d39d15d879be89f7
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+##distributionSha256Sum=71a787faed83c4ef21e8464cc8452b941b5fcd575043aa29d39d15d879be89f7
diff --git a/otr4jandroid/build.gradle b/otr4jandroid/build.gradle
@@ -20,6 +20,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    buildToolsVersion '26.0.2'
 }
 
 dependencies {

diff --git a/tibetanTextLibrary/build.gradle b/tibetanTextLibrary/build.gradle
@@ -18,4 +18,5 @@ android {
     dependencies {
         compile project.ext.appcompat
     }
+    buildToolsVersion '26.0.2'
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,6 +20,7 @@ android { @@
                 proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             }
         }
+        buildToolsVersion '26.0.2'
     }
     dependencies {
@@ Expand Down @@