Update Gradle to 7.x, AGP to 4.2.x

This commit is contained in:
TacoTheDank 2021-07-06 12:16:20 -04:00
parent 08d4651ef0
commit 573839c0ff
5 changed files with 9 additions and 9 deletions

View file

@ -10,7 +10,7 @@ apply plugin: 'checkstyle'
android { android {
compileSdkVersion 29 compileSdkVersion 29
buildToolsVersion '29.0.3' buildToolsVersion '30.0.3'
defaultConfig { defaultConfig {
applicationId "org.schabi.newpipe" applicationId "org.schabi.newpipe"
@ -121,7 +121,7 @@ configurations {
} }
checkstyle { checkstyle {
configDir rootProject.file(".") getConfigDirectory().set(rootProject.file("."))
ignoreFailures false ignoreFailures false
showViolations true showViolations true
toolVersion = checkstyleVersion toolVersion = checkstyleVersion
@ -140,8 +140,8 @@ task runCheckstyle(type: Checkstyle) {
showViolations true showViolations true
reports { reports {
xml.enabled true xml.getRequired().set(true)
html.enabled true html.getRequired().set(true)
} }
} }
@ -151,7 +151,7 @@ def inputFiles = project.fileTree(dir: "src", include: "**/*.kt")
task runKtlint(type: JavaExec) { task runKtlint(type: JavaExec) {
inputs.files(inputFiles) inputs.files(inputFiles)
outputs.dir(outputDir) outputs.dir(outputDir)
main = "com.pinterest.ktlint.Main" getMainClass().set("com.pinterest.ktlint.Main")
classpath = configurations.ktlint classpath = configurations.ktlint
args "src/**/*.kt" args "src/**/*.kt"
} }
@ -159,7 +159,7 @@ task runKtlint(type: JavaExec) {
task formatKtlint(type: JavaExec) { task formatKtlint(type: JavaExec) {
inputs.files(inputFiles) inputs.files(inputFiles)
outputs.dir(outputDir) outputs.dir(outputDir)
main = "com.pinterest.ktlint.Main" getMainClass().set("com.pinterest.ktlint.Main")
classpath = configurations.ktlint classpath = configurations.ktlint
args "-F", "src/**/*.kt" args "-F", "src/**/*.kt"
} }

View file

@ -8,7 +8,7 @@ buildscript {
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.1.3' classpath 'com.android.tools.build:gradle:4.2.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong

Binary file not shown.

View file

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

2
gradlew vendored
View file

@ -72,7 +72,7 @@ case "`uname`" in
Darwin* ) Darwin* )
darwin=true darwin=true
;; ;;
MINGW* ) MSYS* | MINGW* )
msys=true msys=true
;; ;;
NONSTOP* ) NONSTOP* )