diff --git a/.github/workflows/build-src-check.yml b/.github/workflows/plugins-check.yml similarity index 75% rename from .github/workflows/build-src-check.yml rename to .github/workflows/plugins-check.yml index 129f89f63d5..fa482c36d35 100644 --- a/.github/workflows/build-src-check.yml +++ b/.github/workflows/plugins-check.yml @@ -1,16 +1,16 @@ -name: Check buildSrc +name: Check plugins on: pull_request: paths: - - 'buildSrc/**' + - 'plugins/**' concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} cancel-in-progress: true jobs: - build-src-check: + plugins-check: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4.1.1 @@ -20,13 +20,13 @@ jobs: java-version: 17 distribution: temurin cache: gradle - - name: buildSrc Tests + - name: plugins tests env: FIREBASE_CI: 1 run: | - ./gradlew -b buildSrc/build.gradle.kts -PenablePluginTests=true check + ./gradlew plugins:check - name: Publish Test Results uses: EnricoMi/publish-unit-test-result-action@82082dac68ad6a19d980f8ce817e108b9f496c2a with: files: "**/build/test-results/**/*.xml" - check_name: "buildSrc Test Results" + check_name: "plugins test results" diff --git a/.github/workflows/release-note-changes.yml b/.github/workflows/release-note-changes.yml index a2b5002e985..06d42153ea4 100644 --- a/.github/workflows/release-note-changes.yml +++ b/.github/workflows/release-note-changes.yml @@ -9,59 +9,59 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4.1.1 - with: - fetch-depth: 0 + - uses: actions/checkout@v4.1.1 + with: + fetch-depth: 0 - - name: Create output file - run: touch changelog_comment.md + - name: Create output file + run: touch changelog_comment.md - - name: Get changed changelog files - id: changed-files - uses: tj-actions/changed-files@v41.0.0 - with: - files_ignore: | - buildSrc/** - files: | - **/CHANGELOG.md + - name: Get changed changelog files + id: changed-files + uses: tj-actions/changed-files@v41.0.0 + with: + files_ignore: | + plugins/** + files: | + **/CHANGELOG.md - - name: Set up JDK 17 - uses: actions/setup-java@v4.1.0 - with: - java-version: 17 - distribution: temurin - cache: gradle + - name: Set up JDK 17 + uses: actions/setup-java@v4.1.0 + with: + java-version: 17 + distribution: temurin + cache: gradle - - name: Set up Python 3.10 - uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 - if: ${{ steps.changed-files.outputs.any_changed == 'true' }} - with: - python-version: '3.10' + - name: Set up Python 3.10 + uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 + if: ${{ steps.changed-files.outputs.any_changed == 'true' }} + with: + python-version: '3.10' - - name: Set up fireci - id: install-fireci - if: ${{ steps.changed-files.outputs.any_changed == 'true' }} - run: pip3 install -e ci/fireci + - name: Set up fireci + id: install-fireci + if: ${{ steps.changed-files.outputs.any_changed == 'true' }} + run: pip3 install -e ci/fireci - - name: Generate comment - id: generate-comment - if: ${{ steps.install-fireci.outcome == 'success' }} - run: | - fireci changelog_comment -c "${{ steps.changed-files.outputs.all_changed_files }}" -o ./changelog_comment.md + - name: Generate comment + id: generate-comment + if: ${{ steps.install-fireci.outcome == 'success' }} + run: | + fireci changelog_comment -c "${{ steps.changed-files.outputs.all_changed_files }}" -o ./changelog_comment.md - - name: Add PR Comment - uses: mshick/add-pr-comment@v2.8.1 - continue-on-error: true - with: - status: ${{ steps.generate-comment.outcome }} - message-path: ./changelog_comment.md - message-skipped: | - ## Release note changes - No release note changes were detected. If you made changes that should be - present in the next release, ensure you've added an entry in the appropriate - `CHANGELOG.md` file(s). - message-failure: | - ## Release note changes - A `CHANGELOG.md` file seems to not match the expected format. - Please ensure your changelog files are following the format as - defined in [our documentation](#). + - name: Add PR Comment + uses: mshick/add-pr-comment@v2.8.1 + continue-on-error: true + with: + status: ${{ steps.generate-comment.outcome }} + message-path: ./changelog_comment.md + message-skipped: | + ## Release note changes + No release note changes were detected. If you made changes that should be + present in the next release, ensure you've added an entry in the appropriate + `CHANGELOG.md` file(s). + message-failure: | + ## Release note changes + A `CHANGELOG.md` file seems to not match the expected format. + Please ensure your changelog files are following the format as + defined in [our documentation](#). diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts deleted file mode 100644 index 3d822add9e2..00000000000 --- a/buildSrc/build.gradle.kts +++ /dev/null @@ -1,115 +0,0 @@ -// Copyright 2018 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -plugins { - alias(libs.plugins.kotlinx.serialization) - alias(libs.plugins.spotless) - `kotlin-dsl` -} - -repositories { - mavenLocal() - maven(url = "https://maven.google.com/") - mavenCentral() - maven(url = "https://storage.googleapis.com/android-ci/mvn/") - maven(url = "https://plugins.gradle.org/m2/") -} - -spotless { - java { - target("src/**/*.java") - targetExclude("**/test/resources/**") - googleJavaFormat("1.22.0").reorderImports(true).skipJavadocFormatting() - } - kotlin { - target("src/**/*.kt") - ktfmt("0.52").googleStyle() - } -} - -// Refer latest "perf-plugin" released version on https://maven.google.com/web/index.html?q=perf-plugin#com.google.firebase:perf-plugin -// The System property allows us to integrate with an unreleased version from https://bityl.co/3oYt. -// Refer go/fireperf-plugin-test-on-head for more details. -val perfPluginVersion = System.getenv("FIREBASE_PERF_PLUGIN_VERSION") ?: "1.4.1" - -dependencies { - // Firebase performance plugin, it should be added here because of how gradle dependency - // resolution works, otherwise it breaks Fireperf Test Apps. - // See https://github.com/gradle/gradle/issues/12286 - implementation("com.google.firebase:perf-plugin:$perfPluginVersion") - implementation("com.google.auto.value:auto-value-annotations:1.8.1") - annotationProcessor("com.google.auto.value:auto-value:1.6.5") - implementation(kotlin("gradle-plugin", "1.8.22")) - implementation(libs.org.json) - implementation(libs.bundles.maven.resolver) - - implementation("com.google.guava:guava:31.1-jre") - implementation("org.ow2.asm:asm-tree:9.5") - implementation("org.eclipse.jgit:org.eclipse.jgit:6.3.0.202209071007-r") - implementation(libs.kotlinx.serialization.json) - implementation("com.google.code.gson:gson:2.8.9") - implementation(libs.android.gradlePlugin.gradle) - implementation(libs.android.gradlePlugin.builder.test.api) - - testImplementation(libs.bundles.kotest) - testImplementation(libs.junit) - testImplementation(libs.truth) - testImplementation("commons-io:commons-io:2.15.1") -} - -gradlePlugin { - plugins { - register("licensePlugin") { - id = "LicenseResolverPlugin" - implementationClass = "com.google.firebase.gradle.plugins.license.LicenseResolverPlugin" - } - register("continuousIntegrationPlugin") { - id = "firebase-ci" - implementationClass = "com.google.firebase.gradle.plugins.ci.ContinuousIntegrationPlugin" - } - register("smokeTestsPlugin") { - id = "smoke-tests" - implementationClass = "com.google.firebase.gradle.plugins.ci.SmokeTestsPlugin" - } - register("publishingPlugin") { - id = "PublishingPlugin" - implementationClass = "com.google.firebase.gradle.plugins.PublishingPlugin" - } - register("firebaseLibraryPlugin") { - id = "firebase-library" - implementationClass = "com.google.firebase.gradle.plugins.FirebaseAndroidLibraryPlugin" - } - register("firebaseJavaLibraryPlugin") { - id = "firebase-java-library" - implementationClass = "com.google.firebase.gradle.plugins.FirebaseJavaLibraryPlugin" - } - register("firebaseVendorPlugin") { - id = "firebase-vendor" - implementationClass = "com.google.firebase.gradle.plugins.VendorPlugin" - } - register("copyGoogleServicesPlugin") { - id = "copy-google-services" - implementationClass = "com.google.firebase.gradle.plugins.CopyGoogleServicesPlugin" - } - } -} - -tasks.withType { - testLogging { - // Make sure output from standard out or error is shown in Gradle output. - showStandardStreams = true - } - val enablePluginTests: String? by rootProject - enabled = enablePluginTests == "true" -} diff --git a/ci/danger/Dangerfile b/ci/danger/Dangerfile index 0efe1369e0b..9d1b9ef9b29 100644 --- a/ci/danger/Dangerfile +++ b/ci/danger/Dangerfile @@ -45,7 +45,7 @@ has_changelog_changes = hasChangesIn(["CHANGELOG"]) # Ignore changes in these directories $exclude_directories = [ '.github/', - 'buildSrc/', + 'plugins/', 'ci/', 'encoders/', 'firebase-annotations/', diff --git a/contributor-docs/onboarding/new_sdk.md b/contributor-docs/onboarding/new_sdk.md index 52ba25eeaff..2d39b001d62 100644 --- a/contributor-docs/onboarding/new_sdk.md +++ b/contributor-docs/onboarding/new_sdk.md @@ -23,7 +23,7 @@ subdirectory with its respective build file(s). ```bash firebase-android-sdk -├── buildSrc +├── plugins ├── appcheck │ └── firebase-appcheck │ └── firebase-appcheck-playintegrity @@ -45,7 +45,7 @@ Note that the build file name for any given SDK is not `build.gradle` or `build. but rather mirrors the name of the sdk, e.g. `firebase-common/firebase-common.gradle` or `firebase-common/firebase-common.gradle.kts`. -All of the core Gradle build logic lives in `buildSrc` and is used by all +All of the core Gradle build logic lives in `plugins` and is used by all SDKs. SDKs can be grouped together for convenience by placing them in a directory of diff --git a/firebase-perf/dev-app/README.md b/firebase-perf/dev-app/README.md index c79c43fcbcb..489f574d29f 100644 --- a/firebase-perf/dev-app/README.md +++ b/firebase-perf/dev-app/README.md @@ -83,7 +83,7 @@ firebase-android-sdk$ ./gradlew :firebase-perf:dev-app:devicecheck There are differences in terms of Firebase projects when running this command in different scenarios. 1. **CI Run**: These tests are run under Firebase Test Lab of the unified Firebase project -(according to [this](https://github.com/firebase/firebase-android-sdk/blob/main/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/device/FirebaseTestServer.java)) +(according to [this](https://github.com/firebase/firebase-android-sdk/blob/main/plugins/src/main/java/com/google/firebase/gradle/plugins/ci/device/FirebaseTestServer.java)) but the performance events are sent to a different project with which apps are configured with (see `copyRootGoogleServices` task). diff --git a/firebase-perf/e2e-app/README.md b/firebase-perf/e2e-app/README.md index 6554f58e360..dc95fd52b70 100644 --- a/firebase-perf/e2e-app/README.md +++ b/firebase-perf/e2e-app/README.md @@ -75,7 +75,7 @@ firebase-android-sdk$ ./gradlew :firebase-perf:e2e-app:devicecheck There are differences in terms of Firebase projects when running this command in different scenarios. 1. **CI Run**: These tests are run under Firebase Test Lab of the unified Firebase project -(according to [this](https://github.com/firebase/firebase-android-sdk/blob/main/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/device/FirebaseTestServer.java)) +(according to [this](https://github.com/firebase/firebase-android-sdk/blob/main/plugins/src/main/java/com/google/firebase/gradle/plugins/ci/device/FirebaseTestServer.java)) but the performance events are sent to a different project with which apps are configured with (see `copyRootGoogleServices` task) and the Prow Configuration in tg/831643). diff --git a/buildSrc/README.md b/plugins/README.md similarity index 97% rename from buildSrc/README.md rename to plugins/README.md index bc32b0f0449..ba4fd5a9252 100644 --- a/buildSrc/README.md +++ b/plugins/README.md @@ -1,4 +1,4 @@ -## Build Source +## Plugins > [!NOTE] > Eventually, this will be merged with our [contributor documentation](https://firebase.github.io/firebase-android-sdk/). diff --git a/plugins/build.gradle.kts b/plugins/build.gradle.kts new file mode 100644 index 00000000000..856ef9a9b08 --- /dev/null +++ b/plugins/build.gradle.kts @@ -0,0 +1,114 @@ +// Copyright 2018 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +plugins { + alias(libs.plugins.kotlinx.serialization) + alias(libs.plugins.spotless) + `kotlin-dsl` +} + +repositories { + mavenLocal() + maven(url = "https://maven.google.com/") + mavenCentral() + maven(url = "https://storage.googleapis.com/android-ci/mvn/") + maven(url = "https://plugins.gradle.org/m2/") +} + +spotless { + java { + target("src/**/*.java") + targetExclude("**/test/resources/**") + googleJavaFormat("1.22.0").reorderImports(true).skipJavadocFormatting() + } + kotlin { + target("src/**/*.kt") + ktfmt("0.52").googleStyle() + } +} + +// Refer latest "perf-plugin" released version on +// https://maven.google.com/web/index.html?q=perf-plugin#com.google.firebase:perf-plugin +// The System property allows us to integrate with an unreleased version from https://bityl.co/3oYt. +// Refer go/fireperf-plugin-test-on-head for more details. +val perfPluginVersion = System.getenv("FIREBASE_PERF_PLUGIN_VERSION") ?: "1.4.1" + +dependencies { + // Firebase performance plugin, it should be added here because of how gradle dependency + // resolution works, otherwise it breaks Fireperf Test Apps. + // See https://github.com/gradle/gradle/issues/12286 + implementation("com.google.firebase:perf-plugin:$perfPluginVersion") + implementation("com.google.auto.value:auto-value-annotations:1.8.1") + annotationProcessor("com.google.auto.value:auto-value:1.6.5") + implementation(kotlin("gradle-plugin", "1.8.22")) + implementation(libs.org.json) + implementation(libs.bundles.maven.resolver) + + implementation("com.google.guava:guava:31.1-jre") + implementation("org.ow2.asm:asm-tree:9.5") + implementation("org.eclipse.jgit:org.eclipse.jgit:6.3.0.202209071007-r") + implementation(libs.kotlinx.serialization.json) + implementation("com.google.code.gson:gson:2.8.9") + implementation(libs.android.gradlePlugin.gradle) + implementation(libs.android.gradlePlugin.builder.test.api) + + testImplementation(libs.bundles.kotest) + testImplementation(libs.junit) + testImplementation(libs.truth) + testImplementation("commons-io:commons-io:2.15.1") +} + +gradlePlugin { + plugins { + register("licensePlugin") { + id = "LicenseResolverPlugin" + implementationClass = "com.google.firebase.gradle.plugins.license.LicenseResolverPlugin" + } + register("continuousIntegrationPlugin") { + id = "firebase-ci" + implementationClass = "com.google.firebase.gradle.plugins.ci.ContinuousIntegrationPlugin" + } + register("smokeTestsPlugin") { + id = "smoke-tests" + implementationClass = "com.google.firebase.gradle.plugins.ci.SmokeTestsPlugin" + } + register("publishingPlugin") { + id = "PublishingPlugin" + implementationClass = "com.google.firebase.gradle.plugins.PublishingPlugin" + } + register("firebaseLibraryPlugin") { + id = "firebase-library" + implementationClass = "com.google.firebase.gradle.plugins.FirebaseAndroidLibraryPlugin" + } + register("firebaseJavaLibraryPlugin") { + id = "firebase-java-library" + implementationClass = "com.google.firebase.gradle.plugins.FirebaseJavaLibraryPlugin" + } + register("firebaseVendorPlugin") { + id = "firebase-vendor" + implementationClass = "com.google.firebase.gradle.plugins.VendorPlugin" + } + register("copyGoogleServicesPlugin") { + id = "copy-google-services" + implementationClass = "com.google.firebase.gradle.plugins.CopyGoogleServicesPlugin" + } + } +} + +tasks.withType { + testLogging { + // Make sure output from standard out or error is shown in Gradle output. + showStandardStreams = true + } +} diff --git a/buildSrc/resources/dummy.apk b/plugins/resources/dummy.apk similarity index 100% rename from buildSrc/resources/dummy.apk rename to plugins/resources/dummy.apk diff --git a/buildSrc/settings.gradle.kts b/plugins/settings.gradle.kts similarity index 100% rename from buildSrc/settings.gradle.kts rename to plugins/settings.gradle.kts diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/NdkBinaryFixTask.kt b/plugins/src/main/java/com/google/firebase/gradle/NdkBinaryFixTask.kt similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/NdkBinaryFixTask.kt rename to plugins/src/main/java/com/google/firebase/gradle/NdkBinaryFixTask.kt diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/BomGeneratorTask.java b/plugins/src/main/java/com/google/firebase/gradle/bomgenerator/BomGeneratorTask.java similarity index 99% rename from buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/BomGeneratorTask.java rename to plugins/src/main/java/com/google/firebase/gradle/bomgenerator/BomGeneratorTask.java index 433b9132e36..533c3af06f8 100644 --- a/buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/BomGeneratorTask.java +++ b/plugins/src/main/java/com/google/firebase/gradle/bomgenerator/BomGeneratorTask.java @@ -48,6 +48,7 @@ import org.w3c.dom.NodeList; import org.xml.sax.SAXException; +// TODO: add tests, and then start migrating to maybe a task or a new refined testable plugin public abstract class BomGeneratorTask extends DefaultTask { private static final List BOM_ARTIFACTS = List.of( diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/MarkdownDocumentationWriter.java b/plugins/src/main/java/com/google/firebase/gradle/bomgenerator/MarkdownDocumentationWriter.java similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/MarkdownDocumentationWriter.java rename to plugins/src/main/java/com/google/firebase/gradle/bomgenerator/MarkdownDocumentationWriter.java diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/PomXmlWriter.java b/plugins/src/main/java/com/google/firebase/gradle/bomgenerator/PomXmlWriter.java similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/PomXmlWriter.java rename to plugins/src/main/java/com/google/firebase/gradle/bomgenerator/PomXmlWriter.java diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/RecipeVersionWriter.java b/plugins/src/main/java/com/google/firebase/gradle/bomgenerator/RecipeVersionWriter.java similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/RecipeVersionWriter.java rename to plugins/src/main/java/com/google/firebase/gradle/bomgenerator/RecipeVersionWriter.java diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/RepositoryClient.java b/plugins/src/main/java/com/google/firebase/gradle/bomgenerator/RepositoryClient.java similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/RepositoryClient.java rename to plugins/src/main/java/com/google/firebase/gradle/bomgenerator/RepositoryClient.java diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/model/Dependency.java b/plugins/src/main/java/com/google/firebase/gradle/bomgenerator/model/Dependency.java similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/model/Dependency.java rename to plugins/src/main/java/com/google/firebase/gradle/bomgenerator/model/Dependency.java diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/model/VersionBump.java b/plugins/src/main/java/com/google/firebase/gradle/bomgenerator/model/VersionBump.java similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/model/VersionBump.java rename to plugins/src/main/java/com/google/firebase/gradle/bomgenerator/model/VersionBump.java diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/tagging/GitClient.java b/plugins/src/main/java/com/google/firebase/gradle/bomgenerator/tagging/GitClient.java similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/tagging/GitClient.java rename to plugins/src/main/java/com/google/firebase/gradle/bomgenerator/tagging/GitClient.java diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/tagging/ShellExecutor.java b/plugins/src/main/java/com/google/firebase/gradle/bomgenerator/tagging/ShellExecutor.java similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/tagging/ShellExecutor.java rename to plugins/src/main/java/com/google/firebase/gradle/bomgenerator/tagging/ShellExecutor.java diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/BaseFirebaseLibraryPlugin.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/BaseFirebaseLibraryPlugin.kt similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/BaseFirebaseLibraryPlugin.kt rename to plugins/src/main/java/com/google/firebase/gradle/plugins/BaseFirebaseLibraryPlugin.kt diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/Changelog.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/Changelog.kt similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/Changelog.kt rename to plugins/src/main/java/com/google/firebase/gradle/plugins/Changelog.kt diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/CheckHeadDependencies.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/CheckHeadDependencies.kt similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/CheckHeadDependencies.kt rename to plugins/src/main/java/com/google/firebase/gradle/plugins/CheckHeadDependencies.kt diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ClosureUtil.java b/plugins/src/main/java/com/google/firebase/gradle/plugins/ClosureUtil.java similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/ClosureUtil.java rename to plugins/src/main/java/com/google/firebase/gradle/plugins/ClosureUtil.java diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/CopyGoogleServicesPlugin.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/CopyGoogleServicesPlugin.kt similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/CopyGoogleServicesPlugin.kt rename to plugins/src/main/java/com/google/firebase/gradle/plugins/CopyGoogleServicesPlugin.kt diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/DackkaGenerationTask.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/DackkaGenerationTask.kt similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/DackkaGenerationTask.kt rename to plugins/src/main/java/com/google/firebase/gradle/plugins/DackkaGenerationTask.kt diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/DackkaPlugin.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/DackkaPlugin.kt similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/DackkaPlugin.kt rename to plugins/src/main/java/com/google/firebase/gradle/plugins/DackkaPlugin.kt diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseAndroidLibraryPlugin.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseAndroidLibraryPlugin.kt similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseAndroidLibraryPlugin.kt rename to plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseAndroidLibraryPlugin.kt diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseJavaLibraryPlugin.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseJavaLibraryPlugin.kt similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseJavaLibraryPlugin.kt rename to plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseJavaLibraryPlugin.kt diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseLibraryExtension.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseLibraryExtension.kt similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseLibraryExtension.kt rename to plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseLibraryExtension.kt diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseStaticAnalysis.java b/plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseStaticAnalysis.java similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseStaticAnalysis.java rename to plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseStaticAnalysis.java diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/FiresiteTransformTask.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/FiresiteTransformTask.kt similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/FiresiteTransformTask.kt rename to plugins/src/main/java/com/google/firebase/gradle/plugins/FiresiteTransformTask.kt diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/GitSubmodulePlugin.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/GitSubmodulePlugin.kt similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/GitSubmodulePlugin.kt rename to plugins/src/main/java/com/google/firebase/gradle/plugins/GitSubmodulePlugin.kt diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/GmavenHelper.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/GmavenHelper.kt similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/GmavenHelper.kt rename to plugins/src/main/java/com/google/firebase/gradle/plugins/GmavenHelper.kt diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/GmavenVersionChecker.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/GmavenVersionChecker.kt similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/GmavenVersionChecker.kt rename to plugins/src/main/java/com/google/firebase/gradle/plugins/GmavenVersionChecker.kt diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/GradleUtils.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/GradleUtils.kt similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/GradleUtils.kt rename to plugins/src/main/java/com/google/firebase/gradle/plugins/GradleUtils.kt diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/KotlinUtils.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/KotlinUtils.kt similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/KotlinUtils.kt rename to plugins/src/main/java/com/google/firebase/gradle/plugins/KotlinUtils.kt diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/LibraryGroups.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/LibraryGroups.kt similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/LibraryGroups.kt rename to plugins/src/main/java/com/google/firebase/gradle/plugins/LibraryGroups.kt diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/LibraryType.java b/plugins/src/main/java/com/google/firebase/gradle/plugins/LibraryType.java similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/LibraryType.java rename to plugins/src/main/java/com/google/firebase/gradle/plugins/LibraryType.java diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/MakeReleaseNotesTask.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/MakeReleaseNotesTask.kt similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/MakeReleaseNotesTask.kt rename to plugins/src/main/java/com/google/firebase/gradle/plugins/MakeReleaseNotesTask.kt diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/Metalava.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/Metalava.kt similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/Metalava.kt rename to plugins/src/main/java/com/google/firebase/gradle/plugins/Metalava.kt diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ModuleVersion.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/ModuleVersion.kt similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/ModuleVersion.kt rename to plugins/src/main/java/com/google/firebase/gradle/plugins/ModuleVersion.kt diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/MoveUnreleasedChangesTask.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/MoveUnreleasedChangesTask.kt similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/MoveUnreleasedChangesTask.kt rename to plugins/src/main/java/com/google/firebase/gradle/plugins/MoveUnreleasedChangesTask.kt diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/PomValidator.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/PomValidator.kt similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/PomValidator.kt rename to plugins/src/main/java/com/google/firebase/gradle/plugins/PomValidator.kt diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/PostReleasePlugin.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/PostReleasePlugin.kt similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/PostReleasePlugin.kt rename to plugins/src/main/java/com/google/firebase/gradle/plugins/PostReleasePlugin.kt diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ProjectUtils.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/ProjectUtils.kt similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/ProjectUtils.kt rename to plugins/src/main/java/com/google/firebase/gradle/plugins/ProjectUtils.kt diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/PublishingPlugin.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/PublishingPlugin.kt similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/PublishingPlugin.kt rename to plugins/src/main/java/com/google/firebase/gradle/plugins/PublishingPlugin.kt diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ReleaseConfig.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/ReleaseConfig.kt similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/ReleaseConfig.kt rename to plugins/src/main/java/com/google/firebase/gradle/plugins/ReleaseConfig.kt diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ReleaseGenerator.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/ReleaseGenerator.kt similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/ReleaseGenerator.kt rename to plugins/src/main/java/com/google/firebase/gradle/plugins/ReleaseGenerator.kt diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ReleaseNotesConfigurationExtension.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/ReleaseNotesConfigurationExtension.kt similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/ReleaseNotesConfigurationExtension.kt rename to plugins/src/main/java/com/google/firebase/gradle/plugins/ReleaseNotesConfigurationExtension.kt diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/SdkUtil.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/SdkUtil.kt similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/SdkUtil.kt rename to plugins/src/main/java/com/google/firebase/gradle/plugins/SdkUtil.kt diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/Tasks.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/Tasks.kt similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/Tasks.kt rename to plugins/src/main/java/com/google/firebase/gradle/plugins/Tasks.kt diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/UpdatePinnedDependenciesTask.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/UpdatePinnedDependenciesTask.kt similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/UpdatePinnedDependenciesTask.kt rename to plugins/src/main/java/com/google/firebase/gradle/plugins/UpdatePinnedDependenciesTask.kt diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/VendorPlugin.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/VendorPlugin.kt similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/VendorPlugin.kt rename to plugins/src/main/java/com/google/firebase/gradle/plugins/VendorPlugin.kt diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/VersionBumpTask.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/VersionBumpTask.kt similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/VersionBumpTask.kt rename to plugins/src/main/java/com/google/firebase/gradle/plugins/VersionBumpTask.kt diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/AffectedProjectFinder.java b/plugins/src/main/java/com/google/firebase/gradle/plugins/ci/AffectedProjectFinder.java similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/AffectedProjectFinder.java rename to plugins/src/main/java/com/google/firebase/gradle/plugins/ci/AffectedProjectFinder.java diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/ChangedModulesTask.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/ci/ChangedModulesTask.kt similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/ChangedModulesTask.kt rename to plugins/src/main/java/com/google/firebase/gradle/plugins/ci/ChangedModulesTask.kt diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/ContinuousIntegrationExtension.java b/plugins/src/main/java/com/google/firebase/gradle/plugins/ci/ContinuousIntegrationExtension.java similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/ContinuousIntegrationExtension.java rename to plugins/src/main/java/com/google/firebase/gradle/plugins/ci/ContinuousIntegrationExtension.java diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/ContinuousIntegrationPlugin.java b/plugins/src/main/java/com/google/firebase/gradle/plugins/ci/ContinuousIntegrationPlugin.java similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/ContinuousIntegrationPlugin.java rename to plugins/src/main/java/com/google/firebase/gradle/plugins/ci/ContinuousIntegrationPlugin.java diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/Coverage.java b/plugins/src/main/java/com/google/firebase/gradle/plugins/ci/Coverage.java similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/Coverage.java rename to plugins/src/main/java/com/google/firebase/gradle/plugins/ci/Coverage.java diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/Environment.java b/plugins/src/main/java/com/google/firebase/gradle/plugins/ci/Environment.java similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/Environment.java rename to plugins/src/main/java/com/google/firebase/gradle/plugins/ci/Environment.java diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/SmokeTestsPlugin.java b/plugins/src/main/java/com/google/firebase/gradle/plugins/ci/SmokeTestsPlugin.java similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/SmokeTestsPlugin.java rename to plugins/src/main/java/com/google/firebase/gradle/plugins/ci/SmokeTestsPlugin.java diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/device/FirebaseTestLabExtension.java b/plugins/src/main/java/com/google/firebase/gradle/plugins/ci/device/FirebaseTestLabExtension.java similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/device/FirebaseTestLabExtension.java rename to plugins/src/main/java/com/google/firebase/gradle/plugins/ci/device/FirebaseTestLabExtension.java diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/device/FirebaseTestLabPlugin.java b/plugins/src/main/java/com/google/firebase/gradle/plugins/ci/device/FirebaseTestLabPlugin.java similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/device/FirebaseTestLabPlugin.java rename to plugins/src/main/java/com/google/firebase/gradle/plugins/ci/device/FirebaseTestLabPlugin.java diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/device/FirebaseTestServer.java b/plugins/src/main/java/com/google/firebase/gradle/plugins/ci/device/FirebaseTestServer.java similarity index 98% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/device/FirebaseTestServer.java rename to plugins/src/main/java/com/google/firebase/gradle/plugins/ci/device/FirebaseTestServer.java index 9445f9ba952..a13eb035e91 100644 --- a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/device/FirebaseTestServer.java +++ b/plugins/src/main/java/com/google/firebase/gradle/plugins/ci/device/FirebaseTestServer.java @@ -63,7 +63,7 @@ public void uploadApks(String variantName, File testApk, File testedApk) { String testedApkPath = testedApk != null ? testedApk.toString() - : project.getRootDir() + "/buildSrc/resources/dummy.apk"; + : project.getRootDir() + "/plugins/resources/dummy.apk"; project .getLogger() .lifecycle("Uploading for {}: testApk={}, testedApk={}", variantName, testApk, testedApk); diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/license/GenerateLicensesTask.java b/plugins/src/main/java/com/google/firebase/gradle/plugins/license/GenerateLicensesTask.java similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/license/GenerateLicensesTask.java rename to plugins/src/main/java/com/google/firebase/gradle/plugins/license/GenerateLicensesTask.java diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/license/LicenseResolverPlugin.java b/plugins/src/main/java/com/google/firebase/gradle/plugins/license/LicenseResolverPlugin.java similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/license/LicenseResolverPlugin.java rename to plugins/src/main/java/com/google/firebase/gradle/plugins/license/LicenseResolverPlugin.java diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/license/ThirdPartyLicensesExtension.java b/plugins/src/main/java/com/google/firebase/gradle/plugins/license/ThirdPartyLicensesExtension.java similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/license/ThirdPartyLicensesExtension.java rename to plugins/src/main/java/com/google/firebase/gradle/plugins/license/ThirdPartyLicensesExtension.java diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/AccessDescriptor.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/semver/AccessDescriptor.kt similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/AccessDescriptor.kt rename to plugins/src/main/java/com/google/firebase/gradle/plugins/semver/AccessDescriptor.kt diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/ApiDiffer.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/semver/ApiDiffer.kt similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/ApiDiffer.kt rename to plugins/src/main/java/com/google/firebase/gradle/plugins/semver/ApiDiffer.kt diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/ClassInfo.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/semver/ClassInfo.kt similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/ClassInfo.kt rename to plugins/src/main/java/com/google/firebase/gradle/plugins/semver/ClassInfo.kt diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/Delta.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/semver/Delta.kt similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/Delta.kt rename to plugins/src/main/java/com/google/firebase/gradle/plugins/semver/Delta.kt diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/DeltaType.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/semver/DeltaType.kt similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/DeltaType.kt rename to plugins/src/main/java/com/google/firebase/gradle/plugins/semver/DeltaType.kt diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/GmavenCopier.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/semver/GmavenCopier.kt similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/GmavenCopier.kt rename to plugins/src/main/java/com/google/firebase/gradle/plugins/semver/GmavenCopier.kt diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/UtilityClass.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/semver/UtilityClass.kt similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/UtilityClass.kt rename to plugins/src/main/java/com/google/firebase/gradle/plugins/semver/UtilityClass.kt diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/VersionDelta.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/semver/VersionDelta.kt similarity index 100% rename from buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/VersionDelta.kt rename to plugins/src/main/java/com/google/firebase/gradle/plugins/semver/VersionDelta.kt diff --git a/buildSrc/src/test/fixtures/license.txt b/plugins/src/test/fixtures/license.txt similarity index 100% rename from buildSrc/src/test/fixtures/license.txt rename to plugins/src/test/fixtures/license.txt diff --git a/buildSrc/src/test/kotlin/com/google/firebase/gradle/bomgenerator/tagging/GitClientTest.kt b/plugins/src/test/kotlin/com/google/firebase/gradle/bomgenerator/tagging/GitClientTest.kt similarity index 100% rename from buildSrc/src/test/kotlin/com/google/firebase/gradle/bomgenerator/tagging/GitClientTest.kt rename to plugins/src/test/kotlin/com/google/firebase/gradle/bomgenerator/tagging/GitClientTest.kt diff --git a/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/FirebaseTestController.kt b/plugins/src/test/kotlin/com/google/firebase/gradle/plugins/FirebaseTestController.kt similarity index 100% rename from buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/FirebaseTestController.kt rename to plugins/src/test/kotlin/com/google/firebase/gradle/plugins/FirebaseTestController.kt diff --git a/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/LicenseResolverPluginTests.kt b/plugins/src/test/kotlin/com/google/firebase/gradle/plugins/LicenseResolverPluginTests.kt similarity index 100% rename from buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/LicenseResolverPluginTests.kt rename to plugins/src/test/kotlin/com/google/firebase/gradle/plugins/LicenseResolverPluginTests.kt diff --git a/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/MakeReleaseNotesTests.kt b/plugins/src/test/kotlin/com/google/firebase/gradle/plugins/MakeReleaseNotesTests.kt similarity index 100% rename from buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/MakeReleaseNotesTests.kt rename to plugins/src/test/kotlin/com/google/firebase/gradle/plugins/MakeReleaseNotesTests.kt diff --git a/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/Memoization.kt b/plugins/src/test/kotlin/com/google/firebase/gradle/plugins/Memoization.kt similarity index 100% rename from buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/Memoization.kt rename to plugins/src/test/kotlin/com/google/firebase/gradle/plugins/Memoization.kt diff --git a/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/ModuleVersionTests.kt b/plugins/src/test/kotlin/com/google/firebase/gradle/plugins/ModuleVersionTests.kt similarity index 100% rename from buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/ModuleVersionTests.kt rename to plugins/src/test/kotlin/com/google/firebase/gradle/plugins/ModuleVersionTests.kt diff --git a/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/MoveUnreleasedChangesTests.kt b/plugins/src/test/kotlin/com/google/firebase/gradle/plugins/MoveUnreleasedChangesTests.kt similarity index 100% rename from buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/MoveUnreleasedChangesTests.kt rename to plugins/src/test/kotlin/com/google/firebase/gradle/plugins/MoveUnreleasedChangesTests.kt diff --git a/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/PublishingPluginTests.kt b/plugins/src/test/kotlin/com/google/firebase/gradle/plugins/PublishingPluginTests.kt similarity index 100% rename from buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/PublishingPluginTests.kt rename to plugins/src/test/kotlin/com/google/firebase/gradle/plugins/PublishingPluginTests.kt diff --git a/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/UpdatePinnedDependenciesTests.kt b/plugins/src/test/kotlin/com/google/firebase/gradle/plugins/UpdatePinnedDependenciesTests.kt similarity index 100% rename from buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/UpdatePinnedDependenciesTests.kt rename to plugins/src/test/kotlin/com/google/firebase/gradle/plugins/UpdatePinnedDependenciesTests.kt diff --git a/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/VendorTests.kt b/plugins/src/test/kotlin/com/google/firebase/gradle/plugins/VendorTests.kt similarity index 100% rename from buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/VendorTests.kt rename to plugins/src/test/kotlin/com/google/firebase/gradle/plugins/VendorTests.kt diff --git a/buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/publishing.kt b/plugins/src/test/kotlin/com/google/firebase/gradle/plugins/publishing.kt similarity index 100% rename from buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/publishing.kt rename to plugins/src/test/kotlin/com/google/firebase/gradle/plugins/publishing.kt diff --git a/buildSrc/src/test/resources/BasicProject/build.gradle b/plugins/src/test/resources/BasicProject/build.gradle similarity index 100% rename from buildSrc/src/test/resources/BasicProject/build.gradle rename to plugins/src/test/resources/BasicProject/build.gradle diff --git a/buildSrc/src/test/resources/BasicProject/firebase-storage/CHANGELOG.md b/plugins/src/test/resources/BasicProject/firebase-storage/CHANGELOG.md similarity index 100% rename from buildSrc/src/test/resources/BasicProject/firebase-storage/CHANGELOG.md rename to plugins/src/test/resources/BasicProject/firebase-storage/CHANGELOG.md diff --git a/buildSrc/src/test/resources/BasicProject/firebase-storage/build.gradle b/plugins/src/test/resources/BasicProject/firebase-storage/build.gradle similarity index 100% rename from buildSrc/src/test/resources/BasicProject/firebase-storage/build.gradle rename to plugins/src/test/resources/BasicProject/firebase-storage/build.gradle diff --git a/buildSrc/src/test/resources/BasicProject/firebase-storage/gradle.properties b/plugins/src/test/resources/BasicProject/firebase-storage/gradle.properties similarity index 100% rename from buildSrc/src/test/resources/BasicProject/firebase-storage/gradle.properties rename to plugins/src/test/resources/BasicProject/firebase-storage/gradle.properties diff --git a/buildSrc/src/test/resources/BasicProject/settings.gradle b/plugins/src/test/resources/BasicProject/settings.gradle similarity index 100% rename from buildSrc/src/test/resources/BasicProject/settings.gradle rename to plugins/src/test/resources/BasicProject/settings.gradle diff --git a/buildSrc/src/test/resources/MakeReleaseNotes/release-notes.md b/plugins/src/test/resources/MakeReleaseNotes/release-notes.md similarity index 100% rename from buildSrc/src/test/resources/MakeReleaseNotes/release-notes.md rename to plugins/src/test/resources/MakeReleaseNotes/release-notes.md diff --git a/buildSrc/src/test/resources/MoveUnreleasedChanges/basic.md b/plugins/src/test/resources/MoveUnreleasedChanges/basic.md similarity index 100% rename from buildSrc/src/test/resources/MoveUnreleasedChanges/basic.md rename to plugins/src/test/resources/MoveUnreleasedChanges/basic.md diff --git a/buildSrc/src/test/resources/MoveUnreleasedChanges/release.json b/plugins/src/test/resources/MoveUnreleasedChanges/release.json similarity index 100% rename from buildSrc/src/test/resources/MoveUnreleasedChanges/release.json rename to plugins/src/test/resources/MoveUnreleasedChanges/release.json diff --git a/settings.gradle.kts b/settings.gradle.kts index b7e1ad17386..21d672a3b53 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -26,6 +26,7 @@ pluginManagement { maven("https://storage.googleapis.com/android-ci/mvn/") { metadataSources { artifact() } } } + includeBuild("./plugins") includeBuild("firebase-dataconnect/gradleplugin") }