Bump gradle from 4.2.2 to 7.0.0 (#4066)

* Bump gradle from 4.2.2 to 7.0.0 Bumps gradle from 4.2.2 to 7.0.0. --- updated-dependencies: - dependency-name: com.android.tools.build:gradle dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * Remove javadocs Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Michelle Brubaker <[email protected]>
stripe · Aug 13, 2021 · c721bc1 · c721bc1
1 parent 4ad802e
commit c721bc1
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 16 deletions.
diff --git a/build.gradle b/build.gradle
@@ -12,7 +12,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:7.0.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokkaVersion"
         classpath "org.jetbrains.kotlinx:binary-compatibility-validator:0.6.0"

diff --git a/deploy/deploy.gradle b/deploy/deploy.gradle
@@ -19,18 +19,6 @@ def getRepositoryPassword() {
     return findProperty('NEXUS_PASSWORD') ?: ""
 }
 
-task androidJavadocs(type: Javadoc) {
-    excludes = ['**/*.kt']
-    source = android.sourceSets.main.java.srcDirs
-    classpath = configurations.compile
-    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
-}
-
-task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
-    archiveClassifier.set('javadoc')
-    from androidJavadocs.destinationDir
-}
-
 task androidSourcesJar(type: Jar) {
     archiveClassifier.set('sources')
     from android.sourceSets.main.java.srcDirs
@@ -45,7 +33,6 @@ afterEvaluate { project ->
             // Creates a Maven publication called "release".
             release(MavenPublication) {
                 // Adds Javadocs and Sources as separate jars.
-                artifact androidJavadocsJar
                 artifact androidSourcesJar
                 artifact bundleReleaseAar
 
@@ -129,6 +116,5 @@ afterEvaluate { project ->
 
     artifacts {
         archives androidSourcesJar
-        archives androidJavadocsJar
     }
 }
diff --git a/paymentsheet/build.gradle b/paymentsheet/build.gradle
@@ -73,7 +73,6 @@ assemble.dependsOn('lint')
 check.dependsOn('checkstyle')
 
 configurations {
-    javadocDeps
     ktlint
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -73,7 +73,6 @@ assemble.dependsOn('lint') @@
     check.dependsOn('checkstyle')
     configurations {
-        javadocDeps
         ktlint
     }
@@ Expand Down @@