Skip to content

Commit 01ab28e

Browse files
committed
.gitignore, example/{bind,ivy}: revert to master
CL feedback: https://go-review.googlesource.com/c/mobile/+/334689/28/example/bind/ios/README#1 New CL: #72
1 parent b08c472 commit 01ab28e

File tree

4 files changed

+18
-26
lines changed

4 files changed

+18
-26
lines changed

.gitignore

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@ last-change
99
.idea
1010
.gradle
1111

12-
# Xcode configuration files.
13-
*.xcworkspace
14-
xcuserdata
15-
*.entitlements
16-
1712
# Android Studio build and IDE configuration files.
1813
example/bind/android/local.properties
1914
example/bind/android/gradlew*

example/bind/ios/README

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
1. Use gomobile bind to bind the golang.org/x/mobile/example/bind/hello package.
2-
The following command will create an XCFramework in the current directory.
2+
The following command will create a static framework bundle in the current
3+
directory.
34

45
$ gomobile bind -target=ios golang.org/x/mobile/example/bind/hello
56

67
2. Open the Xcode project by double clicking on bind.xcodeproj.
78
The project will not build - ViewController.m calls a function from the hello
8-
package so requires the Hello.xcframework that gomobile bind command created
9+
package so requires the hello.framework the gomobild bind command created
910
in Step 1.
1011

11-
3. Drag-and-drop Hello.xcframework from the desktop to the project navigation window.
12-
This will automatically include the hello.xcframework into the project.
12+
3. Drag-and-drop the hello.framework from the desktop to the project navigation window.
13+
This will automatically include the hello framework into the project.
1314

1415
4. Build.

example/ivy/ios/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
This directory contains the source code to the Ivy iOS app.
44

5-
To build, first create the Mobile.xcframework out of the Go
5+
To build, first create the mobile.framework out of the Go
66
implementation of Ivy. Run:
77

88
```
9-
go install golang.org/x/mobile/cmd/gomobile@latest
9+
go install golang.org/x/mobile/cmd/gomobile@latest
1010
go install golang.org/x/mobile/cmd/gobind@latest
1111
```
1212

@@ -17,11 +17,11 @@ mkdir work; cd work
1717
go mod init work
1818
go get -d golang.org/x/mobile/bind@latest
1919
go get -d robpike.io/ivy/mobile
20-
gomobile bind -target=ios,iossimulator,maccatalyst,macos robpike.io/ivy/mobile
20+
gomobile bind -target=ios robpike.io/ivy/mobile
2121
```
2222

23-
Place the Mobile.xcframework directory in this directory, and
23+
Place the mobile.framework directory in this directory, and
2424
then open ivy.xcodeproj in Xcode.
2525

2626
You have to specify Development Team for code signing certificate in:
27-
Project Settings -> Targets -> Signing & Capabilities -> Signing -> Team.
27+
Project Settings -> Targets -> Signing & Capabilities -> Signing -> Team.

example/ivy/ios/ivy.xcodeproj/project.pbxproj

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
/* Begin PBXBuildFile section */
1010
7DC2F7EA26DFD9870026EBED /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7DC2F7E826DFCF750026EBED /* WebKit.framework */; };
11-
7DC2F7ED26DFD9890026EBED /* Mobile.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = B4C2833A1B98889100878964 /* Mobile.xcframework */; };
11+
7DC2F7ED26DFD9890026EBED /* mobile.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B4C2833A1B98889100878964 /* mobile.framework */; };
1212
B461D25D1B31B27700EC4870 /* tape.html in Resources */ = {isa = PBXBuildFile; fileRef = B461D25C1B31B27700EC4870 /* tape.html */; };
1313
B48878331B2E714100C7CC3C /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = B488780C1B2D1C3F00C7CC3C /* AppDelegate.m */; };
1414
B48878341B2E714100C7CC3C /* IvyController.m in Sources */ = {isa = PBXBuildFile; fileRef = B488780F1B2D1C3F00C7CC3C /* IvyController.m */; };
@@ -35,15 +35,15 @@
3535
B48878311B2DF1B200C7CC3C /* Suggestion.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Suggestion.m; sourceTree = "<group>"; };
3636
B488783B1B2F9CD500C7CC3C /* DocsController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DocsController.h; sourceTree = "<group>"; };
3737
B488783C1B2F9CD500C7CC3C /* DocsController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DocsController.m; sourceTree = "<group>"; };
38-
B4C2833A1B98889100878964 /* Mobile.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; path = Mobile.xcframework; sourceTree = "<group>"; };
38+
B4C2833A1B98889100878964 /* mobile.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = mobile.framework; sourceTree = "<group>"; };
3939
/* End PBXFileReference section */
4040

4141
/* Begin PBXFrameworksBuildPhase section */
4242
B48878011B2D1C3F00C7CC3C /* Frameworks */ = {
4343
isa = PBXFrameworksBuildPhase;
4444
buildActionMask = 2147483647;
4545
files = (
46-
7DC2F7ED26DFD9890026EBED /* Mobile.xcframework in Frameworks */,
46+
7DC2F7ED26DFD9890026EBED /* mobile.framework in Frameworks */,
4747
7DC2F7EA26DFD9870026EBED /* WebKit.framework in Frameworks */,
4848
);
4949
runOnlyForDeploymentPostprocessing = 0;
@@ -62,7 +62,7 @@
6262
B48877FB1B2D1C3F00C7CC3C = {
6363
isa = PBXGroup;
6464
children = (
65-
B4C2833A1B98889100878964 /* Mobile.xcframework */,
65+
B4C2833A1B98889100878964 /* mobile.framework */,
6666
B48878061B2D1C3F00C7CC3C /* ivy */,
6767
B48878051B2D1C3F00C7CC3C /* Products */,
6868
7DC2F7E726DFCF740026EBED /* Frameworks */,
@@ -248,7 +248,6 @@
248248
MTL_ENABLE_DEBUG_INFO = YES;
249249
ONLY_ACTIVE_ARCH = YES;
250250
SDKROOT = iphoneos;
251-
SUPPORTS_MACCATALYST = YES;
252251
TARGETED_DEVICE_FAMILY = "1,2";
253252
VALID_ARCHS = "arm64 x86_64 armv7";
254253
};
@@ -297,7 +296,6 @@
297296
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
298297
MTL_ENABLE_DEBUG_INFO = NO;
299298
SDKROOT = iphoneos;
300-
SUPPORTS_MACCATALYST = YES;
301299
TARGETED_DEVICE_FAMILY = "1,2";
302300
VALIDATE_PRODUCT = YES;
303301
VALID_ARCHS = "arm64 x86_64 armv7";
@@ -324,9 +322,8 @@
324322
ONLY_ACTIVE_ARCH = NO;
325323
PRODUCT_NAME = ivy;
326324
STRIP_STYLE = debugging;
327-
SUPPORTS_MACCATALYST = YES;
328-
TARGETED_DEVICE_FAMILY = "1,2,6";
329-
VALID_ARCHS = "arm64 x86_64 armv7";
325+
TARGETED_DEVICE_FAMILY = "1,2";
326+
VALID_ARCHS = "arm64 armv7";
330327
};
331328
name = Debug;
332329
};
@@ -351,9 +348,8 @@
351348
PRODUCT_BUNDLE_IDENTIFIER = "com.google.$(PRODUCT_NAME:rfc1034identifier)";
352349
PRODUCT_NAME = ivy;
353350
STRIP_STYLE = debugging;
354-
SUPPORTS_MACCATALYST = YES;
355-
TARGETED_DEVICE_FAMILY = "1,2,6";
356-
VALID_ARCHS = "arm64 x86_64 armv7";
351+
TARGETED_DEVICE_FAMILY = "1,2";
352+
VALID_ARCHS = "arm64 armv7";
357353
};
358354
name = Release;
359355
};

0 commit comments

Comments
 (0)