forked from upstream-mirrors/quik
Upgrade gradle, force jdk 8
This commit is contained in:
+16
-2
@@ -16,7 +16,7 @@ buildscript {
|
|||||||
ext.exoplayer_version = "2.8.1"
|
ext.exoplayer_version = "2.8.1"
|
||||||
ext.glide_version = "4.8.0"
|
ext.glide_version = "4.8.0"
|
||||||
ext.junit_version = '4.12'
|
ext.junit_version = '4.12'
|
||||||
ext.kotlin_version = '1.3.31'
|
ext.kotlin_version = '1.3.60'
|
||||||
ext.lifecycle_version = '2.1.0'
|
ext.lifecycle_version = '2.1.0'
|
||||||
ext.material_version = '1.0.0'
|
ext.material_version = '1.0.0'
|
||||||
ext.mockito_version = '2.18.3'
|
ext.mockito_version = '2.18.3'
|
||||||
@@ -42,7 +42,7 @@ buildscript {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:3.4.2'
|
classpath 'com.android.tools.build:gradle:3.5.2'
|
||||||
classpath 'com.google.gms:google-services:4.2.0'
|
classpath 'com.google.gms:google-services:4.2.0'
|
||||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||||
classpath 'io.fabric.tools:gradle:1.29.0'
|
classpath 'io.fabric.tools:gradle:1.29.0'
|
||||||
@@ -68,3 +68,17 @@ allprojects {
|
|||||||
task clean(type: Delete) {
|
task clean(type: Delete) {
|
||||||
delete rootProject.buildDir
|
delete rootProject.buildDir
|
||||||
}
|
}
|
||||||
|
|
||||||
|
subprojects {
|
||||||
|
afterEvaluate {
|
||||||
|
if (project.hasProperty('kapt')) {
|
||||||
|
kapt {
|
||||||
|
// we expect this closure to run over a org.jetbrains.kotlin.gradle.plugin.KaptExtension
|
||||||
|
javacOptions {
|
||||||
|
option("-source", "8")
|
||||||
|
option("-target", "8")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
+2
-2
@@ -1,6 +1,6 @@
|
|||||||
#Thu Jun 06 19:27:58 EDT 2019
|
#Tue Dec 03 23:30:52 EST 2019
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
|
||||||
|
|||||||
Reference in New Issue
Block a user