diff --git a/.gitignore b/.gitignore index 0e1dea5e52..b7acfada51 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,7 @@ captures .idea/navEditor.xml .idea/tasks.xml .idea/modules.xml +.idea/compiler.xml /.idea/jarRepositories.xml gradle.xml *.iml diff --git a/app/build.gradle b/app/build.gradle index 036421f81a..c476f5a1ca 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -248,16 +248,7 @@ android.applicationVariants.all { variant -> } } -def getGitHash() { - def stdout = new ByteArrayOutputStream() - exec { - commandLine 'git', 'rev-parse', '--short', 'HEAD' - standardOutput = stdout - } - return stdout.toString().trim() -} - if (file("google-services.json").exists()) { apply plugin: 'com.google.gms.google-services' - apply plugin: 'io.fabric' + //apply plugin: 'io.fabric' } diff --git a/buildSrc/local.properties b/buildSrc/local.properties new file mode 100644 index 0000000000..3500f009e0 --- /dev/null +++ b/buildSrc/local.properties @@ -0,0 +1,8 @@ +## This file must *NOT* be checked into Version Control Systems, +# as it contains information specific to your local configuration. +# +# Location of the SDK. This is only used by Gradle. +# For customization when using a Version Control System, please read the +# header note. +#Sat Mar 28 09:56:21 GMT 2020 +sdk.dir=/Users/chrisbanes/Library/Android/sdk diff --git a/buildSrc/src/main/java/app/tivi/buildsrc/dependencies.kt b/buildSrc/src/main/java/app/tivi/buildsrc/dependencies.kt index 2364ec6a62..577250a27b 100644 --- a/buildSrc/src/main/java/app/tivi/buildsrc/dependencies.kt +++ b/buildSrc/src/main/java/app/tivi/buildsrc/dependencies.kt @@ -21,7 +21,7 @@ object Versions { } object Libs { - const val androidGradlePlugin = "com.android.tools.build:gradle:4.0.0-beta01" + const val androidGradlePlugin = "com.android.tools.build:gradle:4.1.0-alpha04" const val dexcountGradlePlugin = "com.getkeepsafe.dexcount:dexcount-gradle-plugin:1.0.2" const val playPublisherPlugin = "com.github.triplet.gradle:play-publisher:2.7.1" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6254d2d4ae..6623300beb 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists