Skip to content

Commit a83aa37

Browse files
committed
Fix more incorrect API usages
Signed-off-by: Alex Saveau <[email protected]>
1 parent a0c4f48 commit a83aa37

File tree

8 files changed

+13
-16
lines changed

8 files changed

+13
-16
lines changed

app/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ android {
77
}
88

99
buildTypes {
10-
getByName("release") {
10+
named("release").configure {
1111
// For the purposes of the sample, allow testing of a proguarded release build
1212
// using the debug key
1313
signingConfig = signingConfigs["debug"]

auth/build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
21
import com.android.build.gradle.internal.dsl.TestOptions
32

43
android {
54
buildTypes {
6-
getByName("release") {
5+
named("release").configure {
76
postprocessing {
87
consumerProguardFiles("auth-proguard.pro")
98
}

build.gradle.kts

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ allprojects {
5353
}
5454
}
5555

56-
tasks.withType<Wrapper> {
56+
tasks.withType<Wrapper>().configureEach {
5757
distributionType = Wrapper.DistributionType.ALL
5858
}
5959

@@ -139,14 +139,12 @@ fun Project.setupPublishing() {
139139
}
140140

141141
val javadoc = tasks.register<Javadoc>("javadoc") {
142-
afterEvaluate {
143-
dependsOn(project.the<LibraryExtension>().libraryVariants.map { it.assemble })
142+
setSource(project.the<BaseExtension>().sourceSets["main"].java.srcDirs)
143+
classpath += files(project.the<BaseExtension>().bootClasspath)
144144

145-
setSource(project.the<BaseExtension>().sourceSets["main"].java.srcDirs)
146-
classpath += files(project.the<BaseExtension>().bootClasspath)
147-
classpath += files(project.the<LibraryExtension>().libraryVariants.map {
148-
(it.javaCompiler as AbstractCompile).classpath
149-
})
145+
project.the<LibraryExtension>().libraryVariants.configureEach {
146+
dependsOn(assemble)
147+
classpath += files((javaCompiler as AbstractCompile).classpath)
150148
}
151149

152150
// Ignore warnings about incomplete documentation
@@ -347,7 +345,7 @@ fun Project.setupPublishing() {
347345
})
348346
}
349347

350-
tasks.withType<ArtifactoryTask> { publications(publicationName) }
348+
tasks.withType<ArtifactoryTask>().configureEach { publications(publicationName) }
351349

352350
configure<BintrayExtension> {
353351
user = bintrayUsername

firestore/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ android {
66
}
77

88
buildTypes {
9-
getByName("release") {
9+
named("release").configure {
1010
postprocessing {
1111
consumerProguardFiles("proguard-rules.pro")
1212
}

gradle/wrapper/gradle-wrapper.jar

-5 Bytes
Binary file not shown.
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-4.10-rc-3-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

internal/lint/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dependencies {
1010
testImplementation(Config.Libs.Lint.tests)
1111
}
1212

13-
tasks.withType<Jar> {
13+
tasks.withType<Jar>().configureEach {
1414
manifest {
1515
attributes(mapOf("Lint-Registry-v2" to "com.firebaseui.lint.LintIssueRegistry"))
1616
}

proguard-tests/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ android {
44
}
55

66
buildTypes {
7-
getByName("release") {
7+
named("release").configure {
88
// For the purposes of the sample, allow testing of a proguarded release build
99
// using the debug key
1010
signingConfig = signingConfigs["debug"]

0 commit comments

Comments
 (0)