Merge pull request #2 from forrestguice/build2

gradle
forrestguice · Dec 10, 2018 · 3ce7a67 · 3ce7a67
2 parents c362fdd + 776c66d
commit 3ce7a67
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -26,7 +26,6 @@ android {
     lintOptions
     {
         disable 'MissingTranslation'
-        disable 'IconLauncherFormat'
     }
 }
 

diff --git a/build.gradle b/build.gradle
@@ -3,10 +3,11 @@
 buildscript {
 
     repositories {
+        maven { url "https://maven.google.com/" }
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.2'
+        classpath 'com.android.tools.build:gradle:3.0.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -15,6 +16,7 @@ buildscript {
 
 allprojects {
     repositories {
+        maven { url "https://maven.google.com/" }
         jcenter()
     }
 }

diff --git a/gradle.properties b/gradle.properties
@@ -6,7 +6,7 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx1536m
+#org.gradle.jvmargs=-Xmx1536m
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Nov 12 17:04:44 MST 2018
+#Sun Dec 09 20:25:10 MST 2018
 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
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,7 +26,6 @@ android { @@
         lintOptions
         {
             disable 'MissingTranslation'
-            disable 'IconLauncherFormat'
         }
     }
@@ Expand Down @@