Skip to content

clean up shorebird.yaml update in flutter.groovy #52

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

Merged
merged 2 commits into from
May 22, 2024
Merged

clean up shorebird.yaml update in flutter.groovy #52

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51cce97
clean up shorebird.yaml update in flutter.groovy
bryanoltman May 22, 2024
cfbd128
Merge branch 'fix/public-key-bundleling' into bo/shorebird-yaml-write…
bryanoltman May 22, 2024
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
46 changes: 18 additions & 28 deletions packages/flutter_tools/gradle/src/main/groovy/flutter.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1332,42 +1332,32 @@ class FlutterPlugin implements Plugin<Project> {
}
Task copyFlutterAssetsTask = addFlutterDeps(variant)
copyFlutterAssetsTask.doLast {
def content = "";
def yaml = new Yaml()
def outputDir = copyFlutterAssetsTask.destinationDir

// Read the shorebird.yaml file into a map.
def shorebirdYamlFile = new File("${outputDir}/flutter_assets/shorebird.yaml")
def shorebirdYamlData = yaml.load(shorebirdYamlFile.text)

def usedFlavors = variant.flavorName != null && !variant.flavorName.isEmpty();
if (usedFlavors) {
def flavor = variant.flavorName
def shorebirdYaml = new Yaml().load(shorebirdYamlFile.text)
def flavorAppId = shorebirdYaml['flavors'][flavor]
if (flavorAppId == null) {
throw new GradleException("Cannot find app_id for ${flavor} in shorebird.yaml")
}
content += 'app_id: ' + flavorAppId + '\n';
if (shorebirdYaml.containsKey('base_url')) {
content += 'base_url: ' + shorebirdYaml['base_url'] + '\n';
}
if (shorebirdYaml.containsKey('auto_update')) {
content += 'auto_update: ' + shorebirdYaml['auto_update'] + '\n';
}
// Update the app_id to the correct flavor if one was provided.
if (variant.flavorName != null && !variant.flavorName.isEmpty()) {
shorebirdYamlData['app_id'] = shorebirdYamlData.flavors[variant.flavorName]
}

// Remove any flavors. This is a no-op if the flavors key doesn't exist.
shorebirdYamlData.remove('flavors')

// Add a public key if one was provided via an env var.
// Ideally we'd have a way to pass the key as a parameter, but
// an env var was the easiest way to get this working.
def shorebirdPublicKeyEnvVar = System.getenv('SHOREBIRD_PUBLIC_KEY')
if (shorebirdPublicKeyEnvVar != null && !shorebirdPublicKeyEnvVar.isEmpty()) {
// When a flavor were used, the content variable will already include
// the app_id and other attributes, since the code above makes sure of that
//
// But when no flavor was used, it will be empty, so we make sure that include
// the original file in the beginning
if (!usedFlavors) {
content += shorebirdYamlFile.text;
}
content += 'patch_public_key: ' + shorebirdPublicKeyEnvVar + '\n';
}
if (!content.isEmpty()) {
shorebirdYamlFile.write(content)
shorebirdYamlData['patch_public_key'] = shorebirdPublicKeyEnvVar
}

// Write the updated map back to the shorebird.yaml file.
def updatedYamlString = yaml.dumpAsMap(shorebirdYamlData)
shorebirdYamlFile.write(updatedYamlString)
}
def variantOutput = variant.outputs.first()
def processResources = variantOutput.hasProperty(propProcessResourcesProvider) ?
Expand Down