Merge pull request #9 from cutmail/update-build-gradle-tools-disable-…

…jack Update gradle build tools and disable jack
cutmail · Mar 16, 2017 · f1a43d3 · f1a43d3
2 parents 575f895 + 42a9769
commit f1a43d3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -19,20 +19,12 @@ android {
     compileSdkVersion 25
     buildToolsVersion "25.0.0"
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
     defaultConfig {
         applicationId "me.cutmail.disasterapp"
         minSdkVersion 14
         targetSdkVersion 25
         versionCode 16
         versionName "1.6.1"
-        jackOptions {
-            enabled true
-        }
     }
     buildTypes {
         release {

diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0-alpha1'
+        classpath 'com.android.tools.build:gradle:2.3.0'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
         classpath 'com.google.gms:google-services:3.0.0'

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Oct 15 13:12:36 JST 2016
+#Thu Mar 16 16:34:07 JST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip