kumi/Android-Password-Store
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Upgrade to Gradle 7.3.3 (#1600)

Browse source 
* gradle: upgrade to 7.3.3

* build-logic: make Kotlin and Java targets match
This commit is contained in:
Harsh Shandilya 2021-12-22 21:47:19 +05:30 committed by GitHub
parent ae0afcc585
commit 126bed1a8b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 46 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
build-logic/android-plugins/build.gradle.kts
View file

@ -3,11 +3,25 @@
* SPDX-License-Identifier: GPL-3.0-only * SPDX-License-Identifier: GPL-3.0-only
*/ */
import org.gradle.api.JavaVersion
import org.gradle.api.tasks.compile.JavaCompile
import org.gradle.kotlin.dsl.withType
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins { plugins {
`kotlin-dsl` `kotlin-dsl`
`kotlin-dsl-precompiled-script-plugins` `kotlin-dsl-precompiled-script-plugins`
} }
tasks.withType<JavaCompile>().configureEach {
sourceCompatibility = JavaVersion.VERSION_11.toString()
targetCompatibility = JavaVersion.VERSION_11.toString()
}
tasks.withType<KotlinCompile>().configureEach {
kotlinOptions { jvmTarget = JavaVersion.VERSION_11.toString() }
}
gradlePlugin { gradlePlugin {
plugins { plugins {
register("versioning") { register("versioning") {

14
build-logic/automation-plugins/build.gradle.kts
View file

@ -3,11 +3,25 @@
* SPDX-License-Identifier: GPL-3.0-only * SPDX-License-Identifier: GPL-3.0-only
*/ */
import org.gradle.api.JavaVersion
import org.gradle.api.tasks.compile.JavaCompile
import org.gradle.kotlin.dsl.withType
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins { plugins {
`kotlin-dsl` `kotlin-dsl`
`kotlin-dsl-precompiled-script-plugins` `kotlin-dsl-precompiled-script-plugins`
} }
tasks.withType<JavaCompile>().configureEach {
sourceCompatibility = JavaVersion.VERSION_11.toString()
targetCompatibility = JavaVersion.VERSION_11.toString()
}
tasks.withType<KotlinCompile>().configureEach {
kotlinOptions { jvmTarget = JavaVersion.VERSION_11.toString() }
}
gradlePlugin { gradlePlugin {
plugins { plugins {
register("crowdin") { register("crowdin") {

4
build-logic/automation-plugins/src/main/kotlin/com.github.android-password-store.gradle.gradle.kts
View file

@ -7,6 +7,6 @@ import org.gradle.api.tasks.wrapper.Wrapper
import org.gradle.kotlin.dsl.withType import org.gradle.kotlin.dsl.withType
tasks.withType<Wrapper> { tasks.withType<Wrapper> {
gradleVersion = "7.3.1" gradleVersion = "7.3.3"
distributionSha256Sum = "9afb3ca688fc12c761a0e9e4321e4d24e977a4a8916c8a768b1fe05ddb4d6b66" distributionSha256Sum = "b586e04868a22fd817c8971330fec37e298f3242eb85c374181b12d637f80302"
} }

14
build-logic/kotlin-plugins/build.gradle.kts
View file

@ -3,11 +3,25 @@
* SPDX-License-Identifier: GPL-3.0-only * SPDX-License-Identifier: GPL-3.0-only
*/ */
import org.gradle.api.JavaVersion
import org.gradle.api.tasks.compile.JavaCompile
import org.gradle.kotlin.dsl.withType
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins { plugins {
`kotlin-dsl` `kotlin-dsl`
`kotlin-dsl-precompiled-script-plugins` `kotlin-dsl-precompiled-script-plugins`
} }
tasks.withType<JavaCompile>().configureEach {
sourceCompatibility = JavaVersion.VERSION_11.toString()
targetCompatibility = JavaVersion.VERSION_11.toString()
}
tasks.withType<KotlinCompile>().configureEach {
kotlinOptions { jvmTarget = JavaVersion.VERSION_11.toString() }
}
dependencies { dependencies {
implementation(libs.build.agp) implementation(libs.build.agp)
implementation(libs.build.binarycompat) implementation(libs.build.binarycompat)

4
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionSha256Sum=9afb3ca688fc12c761a0e9e4321e4d24e977a4a8916c8a768b1fe05ddb4d6b66 distributionSha256Sum=b586e04868a22fd817c8971330fec37e298f3242eb85c374181b12d637f80302
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists