chore(client): re-init react-native

fix #1272

Signed-off-by: Godefroy Ponsinet <godefroy.ponsinet@outlook.com>

client/.gitignore

@@ -117,6 +117,7 @@ android/core/core.aar
 jsconfig.json
 
 # Cocoapods
+/ios/Pods/
 *.xcworkspace/
 ios/Pods
 

client/Makefile

@@ -18,6 +18,7 @@ LERNA_PACKAGES := $(patsubst \
 PROTOS = $(strip $(call rwildcard, ../core, *.proto))
 OUR_PROTOS = $(filter-out $(call rwildcard,../core/vendor/, *.proto),$(PROTOS))
 TEMPLATES := $(shell find packages -type f -name '*.hbs' -not -path '*/node_modules/*')
+TEMPLATES_GENERATE := $(patsubst packages/template/%.hbs,packages/%,$(TEMPLATES))
 GENERATE := $(patsubst packages/template/%.hbs,packages/%,$(TEMPLATES)) \
 	$(patsubst ../core/%.proto,packages/bridge/service/%.pb.json,$(OUR_PROTOS))
 RN := react-native
@@ -48,8 +49,8 @@ $(LERNA):
 		-not -path '*/node_modules/*' \
 		-exec rm -f {}/.updated \;
 	$(LERNA) --reject-cycles bootstrap --hoist $(shell [ ! -z "$$CIRCLE_JOB" ] && echo "--ci --concurrency=2")
-	./node_modules/.bin/link-module-alias
-	./node_modules/.bin/napa
+	$(PWD)/node_modules/.bin/link-module-alias
+	$(PWD)/node_modules/.bin/napa
 	# prevent package without dep to rebootstrap
 	mkdir -p $(LERNA_PACKAGES)
 	find packages \
@@ -120,8 +121,8 @@ packages/%: packages/template/%.hbs $(OUR_PROTOS)
 		--proto-path node_modules/berty-core \
 		--output-dir packages \
 		--helper-dir packages/template/helper \
-		node_modules/berty-core/api/node/service.proto
-	npm run prettify -- $(GENERATE)
+		$(PWD)/node_modules/berty-core/api/node/service.proto
+	npm run prettify -- $(TEMPLATES_GENERATE)
 
 .IGNORE \
 .PHONY: generate.clean
@@ -197,7 +198,7 @@ get_iphone_udid:
 
 .PHONY: deps.android
 deps.android: deps.lerna $(PWD)/android/app/google-services.json $(PWD)/.environment
-	./node_modules/.bin/react-native link
+	$(PWD)/node_modules/.bin/react-native link --platforms=android
 	./node_modules/.bin/jetify
 	cd ../core/platform/mobile && make build.android
 
@@ -207,18 +208,25 @@ $(PWD)/android/app/google-services.json:
 
 $(PWD)/.environment:
 	@echo 'Error: You need to configure ' $@ ' with INSTABUG_TOKEN'
-	false
+	@false
 
 .PHONY: deps.ios
-deps.ios: deps.lerna $(PWD)/.environment
+deps.ios: deps.lerna $(PWD)/.environment $(PWD)/ios/core.framework $(PWD)/ios/Pods
 	if [ ! -e ./node_modules/react-native/third-party/glog-0.*/Makefile ]; then	\
 		cd ./node_modules/react-native											\
 			&& rm -rf third-party														\
 			&& ./scripts/ios-install-third-party.sh										\
 			&& cd third-party/glog-0.*													\
 			&& ../../scripts/ios-configure-glog.sh;										\
 	fi
-	./node_modules/.bin/react-native link
+
+$(PWD)/ios/Pods: $(PWD)/ios/Podfile
+	$(PWD)/node_modules/.bin/react-native link --platforms=ios
+	([ ! -z "$(shell which pod)" ] && pod --version | grep '1.7.') || sudo gem install cocoapods
+	cd ios && pod install --verbose
+
+.PHONY: $(PWD)/ios/core.framework
+$(PWD)/ios/core.framework:
 	cd ../core/platform/mobile && make build.ios
 
 .PHONY: deps.web
@@ -245,7 +253,6 @@ patch.android:
 		patch node_modules/react-native-network-info/android/build.gradle_topatch -i patch/gradle.patch -o node_modules/react-native-network-info/android/build.gradle; \
 	fi
 
-
 .PHONY: debug.android
 debug.android: deps.android patch.android
 	$(RN) run-android --no-packager
@@ -392,6 +399,7 @@ fclean.android: clean.android clean.bundler_and_pkgs
 
 .PHONY .IGNORE: fclean.ios
 fclean.ios: clean.ios clean.bundler_and_pkgs
+	rm -rf ios/Pods
 
 .PHONY .IGNORE: fclean.web
 fclean.web: clean.web clean.bundler_and_pkgs

client/android/app/BUCK

@@ -8,23 +8,13 @@
 # - `buck install -r android/app` - compile, install and run application
 #
 
+load(":build_defs.bzl", "create_aar_targets", "create_jar_targets")
+
 lib_deps = []
 
-for jarfile in glob(['libs/*.jar']):
-  name = 'jars__' + jarfile[jarfile.rindex('/') + 1: jarfile.rindex('.jar')]
-  lib_deps.append(':' + name)
-  prebuilt_jar(
-    name = name,
-    binary_jar = jarfile,
-  )
+create_aar_targets(glob(["libs/*.aar"]))
 
-for aarfile in glob(['libs/*.aar']):
-  name = 'aars__' + aarfile[aarfile.rindex('/') + 1: aarfile.rindex('.aar')]
-  lib_deps.append(':' + name)
-  android_prebuilt_aar(
-    name = name,
-    aar = aarfile,
-  )
+create_jar_targets(glob(["libs/*.jar"]))
 
 android_library(
     name = "all-libs",