Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mass rename + restructure to foundry #985

Merged
merged 19 commits into from
Sep 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

Please be descriptive and detailed.

Please read our [Contributing Guidelines](https://github.com/tinyspeck/slack-gradle-plugin/blob/main/.github/CONTRIBUTING.md) and [Code of Conduct](https://slackhq.github.io/code-of-conduct).
Please read our [Contributing Guidelines](https://github.com/tinyspeck/foundry/blob/main/.github/CONTRIBUTING.md) and [Code of Conduct](https://slackhq.github.io/code-of-conduct).

Don't worry about deleting this, it's not visible in the PR!
-->
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,5 +79,5 @@ jobs:
uses: gradle/actions/setup-gradle@v4

- name: Publish snapshot
if: github.repository == 'slackhq/slack-gradle-plugin'
if: github.repository == 'slackhq/foundry'
run: ./gradlew publish -PmavenCentralUsername=${{ secrets.SONATYPEUSERNAME }} -PmavenCentralPassword=${{ secrets.SONATYPEPASSWORD }} -x dokkaHtml --no-configuration-cache
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
slack-gradle-plugin
foundry
===================

### [slackhq.github.io/slack-gradle-plugin](https://slackhq.github.io/slack-gradle-plugin)
### [slackhq.github.io/foundry](https://slackhq.github.io/foundry)

License
--------
Expand Down
3 changes: 0 additions & 3 deletions agp-handlers/agp-handler-api/gradle.properties

This file was deleted.

8 changes: 3 additions & 5 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -178,11 +178,9 @@ val kotlinBuildConfig = KotlinBuildConfig(kotlinVersion)
val jvmTargetVersion = libs.versions.jvmTarget.map(JvmTarget::fromTarget)

subprojects {
if (project.path == ":slack-plugin") {
project.pluginManager.withPlugin("com.github.gmazzo.buildconfig") {
configure<BuildConfigExtension> {
buildConfigField("String", "KOTLIN_VERSION", "\"$kotlinVersion\"")
}
project.pluginManager.withPlugin("com.github.gmazzo.buildconfig") {
configure<BuildConfigExtension> {
buildConfigField("String", "KOTLIN_VERSION", "\"$kotlinVersion\"")
}
}

Expand Down
2 changes: 1 addition & 1 deletion deploy_website.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ fi

if ! [[ ${local} || ${ci} ]]; then
set -ex
REPO="[email protected]:slackhq/slack-gradle-plugin.git"
REPO="[email protected]:slackhq/foundry.git"
DIR=temp-clone
# Delete any existing temporary website clone
rm -rf ${DIR}
Expand Down
4 changes: 2 additions & 2 deletions docs/architecture.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Its responsibilities include:
- Running standard subproject configurations via `StandardProjectConfigurations`.
- Configuring unit tests via `UnitTests`. This also includes configuring the Gradle test retry plugin, if enabled.
- Configuring NullAway, if enabled.
- Configuring [Skippy](/skippy).
- Configuring [Skippy](/tools/skippy).
- Configuring [Mod Score](/mod-score) tasks.

### `StandardProjectConfigurations`
Expand Down Expand Up @@ -78,7 +78,7 @@ Java projects are fairly simple. Note that these are applied on all projects tha

##### Android

- Configures AndroidTest APK aggregation with [Skippy](/skippy) support.
- Configures AndroidTest APK aggregation with [Skippy](/tools/skippy) support.
- Applies the [Android cache fix plugin](https://github.com/gradle/android-cache-fix-gradle-plugin), if enabled.
- Configures common AGP extensions (both legacy extensions and new Component extensions).
- Disables unused/irrelevant variants. SGP is single-variant for library projects by default.
Expand Down
2 changes: 1 addition & 1 deletion docs/dependency-rake.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Dependency Rake
===============

Dependency rake is an tool we develop within slack-gradle-plugin (SGP) to automatically clean up Gradle build files.
Dependency rake is an tool we develop within foundry (SGP) to automatically clean up Gradle build files.

This tool uses the outputs of
the [dependency-analysis-gradle-plugin](https://github.com/autonomousapps/dependency-analysis-android-gradle-plugin) (
Expand Down
2 changes: 1 addition & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
slack-gradle-plugin
foundry
===================

This repository contains the core Gradle plugin and associated logic used for Slack's Android app.
Expand Down
10 changes: 5 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ moshix.generateProguardRules=false
ksp.useKSP2=true

# Versioning bits
GROUP=com.slack.gradle
POM_URL=https://github.com/slackhq/slack-gradle-plugin/
POM_SCM_URL=https://github.com/slackhq/slack-gradle-plugin/
POM_SCM_CONNECTION=scm:git:git://github.com/slackhq/slack-gradle-plugin.git
POM_SCM_DEV_CONNECTION=scm:git:ssh://[email protected]/slackhq/slack-gradle-plugin.git
GROUP=com.slack.foundry
POM_URL=https://github.com/slackhq/foundry/
POM_SCM_URL=https://github.com/slackhq/foundry/
POM_SCM_CONNECTION=scm:git:git://github.com/slackhq/foundry.git
POM_SCM_DEV_CONNECTION=scm:git:ssh://[email protected]/slackhq/foundry.git
POM_LICENCE_NAME=Apache-2.0
POM_LICENCE_URL=https://www.apache.org/licenses/LICENSE-2.0.txt
POM_LICENCE_DIST=repo
Expand Down
8 changes: 4 additions & 4 deletions mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
# mkdocs serve
# mkdocs gh-deploy

site_name: slack-gradle-plugin
repo_name: slack-gradle-plugin
repo_url: https://github.com/slackhq/slack-gradle-plugin
site_name: foundry
repo_name: foundry
repo_url: https://github.com/slackhq/foundry
site_description: "Gradle and IntelliJ build tooling used in Slack's Android repo"
site_author: Slack
remote_branch: gh-pages
Expand Down Expand Up @@ -72,7 +72,7 @@ nav:
# - 'Mod Score': mod-score.md
# - 'Formatters & Analysis': formatters-and-analysis.md
# - 'Thermals Logging': thermals-logging.md
- 'Discussions ⏏': https://github.com/slackhq/slack-gradle-plugin/discussions
- 'Discussions ⏏': https://github.com/slackhq/foundry/discussions
- 'Change Log': changelog.md
- 'API': api/0.x/
- 'Contributing': contributing.md
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/
plugins {
kotlin("jvm")
alias(libs.plugins.kotlin.jvm)
alias(libs.plugins.mavenPublish)
alias(libs.plugins.lint)
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
POM_ARTIFACT_ID=agp-handler-api
POM_NAME=AGP Handler API
POM_DESCRIPTION=AGP Handler API
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package slack.gradle.agp
package foundry.gradle.agp

import com.android.build.api.AndroidPluginVersion

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package slack.gradle.agp
package foundry.gradle.agp

import com.android.build.api.AndroidPluginVersion
import java.util.ServiceLoader
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package slack.gradle.agp
package foundry.gradle.agp

import org.gradle.api.file.RegularFileProperty

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package slack.gradle.agp
package foundry.gradle.agp

/**
* Base interface for interfaces that configure on a per-variant basis and need to expose variant
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package slack.gradle.agp
package foundry.gradle.agp

import com.google.common.collect.Ordering
import java.util.Locale
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package slack.gradle.agp.internal
package foundry.gradle.agp.internal

import com.android.builder.errors.EvalIssueException
import com.android.builder.errors.IssueReporter
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package slack.gradle.agp
package foundry.gradle.agp

import com.google.common.truth.Truth.assertThat
import org.junit.Test
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"issues":[{"type":"get_subprojects","name":"getSubprojects","trace":{"trace":[{"owner":"foundry/gradle/FoundryRootPlugin","name":"apply","descriptor":"(Ljava/lang/Object;)V","metadata":{"isTaskAction":false,"isVirtual":false}},{"owner":"foundry/gradle/FoundryRootPlugin","name":"apply","descriptor":"(Lorg/gradle/api/Project;)V","metadata":{"isTaskAction":false,"isVirtual":false}},{"owner":"foundry/gradle/FoundryRootPlugin","name":"configureRootProject","descriptor":"(Lorg/gradle/api/Project;Lfoundry/gradle/FoundryProperties;Lorg/gradle/api/provider/Provider;)V","metadata":{"isTaskAction":false,"isVirtual":false}},{"owner":"foundry/gradle/tasks/AndroidTestApksTask$Companion","name":"register$foundry_gradle_plugin","descriptor":"(Lorg/gradle/api/Project;)Lorg/gradle/api/tasks/TaskProvider;","metadata":{"isTaskAction":false,"isVirtual":false}},{"owner":"foundry/gradle/artifacts/Resolver$Companion","name":"interProjectResolver$default","descriptor":"(Lfoundry/gradle/artifacts/Resolver$Companion;Lorg/gradle/api/Project;Lfoundry/gradle/artifacts/SgpArtifact;ZILjava/lang/Object;)Lfoundry/gradle/artifacts/Resolver;","metadata":{"isTaskAction":false,"isVirtual":false}},{"owner":"foundry/gradle/artifacts/Resolver$Companion","name":"interProjectResolver","descriptor":"(Lorg/gradle/api/Project;Lfoundry/gradle/artifacts/SgpArtifact;Z)Lfoundry/gradle/artifacts/Resolver;","metadata":{"isTaskAction":false,"isVirtual":false}},{"owner":"foundry/gradle/artifacts/Resolver$Companion","name":"interProjectResolver","descriptor":"(Lorg/gradle/api/Project;Lorg/gradle/api/attributes/Attribute;Ljava/io/Serializable;Ljava/lang/String;Ljava/lang/String;Z)Lfoundry/gradle/artifacts/Resolver;","metadata":{"isTaskAction":false,"isVirtual":false}},{"owner":"foundry/gradle/artifacts/Resolver","name":"addSubprojectDependencies","descriptor":"(Lorg/gradle/api/Project;)V","metadata":{"isTaskAction":false,"isVirtual":false}},{"owner":"org/gradle/api/Project","name":"getSubprojects","descriptor":"()Ljava/util/Set;","metadata":{"isTaskAction":false,"isVirtual":false}}]}},{"type":"get_subprojects","name":"getSubprojects","trace":{"trace":[{"owner":"foundry/gradle/stats/ModuleStatsTasks$configureRoot$1$1","name":"call","descriptor":"()Ljava/lang/Object;","metadata":{"isTaskAction":false,"isVirtual":false}},{"owner":"foundry/gradle/stats/ModuleStatsTasks$configureRoot$1$1","name":"call","descriptor":"()Ljava/util/Map;","metadata":{"isTaskAction":false,"isVirtual":false}},{"owner":"org/gradle/api/Project","name":"getSubprojects","descriptor":"()Ljava/util/Set;","metadata":{"isTaskAction":false,"isVirtual":false}}]}},{"type":"get_subprojects","name":"getSubprojects","trace":{"trace":[{"owner":"foundry/gradle/FoundryRootPlugin$configureRootProject$12","name":"execute","descriptor":"(Ljava/lang/Object;)V","metadata":{"isTaskAction":false,"isVirtual":false}},{"owner":"foundry/gradle/FoundryRootPlugin$configureRootProject$12","name":"execute","descriptor":"(Lorg/gradle/api/plugins/AppliedPlugin;)V","metadata":{"isTaskAction":false,"isVirtual":false}},{"owner":"foundry/gradle/dependencyrake/MissingIdentifiersAggregatorTask$Companion","name":"register","descriptor":"(Lorg/gradle/api/Project;)Lorg/gradle/api/tasks/TaskProvider;","metadata":{"isTaskAction":false,"isVirtual":false}},{"owner":"foundry/gradle/artifacts/Resolver$Companion","name":"interProjectResolver$default","descriptor":"(Lfoundry/gradle/artifacts/Resolver$Companion;Lorg/gradle/api/Project;Lfoundry/gradle/artifacts/SgpArtifact;ZILjava/lang/Object;)Lfoundry/gradle/artifacts/Resolver;","metadata":{"isTaskAction":false,"isVirtual":false}},{"owner":"foundry/gradle/artifacts/Resolver$Companion","name":"interProjectResolver","descriptor":"(Lorg/gradle/api/Project;Lfoundry/gradle/artifacts/SgpArtifact;Z)Lfoundry/gradle/artifacts/Resolver;","metadata":{"isTaskAction":false,"isVirtual":false}},{"owner":"foundry/gradle/artifacts/Resolver$Companion","name":"interProjectResolver","descriptor":"(Lorg/gradle/api/Project;Lorg/gradle/api/attributes/Attribute;Ljava/io/Serializable;Ljava/lang/String;Ljava/lang/String;Z)Lfoundry/gradle/artifacts/Resolver;","metadata":{"isTaskAction":false,"isVirtual":false}},{"owner":"foundry/gradle/artifacts/Resolver","name":"addSubprojectDependencies","descriptor":"(Lorg/gradle/api/Project;)V","metadata":{"isTaskAction":false,"isVirtual":false}},{"owner":"org/gradle/api/Project","name":"getSubprojects","descriptor":"()Ljava/util/Set;","metadata":{"isTaskAction":false,"isVirtual":false}}]}},{"type":"get_subprojects","name":"getSubprojects","trace":{"trace":[{"owner":"foundry/gradle/artifacts/Resolver$Companion","name":"interProjectResolver$default","descriptor":"(Lfoundry/gradle/artifacts/Resolver$Companion;Lorg/gradle/api/Project;Lorg/gradle/api/attributes/Attribute;Ljava/io/Serializable;Ljava/lang/String;Ljava/lang/String;ZILjava/lang/Object;)Lfoundry/gradle/artifacts/Resolver;","metadata":{"isTaskAction":false,"isVirtual":false}},{"owner":"foundry/gradle/artifacts/Resolver$Companion","name":"interProjectResolver","descriptor":"(Lorg/gradle/api/Project;Lorg/gradle/api/attributes/Attribute;Ljava/io/Serializable;Ljava/lang/String;Ljava/lang/String;Z)Lfoundry/gradle/artifacts/Resolver;","metadata":{"isTaskAction":false,"isVirtual":false}},{"owner":"foundry/gradle/artifacts/Resolver","name":"addSubprojectDependencies","descriptor":"(Lorg/gradle/api/Project;)V","metadata":{"isTaskAction":false,"isVirtual":false}},{"owner":"org/gradle/api/Project","name":"getSubprojects","descriptor":"()Ljava/util/Set;","metadata":{"isTaskAction":false,"isVirtual":false}}]}}]}
Original file line number Diff line number Diff line change
Expand Up @@ -26,22 +26,22 @@ plugins {
}

gradlePlugin {
plugins.create("slack-root") {
id = "com.slack.gradle.root"
implementationClass = "slack.gradle.SlackRootPlugin"
plugins.create("foundry-root") {
id = "foundry.gradle.root"
implementationClass = "foundry.gradle.FoundryRootPlugin"
}
plugins.create("slack-base") {
id = "com.slack.gradle.base"
implementationClass = "slack.gradle.SlackBasePlugin"
plugins.create("foundry-base") {
id = "foundry.gradle.base"
implementationClass = "foundry.gradle.FoundryBasePlugin"
}
plugins.create("apkVersioning") {
id = "com.slack.gradle.apk-versioning"
implementationClass = "slack.gradle.ApkVersioningPlugin"
id = "foundry.gradle.apk-versioning"
implementationClass = "foundry.gradle.ApkVersioningPlugin"
}
}

buildConfig {
packageName("slack.gradle.dependencies")
packageName("foundry.gradle.dependencies")
useKotlinOutput { internalVisibility = true }
}

Expand Down Expand Up @@ -73,7 +73,7 @@ dependencies {
api(libs.okhttp)
// Better I/O
api(libs.okio)
api(projects.agpHandlers.agpHandlerApi)
api(projects.platforms.gradle.agpHandlers.agpHandlerApi)

implementation(platform(libs.coroutines.bom))
implementation(libs.commonsText) { because("For access to its StringEscapeUtils") }
Expand All @@ -89,8 +89,8 @@ dependencies {
implementation(libs.moshi)
implementation(libs.oshi) { because("To read hardware information") }
implementation(libs.rxjava)
implementation(projects.sgpCommon)
implementation(projects.skippy)
implementation(projects.tools.foundryCommon)
implementation(projects.tools.skippy)

compileOnly(platform(libs.kotlin.bom))
compileOnly(gradleApi())
Expand Down
3 changes: 3 additions & 0 deletions platforms/gradle/foundry-gradle-plugin/gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
POM_ARTIFACT_ID=gradle-plugin
POM_NAME=Foundry Gradle Plugin
POM_DESCRIPTION=Foundry Gradle Plugin
Loading