-
Notifications
You must be signed in to change notification settings - Fork 4
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
Bazel 6 Migration #34
Merged
Merged
Changes from all commits
Commits
Show all changes
103 commits
Select commit
Hold shift + click to select a range
1c8dcbf
start of bazel 6 + rules_js migration
adierkens 29b840c
builds + package.json creation
adierkens 10d56d5
Plugins folder builds and tests working
adierkens 64a7a04
Add docs generation
adierkens 8ead765
Add docs generation
adierkens d9c8d7c
Split native bundles into separate target
adierkens c62030f
set visibility of js_library for use in iOS targets
hborawski 6923914
remove undefined symbol
hborawski 8429ff0
set visibility on native target
hborawski a162602
Merge pull request #36 from player-ui/spm-bazel-6
hborawski 108f89d
chore: changes tsconfig template to esnext
rafbcampos 458c610
Get stamping working within tsup builds
adierkens 2370c13
Add stamping support to package_json creation
adierkens 1b051fb
Fix tests
adierkens 0372da2
Add custom publish rule
adierkens 24f4cd0
Fix syntax
adierkens 394aaeb
Omit default entrypoints for package creation if specified
KetanReddy 472adc4
Merge pull request #40 from player-ui/bazel-6-stamping
adierkens 56d4319
dont write out any exports if using custom entrypoints
KetanReddy e71339c
Update css rules and dsl
adierkens 090a087
Add macro for oclif cli/plugin building
KetanReddy d003efc
Fix targets for for oclif publishing
KetanReddy 71a2c7f
Update config search path to remove bin/ prefix
adierkens 50ca058
Add presets config
adierkens 309110c
Fix preset config
adierkens 7c7f0f2
Skip validation during dsl compile phase
adierkens ddd9453
All flag for skipping validation on compiled output
adierkens c0f7c97
Update DSL build rules to export individual files
adierkens 444af3c
Update validation call for multiple mocks
adierkens d6b9527
Update player config to use js relative paths
adierkens 9f871a1
Add rule for creating XLR configs
adierkens 16d6ddb
Add way to passthrough more packaging targets
adierkens 30063d4
Update input_dir to be configurable
adierkens 164466e
Merge branch 'main' into bazel-6
sugarmanz afb93d2
Add js_xlr_pipeline macro
adierkens 2c83a22
Update config search path to remove bin/ prefix
adierkens d17ae79
Enable build caching for rules
adierkens 44f92b7
Add presets config
adierkens d0e1edb
Fix preset config
adierkens 73280fe
Skip validation during dsl compile phase
adierkens 0cfbb3a
All flag for skipping validation on compiled output
adierkens 1750427
Update DSL build rules to export individual files
adierkens 5d70021
Update validation call for multiple mocks
adierkens 78afa98
Update player config to use js relative paths
adierkens c306037
Add rule for creating XLR configs
adierkens 5ea0ec5
Add way to passthrough more packaging targets
adierkens c99aa8b
Update input_dir to be configurable
adierkens 5cea23b
Add js_xlr_pipeline macro
adierkens 4e7c6c1
set up maven and kotlin stuff
brocollie08 7dc499f
expose public api
brocollie08 c2bc06d
add deps for BUILD
brocollie08 8261234
maybe junit5
brocollie08 f29b25a
distribution and lint building
brocollie08 a345c49
no maven pinning
brocollie08 f2bc563
junit
brocollie08 b0f4e96
bzlmod junit instead
brocollie08 e1140a8
separate .bzl for extension
brocollie08 03e7494
remove duplicate junit5 def
brocollie08 a70db63
back to workspce def
brocollie08 04d2c10
??
brocollie08 063719e
workspace.bzlmod
brocollie08 f05c3b1
remove rules_java
brocollie08 c7d3127
add junit5 macros locally
brocollie08 7f51fbd
dummy kt_jvm to be reverted
brocollie08 9592cb4
lint changed to stupidity
brocollie08 d4ad1bd
remove WORKSPACE.bzlmod, git override rules kotlin
brocollie08 e58aaf7
revert git override
brocollie08 3ad20fd
update jvm rules
brocollie08 eb053a0
rules_jvm fork
brocollie08 048caed
swap order
brocollie08 7427ab5
reformat junit maven dep
brocollie08 0be9db4
add configuration for overriding mocks output_dir
sugarmanz c7eabdf
add generic stamp rule back in to stamp Podspec
hborawski ebb4360
Merge pull request #46 from player-ui/stamp-readd
hborawski 90f613e
move over common utils.bzl macros to be reused for playerplugins
7eab4b1
address comments
e495a5d
Merge pull request #48 from player-ui/shared-ios-utils
nancywu1 457dba1
ui tests run under uitest target
4c4c60d
update comments
296cf55
test commit
2699dde
Merge pull request #49 from player-ui/seperate-out-uitests
nancywu1 41b4a4c
update android setup
brocollie08 749b5d4
Merge branch 'bazel-6' into bazel-6-jvm
brocollie08 10252ce
put publishing stuff back
brocollie08 2bf335a
correct rules_jvm_external
brocollie08 466ed8b
Merge pull request #43 from player-ui/feature/oclif-macro
KetanReddy f9182ee
Merge pull request #45 from player-ui/bazel-6-xlr
KetanReddy d0752e5
Merge branch 'bazel-6' of https://github.com/player-ui/rules_player i…
KetanReddy 93d45c0
Merge pull request #44 from player-ui/dsl-config-location
KetanReddy 3abf273
Merge branch 'bazel-6' into bazel-6-jvm
brocollie08 a1b9b5d
fixed version rules_jvm_external
brocollie08 5f4359e
Merge branch 'bazel-6-jvm' of github.com:player-ui/rules_player into …
brocollie08 d3f1129
name maven repo
brocollie08 fbb1f24
test + some clean up
brocollie08 1098132
consume rules as consumers would
brocollie08 3d9b637
pick up test targets from kotlin example
brocollie08 a9d37b8
consumer install deps
brocollie08 9963da8
put back accidental removal
brocollie08 1990053
Merge pull request #50 from player-ui/bazel-6-jvm
brocollie08 d858486
Update docs
adierkens 490eeff
Test rules repo & examples
sugarmanz ed33cd1
Merge pull request #53 from player-ui/bazel-6-docs-update
adierkens 6d81ed3
Fix resolution of output directory for dsl compilation
KetanReddy File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
javascript/examples | ||
kotlin/example |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,31 @@ | ||
# Use embedded JDK | ||
common --repo_env=JAVA_HOME=../bazel_tools/jdk | ||
common --enable_bzlmod | ||
common --experimental_google_legacy_api | ||
|
||
build --bes_results_url=https://app.buildbuddy.io/invocation/ | ||
build --bes_backend=grpcs://remote.buildbuddy.io | ||
build --remote_cache=grpcs://remote.buildbuddy.io | ||
build --experimental_remote_cache_compression | ||
build --experimental_remote_cache_async | ||
build --remote_download_toplevel | ||
build --remote_timeout=3600 | ||
build --build_metadata=REPO_URL=https://github.com/player-ui/rules_player.git | ||
|
||
test --bes_results_url=https://app.buildbuddy.io/invocation/ | ||
test --bes_backend=grpcs://remote.buildbuddy.io | ||
test --remote_cache=grpcs://remote.buildbuddy.io | ||
test --experimental_remote_cache_compression | ||
test --experimental_remote_cache_async | ||
test --remote_download_toplevel | ||
test --remote_timeout=3600 | ||
test --build_metadata=REPO_URL=https://github.com/player-ui/rules_player.git | ||
|
||
coverage --bes_results_url=https://app.buildbuddy.io/invocation/ | ||
coverage --bes_backend=grpcs://remote.buildbuddy.io | ||
coverage --remote_cache=grpcs://remote.buildbuddy.io | ||
coverage --experimental_remote_cache_compression | ||
coverage --experimental_remote_cache_async | ||
coverage --remote_download_toplevel | ||
coverage --remote_timeout=3600 | ||
coverage --build_metadata=REPO_URL=https://github.com/player-ui/rules_player.git | ||
|
||
try-import %workspace%/.bazelrc.local |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
5.4.1 | ||
6.4.0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -25,3 +25,4 @@ user.bazelrc | |
**/node_modules/ | ||
|
||
**/.DS_Store | ||
.bazelrc.local |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
module(name = "rules_player", version = "1.0") | ||
|
||
bazel_dep(name = "aspect_bazel_lib", version = "1.32.0") | ||
bazel_dep(name = "aspect_rules_js", version = "1.33.1") | ||
bazel_dep(name = "aspect_rules_rollup", version = "1.0.0") | ||
bazel_dep(name = "bazel_skylib", version = "1.4.1") | ||
bazel_dep(name = "rules_pkg", version = "0.9.1") | ||
bazel_dep(name = "aspect_rules_ts", version = "2.1.0") | ||
bazel_dep(name = "platforms", version = "0.0.5") | ||
|
||
rules_ts_ext = use_extension( | ||
"@aspect_rules_ts//ts:extensions.bzl", | ||
"ext", | ||
dev_dependency = True, | ||
) | ||
|
||
rules_ts_ext.deps() | ||
|
||
use_repo(rules_ts_ext, "npm_typescript") | ||
|
||
bazel_dep(name = "rules_kotlin", version = "1.9.1") | ||
|
||
bazel_dep(name = "rules_jvm_external", version = "5.3") | ||
maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven") | ||
|
||
maven.install( | ||
name = "rules_player_maven", | ||
artifacts = [ | ||
"com.github.ajalt.clikt:clikt-jvm:3.4.0", | ||
"io.github.gradle-nexus:publish-plugin:1.1.0", | ||
"ch.qos.logback:logback-classic:1.2.11", | ||
"org.junit.jupiter:junit-jupiter-api:5.7.2", | ||
"org.junit.jupiter:junit-jupiter-params:5.7.2", | ||
"org.junit.jupiter:junit-jupiter-engine:5.7.2", | ||
"org.junit.platform:junit-platform-suite-api:1.7.2", | ||
"org.junit.platform:junit-platform-console:1.7.2", | ||
"org.junit.platform:junit-platform-launcher:1.7.2" | ||
], | ||
fetch_sources = True, | ||
repositories = [ | ||
"https://repo1.maven.org/maven2", | ||
"https://maven.google.com/", | ||
"https://plugins.gradle.org/m2/", | ||
] | ||
) | ||
use_repo(maven, "rules_player_maven") | ||
## Rule Dependencies | ||
bazel_dep(name = "rules_swift", version = "1.18.0", repo_name = "build_bazel_rules_swift") | ||
bazel_dep(name = "rules_apple", version = "3.5.1", repo_name = "build_bazel_rules_apple") | ||
bazel_dep(name = "rules_ios", version = "4.3.1", repo_name = "build_bazel_rules_ios") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,85 +1,5 @@ | ||
workspace( | ||
name = "rules_player", | ||
managed_directories = { | ||
"@npm": ["node_modules"], | ||
}, | ||
) | ||
|
||
# Defines all potential dependencies -- loading these deps is done lazily on first access | ||
load(":workspace.bzl", "deps") | ||
|
||
deps() | ||
|
||
# Like right here | ||
# load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace") | ||
# bazel_skylib_workspace() | ||
load("//:conf.bzl", "apple", "distribution", "javascript", "skylib", "kotlin") | ||
|
||
skylib() | ||
|
||
# apple() | ||
|
||
distribution() | ||
|
||
javascript() | ||
|
||
kotlin() | ||
|
||
# TODO: This breaks the conf.bzl standard... b/c of the way bzl files | ||
# are required to be structured, we can't consolidate config logic | ||
# to a sinlge .bzl file. This is super frustrating when it comes to | ||
# consolidating and standardizing common workspace configuration for | ||
# Bazel projects and just adds to boilerplate overhead, even if in | ||
# the name of being explicit. | ||
# load("//swift:rules_deps.bzl", "rules_deps") | ||
|
||
# rules_deps() | ||
|
||
# load("//swift:extra_deps.bzl", "extra_deps") | ||
|
||
# extra_deps() | ||
|
||
# load("//apple:support_deps.bzl", "support_deps") | ||
|
||
# support_deps() | ||
|
||
|
||
load("@io_bazel_rules_kotlin//kotlin:core.bzl", "kt_register_toolchains") | ||
|
||
kt_register_toolchains() | ||
|
||
load("@rules_player//junit5:conf.bzl", "junit5") | ||
|
||
junit5() | ||
|
||
###################### | ||
# Maven Dependencies # | ||
###################### | ||
load("@rules_player//distribution:deps.bzl", artifacts = "maven") | ||
load("@rules_jvm_external//:defs.bzl", "maven_install") | ||
|
||
maven_install( | ||
artifacts = artifacts, | ||
fetch_sources = True, | ||
repositories = [ | ||
"https://repo1.maven.org/maven2", | ||
"https://maven.google.com/", | ||
"https://plugins.gradle.org/m2/", | ||
], | ||
) | ||
|
||
##################### | ||
# Yarn Dependencies # | ||
##################### | ||
load("@build_bazel_rules_nodejs//:index.bzl", "node_repositories", "yarn_install") | ||
|
||
node_repositories( | ||
node_version = "16.12.0", | ||
yarn_version = "1.22.17", | ||
) | ||
|
||
yarn_install( | ||
name = "npm", | ||
package_json = "//:package.json", | ||
yarn_lock = "//:yarn.lock", | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
android_sdk_repository( | ||
name = "androidsdk", | ||
) |
This file was deleted.
Oops, something went wrong.
Empty file.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Empty file.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we collapse these into
common
: