diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-05-26 10:58:37 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-05-26 10:58:37 -0300 |
| commit | f76c2ae1b9722a4f9f1157b610324a366448093a (patch) | |
| tree | 0c876f9a4a020c34b242454565a2c90e00e16830 /android | |
| parent | c6f8573a617d0fe97a0f8094a87c23b0c8fee4a6 (diff) | |
| parent | 41b94531c67ee60f512f08a51288ba210c33f1c3 (diff) | |
| download | mullvadvpn-f76c2ae1b9722a4f9f1157b610324a366448093a.tar.xz mullvadvpn-f76c2ae1b9722a4f9f1157b610324a366448093a.zip | |
Merge branch 'upgrade-gradle-plugin'
Diffstat (limited to 'android')
| -rw-r--r-- | android/build.gradle | 20 | ||||
| -rw-r--r-- | android/gradle/wrapper/gradle-wrapper.properties | 2 |
2 files changed, 2 insertions, 20 deletions
diff --git a/android/build.gradle b/android/build.gradle index 1bd0aab5a1..3abe125926 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,6 +1,3 @@ -import org.jmailen.gradle.kotlinter.tasks.FormatTask -import org.jmailen.gradle.kotlinter.tasks.LintTask - apply plugin: 'com.android.application' apply plugin: 'kotlin-android' @@ -96,26 +93,11 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.3.2' + classpath 'com.android.tools.build:gradle:3.6.0' classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.20' - classpath 'org.jmailen.gradle:kotlinter-gradle:1.22.0' } } -task lintKotlin(type: LintTask, group: 'verification') { - source files('src/main/kotlin') - reports = [ - 'plain': file('build/reports/kotlin-lint-report.txt'), - ] -} - -task format(type: FormatTask, group: 'formatting') { - source files('src/main/kotlin') - report file('build/reports/kotlin-format-report.txt') -} - -lint.dependsOn lintKotlin - task copyExtraAssets(type: Copy) { from "$repoRootPath/dist-assets" include "relays.json" diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 7919ae6e6b..d504df910a 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-bin.zip |