File tree Expand file tree Collapse file tree 7 files changed +29
-23
lines changed
src/main/java/com/google/firebase/gradle/plugins Expand file tree Collapse file tree 7 files changed +29
-23
lines changed Original file line number Diff line number Diff line change @@ -16,7 +16,7 @@ import com.google.firebase.gradle.plugins.license.LicenseResolverPlugin
16
16
import com.google.firebase.gradle.MultiProjectReleasePlugin
17
17
18
18
buildscript {
19
- ext. kotlinVersion = ' 1.3.72 '
19
+ ext. kotlinVersion = ' 1.6.20 '
20
20
repositories {
21
21
google()
22
22
mavenCentral()
Original file line number Diff line number Diff line change 13
13
// limitations under the License.
14
14
15
15
plugins {
16
- id " org.gradle.kotlin.kotlin-dsl" version " 1.2.9 "
16
+ id " org.gradle.kotlin.kotlin-dsl" version " 1.3.3 "
17
17
id " org.jlleitschuh.gradle.ktlint" version " 9.2.1"
18
18
id ' com.github.sherter.google-java-format' version ' 0.9'
19
19
}
@@ -52,7 +52,7 @@ dependencies {
52
52
implementation " com.google.auto.value:auto-value-annotations:1.7"
53
53
annotationProcessor " com.google.auto.value:auto-value:1.6.5"
54
54
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 '
56
56
implementation ' org.json:json:20180813'
57
57
58
58
implementation " org.eclipse.aether:aether-api:1.0.0.v20140518"
Original file line number Diff line number Diff line change @@ -20,6 +20,7 @@ import org.gradle.api.DefaultTask
20
20
import org.gradle.api.Project
21
21
import org.gradle.api.artifacts.Configuration
22
22
import org.gradle.api.file.FileCollection
23
+ import org.gradle.api.tasks.Input
23
24
import org.gradle.api.tasks.InputFiles
24
25
import org.gradle.api.tasks.OutputDirectory
25
26
import org.gradle.api.tasks.SourceSet
@@ -50,6 +51,7 @@ fun Project.runMetalavaWithArgs(
50
51
51
52
abstract class GenerateStubsTask : DefaultTask () {
52
53
/* * Source files against which API signatures will be validated. */
54
+ @Input
53
55
lateinit var sourceSet: Object
54
56
55
57
@get:InputFiles
Original file line number Diff line number Diff line change @@ -46,6 +46,7 @@ public abstract class ApiInformationTask extends DefaultTask {
46
46
@ InputFile
47
47
abstract File getApiTxt ();
48
48
49
+ @ Input
49
50
abstract Object getSourceSet ();
50
51
51
52
@ InputFiles
Original file line number Diff line number Diff line change @@ -38,6 +38,7 @@ public abstract class GenerateApiTxtFileTask extends DefaultTask {
38
38
@ OutputFile
39
39
abstract File getApiTxt ();
40
40
41
+ @ Input
41
42
abstract Object getSourceSet ();
42
43
43
44
@ InputFiles
Original file line number Diff line number Diff line change @@ -66,28 +66,30 @@ public static void apply(FirebaseLibraryExtension firebaseLibrary) {
66
66
.add ("**Manifest*.*" )
67
67
.build ();
68
68
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 (
71
87
project .fileTree (
72
88
ImmutableMap .of (
73
89
"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" ))));
91
93
task .reports (
92
94
reports -> {
93
95
reports
Original file line number Diff line number Diff line change 1
1
distributionBase =GRADLE_USER_HOME
2
2
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
4
4
zipStoreBase =GRADLE_USER_HOME
5
5
zipStorePath =wrapper/dists
You can’t perform that action at this time.
0 commit comments