Skip to content

Commit ec2b145

Browse files
committed
Fix tests.
1 parent ebf97df commit ec2b145

File tree

4 files changed

+19
-5
lines changed

4 files changed

+19
-5
lines changed

buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseJavaLibraryPlugin.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import com.google.common.collect.ImmutableMap;
1919
import com.google.firebase.gradle.plugins.apiinfo.ApiInformationTask;
2020
import com.google.firebase.gradle.plugins.apiinfo.GenerateApiTxtFileTask;
21+
import com.google.firebase.gradle.plugins.apiinfo.GetMetalavaJarTask;
2122
import com.google.firebase.gradle.plugins.ci.Coverage;
2223
import java.io.File;
2324
import java.nio.file.Paths;
@@ -104,6 +105,14 @@ private static void setupApiInformationAnalysis(Project project) {
104105
project.getPath().substring(1).replace(":", "_")));
105106
File outputApiFile = new File(outputFile.getAbsolutePath() + "_api.txt");
106107

108+
project
109+
.getTasks()
110+
.register(
111+
"getMetalavaJar",
112+
GetMetalavaJarTask.class,
113+
task -> {
114+
task.setOutputFile(metalavaOutputJarFile);
115+
});
107116
File apiTxt =
108117
project.file("api.txt").exists()
109118
? project.file("api.txt")

buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseLibraryPlugin.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ public void apply(Project project) {
101101
.setFreeCompilerArgs(
102102
ImmutableList.of("-module-name", kotlinModuleName(project))));
103103

104-
105104
Dokka.configure(project, android, firebaseLibrary);
106105
}
107106

buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/PublishingPluginTests.kt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,16 @@ licenses {
344344
plugins {
345345
id 'PublishingPlugin'
346346
}
347+
348+
configure(subprojects) {
349+
repositories {
350+
google()
351+
jcenter()
352+
maven {
353+
url 'https://storage.googleapis.com/android-ci/mvn/'
354+
}
355+
}
356+
}
347357
"""
348358
private const val MANIFEST = """<?xml version="1.0" encoding="utf-8"?>
349359
<manifest xmlns:android="http://schemas.android.com/apk/res/android"

buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/publishing.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,6 @@ data class Project(
4545
}
4646
${if (libraryType == LibraryType.ANDROID) "android.compileSdkVersion = 26" else ""}
4747
48-
repositories {
49-
google()
50-
jcenter()
51-
}
5248
dependencies {
5349
${projectDependencies.joinToString("\n") { "implementation project(':${it.name}')" }}
5450
${externalDependencies.joinToString("\n") { "implementation '${it.simpleDepString}'" }}

0 commit comments

Comments
 (0)