Slices: fixed .gitignores and updated Gradle for AS 3.2.

Doug Sigelbaum · Doug Sigelbaum · commit 295efc9869a2 · 2018-05-08T20:39:54.000-07:00
diff --git a/slices-basic-codelab/step-00/SliceCodelab/.gitignore b/slices-basic-codelab/step-00/SliceCodelab/.gitignore
@@ -1,9 +1,7 @@
 *.iml
 .gradle
 /local.properties
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
+/.idea
 .DS_Store
 /build
 /captures
diff --git a/slices-basic-codelab/step-00/SliceCodelab/build.gradle b/slices-basic-codelab/step-00/SliceCodelab/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.2'
+        classpath 'com.android.tools.build:gradle:3.2.0-alpha14'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
diff --git a/slices-basic-codelab/step-00/SliceCodelab/gradle/wrapper/gradle-wrapper.properties b/slices-basic-codelab/step-00/SliceCodelab/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/slices-basic-codelab/step-01/SliceCodelab/.gitignore b/slices-basic-codelab/step-01/SliceCodelab/.gitignore
@@ -1,9 +1,7 @@
 *.iml
 .gradle
 /local.properties
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
+/.idea
 .DS_Store
 /build
 /captures
diff --git a/slices-basic-codelab/step-01/SliceCodelab/build.gradle b/slices-basic-codelab/step-01/SliceCodelab/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.1'
+        classpath 'com.android.tools.build:gradle:3.2.0-alpha14'
         
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/slices-basic-codelab/step-01/SliceCodelab/gradle/wrapper/gradle-wrapper.properties b/slices-basic-codelab/step-01/SliceCodelab/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Apr 30 13:55:22 PDT 2018
+#Tue May 08 20:18:24 PDT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/slices-basic-codelab/step-02/SliceCodelab/.gitignore b/slices-basic-codelab/step-02/SliceCodelab/.gitignore
@@ -1,9 +1,7 @@
 *.iml
 .gradle
 /local.properties
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
+/.idea
 .DS_Store
 /build
 /captures
diff --git a/slices-basic-codelab/step-02/SliceCodelab/build.gradle b/slices-basic-codelab/step-02/SliceCodelab/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.1'
+        classpath 'com.android.tools.build:gradle:3.2.0-alpha14'
         
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/slices-basic-codelab/step-02/SliceCodelab/gradle/wrapper/gradle-wrapper.properties b/slices-basic-codelab/step-02/SliceCodelab/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Apr 30 13:55:22 PDT 2018
+#Tue May 08 20:19:00 PDT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/slices-basic-codelab/step-03/SliceCodelab/.gitignore b/slices-basic-codelab/step-03/SliceCodelab/.gitignore
@@ -1,9 +1,7 @@
 *.iml
 .gradle
 /local.properties
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
+/.idea
 .DS_Store
 /build
 /captures
diff --git a/slices-basic-codelab/step-03/SliceCodelab/build.gradle b/slices-basic-codelab/step-03/SliceCodelab/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.1'
+        classpath 'com.android.tools.build:gradle:3.2.0-alpha14'
         
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/slices-basic-codelab/step-03/SliceCodelab/gradle/wrapper/gradle-wrapper.properties b/slices-basic-codelab/step-03/SliceCodelab/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Apr 30 13:55:22 PDT 2018
+#Tue May 08 20:36:29 PDT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ buildscript {`
`7`	`7`	`jcenter()`
`8`	`8`	`}`
`9`	`9`	`dependencies {`
`10`		`- classpath 'com.android.tools.build:gradle:3.1.2'`
	`10`	`+ classpath 'com.android.tools.build:gradle:3.2.0-alpha14'`
`11`	`11`	`// NOTE: Do not place your application dependencies here; they belong`
`12`	`12`	`// in the individual module build.gradle files`
`13`	`13`	`}`