Skip to content

Commit

Permalink
feat: update gomobile to support xcframework
Browse files Browse the repository at this point in the history
Signed-off-by: gfanton <8671905+gfanton@users.noreply.github.com>
  • Loading branch information
gfanton committed Jul 7, 2021
1 parent a2196cb commit a4caef8
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 13 deletions.
4 changes: 1 addition & 3 deletions go/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/ipfs-shipyard/gomobile-ipfs/go

go 1.14
go 1.16

require (
github.com/ipfs/go-datastore v0.4.5
Expand All @@ -13,5 +13,3 @@ require (
github.com/multiformats/go-multiaddr v0.3.1
github.com/pkg/errors v0.9.1
)

replace github.com/lucas-clemente/quic-go => github.com/lucas-clemente/quic-go v0.18.0 // required by go1.15
2 changes: 1 addition & 1 deletion packages/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ IOS_SRC = $(shell git ls-files $(IOS_DIR) | grep -v '.gitignore')
IOS_BUILD_DIR = $(BUILD_DIR)/ios
IOS_BUILD_DIR_INT = $(IOS_BUILD_DIR)/intermediates
IOS_BUILD_DIR_INT_CORE = $(IOS_BUILD_DIR_INT)/core
IOS_CORE = $(IOS_BUILD_DIR_INT_CORE)/Core.framework
IOS_CORE = $(IOS_BUILD_DIR_INT_CORE)/Core.xcframework
IOS_BUILD_DIR_CCP = $(IOS_BUILD_DIR)/cocoapods
IOS_BUILD_DIR_CCP_CORE = $(IOS_BUILD_DIR_CCP)/$(IOS_CORE_PACKAGE)/$(VERSION)
IOS_WORKSPACE = $(IOS_DIR)/Example.xcworkspace
Expand Down
8 changes: 5 additions & 3 deletions packages/go.mod
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
module github.com/ipfs-shipyard/gomobile-ipfs/packages

go 1.16

require (
github.com/ipfs-shipyard/gomobile-ipfs/go v0.0.0
golang.org/x/mobile v0.0.0-20210614202936-7c8f154d1008
golang.org/x/mobile v0.0.0
)

replace github.com/ipfs-shipyard/gomobile-ipfs/go => ../go
replace golang.org/x/mobile => github.com/aeddi/mobile v0.0.3-silicon

go 1.14
replace github.com/ipfs-shipyard/gomobile-ipfs/go => ../go
7 changes: 2 additions & 5 deletions packages/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/utils/cocoapod_format/cocoapod_format_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
bintray_package,
global_version,
),
"framework": "Core.framework",
"framework": "Core.xcframework",
}

i = 0
Expand Down

0 comments on commit a4caef8

Please sign in to comment.