Merge pull request #100 from n0izn0iz/fix-cocoa-release

fix(core): target ios simulator too
ipfs-shipyard · Jan 30, 2022 · 1570745 · 1570745
2 parents ece63eb + 5c3929a
commit 1570745
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/packages/Makefile b/packages/Makefile
@@ -131,7 +131,7 @@ $(IOS_CORE): $(IOS_BUILD_DIR_INT_CORE) $(GO_SRC) $(GO_MOD_FILES) | $(GOMOBILE)
 	@echo '------------------------------------'
 	@echo '     iOS Core: Gomobile binding     '
 	@echo '------------------------------------'
-	$(GOMOBILE) bind $(GOMOBILE_OPT) -target=ios$(GOMOBILE_TARGET) -o $(IOS_CORE) $(CORE_PACKAGE) $(EXT_PACKAGE)
+	$(GOMOBILE) bind $(GOMOBILE_OPT) -target=ios,iossimulator$(GOMOBILE_TARGET) -o $(IOS_CORE) $(CORE_PACKAGE) $(EXT_PACKAGE)
 	@echo 'Done!'
 
 $(IOS_BUILD_DIR_INT_CORE):

diff --git a/packages/go.mod b/packages/go.mod
@@ -4,7 +4,7 @@ go 1.17
 
 require (
 	github.com/ipfs-shipyard/gomobile-ipfs/go v0.0.0
-	golang.org/x/mobile v0.0.0
+	golang.org/x/mobile v0.0.0-20220112015953-858099ff7816
 )
 
 require (
@@ -239,6 +239,4 @@ require (
 	lukechampine.com/blake3 v1.1.6 // indirect
 )
 
-replace golang.org/x/mobile => github.com/aeddi/mobile v0.0.3-silicon
-
 replace github.com/ipfs-shipyard/gomobile-ipfs/go => ../go
diff --git a/packages/go.sum b/packages/go.sum
diff --git a/packages/utils/cocoapod_format/podspec_template b/packages/utils/cocoapod_format/podspec_template
@@ -23,7 +23,4 @@ Pod::Spec.new do |spec|
   {{#header_dir}}spec.header_dir          = '{{header_dir}}'{{/header_dir}}
   {{#framework}}spec.vendored_frameworks = '{{framework}}'{{/framework}}
   {{#dependency}}spec.dependency            {{{dependency}}}{{/dependency}}
-
-  spec.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }
-  spec.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }
 end