Skip to content

Commit 4614adb

Browse files
committed
chore: update gradle, kotlin and kotlin-dsl versions
1 parent aa45160 commit 4614adb

File tree

7 files changed

+29
-23
lines changed

7 files changed

+29
-23
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import com.google.firebase.gradle.plugins.license.LicenseResolverPlugin
1616
import com.google.firebase.gradle.MultiProjectReleasePlugin
1717

1818
buildscript {
19-
ext.kotlinVersion = '1.3.72'
19+
ext.kotlinVersion = '1.6.20'
2020
repositories {
2121
google()
2222
mavenCentral()

buildSrc/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// limitations under the License.
1414

1515
plugins {
16-
id "org.gradle.kotlin.kotlin-dsl" version "1.2.9"
16+
id "org.gradle.kotlin.kotlin-dsl" version "1.3.3"
1717
id "org.jlleitschuh.gradle.ktlint" version "9.2.1"
1818
id 'com.github.sherter.google-java-format' version '0.9'
1919
}
@@ -52,7 +52,7 @@ dependencies {
5252
implementation "com.google.auto.value:auto-value-annotations:1.7"
5353
annotationProcessor "com.google.auto.value:auto-value:1.6.5"
5454
implementation 'digital.wup:android-maven-publish:3.6.3'
55-
implementation 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72'
55+
implementation 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.20'
5656
implementation 'org.json:json:20180813'
5757

5858
implementation "org.eclipse.aether:aether-api:1.0.0.v20140518"

buildSrc/src/main/java/com/google/firebase/gradle/plugins/Metalava.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import org.gradle.api.DefaultTask
2020
import org.gradle.api.Project
2121
import org.gradle.api.artifacts.Configuration
2222
import org.gradle.api.file.FileCollection
23+
import org.gradle.api.tasks.Input
2324
import org.gradle.api.tasks.InputFiles
2425
import org.gradle.api.tasks.OutputDirectory
2526
import org.gradle.api.tasks.SourceSet
@@ -50,6 +51,7 @@ fun Project.runMetalavaWithArgs(
5051

5152
abstract class GenerateStubsTask : DefaultTask() {
5253
/** Source files against which API signatures will be validated. */
54+
@Input
5355
lateinit var sourceSet: Object
5456

5557
@get:InputFiles

buildSrc/src/main/java/com/google/firebase/gradle/plugins/apiinfo/ApiInformationTask.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ public abstract class ApiInformationTask extends DefaultTask {
4646
@InputFile
4747
abstract File getApiTxt();
4848

49+
@Input
4950
abstract Object getSourceSet();
5051

5152
@InputFiles

buildSrc/src/main/java/com/google/firebase/gradle/plugins/apiinfo/GenerateApiTxtFileTask.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ public abstract class GenerateApiTxtFileTask extends DefaultTask {
3838
@OutputFile
3939
abstract File getApiTxt();
4040

41+
@Input
4142
abstract Object getSourceSet();
4243

4344
@InputFiles

buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/Coverage.java

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -66,28 +66,30 @@ public static void apply(FirebaseLibraryExtension firebaseLibrary) {
6666
.add("**Manifest*.*")
6767
.build();
6868

69-
task.setClassDirectories(
70-
project.files(
69+
task.getClassDirectories()
70+
.from(
71+
project.files(
72+
project.fileTree(
73+
ImmutableMap.of(
74+
"dir",
75+
project.getBuildDir() + "/intermediates/javac/release",
76+
"excludes",
77+
excludes)),
78+
project.fileTree(
79+
ImmutableMap.of(
80+
"dir",
81+
project.getBuildDir() + "/tmp/kotlin-classes/release",
82+
"excludes",
83+
excludes))));
84+
task.getSourceDirectories().from(project.files("src/main/java", "src/main/kotlin"));
85+
task.getExecutionData()
86+
.from(
7187
project.fileTree(
7288
ImmutableMap.of(
7389
"dir",
74-
project.getBuildDir() + "/intermediates/javac/release",
75-
"excludes",
76-
excludes)),
77-
project.fileTree(
78-
ImmutableMap.of(
79-
"dir",
80-
project.getBuildDir() + "/tmp/kotlin-classes/release",
81-
"excludes",
82-
excludes))));
83-
task.setSourceDirectories(project.files("src/main/java", "src/main/kotlin"));
84-
task.setExecutionData(
85-
project.fileTree(
86-
ImmutableMap.of(
87-
"dir",
88-
project.getBuildDir(),
89-
"includes",
90-
ImmutableList.of("jacoco/*.exec"))));
90+
project.getBuildDir(),
91+
"includes",
92+
ImmutableList.of("jacoco/*.exec"))));
9193
task.reports(
9294
reports -> {
9395
reports
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)