Skip to content

Commit

Permalink
Remove publish sources (#6427)
Browse files Browse the repository at this point in the history
Per [b/377292172](https://b.corp.google.com/issues/377292172),

This fixes the issue with source jars not being published. Android
variants are configured at configuration time, but `withSourcesJar` is
only a function. There's no way to provide a `Provider` to defer setting
it. Attempting to instead call it after evaluation will result in it not
actually being set.

Previously, we published sources jars regardless if `publishSources` was
set to false. Furthermore, no SDK actually had it set to false anyhow.

So moving forward, I've just removed the setting entirely- as it wasn't
really being used, it fixes our issue, and reduces maintenance costs.

NO_RELEASE_CHANGE
  • Loading branch information
daymxn authored Nov 4, 2024
1 parent 6383f6d commit 442bab2
Show file tree
Hide file tree
Showing 46 changed files with 2 additions and 66 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ plugins {
firebaseLibrary {
libraryGroup = "appcheck"
testLab.enabled = true
publishSources = true
releaseNotes {
name.set("{{app_check}} Debug Testing")
versionName.set("appcheck-debug-testing")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ plugins {

firebaseLibrary {
libraryGroup = "appcheck"
publishSources = true
releaseNotes {
name.set("{{app_check}} Debug")
versionName.set("appcheck-debug")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ plugins {
}

firebaseLibrary {
publishSources = true
publishJavadoc = false
releaseNotes {
enabled.set(false)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ plugins {

firebaseLibrary {
libraryGroup = "appcheck"
publishSources = true
releaseNotes {
name.set("{{app_check}} Play integrity")
versionName.set("appcheck-playintegrity")
Expand Down
1 change: 0 additions & 1 deletion appcheck/firebase-appcheck/firebase-appcheck.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ plugins {

firebaseLibrary {
libraryGroup = "appcheck"
publishSources = true
releaseNotes {
name.set("{{app_check}}")
versionName.set("appcheck")
Expand Down
1 change: 0 additions & 1 deletion appcheck/firebase-appcheck/ktx/ktx.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ firebaseLibrary {
releaseNotes {
enabled.set(false)
}
publishSources = true
}

android {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ abstract class BaseFirebaseLibraryPlugin : Plugin<Project> {
with(library) {
previewMode.convention("")
publishJavadoc.convention(true)
publishSources.convention(true)
artifactId.convention(project.name)
groupId.convention(project.provider { project.group.toString() })
libraryGroup.convention(artifactId)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ package com.google.firebase.gradle.plugins

import com.android.build.gradle.LibraryExtension
import com.android.build.gradle.LibraryPlugin
import com.android.build.gradle.internal.crash.afterEvaluate
import com.google.firebase.gradle.plugins.LibraryType.ANDROID
import com.google.firebase.gradle.plugins.ci.device.FirebaseTestServer
import com.google.firebase.gradle.plugins.license.LicenseResolverPlugin
Expand Down Expand Up @@ -199,13 +198,8 @@ class FirebaseAndroidLibraryPlugin : BaseFirebaseLibraryPlugin() {
firebaseLibrary: FirebaseLibraryExtension,
android: LibraryExtension,
) {
android.publishing.singleVariant("release") {
project.afterEvaluate {
if (firebaseLibrary.publishSources.get()) {
withSourcesJar()
}
}
}
android.publishing.singleVariant("release") { withSourcesJar() }

project.tasks.withType<GenerateModuleMetadata> { isEnabled = false }

configurePublishing(project, firebaseLibrary)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,20 +69,6 @@ constructor(val project: Project, val type: LibraryType) {
*/
abstract val publishJavadoc: Property<Boolean>

/**
* Publish source files for this library.
*
* Publishing sources alongside your standard `jar` or `aar` allows the IDE to offer better
* auto-complete and inline linkage.
*
* If your SDK lives in the public repo, there's no real reason for you to have this disabled.
*
* Defaults to `true`.
*
* @see [FirebaseLibraryExtension]
*/
abstract val publishSources: Property<Boolean>

/**
* Indicates the library is in a preview mode (such as `alpha` or `beta`).
*
Expand Down
1 change: 0 additions & 1 deletion contributor-docs/onboarding/new_sdk.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ plugins {
firebaseLibrary {
// enable this only if you have tests in `androidTest`.
testLab.enabled = true
publishSources = true
publishJavadoc = true
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ plugins {
}

firebaseLibrary {
publishSources = true
publishJavadoc = false
releaseNotes {
enabled.set(false)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ plugins {
}

firebaseLibrary {
publishSources = true
publishJavadoc = false
releaseNotes {
enabled.set(false)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ plugins {
}

firebaseLibrary {
publishSources = true
publishJavadoc = false
releaseNotes {
enabled.set(false)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ plugins {
}

firebaseLibrary {
publishSources = true
publishJavadoc = false
releaseNotes {
enabled.set(false)
Expand Down
1 change: 0 additions & 1 deletion encoders/firebase-encoders/firebase-encoders.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ plugins {
}

firebaseLibrary {
publishSources = true
publishJavadoc = false
releaseNotes {
enabled.set(false)
Expand Down
1 change: 0 additions & 1 deletion firebase-abt/firebase-abt.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ plugins {

firebaseLibrary {
testLab.enabled = false
publishSources = true
publishJavadoc = false
releaseNotes {
name.set("{{ab_testing}}")
Expand Down
1 change: 0 additions & 1 deletion firebase-annotations/firebase-annotations.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
plugins { id("firebase-java-library") }

firebaseLibrary {
publishSources = true
publishJavadoc = false
releaseNotes { enabled.set(false) }
}
Expand Down
1 change: 0 additions & 1 deletion firebase-appdistribution-api/ktx/ktx.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ firebaseLibrary {
releaseNotes {
enabled.set(false)
}
publishSources = true
previewMode = "beta"
}

Expand Down
1 change: 0 additions & 1 deletion firebase-common/firebase-common.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ plugins {
firebaseLibrary {
libraryGroup = "common"
testLab.enabled = true
publishSources = true
releaseNotes { enabled = false }
}

Expand Down
1 change: 0 additions & 1 deletion firebase-components/firebase-components.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
plugins { id("firebase-library") }

firebaseLibrary {
publishSources = true
publishJavadoc = false
releaseNotes { enabled.set(false) }
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ group = "com.google.firebase"

firebaseLibrary {
testLab.enabled = false
publishSources = true
publishJavadoc = false
releaseNotes {
name.set("Dynamic feature modules support")
Expand Down
1 change: 0 additions & 1 deletion firebase-config-interop/firebase-config-interop.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
plugins { id("firebase-library") }

firebaseLibrary {
publishSources = true
publishJavadoc = false
releaseNotes { enabled.set(false) }
}
Expand Down
1 change: 0 additions & 1 deletion firebase-config/firebase-config.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ plugins {
firebaseLibrary {
libraryGroup = "config"
testLab.enabled = true
publishSources = true
releaseNotes {
name.set("{{remote_config}}")
versionName.set("remote-config")
Expand Down
1 change: 0 additions & 1 deletion firebase-config/ktx/ktx.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ firebaseLibrary {
releaseNotes {
enabled.set(false)
}
publishSources = true
}

android {
Expand Down
1 change: 0 additions & 1 deletion firebase-crashlytics/ktx/ktx.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ firebaseLibrary {
releaseNotes {
enabled.set(false)
}
publishSources = true
}

android {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
plugins { id("firebase-library") }

firebaseLibrary {
publishSources = true
publishJavadoc = false
releaseNotes { enabled.set(false) }
}
Expand Down
1 change: 0 additions & 1 deletion firebase-database/firebase-database.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ plugins {
firebaseLibrary {
libraryGroup = "database"
testLab.enabled = true
publishSources = true
releaseNotes {
name.set("{{database}}")
versionName.set("realtime-database")
Expand Down
1 change: 0 additions & 1 deletion firebase-database/ktx/ktx.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ firebaseLibrary {
libraryGroup = "database"
publishJavadoc = false
releaseNotes { enabled.set(false) }
publishSources = true
}

android {
Expand Down
1 change: 0 additions & 1 deletion firebase-dataconnect/firebase-dataconnect.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ plugins {
firebaseLibrary {
libraryGroup = "dataconnect"
testLab.enabled = false
publishSources = true
publishJavadoc = false
previewMode = "beta"
releaseNotes {
Expand Down
1 change: 0 additions & 1 deletion firebase-datatransport/firebase-datatransport.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ firebaseLibrary {
releaseNotes {
enabled.set(false)
}
publishSources = true
}

android {
Expand Down
1 change: 0 additions & 1 deletion firebase-dynamic-links/firebase-dynamic-links.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ plugins {
firebaseLibrary {
libraryGroup = "dynamic-links"
testLab.enabled = false
publishSources = true
releaseNotes {
name.set("{{ddls}}")
versionName.set("dynamic-links")
Expand Down
1 change: 0 additions & 1 deletion firebase-dynamic-links/ktx/ktx.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ firebaseLibrary {
releaseNotes {
enabled.set(false)
}
publishSources = true
}

android {
Expand Down
1 change: 0 additions & 1 deletion firebase-firestore/firebase-firestore.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ plugins {

firebaseLibrary {
libraryGroup = "firestore"
publishSources = true
testLab {
enabled = true
timeout = '45m'
Expand Down
1 change: 0 additions & 1 deletion firebase-firestore/ktx/ktx.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ group = "com.google.firebase"

firebaseLibrary {
libraryGroup = "firestore"
publishSources = true
publishJavadoc = false
releaseNotes {
enabled.set(false)
Expand Down
1 change: 0 additions & 1 deletion firebase-functions/firebase-functions.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ plugins {
firebaseLibrary {
libraryGroup = "functions"
testLab.enabled = true
publishSources = true
releaseNotes {
name.set("{{functions_client}}")
versionName.set("functions-client")
Expand Down
1 change: 0 additions & 1 deletion firebase-functions/ktx/ktx.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ firebaseLibrary {
libraryGroup = "functions"
publishJavadoc = false
releaseNotes { enabled.set(false) }
publishSources = true
testLab.enabled = true
}

Expand Down
1 change: 0 additions & 1 deletion firebase-inappmessaging-display/ktx/ktx.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ firebaseLibrary {
releaseNotes {
enabled.set(false)
}
publishSources = true
}

android {
Expand Down
1 change: 0 additions & 1 deletion firebase-inappmessaging/ktx/ktx.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ firebaseLibrary {
releaseNotes {
enabled.set(false)
}
publishSources = true
}

android {
Expand Down
1 change: 0 additions & 1 deletion firebase-installations/ktx/ktx.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ firebaseLibrary {
releaseNotes {
enabled.set(false)
}
publishSources = true
}

android {
Expand Down
1 change: 0 additions & 1 deletion firebase-messaging/ktx/ktx.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ firebaseLibrary {
releaseNotes {
enabled.set(false)
}
publishSources = true
}

android {
Expand Down
1 change: 0 additions & 1 deletion firebase-ml-modeldownloader/ktx/ktx.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ firebaseLibrary {
releaseNotes {
enabled.set(false)
}
publishSources = true
testLab.enabled = false
}

Expand Down
1 change: 0 additions & 1 deletion firebase-perf/ktx/ktx.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ firebaseLibrary {
releaseNotes {
enabled.set(false)
}
publishSources = true
}

android {
Expand Down
1 change: 0 additions & 1 deletion firebase-sessions/firebase-sessions.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ firebaseLibrary {
libraryGroup = "crashlytics"

testLab.enabled = true
publishSources = true
publishJavadoc = false
releaseNotes { enabled.set(false) }
}
Expand Down
1 change: 0 additions & 1 deletion firebase-storage/firebase-storage.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ firebaseLibrary {
libraryGroup = "storage"
testLab.enabled = true
publishJavadoc = true
publishSources = true
releaseNotes {
name.set("{{firebase_storage_full}}")
versionName.set("storage")
Expand Down
1 change: 0 additions & 1 deletion firebase-storage/ktx/ktx.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ firebaseLibrary {
releaseNotes {
enabled.set(false)
}
publishSources = true
}

android {
Expand Down
1 change: 0 additions & 1 deletion firebase-vertexai/firebase-vertexai.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ plugins {

firebaseLibrary {
testLab.enabled = false
publishSources = true
publishJavadoc = true
releaseNotes {
name.set("{{firebase_vertexai}}")
Expand Down

0 comments on commit 442bab2

Please sign in to comment.