diff --git a/go/go.mod b/go/go.mod index 04040514..afa173cc 100644 --- a/go/go.mod +++ b/go/go.mod @@ -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 @@ -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 diff --git a/packages/Makefile b/packages/Makefile index 31b8cb8d..66bb4bda 100644 --- a/packages/Makefile +++ b/packages/Makefile @@ -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 diff --git a/packages/go.mod b/packages/go.mod index 12ccbc01..44883b2a 100644 --- a/packages/go.mod +++ b/packages/go.mod @@ -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 diff --git a/packages/go.sum b/packages/go.sum index 30c1d6b7..d4a409be 100644 --- a/packages/go.sum +++ b/packages/go.sum @@ -38,6 +38,8 @@ github.com/Stebalien/go-bitfield v0.0.0-20180330043415-076a62f9ce6e/go.mod h1:3o github.com/Stebalien/go-bitfield v0.0.1 h1:X3kbSSPUaJK60wV2hjOPZwmpljr6VGCqdq4cBLhbQBo= github.com/Stebalien/go-bitfield v0.0.1/go.mod h1:GNjFpasyUVkHMsfEOk8EFLJ9syQ6SI+XWrX9Wf2XH0s= github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII= +github.com/aeddi/mobile v0.0.3-silicon h1:wOm6xG8FinN1kQW8aQNZAS9QWMUOPstVU6WV1iIEI4A= +github.com/aeddi/mobile v0.0.3-silicon/go.mod h1:jFTmtFYCV0MFtXBU+J5V/+5AUeVS0ON/0WkE/KSrl6E= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= @@ -1073,7 +1075,6 @@ golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4= golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= @@ -1095,10 +1096,6 @@ golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRu golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20200302205851-738671d3881b h1:Wh+f8QHJXR411sJR8/vRBTZ7YapZaRvUcLFFJhusH0k= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= -golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= -golang.org/x/mobile v0.0.0-20210614202936-7c8f154d1008 h1:bhUgRXVM4qBWv8em9+JtJwUVvagppJ5Z1JMbJmu97fc= -golang.org/x/mobile v0.0.0-20210614202936-7c8f154d1008/go.mod h1:jFTmtFYCV0MFtXBU+J5V/+5AUeVS0ON/0WkE/KSrl6E= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= diff --git a/packages/utils/cocoapod_format/cocoapod_format_core.py b/packages/utils/cocoapod_format/cocoapod_format_core.py index 9362997a..89837aaf 100755 --- a/packages/utils/cocoapod_format/cocoapod_format_core.py +++ b/packages/utils/cocoapod_format/cocoapod_format_core.py @@ -52,7 +52,7 @@ bintray_package, global_version, ), - "framework": "Core.framework", + "framework": "Core.xcframework", } i = 0