upgrade to 6.x gradle (#342)

thomaszurkan-optimizely · web-flow · commit 50e64d92342e · 2020-07-20T12:35:59.000-04:00
diff --git a/android-sdk/build.gradle b/android-sdk/build.gradle
@@ -115,7 +115,7 @@ android.libraryVariants.all { variant ->
 
         doFirst {
             // First add all of your dependencies to the classpath, then add the android jars
-            classpath += files(variant.javaCompileProvider.classpath.files)
+            classpath += files(variant.javaCompileProvider.get().classpath.files)
             classpath += files(android.getBootClasspath())
         }
         // We're excluding these generated files
diff --git a/datafile-handler/build.gradle b/datafile-handler/build.gradle
@@ -101,7 +101,7 @@ android.libraryVariants.all { variant ->
 
         // First add all of your dependencies to the classpath, then add the android jars
         doFirst {
-            classpath += files(variant.javaCompileProvider.classpath.files)
+            classpath += files(variant.javaCompileProvider.get().classpath.files)
             classpath += files(android.getBootClasspath())
         }
         // We're excluding these generated files
diff --git a/event-handler/build.gradle b/event-handler/build.gradle
@@ -102,7 +102,7 @@ android.libraryVariants.all { variant ->
 
         // First add all of your dependencies to the classpath, then add the android jars
         doFirst {
-            classpath += files(variant.javaCompileProvider.classpath.files)
+            classpath += files(variant.javaCompileProvider.get().classpath.files)
             classpath += files(android.getBootClasspath())
         }
         // We're excluding these generated files
diff --git a/shared/build.gradle b/shared/build.gradle
@@ -105,7 +105,7 @@ android.libraryVariants.all { variant ->
 
         // First add all of your dependencies to the classpath, then add the android jars
         doFirst {
-            classpath += files(variant.javaCompileProvider.classpath.files)
+            classpath += files(variant.javaCompileProvider.get().classpath.files)
             classpath += files(android.getBootClasspath())
         }
         // We're excluding these generated files
diff --git a/user-profile/build.gradle b/user-profile/build.gradle
@@ -101,7 +101,7 @@ android.libraryVariants.all { variant ->
 
         // First add all of your dependencies to the classpath, then add the android jars
         doFirst {
-            classpath += files(variant.javaCompileProvider.classpath.files)
+            classpath += files(variant.javaCompileProvider.get().classpath.files)
             classpath += files(android.getBootClasspath())
         }
         // We're excluding these generated files

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ android.libraryVariants.all { variant ->`
`115`	`115`
`116`	`116`	`doFirst {`
`117`	`117`	`// First add all of your dependencies to the classpath, then add the android jars`
`118`		`- classpath += files(variant.javaCompileProvider.classpath.files)`
	`118`	`+ classpath += files(variant.javaCompileProvider.get().classpath.files)`
`119`	`119`	`classpath += files(android.getBootClasspath())`
`120`	`120`	`}`
`121`	`121`	`// We're excluding these generated files`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ android.libraryVariants.all { variant ->`
`101`	`101`
`102`	`102`	`// First add all of your dependencies to the classpath, then add the android jars`
`103`	`103`	`doFirst {`
`104`		`- classpath += files(variant.javaCompileProvider.classpath.files)`
	`104`	`+ classpath += files(variant.javaCompileProvider.get().classpath.files)`
`105`	`105`	`classpath += files(android.getBootClasspath())`
`106`	`106`	`}`
`107`	`107`	`// We're excluding these generated files`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ android.libraryVariants.all { variant ->`
`102`	`102`
`103`	`103`	`// First add all of your dependencies to the classpath, then add the android jars`
`104`	`104`	`doFirst {`
`105`		`- classpath += files(variant.javaCompileProvider.classpath.files)`
	`105`	`+ classpath += files(variant.javaCompileProvider.get().classpath.files)`
`106`	`106`	`classpath += files(android.getBootClasspath())`
`107`	`107`	`}`
`108`	`108`	`// We're excluding these generated files`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ android.libraryVariants.all { variant ->`
`105`	`105`
`106`	`106`	`// First add all of your dependencies to the classpath, then add the android jars`
`107`	`107`	`doFirst {`
`108`		`- classpath += files(variant.javaCompileProvider.classpath.files)`
	`108`	`+ classpath += files(variant.javaCompileProvider.get().classpath.files)`
`109`	`109`	`classpath += files(android.getBootClasspath())`
`110`	`110`	`}`
`111`	`111`	`// We're excluding these generated files`