Skip to content

feat: bundling the public key in the artifact for android #44

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 5 commits into from
May 7, 2024
Merged

feat: bundling the public key in the artifact for android #44

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5fcb4bf
feat: bundling the public key in the artifact for android
erickzanardo May 3, 2024
f2b2b7c
Merge branch 'shorebird/dev' into ez/bundling-public-key-into-artifact
erickzanardo May 7, 2024
70ea949
Update packages/flutter_tools/gradle/src/main/groovy/flutter.groovy
eseidel May 7, 2024
ba5b356
changing to read public key from a env var instead of a hardcoded fil…
erickzanardo May 7, 2024
8ff073f
removing unused imports
erickzanardo May 7, 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
18 changes: 13 additions & 5 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 @@ -6,8 +6,8 @@ import com.android.build.OutputFile
import groovy.json.JsonSlurper
import groovy.json.JsonGenerator
import groovy.xml.QName

import java.nio.file.Paths
import java.util.Set
import org.apache.tools.ant.taskdefs.condition.Os
import org.gradle.api.DefaultTask
import org.gradle.api.GradleException
Expand All @@ -28,7 +28,6 @@ import org.gradle.api.tasks.Optional
import org.gradle.api.tasks.TaskAction
import org.gradle.api.tasks.bundling.Jar
import org.gradle.internal.os.OperatingSystem
import org.gradle.util.VersionNumber
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was unused

import org.yaml.snakeyaml.Yaml

/**
Expand Down Expand Up @@ -1185,22 +1184,31 @@ class FlutterPlugin implements Plugin<Project> {
}
Task copyFlutterAssetsTask = addFlutterDeps(variant)
copyFlutterAssetsTask.doLast {
def content = "";
def outputDir = copyFlutterAssetsTask.destinationDir
def shorebirdYamlFile = new File("${outputDir}/flutter_assets/shorebird.yaml")

def shorebirdPublicKeyEnvVar = System.getenv('SHOREBIRD_PUBLIC_KEY')
if (shorebirdPublicKeyEnvVar != null && !shorebirdPublicKeyEnvVar.isEmpty()) {
content += 'patch_public_key: ' + shorebirdPublicKeyEnvVar + '\n';
}

if (variant.flavorName != null && !variant.flavorName.isEmpty()) {
def outputDir = copyFlutterAssetsTask.destinationDir
def shorebirdYamlFile = new File("${outputDir}/flutter_assets/shorebird.yaml")
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")
}
def content = 'app_id: ' + flavorAppId + '\n';
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';
}
}
if (!content.isEmpty()) {
shorebirdYamlFile.write(content)
}
}
Expand Down
Loading