Merge remote-tracking branch 'origin/master' into fix-android-minsdk-usage-in-binres

Author: igadmg

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 The Go Authors. All rights reserved.
+Copyright 2009 The Go Authors.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -10,7 +10,7 @@ notice, this list of conditions and the following disclaimer.
 copyright notice, this list of conditions and the following disclaimer
 in the documentation and/or other materials provided with the
 distribution.
-   * Neither the name of Google Inc. nor the names of its
+   * Neither the name of Google LLC nor the names of its
 contributors may be used to endorse or promote products derived from
 this software without specific prior written permission.
 

README.md

@@ -24,9 +24,11 @@ and the [bind](https://golang.org/x/mobile/example/bind) example apps.
 
 --
 
-Contributions to Go are appreciated. See https://golang.org/doc/contribute.html.
+Contributions to Go are appreciated. See https://go.dev/doc/contribute.
 
-* Bugs can be filed at the [Go issue tracker](https://golang.org/issue/new?title=x/mobile:+).
+The git repository is https://go.googlesource.com/mobile.
+
+* Bugs can be filed at the [Go issue tracker](https://go.dev/issue/new?title=x/mobile:+).
 * Feature requests should preliminary be discussed on
 [golang-nuts](https://groups.google.com/forum/#!forum/golang-nuts)
 mailing list.

app/android.go

@@ -365,7 +365,7 @@ func runInputQueue(vm, jniEnv, ctx uintptr) error {
 
 	var q *C.AInputQueue
 	for {
-		if C.ALooper_pollAll(-1, nil, nil, nil) == C.ALOOPER_POLL_WAKE {
+		if C.ALooper_pollOnce(-1, nil, nil, nil) == C.ALOOPER_POLL_WAKE {
 			select {
 			default:
 			case p := <-pending:

asset/asset_darwin_armx.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build (linux && !android) || (darwin && !arm && !arm64) || windows
+//go:build (linux && !android) || (darwin && !ios) || windows
 
 package asset
 

asset/asset_desktop.go

@@ -0,0 +1,13 @@
+// Copyright 2024 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package asset
+
+import (
+	"os"
+)
+
+func openAsset(name string) (File, error) {
+	return os.Open(name)
+}

asset/asset_ios.go

@@ -381,7 +381,7 @@ func (g *ClassGen) genCMethodBody(cls *java.Class, f *java.Func, virtual bool) {
 		g.Printf("Nonvirtual")
 	}
 	if f.Ret != nil {
-		g.Printf(f.Ret.JNICallType())
+		g.Printf("%s", f.Ret.JNICallType())
 	} else {
 		g.Printf("Void")
 	}
@@ -430,7 +430,7 @@ func (g *ClassGen) genFuncDecl(local bool, fs *java.FuncSet) {
 		if i == len(fs.Params)-1 && fs.Variadic {
 			g.Printf("...")
 		}
-		g.Printf(g.goType(a, local))
+		g.Printf("%s", g.goType(a, local))
 	}
 	g.Printf(")")
 	if fs.Throws {
@@ -879,7 +879,7 @@ func (g *ClassGen) genInterface(cls *java.Class) {
 		if !g.isFuncSetSupported(fs) {
 			continue
 		}
-		g.Printf(fs.GoName)
+		g.Printf("%s", fs.GoName)
 		g.genFuncDecl(true, fs)
 		g.Printf("\n")
 	}
@@ -904,7 +904,7 @@ func flattenName(n string) string {
 	return strings.Replace(strings.Replace(n, ".", "_", -1), "$", "_", -1)
 }
 
-var (
+const (
 	classesPkgHeader = gobindPreamble + `
 package Java
 

bind/genclasses.go

@@ -341,7 +341,7 @@ func (g *goGen) genInterface(obj *types.TypeName) {
 		g.Printf(") ")
 
 		if res.Len() == 1 {
-			g.Printf(g.typeString(res.At(0).Type()))
+			g.Printf("%s", g.typeString(res.At(0).Type()))
 		} else if res.Len() == 2 {
 			g.Printf("(%s, error)", g.typeString(res.At(0).Type()))
 		}

bind/gengo.go

@@ -437,7 +437,7 @@ func (g *JavaGen) genConstructor(f *types.Func, n string, jcls bool) {
 			if i > 0 {
 				g.Printf(", ")
 			}
-			g.Printf(g.paramName(params, i))
+			g.Printf("%s", g.paramName(params, i))
 		}
 		g.Printf(");\n")
 	}
@@ -447,7 +447,7 @@ func (g *JavaGen) genConstructor(f *types.Func, n string, jcls bool) {
 		if i > 0 {
 			g.Printf(", ")
 		}
-		g.Printf(g.paramName(params, i))
+		g.Printf("%s", g.paramName(params, i))
 	}
 	g.Printf(");\n")
 	g.Printf("Seq.trackGoRef(refnum, this);\n")
@@ -757,21 +757,21 @@ func (g *JavaGen) genJNIFuncSignature(o *types.Func, sName string, jm *java.Func
 	g.Printf("Java_%s_", g.jniPkgName())
 	if sName != "" {
 		if proxy {
-			g.Printf(java.JNIMangle(g.className()))
+			g.Printf("%s", java.JNIMangle(g.className()))
 			// 0024 is the mangled form of $, for naming inner classes.
 			g.Printf("_00024proxy%s", sName)
 		} else {
-			g.Printf(java.JNIMangle(g.javaTypeName(sName)))
+			g.Printf("%s", java.JNIMangle(g.javaTypeName(sName)))
 		}
 	} else {
-		g.Printf(java.JNIMangle(g.className()))
+		g.Printf("%s", java.JNIMangle(g.className()))
 	}
 	g.Printf("_")
 	if jm != nil {
-		g.Printf(jm.JNIName)
+		g.Printf("%s", jm.JNIName)
 	} else {
 		oName := javaNameReplacer(lowerFirst(o.Name()))
-		g.Printf(java.JNIMangle(oName))
+		g.Printf("%s", java.JNIMangle(oName))
 	}
 	g.Printf("(JNIEnv* env, ")
 	if sName != "" {
@@ -839,9 +839,9 @@ func (g *JavaGen) genFuncSignature(o *types.Func, jm *java.Func, hasThis bool) {
 
 	g.Printf("%s ", ret)
 	if jm != nil {
-		g.Printf(jm.Name)
+		g.Printf("%s", jm.Name)
 	} else {
-		g.Printf(javaNameReplacer(lowerFirst(o.Name())))
+		g.Printf("%s", javaNameReplacer(lowerFirst(o.Name())))
 	}
 	g.Printf("(")
 	g.genFuncArgs(o, jm, hasThis)

bind/genjava.go

@@ -1060,7 +1060,7 @@ func (g *ObjcGen) genStructH(obj *types.TypeName, t *types.Struct) {
 	if oinf != nil {
 		for _, sup := range oinf.supers {
 			if !sup.Protocol {
-				g.Printf(sup.Name)
+				g.Printf("%s", sup.Name)
 			} else {
 				prots = append(prots, sup.Name)
 			}

bind/genobjc.go

@@ -286,14 +286,13 @@ func (g *ObjcWrapper) genCFuncDecl(prefix, name string, f *objc.Func) {
 	case ret != nil && returnsErr:
 		g.Printf("ret_%s", strings.Replace(g.cType(ret), " ", "_", -1))
 	case ret != nil:
-		g.Printf(g.cType(ret))
+		g.Printf("%s", g.cType(ret))
 	case returnsErr:
 		g.Printf("int")
 	default:
 		g.Printf("void")
 	}
-	g.Printf(" ")
-	g.Printf(prefix)
+	g.Printf(" %s", prefix)
 	if f.Static {
 		g.Printf("_s")
 	}
@@ -397,8 +396,7 @@ func (g *ObjcWrapper) genFuncBody(n *objc.Named, f *objc.Func, prefix string) {
 	if ret != nil || errParam != nil {
 		g.Printf("res := ")
 	}
-	g.Printf("C.")
-	g.Printf(prefix)
+	g.Printf("C.%s", prefix)
 	if f.Static {
 		g.Printf("_s")
 	}
@@ -575,7 +573,7 @@ func (g *ObjcWrapper) genInterface(n *objc.Named) {
 		if !g.isFuncSupported(f) {
 			continue
 		}
-		g.Printf(f.GoName)
+		g.Printf("%s", f.GoName)
 		g.genFuncDecl(true, f)
 		g.Printf("\n")
 	}

bind/genobjcw.go

@@ -15,6 +15,7 @@ import (
 	"strconv"
 	"strings"
 	"text/template"
+	"time"
 
 	"golang.org/x/sync/errgroup"
 	"golang.org/x/tools/go/packages"
@@ -233,9 +234,11 @@ func goAppleBind(gobind string, pkgs []*packages.Package, targets []targetInfo)
 			return err
 		}
 		err = writeFile(filepath.Join(frameworkInfoPlistDir, "Info.plist"), func(w io.Writer) error {
+			fmVersion := fmt.Sprintf("0.0.%d", time.Now().Unix())
 			infoFrameworkPlistlData := infoFrameworkPlistlData{
 				BundleID:       escapePlistValue(rfc1034Label(title)),
 				ExecutableName: escapePlistValue(title),
+				Version:        escapePlistValue(fmVersion),
 			}
 			infoplist := new(bytes.Buffer)
 			if err := infoFrameworkPlistTmpl.Execute(infoplist, infoFrameworkPlistlData); err != nil {
@@ -333,6 +336,7 @@ func frameworkLayoutForTarget(t targetInfo, title string) (*frameworkLayout, err
 type infoFrameworkPlistlData struct {
 	BundleID       string
 	ExecutableName string
+	Version        string
 }
 
 // infoFrameworkPlistTmpl is a template for the Info.plist file in a framework.
@@ -348,6 +352,10 @@ var infoFrameworkPlistTmpl = template.Must(template.New("infoFrameworkPlist").Pa
   <string>{{.BundleID}}</string>
   <key>MinimumOSVersion</key>
   <string>100.0</string>
+  <key>CFBundleShortVersionString</key>
+  <string>{{.Version}}</string>
+  <key>CFBundleVersion</key>
+  <string>{{.Version}}</string>
   <key>CFBundlePackageType</key>
   <string>FMWK</string>
 </dict>

cmd/gomobile/bind_iosapp.go

@@ -160,7 +160,7 @@ func runBuildImpl(cmd *command) (*packages.Package, error) {
 			return pkg, nil
 		}
 		if buildBundleID == "" {
-			return nil, fmt.Errorf("-target=ios requires -bundleid set")
+			return nil, fmt.Errorf("-target=%s requires -bundleid set", buildTarget)
 		}
 		nmpkgs, err = goAppleBuild(pkg, buildBundleID, targets)
 		if err != nil {

cmd/gomobile/build.go

@@ -63,9 +63,11 @@ func platformOS(platform string) string {
 	case "macos", "maccatalyst":
 		// For "maccatalyst", Go packages should be built with GOOS=darwin,
 		// not GOOS=ios, since the underlying OS (and kernel, runtime) is macOS.
+		// But, using GOOS=darwin with build-tag ios leads to corrupt builds: https://go.dev/issue/52299
+		// => So we use GOOS=ios for now.
 		// We also apply a "macos" or "maccatalyst" build tag, respectively.
 		// See below for additional context.
-		return "darwin"
+		return "ios"
 	default:
 		panic(fmt.Sprintf("unexpected platform: %s", platform))
 	}
@@ -82,17 +84,17 @@ func platformTags(platform string) []string {
 	case "maccatalyst":
 		// Mac Catalyst is a subset of iOS APIs made available on macOS
 		// designed to ease porting apps developed for iPad to macOS.
-		// See https://developer.apple.com/mac-catalyst/.
-		// Because of this, when building a Go package targeting maccatalyst,
-		// GOOS=darwin (not ios). To bridge the gap and enable maccatalyst
-		// packages to be compiled, we also specify the "ios" build tag.
+		// See
+		//   https://developer.apple.com/mac-catalyst/.
+		//   https://stackoverflow.com/questions/12132933/preprocessor-macro-for-os-x-targets/49560690#49560690
+		//
+		// Historically gomobile used GOOS=darwin with build tag ios when
+		// targeting Mac Catalyst. However, this configuration is not officially
+		// supported and leads to corrupt builds after go1.18: https://go.dev/issues/52299
+		// Use GOOS=ios.
 		// To help discriminate between darwin, ios, macos, and maccatalyst
 		// targets, there is also a "maccatalyst" tag.
-		// Some additional context on this can be found here:
-		// https://stackoverflow.com/questions/12132933/preprocessor-macro-for-os-x-targets/49560690#49560690
-		// TODO(ydnar): remove tag "ios" when cgo supports Catalyst
-		// See golang.org/issues/47228
-		return []string{"ios", "macos", "maccatalyst"}
+		return []string{"macos", "maccatalyst"}
 	default:
 		panic(fmt.Sprintf("unexpected platform: %s", platform))
 	}
@@ -217,17 +219,11 @@ func envInit() (err error) {
 				cflags += " -mios-simulator-version-min=" + buildIOSVersion
 				cflags += " -fembed-bitcode"
 			case "maccatalyst":
-				// Mac Catalyst is a subset of iOS APIs made available on macOS
-				// designed to ease porting apps developed for iPad to macOS.
-				// See https://developer.apple.com/mac-catalyst/.
-				// Because of this, when building a Go package targeting maccatalyst,
-				// GOOS=darwin (not ios). To bridge the gap and enable maccatalyst
-				// packages to be compiled, we also specify the "ios" build tag.
-				// To help discriminate between darwin, ios, macos, and maccatalyst
-				// targets, there is also a "maccatalyst" tag.
-				// Some additional context on this can be found here:
-				// https://stackoverflow.com/questions/12132933/preprocessor-macro-for-os-x-targets/49560690#49560690
-				goos = "darwin"
+				// See the comment about maccatalyst's GOOS, build tags configuration
+				// in platformOS and platformTags.
+				// Using GOOS=darwin with build-tag ios leads to corrupt builds: https://go.dev/issue/52299
+				// => So we use GOOS=ios for now.
+				goos = "ios"
 				sdk = "macosx"
 				clang, cflags, err = envClang(sdk)
 				// TODO(ydnar): the following 3 lines MAY be needed to compile
@@ -436,15 +432,21 @@ func envClang(sdkName string) (clang, cflags string, err error) {
 		return sdkName + "-clang", "-isysroot " + sdkName, nil
 	}
 	cmd := exec.Command("xcrun", "--sdk", sdkName, "--find", "clang")
-	out, err := cmd.CombinedOutput()
+	out, err := cmd.Output()
 	if err != nil {
+		if ee := (*exec.ExitError)(nil); errors.As(err, &ee) {
+			out = append(out, ee.Stderr...)
+		}
 		return "", "", fmt.Errorf("xcrun --find: %v\n%s", err, out)
 	}
 	clang = strings.TrimSpace(string(out))
 
 	cmd = exec.Command("xcrun", "--sdk", sdkName, "--show-sdk-path")
-	out, err = cmd.CombinedOutput()
+	out, err = cmd.Output()
 	if err != nil {
+		if ee := (*exec.ExitError)(nil); errors.As(err, &ee) {
+			out = append(out, ee.Stderr...)
+		}
 		return "", "", fmt.Errorf("xcrun --show-sdk-path: %v\n%s", err, out)
 	}
 	sdk := strings.TrimSpace(string(out))

cmd/gomobile/env.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build ignore
+//go:build tools
 
 package dummy
 

example/ivy/tools.go

@@ -61,7 +61,7 @@ int GoAndroid_readQueue(int n, int32_t* types, int64_t* timestamps, float* vecto
   // Try n times read from the event queue.
   // If anytime timeout occurs, don't retry to read and immediately return.
   // Consume the event queue entirely between polls.
-  while (i < n && (id = ALooper_pollAll(GO_ANDROID_READ_TIMEOUT_MS, NULL, &events, NULL)) >= 0) {
+  while (i < n && (id = ALooper_pollOnce(GO_ANDROID_READ_TIMEOUT_MS, NULL, &events, NULL)) >= 0) {
     if (id != GO_ANDROID_SENSOR_LOOPER_ID) {
       continue;
     }