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

Update Gradle and tighten repository inclusion rules (#1347)

Browse source 
* build: remove now migrated indirect dependencies from JCenter

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

* build: update Gradle 6.8.3

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

* build: set explicit inclusions for Jitpack

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
This commit is contained in:
Harsh Shandilya 2021-03-17 00:34:13 +05:30 committed by GitHub
parent 197af98bb5
commit 1084fc49b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
build.gradle.kts
View file

@ -6,3 +6,12 @@ plugins {
`binary-compatibility-validator`
`aps-plugin`
}
subprojects {
configurations.all {
resolutionStrategy.dependencySubstitution {
substitute(module("org.jetbrains.trove4j:trove4j:20160824"))
.using(module("org.jetbrains.intellij.deps:trove4j:1.0.20200330"))
}
}
}

23
buildSrc/src/main/java/BaseProjectConfig.kt
View file

@ -11,6 +11,7 @@ import org.gradle.api.tasks.Delete
import org.gradle.api.tasks.testing.Test
import org.gradle.api.tasks.testing.logging.TestLogEvent
import org.gradle.api.tasks.wrapper.Wrapper
import org.gradle.kotlin.dsl.maven
import org.gradle.kotlin.dsl.repositories
import org.gradle.kotlin.dsl.withType
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@ -25,9 +26,9 @@ internal fun Project.configureForRootProject() {
delete(rootProject.buildDir)
}
tasks.withType<Wrapper> {
gradleVersion = "6.8.2"
gradleVersion = "6.8.3"
distributionType = Wrapper.DistributionType.ALL
distributionSha256Sum = "1433372d903ffba27496f8d5af24265310d2da0d78bf6b4e5138831d4fe066e9"
distributionSha256Sum = "9af5c8e7e2cd1a3b0f694a4ac262b9f38c75262e74a9e8b5101af302a6beadd7"
}
configureBinaryCompatibilityValidator()
}
@ -41,23 +42,19 @@ internal fun Project.configureForAllProjects() {
mavenCentral()
jcenter() {
content {
// Direct dependencies
// https://github.com/zhanghai/AndroidFastScroll/issues/35
includeModule("me.zhanghai.android.fastscroll", "library")
// https://github.com/open-keychain/open-keychain/issues/2645
includeModule("org.sufficientlysecure", "sshauthentication-api")
// Indirect dependencies
// https://youtrack.jetbrains.com/issue/IDEA-261387
includeModule("org.jetbrains.trove4j", "trove4j")
// https://github.com/Kotlin/dokka/issues/41
includeGroup("org.jetbrains.dokka")
includeGroup("org.jetbrains.kotlinx")
includeModule("org.jetbrains", "markdown")
}
}
maven { setUrl("https://jitpack.io") }
maven("https://jitpack.io") {
name = "Jitpack"
content {
includeModule("com.github.android-password-store", "zxing-android-embedded")
includeModule("com.github.haroldadmin", "WhatTheStack")
}
}
}
tasks.withType<KotlinCompile> {
kotlinOptions {

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

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=1433372d903ffba27496f8d5af24265310d2da0d78bf6b4e5138831d4fe066e9
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-all.zip
distributionSha256Sum=9af5c8e7e2cd1a3b0f694a4ac262b9f38c75262e74a9e8b5101af302a6beadd7
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists