Skip to content

05: Migrate Consumer Module extension wiring #29

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.

Sign up for GitHub

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

Closed
Sameri11 wants to merge 1 commit into from
Closed

05: Migrate Consumer Module extension wiring #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions QUICKSTART.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ android_sdk.configure(
use_repo(android_sdk, "androidsdk")
register_toolchains("@androidsdk//:all")

android_ndk = use_extension("@rules_flutter//tools/flutter:ndk.bzl", "android_ndk")
android_ndk = use_extension("@rules_flutter//flutter:extensions.bzl", "android_ndk")
use_repo(android_ndk, "androidndk", "androidndk_cmake")
register_toolchains("@androidndk//:all")

Expand Down Expand Up @@ -395,7 +395,7 @@ proxy and import, then add the plugin extension and generated segment:
maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
use_repo(maven, "flutter_maven")

plugins = use_extension("@rules_flutter//tools/flutter:plugins.bzl", "flutter_plugins_ext")
plugins = use_extension("@rules_flutter//flutter:extensions.bzl", "flutter_plugins_ext")
plugins.project(
abis = ["arm64-v8a", "x86_64"],
metadata = "//:.flutter-plugins-dependencies",
Expand Down Expand Up @@ -617,14 +617,14 @@ android_sdk.configure(
use_repo(android_sdk, "androidsdk")
register_toolchains("@androidsdk//:all")

android_ndk = use_extension("@rules_flutter//tools/flutter:ndk.bzl", "android_ndk")
android_ndk = use_extension("@rules_flutter//flutter:extensions.bzl", "android_ndk")
use_repo(android_ndk, "androidndk", "androidndk_cmake")
register_toolchains("@androidndk//:all")

maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
use_repo(maven, "flutter_maven")

plugins = use_extension("@rules_flutter//tools/flutter:plugins.bzl", "flutter_plugins_ext")
plugins = use_extension("@rules_flutter//flutter:extensions.bzl", "flutter_plugins_ext")
plugins.project(
abis = ["arm64-v8a"],
embedding = "//packages/host_app/android/app:flutter_embedding",
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ android_sdk.configure(
use_repo(android_sdk, "androidsdk")
register_toolchains("@androidsdk//:all")

android_ndk = use_extension("@rules_flutter//tools/flutter:ndk.bzl", "android_ndk")
android_ndk = use_extension("@rules_flutter//flutter:extensions.bzl", "android_ndk")
use_repo(android_ndk, "androidndk", "androidndk_cmake")
register_toolchains("@androidndk//:all")

Expand Down
32 changes: 7 additions & 25 deletions examples/demo_app/MODULE.bazel.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions examples/demo_app/android/config.MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ use_repo(android_sdk, "androidsdk")

register_toolchains("@androidsdk//:all")

android_ndk = use_extension("@rules_flutter//tools/flutter:ndk.bzl", "android_ndk")
android_ndk = use_extension("@rules_flutter//flutter:extensions.bzl", "android_ndk")
use_repo(android_ndk, "androidndk", "androidndk_cmake")

register_toolchains("@androidndk//:all")

plugins = use_extension("@rules_flutter//tools/flutter:plugins.bzl", "flutter_plugins_ext")
plugins = use_extension("@rules_flutter//flutter:extensions.bzl", "flutter_plugins_ext")
plugins.project(
abis = [
"arm64-v8a",
Expand Down
32 changes: 7 additions & 25 deletions examples/local_plugin/MODULE.bazel.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions examples/local_plugin/packages/host_app/android/config.MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ use_repo(android_sdk, "androidsdk")

register_toolchains("@androidsdk//:all")

android_ndk = use_extension("@rules_flutter//tools/flutter:ndk.bzl", "android_ndk")
android_ndk = use_extension("@rules_flutter//flutter:extensions.bzl", "android_ndk")
use_repo(android_ndk, "androidndk", "androidndk_cmake")

register_toolchains("@androidndk//:all")

plugins = use_extension("@rules_flutter//tools/flutter:plugins.bzl", "flutter_plugins_ext")
plugins = use_extension("@rules_flutter//flutter:extensions.bzl", "flutter_plugins_ext")
plugins.project(
abis = ["arm64-v8a"],
embedding = "//packages/host_app/android/app:flutter_embedding",
Expand Down
21 changes: 1 addition & 20 deletions examples/no_plugins/MODULE.bazel.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion examples/no_plugins/android/config.MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use_repo(android_sdk, "androidsdk")

register_toolchains("@androidsdk//:all")

android_ndk = use_extension("@rules_flutter//tools/flutter:ndk.bzl", "android_ndk")
android_ndk = use_extension("@rules_flutter//flutter:extensions.bzl", "android_ndk")
use_repo(android_ndk, "androidndk", "androidndk_cmake")

register_toolchains("@androidndk//:all")
Expand Down
32 changes: 7 additions & 25 deletions examples/pub_plugins/MODULE.bazel.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions examples/pub_plugins/android/config.MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ use_repo(android_sdk, "androidsdk")

register_toolchains("@androidsdk//:all")

android_ndk = use_extension("@rules_flutter//tools/flutter:ndk.bzl", "android_ndk")
android_ndk = use_extension("@rules_flutter//flutter:extensions.bzl", "android_ndk")
use_repo(android_ndk, "androidndk", "androidndk_cmake")

register_toolchains("@androidndk//:all")

plugins = use_extension("@rules_flutter//tools/flutter:plugins.bzl", "flutter_plugins_ext")
plugins = use_extension("@rules_flutter//flutter:extensions.bzl", "flutter_plugins_ext")
plugins.project(
abis = ["arm64-v8a"],
embedding = "//android/app:flutter_embedding",
Expand Down
2 changes: 1 addition & 1 deletion tools/ci/android_toolchain_probe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ def run_missing_ndk(workspace, output_base):
use_repo(android_sdk, "androidsdk")
register_toolchains("@androidsdk//:all")

android_ndk = use_extension("@rules_flutter//tools/flutter:ndk.bzl", "android_ndk")
android_ndk = use_extension("@rules_flutter//flutter:extensions.bzl", "android_ndk")
use_repo(android_ndk, "androidndk", "androidndk_cmake")
register_toolchains("@androidndk//:all")
"""
Expand Down
2 changes: 1 addition & 1 deletion tools/ci/committed_lock_guard.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def _selftest():
clean = json.dumps(
{
"moduleExtensions": {
"//tools/flutter:ndk.bzl%android_ndk": {
"//flutter:extensions.bzl%android_ndk": {
"general": {
"recordedInputs": [
"REPO_MAPPING:sameri11_rules_flutter+,rules_android_ndk rules_android_ndk+",
Expand Down
Loading