fix(ios): gomobile build and exported field setter

Signed-off-by: Godefroy Ponsinet <godefroy.ponsinet@outlook.com>
berty · Jan 29, 2019 · 580c58c · 580c58c
1 parent 69a3474
commit 580c58c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/client/react-native/gomobile/Makefile b/client/react-native/gomobile/Makefile
@@ -66,13 +66,13 @@ deps-osx:
 deps:
 	rm -rf $(GOPATH)/src/golang.org/x/mobile
 	GO111MODULE=off go get -u golang.org/x/mobile/cmd/gomobile
-	go get -u golang.org/x/mobile/cmd/gobind
-	patch -N $(GOPATH)/src/golang.org/x/mobile/cmd/gomobile/env.go $(BUILD_PATCH_PATH)/gomobile-env-flag.diff || true
-	go install golang.org/x/mobile/cmd/gomobile
+	GO111MODULE=off go get -u golang.org/x/mobile/cmd/gobind
+	patch -N $(GOPATH)/src/golang.org/x/mobile/cmd/gomobile/env.go $(BUILD_PATCH_PATH)/gomobile-env-flag.diff
+	GO111MODULE=off go install golang.org/x/mobile/cmd/gomobile
 
 .PHONY: init
 init: deps
-	gomobile init -v -ndk $(ANDROID_NDK_HOME)
+	GO111MODULE=off gomobile init -v -ndk $(ANDROID_NDK_HOME)
 
 .PHONY: test
 test:
@@ -114,8 +114,7 @@ build.ios: $(IOS_BUILD_PATH)/core.framework/Core
 $(IOS_BUILD_PATH)/core.framework/Core: $(CORE_SOURCES)
 	GO111MODULE=on go mod vendor
 	mkdir -p $(IOS_BUILD_PATH)
-	GO111MODULE=off CGO_CPPFLAGS="$(CGO_CPPFLAGS)" CGO_LDFLAGS="$(IOS_LDFLAGS)" \
-		gomobile bind -v $(EXT_LDFLAGS) $(GOMOBILES_OPT) -target=ios -o $(IOS_BUILD_PATH)/core.framework berty.tech/client/react-native/gomobile/core
+	GO111MODULE=off CGO_CPPFLAGS="$(CGO_CPPFLAGS)" CGO_LDFLAGS="$(IOS_LDFLAGS)" gomobile bind -v $(EXT_LDFLAGS) $(GOMOBILES_OPT) -target=ios -o $(IOS_BUILD_PATH)/core.framework berty.tech/client/react-native/gomobile/core
 
 .PHONY: build
 build: build.android build.ios

diff --git a/client/react-native/gomobile/go.sum b/client/react-native/gomobile/go.sum
@@ -351,6 +351,8 @@ github.com/libp2p/go-libp2p-protocol v1.0.0 h1:6AnF76m2VjjiaDisOahQnWSnX2WWaISOX
 github.com/libp2p/go-libp2p-protocol v1.0.0/go.mod h1:Af9n4PiruirSDjHycM1QuiMi/1VZNHYcK8cLgFJLZ4s=
 github.com/libp2p/go-libp2p-pubsub v0.10.3-0.20181227100204-0363ea8f53a9 h1:HB1w0H1Lm4jpHQv6ZTEztNGJdYprWkovQa5/fiaT87U=
 github.com/libp2p/go-libp2p-pubsub v0.10.3-0.20181227100204-0363ea8f53a9/go.mod h1:E2KoEMwM5nWtdGV+wWueN7g/j++VL9tmCfjzk1fLpWc=
+github.com/libp2p/go-libp2p-pubsub v0.10.3-0.20190121225156-d4589956d289 h1:vOabGiZFvqct09RU948E9VHILBuLAPVmiPgTmae63CE=
+github.com/libp2p/go-libp2p-pubsub v0.10.3-0.20190121225156-d4589956d289/go.mod h1:E2KoEMwM5nWtdGV+wWueN7g/j++VL9tmCfjzk1fLpWc=
 github.com/libp2p/go-libp2p-quic-transport v0.2.9 h1:9YiNGAhsVTP3ysy/gNx7PRlYMLQxL64J9Q6AqpNNrA0=
 github.com/libp2p/go-libp2p-quic-transport v0.2.9/go.mod h1:K7NlcUvC/DQCjGX9nctnSCN0l/QXMTveKL48SVdvkGM=
 github.com/libp2p/go-libp2p-record v4.1.7+incompatible h1:SDxar7iuh4z03b85lr8tVMSKNWWK73RLkQKyPwcxIeo=

diff --git a/client/react-native/ios/modules/core/CoreModule.swift b/client/react-native/ios/modules/core/CoreModule.swift
@@ -21,7 +21,7 @@ class CoreModule: NSObject {
 
   override init() {
     super.init()
-    self.notificationDriver.setNative(Notification())
+    Core.notificationDriver()?.native = Notification()
   }
 
   func getFilesDir() throws -> String {