Update Gradle and tighten repository inclusion rules (#1347)

* 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>

3 files changed, 21 insertions, 15 deletions

diff --git a/build.gradle.kts b/build.gradle.kts
index dabd32fe..da32e794 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -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"))
+        }
+    }
+}
diff --git a/buildSrc/src/main/java/BaseProjectConfig.kt b/buildSrc/src/main/java/BaseProjectConfig.kt
index 0ec91eb2..cb5818b8 100644
--- a/buildSrc/src/main/java/BaseProjectConfig.kt
+++ b/buildSrc/src/main/java/BaseProjectConfig.kt
@@ -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 {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 087983c1..6e61ea74 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -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