Merge pull request #209 from go-flutter-desktop/config/organization-name

Introduce organization name field to hover config

Author: jld3103

assets/app/hover.yaml.tmpl

@@ -1,6 +1,7 @@
 #application-name: "{{.applicationName}}" # Uncomment to modify this value.
 #executable-name: "{{.executableName}}" # Uncomment to modify this value. Only lowercase a-z, numbers, underscores and no spaces
 #package-name: "{{.packageName}}" # Uncomment to modify this value. Only lowercase a-z, numbers and no underscores or spaces
+organization-name: "com.{{.packageName}}"
 license: "" # MANDATORY: Fill in your SPDX license name: https://spdx.org/licenses
 target: lib/main_desktop.dart
 # opengl: "none" # Uncomment this line if you have trouble with your OpenGL driver (https://github.com/go-flutter-desktop/go-flutter/issues/272)

cmd/build.go

@@ -13,7 +13,6 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/go-flutter-desktop/hover/cmd/packaging"
-	"github.com/go-flutter-desktop/hover/internal/androidmanifest"
 	"github.com/go-flutter-desktop/hover/internal/build"
 	"github.com/go-flutter-desktop/hover/internal/config"
 	"github.com/go-flutter-desktop/hover/internal/darwinhacks"
@@ -787,7 +786,7 @@ func buildCommand(targetOS string, vmArguments []string, outputBinaryPath string
 		buildVersionNumber,
 		currentTag,
 		config.GetConfig().GetApplicationName(pubspec.GetPubSpec().Name),
-		androidmanifest.AndroidOrganizationName()))
+		config.GetConfig().GetOrganizationName()))
 
 	outputCommand := []string{
 		"go",

cmd/packaging/packaging.go

@@ -3,7 +3,6 @@ package packaging
 import (
 	"bytes"
 	"fmt"
-	"github.com/go-flutter-desktop/hover/internal/androidmanifest"
 	"github.com/go-flutter-desktop/hover/internal/pubspec"
 	"io/ioutil"
 	"os"
@@ -153,8 +152,8 @@ func (t *packagingTask) Pack(fullVersion string, mode build.Mode) {
 		release = strings.ReplaceAll(fullVersion, ".", "")
 	}
 	description := pubspec.GetPubSpec().GetDescription()
-	organizationName := androidmanifest.AndroidOrganizationName()
 	author := pubspec.GetPubSpec().GetAuthor()
+	organizationName := config.GetConfig().GetOrganizationName()
 	applicationName := config.GetConfig().GetApplicationName(projectName)
 	executableName := config.GetConfig().GetExecutableName(projectName)
 	packageName := config.GetConfig().GetPackageName(projectName)

internal/config/config.go

@@ -9,6 +9,7 @@ import (
 	"github.com/pkg/errors"
 	"gopkg.in/yaml.v2"
 
+	"github.com/go-flutter-desktop/hover/internal/androidmanifest"
 	"github.com/go-flutter-desktop/hover/internal/build"
 	"github.com/go-flutter-desktop/hover/internal/log"
 )
@@ -27,6 +28,7 @@ type Config struct {
 	ApplicationName  string `yaml:"application-name"`
 	ExecutableName   string `yaml:"executable-name"`
 	PackageName      string `yaml:"package-name"`
+	OrganizationName string `yaml:"organization-name"`
 	License          string
 	Target           string
 	BranchREMOVED    string `yaml:"branch"`
@@ -56,6 +58,16 @@ func (c Config) GetPackageName(projectName string) string {
 	return c.PackageName
 }
 
+func (c Config) GetOrganizationName() string {
+	if len(c.OrganizationName) == 0 {
+		PrintMissingField("organization-name", "go/hover.yaml", c.OrganizationName)
+		// It would be nicer to not load a value from the AndroidManifest.xml and instead define a default value here,
+		// but then older apps might break so for compatibility reasons it's done this way.
+		c.OrganizationName = androidmanifest.AndroidOrganizationName()
+	}
+	return c.OrganizationName
+}
+
 func (c Config) GetLicense() string {
 	if len(c.License) == 0 {
 		c.License = "NOASSERTION"