Skip to content

Commit e5c6930

Browse files
committed
replace deprecated strings.Title
1 parent a1d9079 commit e5c6930

File tree

8 files changed

+27
-10
lines changed

8 files changed

+27
-10
lines changed

bind/genjava.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ import (
1515
"strings"
1616

1717
"golang.org/x/mobile/internal/importers/java"
18+
"golang.org/x/text/cases"
19+
"golang.org/x/text/language"
1820
)
1921

2022
// TODO(crawshaw): disallow basic android java type names in exported symbols.
@@ -1038,7 +1040,7 @@ func JavaClassName(pkg *types.Package) string {
10381040
if pkg == nil {
10391041
return "Universe"
10401042
}
1041-
return javaNameReplacer(strings.Title(pkg.Name()))
1043+
return javaNameReplacer(cases.Title(language.English).String(pkg.Name()))
10421044
}
10431045

10441046
func (g *JavaGen) genConst(o *types.Const) {

bind/genobjc.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ import (
1212
"strings"
1313

1414
"golang.org/x/mobile/internal/importers/objc"
15+
"golang.org/x/text/cases"
16+
"golang.org/x/text/language"
1517
)
1618

1719
// TODO(hyangah): handle method name conflicts.
@@ -101,7 +103,7 @@ func (g *ObjcGen) namePrefixOf(pkg *types.Package) string {
101103
return "Universe"
102104
}
103105
p := g.Prefix
104-
return p + strings.Title(pkg.Name())
106+
return p + cases.Title(language.English).String(pkg.Name())
105107
}
106108

107109
func (g *ObjcGen) GenGoH() error {

cmd/gobind/gen.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ import (
2121
"golang.org/x/mobile/internal/importers"
2222
"golang.org/x/mobile/internal/importers/java"
2323
"golang.org/x/mobile/internal/importers/objc"
24+
"golang.org/x/text/cases"
25+
"golang.org/x/text/language"
2426
"golang.org/x/tools/go/packages"
2527
)
2628

@@ -142,12 +144,12 @@ func genPkg(lang string, p *types.Package, astFiles []*ast.File, allPkg []*types
142144
processErr(g.GenGoH())
143145
io.Copy(w, &buf)
144146
closer()
145-
hname := strings.Title(fname[:len(fname)-2]) + ".objc.h"
147+
hname := cases.Title(language.English).String(fname[:len(fname)-2]) + ".objc.h"
146148
w, closer = writer(filepath.Join("src", "gobind", hname))
147149
processErr(g.GenH())
148150
io.Copy(w, &buf)
149151
closer()
150-
mname := strings.Title(fname[:len(fname)-2]) + "_darwin.m"
152+
mname := cases.Title(language.English).String(fname[:len(fname)-2]) + "_darwin.m"
151153
w, closer = writer(filepath.Join("src", "gobind", mname))
152154
conf.Writer = w
153155
processErr(g.GenM())

cmd/gomobile/bind_iosapp.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ import (
1818
"time"
1919

2020
"golang.org/x/sync/errgroup"
21+
"golang.org/x/text/cases"
22+
"golang.org/x/text/language"
2123
"golang.org/x/tools/go/packages"
2224
)
2325

@@ -27,15 +29,15 @@ func goAppleBind(gobind string, pkgs []*packages.Package, targets []targetInfo)
2729

2830
if buildO == "" {
2931
name = pkgs[0].Name
30-
title = strings.Title(name)
32+
title = cases.Title(language.English).String(name)
3133
buildO = title + ".xcframework"
3234
} else {
3335
if !strings.HasSuffix(buildO, ".xcframework") {
3436
return fmt.Errorf("static framework name %q missing .xcframework suffix", buildO)
3537
}
3638
base := filepath.Base(buildO)
3739
name = base[:len(base)-len(".xcframework")]
38-
title = strings.Title(name)
40+
title = cases.Title(language.English).String(name)
3941
}
4042

4143
if err := removeAll(buildO); err != nil {
@@ -185,7 +187,7 @@ func goAppleBind(gobind string, pkgs []*packages.Package, targets []targetInfo)
185187

186188
fileBases := make([]string, len(pkgs)+1)
187189
for i, pkg := range pkgs {
188-
fileBases[i] = bindPrefix + strings.Title(pkg.Name)
190+
fileBases[i] = bindPrefix + cases.Title(language.English).String(pkg.Name)
189191
}
190192
fileBases[len(fileBases)-1] = "Universe"
191193

cmd/gomobile/build_androidapp.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ import (
2020
"strings"
2121

2222
"golang.org/x/mobile/internal/binres"
23+
"golang.org/x/text/cases"
24+
"golang.org/x/text/language"
2325
"golang.org/x/tools/go/packages"
2426
)
2527

@@ -47,7 +49,7 @@ func goAndroidBuild(pkg *packages.Package, targets []targetInfo) (map[string]boo
4749
err := manifestTmpl.Execute(buf, manifestTmplData{
4850
// TODO(crawshaw): a better package path.
4951
JavaPkgPath: "org.golang.todo." + libName,
50-
Name: strings.Title(appName),
52+
Name: cases.Title(language.English).String(appName),
5153
LibName: libName,
5254
})
5355
if err != nil {

cmd/gomobile/build_apple.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ import (
1616
"strings"
1717
"text/template"
1818

19+
"golang.org/x/text/cases"
20+
"golang.org/x/text/language"
1921
"golang.org/x/tools/go/packages"
2022
)
2123

@@ -33,7 +35,7 @@ func goAppleBuild(pkg *packages.Package, bundleID string, targets []targetInfo)
3335
infoplist := new(bytes.Buffer)
3436
if err := infoplistTmpl.Execute(infoplist, infoplistTmplData{
3537
BundleID: bundleID + "." + productName,
36-
Name: strings.Title(path.Base(pkg.PkgPath)),
38+
Name: cases.Title(language.English).String(path.Base(pkg.PkgPath)),
3739
}); err != nil {
3840
return nil, err
3941
}

go.mod

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,7 @@ require (
2323
golang.org/x/tools v0.33.0
2424
)
2525

26-
require golang.org/x/sys v0.33.0 // indirect
26+
require (
27+
golang.org/x/sys v0.33.0 // indirect
28+
golang.org/x/text v0.25.0 // indirect
29+
)

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,7 @@ golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ=
1010
golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
1111
golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
1212
golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
13+
golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
14+
golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
1315
golang.org/x/tools v0.33.0 h1:4qz2S3zmRxbGIhDIAgjxvFutSvH5EfnsYrRBj0UI0bc=
1416
golang.org/x/tools v0.33.0/go.mod h1:CIJMaWEY88juyUfo7UbgPqbC8rU2OqfAV1h2Qp0oMYI=

0 commit comments

Comments
 (0)