Skip to content

Commit 79be45f

Browse files
authored
Merge branch 'master' into daymon-update-dackka-1.0.5
2 parents 5133cc7 + df07a40 commit 79be45f

File tree

138 files changed

+7870
-2349
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

138 files changed

+7870
-2349
lines changed

appcheck/firebase-appcheck/CHANGELOG.md

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,21 @@
11
# Unreleased
22
* [unchanged] Updated to keep [app_check] SDK versions aligned.
33

4+
45
# 16.1.1
5-
* [changed] Migrated [app_check] SDKs to use standard Firebase executors. (#4431, #4449)
6-
* [changed] Moved Task continuations off the main thread. (#4453)
6+
* [changed] Migrated [app_check] SDKs to use standard Firebase executors.
7+
(GitHub [#4431](//github.com/firebase/firebase-android-sdk/issues/4431){: .external}
8+
and
9+
[#4449](//github.com/firebase/firebase-android-sdk/issues/4449){: .external})
10+
11+
* [changed] Moved Task continuations off the main thread.
12+
(GitHub [#4453](//github.com/firebase/firebase-android-sdk/issues/4453){: .external})
13+
14+
15+
## Kotlin
16+
The Kotlin extensions library transitively includes the updated
17+
`firebase-appcheck` library. The Kotlin extensions library has no additional
18+
updates.
719

820
# 16.1.0
921
* [unchanged] Updated to accommodate the release of the updated

build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ buildscript {
4141
classpath 'gradle.plugin.com.github.sherter.google-java-format:google-java-format-gradle-plugin:0.9'
4242
classpath 'com.google.gms:google-services:4.3.15'
4343
classpath "com.ncorti.ktfmt.gradle:plugin:0.11.0"
44+
classpath 'com.google.firebase:firebase-appdistribution-gradle:3.0.2'
4445
}
4546
}
4647

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
// Copyright 2023 Google LLC
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
//
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
package com.google.firebase.gradle.plugins
15+
16+
import com.google.firebase.gradle.plugins.ci.Coverage
17+
import java.io.File
18+
import java.nio.file.Paths
19+
import org.gradle.api.Plugin
20+
import org.gradle.api.Project
21+
import org.gradle.api.publish.PublishingExtension
22+
import org.gradle.api.publish.maven.MavenPublication
23+
import org.gradle.api.publish.maven.plugins.MavenPublishPlugin
24+
import org.gradle.api.tasks.TaskProvider
25+
import org.gradle.kotlin.dsl.apply
26+
import org.gradle.kotlin.dsl.configure
27+
import org.gradle.kotlin.dsl.create
28+
import org.gradle.kotlin.dsl.register
29+
30+
abstract class BaseFirebaseLibraryPlugin : Plugin<Project> {
31+
32+
protected fun kotlinModuleName(project: Project): String {
33+
val fullyQualifiedProjectPath = project.path.replace(":".toRegex(), "-")
34+
return project.rootProject.name + fullyQualifiedProjectPath
35+
}
36+
37+
protected fun setupStaticAnalysis(project: Project, library: FirebaseLibraryExtension) {
38+
project.afterEvaluate {
39+
configurations.all {
40+
if ("lintChecks" == name) {
41+
for (checkProject in library.staticAnalysis.androidLintCheckProjects) {
42+
project.dependencies.add("lintChecks", project.project(checkProject!!))
43+
}
44+
}
45+
}
46+
}
47+
project.tasks.register("firebaseLint") { dependsOn("lint") }
48+
Coverage.apply(library)
49+
}
50+
51+
protected fun getApiInfo(project: Project, srcDirs: Set<File>): TaskProvider<ApiInformationTask> {
52+
val outputFile =
53+
project.rootProject.file(
54+
Paths.get(
55+
project.rootProject.buildDir.path,
56+
"apiinfo",
57+
project.path.substring(1).replace(":", "_")
58+
)
59+
)
60+
val outputApiFile = File(outputFile.absolutePath + "_api.txt")
61+
val apiTxt =
62+
project.file("api.txt").takeIf { it.exists() } ?: project.rootProject.file("empty-api.txt")
63+
val apiInfo =
64+
project.tasks.register<ApiInformationTask>("apiInformation") {
65+
sources.value(project.provider { srcDirs })
66+
apiTxtFile.set(apiTxt)
67+
baselineFile.set(project.file("baseline.txt"))
68+
this.outputFile.set(outputFile)
69+
this.outputApiFile.set(outputApiFile)
70+
updateBaseline.set(project.hasProperty("updateBaseline"))
71+
}
72+
return apiInfo
73+
}
74+
75+
protected fun getGenerateApiTxt(project: Project, srcDirs: Set<File>) =
76+
project.tasks.register<GenerateApiTxtTask>("generateApiTxtFile") {
77+
sources.value(project.provider { srcDirs })
78+
apiTxtFile.set(project.file("api.txt"))
79+
baselineFile.set(project.file("baseline.txt"))
80+
updateBaseline.set(project.hasProperty("updateBaseline"))
81+
}
82+
83+
protected fun getDocStubs(project: Project, srcDirs: Set<File>) =
84+
project.tasks.register<GenerateStubsTask>("docStubs") {
85+
sources.value(project.provider { srcDirs })
86+
}
87+
88+
protected fun configurePublishing(project: Project, firebaseLibrary: FirebaseLibraryExtension) {
89+
project.afterEvaluate {
90+
project.apply<MavenPublishPlugin>()
91+
project.extensions.configure<PublishingExtension> {
92+
repositories.maven {
93+
val s = project.rootProject.buildDir.toString() + "/m2repository"
94+
url = File(s).toURI()
95+
name = "BuildDir"
96+
}
97+
publications.create<MavenPublication>("mavenAar") {
98+
from(project.components.findByName(firebaseLibrary.type.componentName))
99+
artifactId = firebaseLibrary.artifactId.get()
100+
groupId = firebaseLibrary.groupId.get()
101+
firebaseLibrary.applyPomCustomization(pom)
102+
}
103+
}
104+
}
105+
}
106+
}

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

Lines changed: 0 additions & 207 deletions
This file was deleted.

0 commit comments

Comments
 (0)