diff --git a/.circleci/config.yml b/.circleci/config.yml index 6820db64d2..12ad425634 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -177,7 +177,10 @@ jobs: - restore_cache: key: node-v1-{{ checksum "client/react-native/package.json" }}-{{ arch }} - - run: cd client/react-native && make deps + - run: + name: install react-native deps + command: | + cd client/react-native && make deps - save_cache: key: yarn-v1-{{ checksum "client/react-native/yarn.lock" }}-{{ arch }} @@ -194,12 +197,9 @@ jobs: paths: - client/react-native/common - client/react-native/node_modules - - client/react-native/gomobile/node_modules - - client/react-native/common/node_modules - - client/react-native/mobile/node_modules client.rn.android: - working_directory: ~/go/src/berty.tech/client/react-native/mobile/android + working_directory: ~/go/src/berty.tech/client/react-native/android docker: - image: bertychat/android-ci:v2 steps: @@ -212,14 +212,12 @@ jobs: - run: name: setup golang environment command: | - ~/go/src/berty.tech/.circleci/paths_changed ^client ^.circle || exit 0 echo "export PATH=/usr/local/go/bin/:~/go/bin:$PATH" >> $BASH_ENV - run: name: gomobile android build command: | - ~/go/src/berty.tech/.circleci/paths_changed ^client ^.circle || exit 0 - env && cd ../../gomobile && make android + env && cd ../gomobile && make build.android - restore_cache: key: android-gems-{{ checksum "~/go/src/berty.tech/client/react-native/mobile/android/Gemfile.lock" }} @@ -227,7 +225,6 @@ jobs: - run: name: install bundle command: | - ~/go/src/berty.tech/.circleci/paths_changed ^client ^.circle || exit 0 bundle check || bundle install --path vendor/bundle - save_cache: @@ -238,7 +235,6 @@ jobs: - run: name: build app command: | - ~/go/src/berty.tech/.circleci/paths_changed ^client ^.circle || exit 0 time bundle exec fastlane android beta client.rn.ios: @@ -265,13 +261,13 @@ jobs: - attach_workspace: at: ~/go/src/berty.tech/ - # - restore_cache: - # key: ios-golang-{{ .Environment.GOVERSION }}-2 + # if build breaks, increment vX in both restore_cache and save_cache + - restore_cache: + key: v1-ios-golang-{{ .Environment.GOVERSION }}-2 - run: name: install-go command: | - # ~/go/src/berty.tech/.circleci/paths_changed ^client ^.circle || exit 0 if [ ! -f ~/go-install/go/bin/go ]; then cd ~ && git clone https://github.com/udhos/update-golang cd ~/update-golang && mkdir ~/go-install && sudo DESTINATION=~/go-install ./update-golang.sh @@ -281,7 +277,6 @@ jobs: - run: name: install gomobile command: | - # ~/go/src/berty.tech/.circleci/paths_changed ^client ^.circle || exit 0 if [ ! -f ~/go/bin/gomobile ]; then go get golang.org/x/mobile/cmd/gomobile cd ~/go/src/golang.org/x/mobile @@ -292,47 +287,49 @@ jobs: gomobile init fi - # - save_cache: - # key: ios-golang-{{ .Environment.GOVERSION }}-2 - # paths: - # - ~/go - # - ~/go-install + - save_cache: + key: v1-ios-golang-{{ .Environment.GOVERSION }}-2 + paths: + - ~/go + - ~/go-install - run: name: install core working_directory: ~/go/src/berty.tech/client/react-native/gomobile command: | - # ~/go/src/berty.tech/.circleci/paths_changed ^client ^.circle || exit 0 - make ios + make build.ios - # - restore_cache: - # key: ios-gems-{{ checksum "~/go/src/berty.tech/client/react-native/Gemfile.lock" }}-3 + - restore_cache: + key: ios-gems-{{ checksum "~/go/src/berty.tech/client/react-native/Gemfile.lock" }}-3 - run: working_directory: ~/go/src/berty.tech/client/react-native command: | - # ~/go/src/berty.tech/.circleci/paths_changed ^client ^.circle || exit 0 bundle check || bundle install --path vendor/bundle - # - save_cache: - # key: ios-gems-{{ checksum "~/go/src/berty.tech/client/react-native/Gemfile.lock" }}-3 - # paths: - # - client/react-native/vendor/bundle + - save_cache: + key: ios-gems-{{ checksum "~/go/src/berty.tech/client/react-native/Gemfile.lock" }}-3 + paths: + - client/react-native/vendor/bundle - run: name: set version working_directory: ~/go/src/berty.tech/client/react-native command: | - # ~/go/src/berty.tech/.circleci/paths_changed ^client ^.circle || exit 0 make version + - run: + name: install fsevents + working_directory: ~/go/src/berty.tech/client/react-native + command: | + yarn add fsevents + - run: name: build app working_directory: ~/go/src/berty.tech/client/react-native command: | - # ~/go/src/berty.tech/.circleci/paths_changed ^client ^.circle || exit 0 make fastlane.setup_circle \ - fastlane.ios.build + fastlane.ios.build - store_artifacts: path: /tmp/fl @@ -349,29 +346,29 @@ jobs: at: ~/go/src/berty.tech/ - - restore_cache: - key: yarn-v1-{{ checksum "client/react-native/web/yarn.lock" }}-{{ arch }} + # - restore_cache: + # key: yarn-v1-{{ checksum "client/react-native/web/yarn.lock" }}-{{ arch }} - - restore_cache: - key: node-v1-{{ checksum "client/react-native/web/package.json" }}-{{ arch }} + # - restore_cache: + # key: node-v1-{{ checksum "client/react-native/web/package.json" }}-{{ arch }} - - run: cd client/react-native/web && yarn + # - run: cd client/react-native/web && yarn - - save_cache: - key: yarn-v1-{{ checksum "client/react-native/web/yarn.lock" }}-{{ arch }} - paths: - - ~/.cache/yarn + # - save_cache: + # key: yarn-v1-{{ checksum "client/react-native/web/yarn.lock" }}-{{ arch }} + # paths: + # - ~/.cache/yarn - - save_cache: - key: node-v1-{{ checksum "client/react-native/web/package.json" }}-{{ arch }} - paths: - - node_modules + # - save_cache: + # key: node-v1-{{ checksum "client/react-native/web/package.json" }}-{{ arch }} + # paths: + # - node_modules - - run: - name: build web app - working_directory: ~/go/src/berty.tech/client/react-native/web - command: | - yarn build + # - run: + # name: build web app + # working_directory: ~/go/src/berty.tech/client/react-native/web + # command: | + # yarn build workflows: version: 2 diff --git a/Makefile b/Makefile index 5a8d977c67..95f095bc36 100644 --- a/Makefile +++ b/Makefile @@ -30,6 +30,7 @@ lint-editorconfig: ! -name '*.patch' \ ! -name '*.diff' \ ! -name '*.vim' \ + ! -name '*.bat' \ ! -name '.DS_Store' \ ! -name '.generated' \ ! -name '.gitkeep' \ @@ -48,12 +49,13 @@ lint-editorconfig: ! -path './.github/*' \ ! -path './client/common/openssl/built/*' \ ! -path './client/react-native/common/schema.graphql' \ - ! -path './client/react-native/mobile/*/Build/*' \ - ! -path './client/react-native/mobile/*/build/*' \ - ! -path './client/react-native/mobile/android/.gradle/*' \ - ! -path './client/react-native/mobile/ios/berty.xcodeproj/*' \ - ! -path './client/react-native/mobile/ios/berty/Images.xcassets/*' \ - ! -path './client/react-native/mobile/ios/core.framework/*' \ + ! -path './client/react-native/*/Build/*' \ + ! -path './client/react-native/*/build/*' \ + ! -path './client/react-native/android/.idea/*' \ + ! -path './client/react-native/android/.gradle/*' \ + ! -path './client/react-native/ios/Berty.xcodeproj/*' \ + ! -path './client/react-native/ios/Berty/Images.xcassets/*' \ + ! -path './client/react-native/ios/core.framework/*' \ ! -path './vendor/*' \ `; \ COUNT=$$(echo "$$FILES" | sed '/^\s*$$/d' | wc -l | tr -d ' '); \ diff --git a/client/react-native/.babelrc b/client/react-native/.babelrc index c11361214e..eb6c0e73f8 100644 --- a/client/react-native/.babelrc +++ b/client/react-native/.babelrc @@ -1,9 +1,8 @@ { - "presets": ["react-native", "react-app", "stage-0"], - "env": { - "browser": true - }, + "presets": ["module:metro-react-native-babel-preset"], "plugins": [ + "module:@babel/plugin-syntax-export-namespace-from", + "transform-export-extensions", "relay" ] } diff --git a/client/react-native/mobile/.buckconfig b/client/react-native/.buckconfig similarity index 100% rename from client/react-native/mobile/.buckconfig rename to client/react-native/.buckconfig diff --git a/client/react-native/.env.example b/client/react-native/.env.example deleted file mode 100644 index c7d7fb75d0..0000000000 --- a/client/react-native/.env.example +++ /dev/null @@ -1,18 +0,0 @@ -# FASTLANE - -# FASTLANE_USER= -# FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD= - -FASTLANE_SKIP_UPDATE_CHECK=1 -FASTLANE_HIDE_CHANGELOG=1 - -MATCH_USERNAME= -MATCH_GIT_URL= -MATCH_APP_IDENTIFIER=chat.berty.tech -MATCH_PASSWORD= - -PILOT_USERNAME= -PILOT_APPLE_ID= -PILOT_TEAM_ID= -PILOT_IPA=.build/ios/berty.ipa -PILOT_SKIP_WAITING_FOR_BUILD_PROCESSING=true diff --git a/client/react-native/mobile/.flowconfig b/client/react-native/.flowconfig similarity index 96% rename from client/react-native/mobile/.flowconfig rename to client/react-native/.flowconfig index 3c0adb5663..1043c82d70 100644 --- a/client/react-native/mobile/.flowconfig +++ b/client/react-native/.flowconfig @@ -29,6 +29,9 @@ node_modules/react-native/flow-github/ [options] emoji=true +esproposal.optional_chaining=enable +esproposal.nullish_coalescing=enable + module.system=haste module.system.haste.use_name_reducers=true # get basename @@ -64,4 +67,4 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError [version] -^0.75.0 +^0.78.0 diff --git a/client/react-native/mobile/.gitattributes b/client/react-native/.gitattributes similarity index 51% rename from client/react-native/mobile/.gitattributes rename to client/react-native/.gitattributes index d42ff18354..68992b848a 100644 --- a/client/react-native/mobile/.gitattributes +++ b/client/react-native/.gitattributes @@ -1 +1,2 @@ *.pbxproj -text +*.bat eol=crlf diff --git a/client/react-native/.gitignore b/client/react-native/.gitignore index 8ad2d0185d..991c9826c0 100644 --- a/client/react-native/.gitignore +++ b/client/react-native/.gitignore @@ -1,5 +1,8 @@ # See https://help.github.com/ignore-files/ for more about ignoring files. +# Fastlane +.build + # junk files # *~ @@ -14,8 +17,8 @@ gin-bin ## Gomobile # -mobile/ios/core.framework -mobile/android/app/libs/core.aar +ios/core.framework +android/app/libs/core.aar # Xcode # @@ -84,14 +87,14 @@ fastlane/Appfile fastlane/Matchfile # Gomobile -mobile/android/app/libs/*.aar -mobile/android/app/libs/*-sources.jar +android/app/libs/*.aar +android/app/libs/*-sources.jar gomobile/vendor gomobile/bin gomobile/_vendor-* gomobile/tags -mobile/android/libs/ -mobile/ios/libs/ +android/libs/ +ios/libs/ # mobile shim.js diff --git a/client/react-native/Makefile b/client/react-native/Makefile index 3452a94bdc..386d4368df 100644 --- a/client/react-native/Makefile +++ b/client/react-native/Makefile @@ -1,18 +1,15 @@ +# Deps / build related +ROOT := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))) +WEB := $(ROOT)/web +GOMOB := $(ROOT)/gomobile +IOS := $(ROOT)/ios +ANDROID := $(ROOT)/android + +# Fastlane build related IOS_VERSION ?= $(shell git describe --tags --always | cut -d - -f 1,2 | tr - .| tail -c +2) ANDROID_VERSION ?= $(shell git rev-list --all --count) -XCODE_MAJOR := $(shell xcodebuild -version | head -1 | sed 's~^Xcode \(.*\)\..*$$~\1~') - -PWD := $(shell pwd) -ROOT := $(PWD) -DIRS := common mobile web gomobile -DEPS := $(addsuffix /node_modules, $(DIRS) $(ROOT)) -CLEAN := $(addsuffix .clean, $(DIRS) $(ROOT)) -FCLEAN := $(addsuffix .fclean, $(DIRS) $(ROOT)) -RE := $(addsuffix .re, $(DIRS) $(ROOT)) -START := $(addsuffix .start, $(DIRS) $(ROOT)) - -# build related env -NAME ?= berty + +NAME ?= Berty BUILD ?= .build BUILD_IOS ?= $(BUILD)/ios BUILD_ANDROID ?= $(BUILD)/android @@ -20,73 +17,120 @@ BUILD_ANDROID ?= $(BUILD)/android KEYCHAIN_NAME ?= berty_keychain KEYCHAIN_PASSWORD ?= berty_pass +# Dockerised webapp related SCALE ?= 1 PORT ?= 0 SERV ?= -.PHONY: all -all: $(ROOT) $(DEPS) - .PHONY: help help: @echo "React-Native commands:" @$(MAKE) -pRrq -f $(lastword $(MAKEFILE_LIST)) : 2>/dev/null | awk -v RS= -F: '/^# File/,/^# Finished Make data base/ {if ($$1 !~ "^[#.]") {print $$1}}' | sort | egrep -v -e '^[^[:alnum:]]' -e '^$@$$' | grep -v / | sed 's/^/ $(HELP_MSG_PREFIX)make /' + +### Dependencies part ### .PHONY: deps -deps: $(DEPS) +deps: + cd $(ROOT) && yarn + +.PHONY: deps.android +deps.android: deps + $(MAKE) -C $(GOMOB) build.android + cd $(ROOT) && react-native link + +.PHONY: deps.ios +deps.ios: deps + $(MAKE) -C $(GOMOB) build.ios + if [ ! -e $(ROOT)/node_modules/react-native/third-party/glog-0.*/Makefile ]; then \ + cd $(ROOT)/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 + cd $(ROOT) && react-native link + +.PHONY: deps.web +deps.web: deps + cd $(WEB) && yarn +############################## + + +### Build release/debug part ### +.PHONY: debug.android +debug.android: deps.android + cd $(ROOT) && ./node_modules/.bin/concurrently 'react-native run-android --no-packager' 'yarn start' + +.PHONY: release.android +release.android: deps.android + @echo "Not implemented yet" + +.PHONY: debug.ios +debug.ios: deps.ios + cd $(ROOT) && ./node_modules/.bin/concurrently "react-native run-ios --no-packager --configuration=Debug --scheme=debug --device '$(device)'" 'yarn start' + +.PHONY: release.ios +release.ios: deps.ios + cd $(ROOT) && react-native run-ios --no-packager --configuration=Release --scheme=release --device '$(device)' + +.PHONY: debug.web +debug.web: deps.web + @echo "Not implemented yet" +############################## + + +### Clean dependencies part ### +.PHONY: clean +clean.bundler_and_pkgs: + cd $(ROOT) \ + && rm -rf node_modules \ + && yarn cache clean \ + && watchman watch-del-all + rm -rf $$TMPDIR/metro-* + rm -rf $$TMPDIR/react-* + rm -rf $$TMPDIR/haste-* + +.PHONY: clean.android +clean.android: + $(MAKE) -C $(GOMOB) clean.android + cd $(ANDROID) && rm -rf app/build && ./gradlew clean + +.PHONY: clean.ios +clean.ios: + $(MAKE) -C $(GOMOB) clean.ios + cd $(IOS) && rm -rf build && xcodebuild clean + +.PHONY: clean.web +clean.web: + cd $(WEB) \ + && rm -rf node_modules \ + && yarn cache clean \ + && watchman watch-del-all + +.PHONY: fclean.android +fclean.android: clean.android clean.bundler_and_pkgs + +.PHONY: fclean.ios +fclean.ios: clean.ios clean.bundler_and_pkgs + +.PHONY: fclean.web +fclean.web: clean.web clean.bundler_and_pkgs .PHONY: fclean -fclean: $(FCLEAN) - yarn cache clean && watchman watch-del-all - -.PHONY: re -re: $(RE) - -$(DEPS): %/node_modules: %/package.json - cd $(dir $@) && yarn - -.PHONY: $(DIRS) -$(DIRS): %: %/node_modules $(ROOT)/node_modules +fclean: clean.android clean.ios clean.web clean.bundler_and_pkgs -.PHONY: android -android: mobile - make -C gomobile android - cd mobile && yarn android && yarn start +.PHONY: re.android +re.android: fclean.android debug.android +.PHONY: re.ios +re.ios: fclean.ios debug.ios -.PHONY: patch-xcode10 -patch-xcode10: -ifeq ("$(XCODE_MAJOR)", "10") - cd node_modules/react-native \ - && cp scripts/ios-install-third-party.sh . \ - && rm -rf third-party \ - && ./ios-install-third-party.sh \ - && cp scripts/ios-configure-glog.sh third-party/glog-0.3.4 \ - && cd third-party/glog-0.3.4 \ - && ./ios-configure-glog.sh - patch -N ./node_modules/react-native/Libraries/WebSocket/RCTWebSocket.xcodeproj/project.pbxproj ./patch/project.pbxproj.patch || true -else - @echo "patch-xcode10: skipping patch, using xcode $(XCODE_MAJOR)" -endif +.PHONY: re.web +re.web: fclean.web debug.web +############################## -.PHONY: ios -ios: mobile patch-xcode10 - make -C gomobile ios - cd mobile && yarn ios --device '$(device)' && yarn start - -.PHONY: $(FCLEAN) -$(FCLEAN): - rm -rf $(basename $@)/node_modules - -.PHONY: $(RE) -$(RE): %.re: %.fclean %/node_modules - -$(START): %.start: % - cd $< && yarn start - -$(BUILD): %.build: % - cd $< && yarn build +### Dockerized webapp part ### webapp.start: @docker-compose up -d --build --scale core-service=$(SCALE) @@ -141,13 +185,16 @@ webapp.rm: webapp.stop COUNT=$$(echo "$$CONT_ID" | sed '/^\s*$$/d' | wc -w | tr -d ' '); \ echo "Deleting $$COUNT previously generated containers..."; \ if [ $$COUNT -ne 0 ]; then docker rm $$CONT_ID; fi +############################## + +### Fastlane build part ### .PHONY: version version: mkdir -p $(BUILD) - plutil -replace CFBundleShortVersionString -string $(IOS_VERSION) mobile/ios/berty/Info.plist - bundle exec fastlane run increment_version_code version_code:$(ANDROID_VERSION) gradle_file_path:./mobile/android/app/build.gradle + plutil -replace CFBundleShortVersionString -string $(IOS_VERSION) $(IOS)/Berty/Info.plist + bundle exec fastlane run increment_version_code version_code:$(ANDROID_VERSION) gradle_file_path:$(ANDROID)/app/build.gradle echo "ios:$(IOS_VERSION)\nandroid:$(ANDROID_VERSION)\n" > $(BUILD)/version fastlane.match.development: @@ -177,13 +224,14 @@ fastlane.ios.build: GYM_OPTION_PROVISIONING_PROFILE='match AdHoc chat.berty.ios' \ GYM_OUTPUT_NAME=$(NAME) \ GYM_OUTPUT_DIRECTORY=$(BUILD_IOS) \ - GYM_PROJECT=mobile/ios/berty.xcodeproj \ + GYM_PROJECT=ios/Berty.xcodeproj \ GYM_SCHEME=adhoc \ GYM_INCLUDE_SYMBOLS=false \ time bundle exec fastlane ios build --verbose # extract build informations - unzip -p $(BUILD_IOS)/$(NAME).ipa Payload/berty.app/embedded.mobileprovision | security cms -D > $(BUILD_IOS)/$(NAME).embedded.mobileprovision.txt || true + unzip -p $(BUILD_IOS)/$(NAME).ipa Payload/Berty.app/embedded.mobileprovision | security cms -D > $(BUILD_IOS)/$(NAME).embedded.mobileprovision.txt || true fastlane.ios.release: - time bundle exec fastlane run pilot upload --verbose ipa:$(BUILD_IOS)/berty.ipa skip_waiting_for_build_processing:true + time bundle exec fastlane run pilot upload --verbose ipa:$(BUILD_IOS)/Berty.ipa skip_waiting_for_build_processing:true +############################## diff --git a/client/react-native/mobile/android/.project b/client/react-native/android/.project similarity index 82% rename from client/react-native/mobile/android/.project rename to client/react-native/android/.project index a05356262f..3162260232 100644 --- a/client/react-native/mobile/android/.project +++ b/client/react-native/android/.project @@ -1,7 +1,7 @@ - berty - Project berty created by Buildship. + Berty + Project Berty created by Buildship. diff --git a/client/react-native/android/.settings/org.eclipse.buildship.core.prefs b/client/react-native/android/.settings/org.eclipse.buildship.core.prefs new file mode 100644 index 0000000000..7e00116667 --- /dev/null +++ b/client/react-native/android/.settings/org.eclipse.buildship.core.prefs @@ -0,0 +1,2 @@ +#Wed Oct 10 17:02:13 CEST 2018 +connection.project.dir= diff --git a/client/react-native/mobile/android/app/.classpath b/client/react-native/android/app/.classpath similarity index 94% rename from client/react-native/mobile/android/app/.classpath rename to client/react-native/android/app/.classpath index 3589094139..eb19361b57 100644 --- a/client/react-native/mobile/android/app/.classpath +++ b/client/react-native/android/app/.classpath @@ -1,6 +1,6 @@ - + diff --git a/client/react-native/mobile/android/app/.project b/client/react-native/android/app/.project similarity index 100% rename from client/react-native/mobile/android/app/.project rename to client/react-native/android/app/.project diff --git a/client/react-native/android/app/.settings/org.eclipse.buildship.core.prefs b/client/react-native/android/app/.settings/org.eclipse.buildship.core.prefs new file mode 100644 index 0000000000..eddef8b81d --- /dev/null +++ b/client/react-native/android/app/.settings/org.eclipse.buildship.core.prefs @@ -0,0 +1,2 @@ +#Wed Oct 10 17:02:14 CEST 2018 +connection.project.dir=.. diff --git a/client/react-native/mobile/android/app/BUCK b/client/react-native/android/app/BUCK similarity index 95% rename from client/react-native/mobile/android/app/BUCK rename to client/react-native/android/app/BUCK index d1825f1876..d66bc00053 100644 --- a/client/react-native/mobile/android/app/BUCK +++ b/client/react-native/android/app/BUCK @@ -45,12 +45,12 @@ android_library( android_build_config( name = "build_config", - package = "com.@berty/mobile", + package = "com.berty", ) android_resource( name = "res", - package = "com.@berty/mobile", + package = "com.berty", res = "src/main/res", ) diff --git a/client/react-native/mobile/android/app/build.gradle b/client/react-native/android/app/build.gradle similarity index 88% rename from client/react-native/mobile/android/app/build.gradle rename to client/react-native/android/app/build.gradle index 0426378e42..d6efaceaf1 100644 --- a/client/react-native/mobile/android/app/build.gradle +++ b/client/react-native/android/app/build.gradle @@ -1,5 +1,4 @@ apply plugin: "com.android.application" -apply from: "../../node_modules/react-native-vector-icons/fonts.gradle" import com.android.build.OutputFile @@ -74,7 +73,7 @@ import com.android.build.OutputFile */ project.ext.react = [ - entryFile: "${project.projectDir}/../../../common/index.js" + entryFile: "index.js" ] apply from: "../../node_modules/react-native/react.gradle" @@ -96,9 +95,10 @@ def enableProguardInReleaseBuilds = false android { compileSdkVersion rootProject.ext.compileSdkVersion + buildToolsVersion rootProject.ext.buildToolsVersion defaultConfig { - applicationId "com.berty" + applicationId "chat.berty" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 @@ -130,7 +130,7 @@ android { variant.outputs.each { output -> // For each separate APK per architecture, set a unique version code as described here: // http://tools.android.com/tech-docs/new-build-system/user-guide/apk-splits - def versionCodes = ["armeabi-v7a": 1, "x86": 2] + def versionCodes = ["armeabi-v7a":1, "x86":2] def abi = output.getFilter(OutputFile.ABI) if (abi != null) { // null for the universal-debug, universal-release variants output.versionCodeOverride = @@ -141,18 +141,17 @@ android { } dependencies { - api project(':react-native-image-picker') - api project(':react-native-network-info') - api project(':react-native-vector-icons') - api fileTree(dir: "libs", include: ["*.jar"]) - api(name: 'core', ext: 'aar') - api "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}" - api "com.facebook.react:react-native:+" // From node_modules + compile project(':react-native-vector-icons') + compile project(':react-native-network-info') + compile project(':react-native-image-picker') + implementation fileTree(dir: "libs", include: ["*.jar", "core.aar"]) + implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}" + implementation "com.facebook.react:react-native:+" // From node_modules } // Run this once to be able to run the application with BUCK -// puts all api dependencies into folder libs for BUCK to use +// puts all compile dependencies into folder libs for BUCK to use task copyDownloadableDepsToLibs(type: Copy) { - from configurations.api + from configurations.compile into 'libs' } diff --git a/client/react-native/mobile/android/app/proguard-rules.pro b/client/react-native/android/app/proguard-rules.pro similarity index 100% rename from client/react-native/mobile/android/app/proguard-rules.pro rename to client/react-native/android/app/proguard-rules.pro diff --git a/client/react-native/mobile/android/app/src/main/AndroidManifest.xml b/client/react-native/android/app/src/main/AndroidManifest.xml similarity index 100% rename from client/react-native/mobile/android/app/src/main/AndroidManifest.xml rename to client/react-native/android/app/src/main/AndroidManifest.xml diff --git a/client/react-native/android/app/src/main/assets/fonts/AntDesign.ttf b/client/react-native/android/app/src/main/assets/fonts/AntDesign.ttf new file mode 100644 index 0000000000..2abf03542c Binary files /dev/null and b/client/react-native/android/app/src/main/assets/fonts/AntDesign.ttf differ diff --git a/client/react-native/mobile/android/app/src/main/assets/fonts/Entypo.ttf b/client/react-native/android/app/src/main/assets/fonts/Entypo.ttf similarity index 100% rename from client/react-native/mobile/android/app/src/main/assets/fonts/Entypo.ttf rename to client/react-native/android/app/src/main/assets/fonts/Entypo.ttf diff --git a/client/react-native/mobile/android/app/src/main/assets/fonts/EvilIcons.ttf b/client/react-native/android/app/src/main/assets/fonts/EvilIcons.ttf similarity index 100% rename from client/react-native/mobile/android/app/src/main/assets/fonts/EvilIcons.ttf rename to client/react-native/android/app/src/main/assets/fonts/EvilIcons.ttf diff --git a/client/react-native/mobile/android/app/src/main/assets/fonts/Feather.ttf b/client/react-native/android/app/src/main/assets/fonts/Feather.ttf similarity index 100% rename from client/react-native/mobile/android/app/src/main/assets/fonts/Feather.ttf rename to client/react-native/android/app/src/main/assets/fonts/Feather.ttf diff --git a/client/react-native/mobile/android/app/src/main/assets/fonts/FontAwesome.ttf b/client/react-native/android/app/src/main/assets/fonts/FontAwesome.ttf similarity index 100% rename from client/react-native/mobile/android/app/src/main/assets/fonts/FontAwesome.ttf rename to client/react-native/android/app/src/main/assets/fonts/FontAwesome.ttf diff --git a/client/react-native/mobile/android/app/src/main/assets/fonts/FontAwesome5_Brands.ttf b/client/react-native/android/app/src/main/assets/fonts/FontAwesome5_Brands.ttf similarity index 89% rename from client/react-native/mobile/android/app/src/main/assets/fonts/FontAwesome5_Brands.ttf rename to client/react-native/android/app/src/main/assets/fonts/FontAwesome5_Brands.ttf index 2ffa92d4fa..ecbc761ef8 100644 Binary files a/client/react-native/mobile/android/app/src/main/assets/fonts/FontAwesome5_Brands.ttf and b/client/react-native/android/app/src/main/assets/fonts/FontAwesome5_Brands.ttf differ diff --git a/client/react-native/mobile/android/app/src/main/assets/fonts/FontAwesome5_Regular.ttf b/client/react-native/android/app/src/main/assets/fonts/FontAwesome5_Regular.ttf similarity index 92% rename from client/react-native/mobile/android/app/src/main/assets/fonts/FontAwesome5_Regular.ttf rename to client/react-native/android/app/src/main/assets/fonts/FontAwesome5_Regular.ttf index 43406e854c..36a7de36cc 100644 Binary files a/client/react-native/mobile/android/app/src/main/assets/fonts/FontAwesome5_Regular.ttf and b/client/react-native/android/app/src/main/assets/fonts/FontAwesome5_Regular.ttf differ diff --git a/client/react-native/mobile/android/app/src/main/assets/fonts/FontAwesome5_Solid.ttf b/client/react-native/android/app/src/main/assets/fonts/FontAwesome5_Solid.ttf similarity index 73% rename from client/react-native/mobile/android/app/src/main/assets/fonts/FontAwesome5_Solid.ttf rename to client/react-native/android/app/src/main/assets/fonts/FontAwesome5_Solid.ttf index a1da1bbb5c..2a05512698 100644 Binary files a/client/react-native/mobile/android/app/src/main/assets/fonts/FontAwesome5_Solid.ttf and b/client/react-native/android/app/src/main/assets/fonts/FontAwesome5_Solid.ttf differ diff --git a/client/react-native/mobile/android/app/src/main/assets/fonts/Foundation.ttf b/client/react-native/android/app/src/main/assets/fonts/Foundation.ttf similarity index 100% rename from client/react-native/mobile/android/app/src/main/assets/fonts/Foundation.ttf rename to client/react-native/android/app/src/main/assets/fonts/Foundation.ttf diff --git a/client/react-native/mobile/android/app/src/main/assets/fonts/Ionicons.ttf b/client/react-native/android/app/src/main/assets/fonts/Ionicons.ttf similarity index 100% rename from client/react-native/mobile/android/app/src/main/assets/fonts/Ionicons.ttf rename to client/react-native/android/app/src/main/assets/fonts/Ionicons.ttf diff --git a/client/react-native/mobile/android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf b/client/react-native/android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf similarity index 84% rename from client/react-native/mobile/android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf rename to client/react-native/android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf index 7845112675..42a11c8830 100644 Binary files a/client/react-native/mobile/android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf and b/client/react-native/android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf differ diff --git a/client/react-native/mobile/android/app/src/main/assets/fonts/MaterialIcons.ttf b/client/react-native/android/app/src/main/assets/fonts/MaterialIcons.ttf similarity index 100% rename from client/react-native/mobile/android/app/src/main/assets/fonts/MaterialIcons.ttf rename to client/react-native/android/app/src/main/assets/fonts/MaterialIcons.ttf diff --git a/client/react-native/mobile/android/app/src/main/assets/fonts/Octicons.ttf b/client/react-native/android/app/src/main/assets/fonts/Octicons.ttf similarity index 100% rename from client/react-native/mobile/android/app/src/main/assets/fonts/Octicons.ttf rename to client/react-native/android/app/src/main/assets/fonts/Octicons.ttf diff --git a/client/react-native/mobile/android/app/src/main/assets/fonts/SimpleLineIcons.ttf b/client/react-native/android/app/src/main/assets/fonts/SimpleLineIcons.ttf similarity index 100% rename from client/react-native/mobile/android/app/src/main/assets/fonts/SimpleLineIcons.ttf rename to client/react-native/android/app/src/main/assets/fonts/SimpleLineIcons.ttf diff --git a/client/react-native/mobile/android/app/src/main/assets/fonts/Zocial.ttf b/client/react-native/android/app/src/main/assets/fonts/Zocial.ttf similarity index 100% rename from client/react-native/mobile/android/app/src/main/assets/fonts/Zocial.ttf rename to client/react-native/android/app/src/main/assets/fonts/Zocial.ttf diff --git a/client/react-native/mobile/android/app/src/main/java/chat/berty/core/CoreModule.java b/client/react-native/android/app/src/main/java/chat/berty/core/CoreModule.java similarity index 100% rename from client/react-native/mobile/android/app/src/main/java/chat/berty/core/CoreModule.java rename to client/react-native/android/app/src/main/java/chat/berty/core/CoreModule.java diff --git a/client/react-native/mobile/android/app/src/main/java/chat/berty/core/CorePackage.java b/client/react-native/android/app/src/main/java/chat/berty/core/CorePackage.java similarity index 100% rename from client/react-native/mobile/android/app/src/main/java/chat/berty/core/CorePackage.java rename to client/react-native/android/app/src/main/java/chat/berty/core/CorePackage.java diff --git a/client/react-native/mobile/android/app/src/main/java/chat/berty/main/MainActivity.java b/client/react-native/android/app/src/main/java/chat/berty/main/MainActivity.java similarity index 100% rename from client/react-native/mobile/android/app/src/main/java/chat/berty/main/MainActivity.java rename to client/react-native/android/app/src/main/java/chat/berty/main/MainActivity.java diff --git a/client/react-native/mobile/android/app/src/main/java/chat/berty/main/MainApplication.java b/client/react-native/android/app/src/main/java/chat/berty/main/MainApplication.java similarity index 100% rename from client/react-native/mobile/android/app/src/main/java/chat/berty/main/MainApplication.java rename to client/react-native/android/app/src/main/java/chat/berty/main/MainApplication.java diff --git a/client/react-native/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/client/react-native/android/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100755 index 0000000000..8dce9e05b6 Binary files /dev/null and b/client/react-native/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/client/react-native/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/client/react-native/android/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100755 index 0000000000..587f7e7596 Binary files /dev/null and b/client/react-native/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/client/react-native/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/client/react-native/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100755 index 0000000000..60c097b704 Binary files /dev/null and b/client/react-native/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/client/react-native/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/client/react-native/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100755 index 0000000000..7b46afb6f4 Binary files /dev/null and b/client/react-native/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/client/react-native/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/client/react-native/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100755 index 0000000000..2bc99d5d31 Binary files /dev/null and b/client/react-native/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/client/react-native/android/app/src/main/res/values/strings.xml b/client/react-native/android/app/src/main/res/values/strings.xml new file mode 100644 index 0000000000..ff2ecfbd94 --- /dev/null +++ b/client/react-native/android/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + Berty + diff --git a/client/react-native/mobile/android/app/src/main/res/values/styles.xml b/client/react-native/android/app/src/main/res/values/styles.xml similarity index 100% rename from client/react-native/mobile/android/app/src/main/res/values/styles.xml rename to client/react-native/android/app/src/main/res/values/styles.xml diff --git a/client/react-native/mobile/android/build.gradle b/client/react-native/android/build.gradle similarity index 57% rename from client/react-native/mobile/android/build.gradle rename to client/react-native/android/build.gradle index f2fb677c66..85d8f2f81e 100644 --- a/client/react-native/mobile/android/build.gradle +++ b/client/react-native/android/build.gradle @@ -1,15 +1,20 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. + buildscript { + ext { + buildToolsVersion = "27.0.3" + minSdkVersion = 16 + compileSdkVersion = 27 + targetSdkVersion = 26 + supportLibVersion = "27.1.1" + } repositories { - google() jcenter() - maven { - url 'https://maven.google.com/' - name 'Google' - } + google() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.android.tools.build:gradle:3.1.4' + // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } @@ -18,27 +23,17 @@ buildscript { allprojects { repositories { mavenLocal() - google() jcenter() - maven { // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm url "$rootDir/../node_modules/react-native/android" } - maven { - url 'https://maven.google.com/' - name 'Google' - } - flatDir { - dirs 'libs' - } - maven { url 'https://jitpack.io' } + google() } } -ext { - minSdkVersion = 16 - compileSdkVersion = 27 - targetSdkVersion = 27 - supportLibVersion = "27.1.1" + +task wrapper(type: Wrapper) { + gradleVersion = '4.4' + distributionUrl = distributionUrl.replace("bin", "all") } diff --git a/client/react-native/mobile/android/fastlane/Appfile b/client/react-native/android/fastlane/Appfile similarity index 100% rename from client/react-native/mobile/android/fastlane/Appfile rename to client/react-native/android/fastlane/Appfile diff --git a/client/react-native/mobile/android/fastlane/Fastfile b/client/react-native/android/fastlane/Fastfile similarity index 100% rename from client/react-native/mobile/android/fastlane/Fastfile rename to client/react-native/android/fastlane/Fastfile diff --git a/client/react-native/mobile/android/fastlane/README.md b/client/react-native/android/fastlane/README.md similarity index 100% rename from client/react-native/mobile/android/fastlane/README.md rename to client/react-native/android/fastlane/README.md diff --git a/client/react-native/mobile/android/gradle.properties b/client/react-native/android/gradle.properties similarity index 96% rename from client/react-native/mobile/android/gradle.properties rename to client/react-native/android/gradle.properties index f00d01d742..1914150432 100644 --- a/client/react-native/mobile/android/gradle.properties +++ b/client/react-native/android/gradle.properties @@ -17,5 +17,4 @@ # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true -android.useDeprecatedNdk=true org.gradle.configureondemand=true diff --git a/client/react-native/android/gradle/wrapper/gradle-wrapper.jar b/client/react-native/android/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000..01b8bf6b1f Binary files /dev/null and b/client/react-native/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/client/react-native/mobile/android/gradle/wrapper/gradle-wrapper.properties b/client/react-native/android/gradle/wrapper/gradle-wrapper.properties similarity index 87% rename from client/react-native/mobile/android/gradle/wrapper/gradle-wrapper.properties rename to client/react-native/android/gradle/wrapper/gradle-wrapper.properties index da47e7f403..b6517bb1d1 100644 --- a/client/react-native/mobile/android/gradle/wrapper/gradle-wrapper.properties +++ b/client/react-native/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,3 @@ distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip -org.gradle.jvmargs=-Xmx2048m diff --git a/client/react-native/mobile/android/gradlew b/client/react-native/android/gradlew similarity index 82% rename from client/react-native/mobile/android/gradlew rename to client/react-native/android/gradlew index ef845e3a2d..42a3399a90 100755 --- a/client/react-native/mobile/android/gradlew +++ b/client/react-native/android/gradlew @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh ############################################################################## ## @@ -6,20 +6,38 @@ ## ############################################################################## -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" -warn ( ) { +warn () { echo "$*" } -die ( ) { +die () { echo echo "$*" echo @@ -30,6 +48,7 @@ die ( ) { cygwin=false msys=false darwin=false +nonstop=false case "`uname`" in CYGWIN* ) cygwin=true @@ -40,31 +59,11 @@ case "`uname`" in MINGW* ) msys=true ;; + NONSTOP* ) + nonstop=true + ;; esac -# For Cygwin, ensure paths are in UNIX format before anything is touched. -if $cygwin ; then - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >&- -APP_HOME="`pwd -P`" -cd "$SAVED" >&- - CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. @@ -90,7 +89,7 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then MAX_FD_LIMIT=`ulimit -H -n` if [ $? -eq 0 ] ; then if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then @@ -114,6 +113,7 @@ fi if $cygwin ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` @@ -154,11 +154,19 @@ if $cygwin ; then esac fi -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " } -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +exec "$JAVACMD" "$@" diff --git a/client/react-native/mobile/android/gradlew.bat b/client/react-native/android/gradlew.bat similarity index 91% rename from client/react-native/mobile/android/gradlew.bat rename to client/react-native/android/gradlew.bat index 8a0b282aa6..f9553162f1 100644 --- a/client/react-native/mobile/android/gradlew.bat +++ b/client/react-native/android/gradlew.bat @@ -8,14 +8,14 @@ @rem Set local scope for the variables with windows NT shell if "%OS%"=="Windows_NT" setlocal -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - set DIRNAME=%~dp0 if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome @@ -46,10 +46,9 @@ echo location of your Java installation. goto fail :init -@rem Get command-line arguments, handling Windowz variants +@rem Get command-line arguments, handling Windows variants if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args :win9xME_args @rem Slurp the command line arguments. @@ -60,11 +59,6 @@ set _SKIP=2 if "x%~1" == "x" goto execute set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ :execute @rem Setup the command line diff --git a/client/react-native/mobile/android/keystores/BUCK b/client/react-native/android/keystores/BUCK similarity index 100% rename from client/react-native/mobile/android/keystores/BUCK rename to client/react-native/android/keystores/BUCK diff --git a/client/react-native/mobile/android/keystores/debug.keystore.properties b/client/react-native/android/keystores/debug.keystore.properties similarity index 100% rename from client/react-native/mobile/android/keystores/debug.keystore.properties rename to client/react-native/android/keystores/debug.keystore.properties diff --git a/client/react-native/mobile/android/settings.gradle b/client/react-native/android/settings.gradle similarity index 95% rename from client/react-native/mobile/android/settings.gradle rename to client/react-native/android/settings.gradle index 7d3c38a167..f986dfb140 100644 --- a/client/react-native/mobile/android/settings.gradle +++ b/client/react-native/android/settings.gradle @@ -1,5 +1,4 @@ -rootProject.name = 'berty' - +rootProject.name = 'Berty' include ':react-native-vector-icons' project(':react-native-vector-icons').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vector-icons/android') include ':react-native-network-info' diff --git a/client/react-native/app.json b/client/react-native/app.json new file mode 100644 index 0000000000..42b7ccdd3d --- /dev/null +++ b/client/react-native/app.json @@ -0,0 +1,4 @@ +{ + "name": "Berty", + "displayName": "Berty" +} diff --git a/client/react-native/common/package.json b/client/react-native/common/package.json deleted file mode 100644 index 5ae211b61d..0000000000 --- a/client/react-native/common/package.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "@berty/common", - "version": "0.0.1", - "description": "Berty's react native common", - "main": "index.js" -} diff --git a/client/react-native/common/registerServiceWorker.js b/client/react-native/common/registerServiceWorker.js index 4f6fa3e107..eb333e034c 100644 --- a/client/react-native/common/registerServiceWorker.js +++ b/client/react-native/common/registerServiceWorker.js @@ -8,6 +8,10 @@ // To learn more about the benefits of this model, read https://goo.gl/KwvDNy. // This link also includes instructions on opting out of this behavior. +/** +* @jest-environment jsdom +*/ + import fetch from 'whatwg-fetch' const isLocalhost = Boolean( diff --git a/client/react-native/common/yarn.lock b/client/react-native/common/yarn.lock deleted file mode 100644 index fb57ccd13a..0000000000 --- a/client/react-native/common/yarn.lock +++ /dev/null @@ -1,4 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - diff --git a/client/react-native/gomobile/.gitkeep b/client/react-native/gomobile/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/client/react-native/gomobile/Makefile b/client/react-native/gomobile/Makefile index 7db59178a2..f0808a0a09 100644 --- a/client/react-native/gomobile/Makefile +++ b/client/react-native/gomobile/Makefile @@ -1,27 +1,33 @@ -PWD := $(shell pwd) +MAKEFILE_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))) -CORE_PACKAGE := $(PWD)/../../../core -CORE_SOURCES := $(shell find $(CORE_PACKAGE) -type f -name "*.go") \ - $(shell find . -type f -name "*.go") -BUILD_PATCH_PATH := $(PWD)/../../../build/docker/android-ci +CORE_PACKAGE := $(MAKEFILE_DIR)/../../../core +CORE_SOURCES := $(shell find $(CORE_PACKAGE) -type f -name "*.go") \ + $(shell find . -type f -name "*.go") + +BUILD_PATCH_PATH := $(MAKEFILE_DIR)/../../../.circleci/docker GOPATH ?= $(HOME)/go -CGO_CPPFLAGS ?= -I$(PWD)/../../common/openssl/built/include +CGO_CPPFLAGS ?= -I$(MAKEFILE_DIR)/../../common/openssl/built/include + +LIBS_PATH := $(MAKEFILE_DIR)/../../common/openssl/built -LIBS_PATH := $(PWD)/../../common/openssl/built +IOS_BUILD_PATH := $(MAKEFILE_DIR)/../ios +IOS_LDFLAGS := -L$(LIBS_PATH)/ios -IOS_BUILD_PATH := $(PWD)/../mobile/ios -IOS_LDFLAGS := -L$(LIBS_PATH)/ios +ANDROID_NDK_HOME := /usr/local/share/android-ndk/ +ANDROID_ARCHS := aarch64 arm x86_64 x86 +ANDROID_LIBS_PATHS := $(addprefix $(LIBS_PATH)/android/, $(ANDROID_ARCHS)) +ANDROID_LDFLAGS := $(addprefix -L, $(ANDROID_LIBS_PATHS)) +ANDROID_BUILD_PATH := $(MAKEFILE_DIR)/../android/app/libs +ANDROID_BUILD := $(addprefix $(ANDROID_BUILD_PATH)/core., $(addsuffix .aar, $(ANDROID_ARCHS))) -ANDROID_NDK_HOME := /usr/local/share/android-ndk/ -ANDROID_ARCHS := aarch64 arm x86_64 x86 -ANDROID_LIBS_PATHS := $(addprefix $(LIBS_PATH)/android/, $(ANDROID_ARCHS)) -ANDROID_LDFLAGS := $(addprefix -L, $(ANDROID_LIBS_PATHS)) -ANDROID_BUILD_PATH := $(PWD)/../mobile/android/app/libs -ANDROID_BUILD := $(addprefix $(ANDROID_BUILD_PATH)/core., $(addsuffix .aar, $(ANDROID_ARCHS))) +GOTEST_TIMEOUT ?= 30s -GOTEST_TIMEOUT ?= 30s +.PHONY: help +help: + @echo "Gomobile commands:" + @$(MAKE) -pRrq -f $(lastword $(MAKEFILE_LIST)) : 2>/dev/null | awk -v RS= -F: '/^# File/,/^# Finished Make data base/ {if ($$1 !~ "^[#.]") {print $$1}}' | sort | egrep -v -e '^[^[:alnum:]]' -e '^$@$$' | grep -v / | sed 's/^/ $(HELP_MSG_PREFIX)make /' .PHONY: deps-osx deps-osx: @@ -39,8 +45,21 @@ deps: init: deps gomobile init -v -ndk $(ANDROID_NDK_HOME) -.PHONY: ios -ios: $(IOS_BUILD_PATH)/core.framework/Core +.PHONY: test +test: + go test -test.timeout $(GOTEST_TIMEOUT) -v ./... + +.PHONY: build.android +build.android: $(ANDROID_BUILD_PATH)/core.aar + +$(ANDROID_BUILD_PATH)/core.aar: $(CORE_SOURCES) + GO111MODULE=on go mod vendor + mkdir -p $(ANDROID_BUILD_PATH) + CGO_CPPFLAGS="$(CGO_CPPFLAGS)" CGO_LDFLAGS="$(ANDROID_LDFLAGS)" \ + gomobile bind -v -target=android -o $(ANDROID_BUILD_PATH)/core.aar . + +.PHONY: build.ios +build.ios: $(IOS_BUILD_PATH)/core.framework/Core $(IOS_BUILD_PATH)/core.framework/Core: $(CORE_SOURCES) GO111MODULE=on go mod vendor @@ -48,17 +67,25 @@ $(IOS_BUILD_PATH)/core.framework/Core: $(CORE_SOURCES) CGO_CPPFLAGS="$(CGO_CPPFLAGS)" CGO_LDFLAGS="$(IOS_LDFLAGS)" \ gomobile bind -v -target=ios -o $(IOS_BUILD_PATH)/core.framework . -.PHONY: android -android: $(ANDROID_BUILD_PATH)/core.aar +.PHONY: build +build: build.android build.ios -$(ANDROID_BUILD_PATH)/core.aar: $(CORE_SOURCES) - GO111MODULE=on go mod vendor - mkdir -p $(ANDROID_BUILD_PATH) - CGO_CPPFLAGS="$(CGO_CPPFLAGS)" CGO_LDFLAGS="$(ANDROID_LDFLAGS)" \ - gomobile bind -v -target=android -o $(ANDROID_BUILD_PATH)/core.aar . +.PHONY: clean.android +clean.android: + rm -rf $(ANDROID_BUILD_PATH)/core.aar -.PHONY: test -test: - go test -test.timeout $(GOTEST_TIMEOUT) -v ./... +.PHONY: clean.ios +clean.ios: + rm -rf $(IOS_BUILD_PATH)/core.framework + +.PHONY: clean +clean: clean.android clean.ios + +.PHONY: re.android +re.android: clean.android build.android + +.PHONY: re.ios +re.ios: clean.ios build.ios -build: android ios +.PHONY: re +re: clean build diff --git a/client/react-native/gomobile/go.mod b/client/react-native/gomobile/go.mod index c572d8e9f9..8ffec822fd 100644 --- a/client/react-native/gomobile/go.mod +++ b/client/react-native/gomobile/go.mod @@ -2,7 +2,7 @@ module berty.tech/client/react-native/gomobile require ( berty.tech/core v0.0.0 - github.com/99designs/gqlgen v0.4.4 + github.com/99designs/gqlgen v0.6.0 github.com/gorilla/websocket v1.4.0 github.com/grpc-ecosystem/go-grpc-middleware v1.0.0 github.com/ipfs/go-log v1.5.7 diff --git a/client/react-native/gomobile/go.sum b/client/react-native/gomobile/go.sum index 8a6fb4c248..cabd465c35 100644 --- a/client/react-native/gomobile/go.sum +++ b/client/react-native/gomobile/go.sum @@ -1,7 +1,11 @@ cloud.google.com/go v0.26.0 h1:e0WKqKTd5BnrG8aKH3J3h+QvEIQtSUcf2n5UZ5ZgLtQ= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.30.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +github.com/0xAX/notificator v0.0.0-20171022182052-88d57ee9043b/go.mod h1:NtXa9WwQsukMHZpjNakTTz0LArxvGYdPA9CjIcUSZ6s= github.com/99designs/gqlgen v0.4.4 h1:PizqWc/bsp/2msJOCsaxHaSLZj0y6HRnZ2RriKYxH8s= github.com/99designs/gqlgen v0.4.4/go.mod h1:KSQDfLlTTGmzlRgLGm6HeKKKo598l5E2svEM6Nz2Jnw= +github.com/99designs/gqlgen v0.6.0 h1:gg+WRRW2A+XldwDRcwkgBh0wffvyZlcQX8WUu+4rKd0= +github.com/99designs/gqlgen v0.6.0/go.mod h1:KSQDfLlTTGmzlRgLGm6HeKKKo598l5E2svEM6Nz2Jnw= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412 h1:w1UutsfOrms1J05zt7ISrnJIXKzwaspym5BTKGx93EI= github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412/go.mod h1:WPjqKcmVOxf0XSf3YxCJs6N6AOSrOx3obionmG7T0y0= @@ -11,17 +15,24 @@ github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 h1:bvNMNQO63//z+xNg github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= github.com/brianvoe/gofakeit v3.12.1+incompatible h1:m8qs7wYNmQnWAGKVmyRsRH36hyI4teHq2khpAuy1424= github.com/brianvoe/gofakeit v3.12.1+incompatible/go.mod h1:kfwdRA90vvNhPutZWfH7WPaDzUjz+CZFqG+rPkOjGOc= +github.com/brianvoe/gofakeit v3.13.0+incompatible h1:OscAXOIT40Xp4qY/VBxyRVsvp1Jv7i0fyBnXdJmI9cI= +github.com/brianvoe/gofakeit v3.13.0+incompatible/go.mod h1:kfwdRA90vvNhPutZWfH7WPaDzUjz+CZFqG+rPkOjGOc= github.com/btcsuite/btcd v0.0.0-20180924021209-2a560b2036be h1:okpkDD2klX1OdvDlxlUW9bnfODro1x7y7IeGMxs8VvE= github.com/btcsuite/btcd v0.0.0-20180924021209-2a560b2036be/go.mod h1:Dmm/EzmjnCiweXmzRIAiUWCInVmPgjkzgv5k4tVyXiQ= +github.com/btcsuite/btcd v0.0.0-20181013004428-67e573d211ac h1:/zx+Hglw2JN/pwVam1Z8cTCTl4pWyrbvOn2oooqCQSs= +github.com/btcsuite/btcd v0.0.0-20181013004428-67e573d211ac/go.mod h1:Dmm/EzmjnCiweXmzRIAiUWCInVmPgjkzgv5k4tVyXiQ= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd h1:qMd81Ts1T2OTKmB4acZcyKaMtRnY5Y44NuXGX2GFJ1w= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= +github.com/codegangsta/envy v0.0.0-20141216192214-4b78388c8ce4/go.mod h1:X7wHz0C25Lga6CnJ4WAQNbUQ9P/8eWSNv8qIO71YkSM= +github.com/codegangsta/gin v0.0.0-20171026143024-cafe2ce98974/go.mod h1:UBYuwaH3dMw91EZ7tGVaFF6GDj5j46S7zqB9lZPIe58= github.com/coreos/go-semver v0.2.0 h1:3Jm3tLmsgAYcjC+4Up7hJrFBPr+n7rAqYeSw/SZazuY= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/denisenkom/go-mssqldb v0.0.0-20180901172138-1eb28afdf9b6 h1:BZGp1dbKFjqlGmxEpwkDpCWNxVwEYnUPoncIzLiHlPo= github.com/denisenkom/go-mssqldb v0.0.0-20180901172138-1eb28afdf9b6/go.mod h1:xN/JuLBIz4bjkxNmByTiV1IbhfnYb6oo99phBn4Eqhc= +github.com/denisenkom/go-mssqldb v0.0.0-20181014144952-4e0d7dc8888f/go.mod h1:xN/JuLBIz4bjkxNmByTiV1IbhfnYb6oo99phBn4Eqhc= github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 h1:Yzb9+7DPaBjB8zlTR87/ElzFsnQfuHnVUVqpZZIcV5Y= github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0= github.com/fd/go-nat v1.0.0 h1:DPyQ97sxA9ThrWYRPcWUz/z9TnpTIGRYODIQc/dy64M= @@ -37,6 +48,7 @@ github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7a github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E= +github.com/golang/lint v0.0.0-20181011164241-5906bd5c48cd/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -63,11 +75,18 @@ github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/huin/goupnp v0.0.0-20180415215157-1395d1447324 h1:PV190X5/DzQ/tbFFG5YpT5mH6q+cHlfgqI5JuRnH9oE= github.com/huin/goupnp v0.0.0-20180415215157-1395d1447324/go.mod h1:MZ2ZmwcBpvOoJ22IJsc7va19ZwoheaBk43rKg12SKag= +github.com/huin/goupnp v1.0.0 h1:wg75sLpL6DZqwHQN6E1Cfk6mtfzS45z8OV+ic+DtHRo= +github.com/huin/goupnp v1.0.0/go.mod h1:n9v9KO1tAxYH82qOn+UTIFQDmx5n1Zxd/ClZDMX7Bnc= +github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/ipfs/go-cid v0.7.21 h1:rseIraQ1ofdT+zJl1/HgU+5rkD83KA7FaqaHY/Xnmcc= github.com/ipfs/go-cid v0.7.21/go.mod h1:DEZAg7ik3SR8PY77P+hNaWtHtBirqeEgHbfmePL8WJA= +github.com/ipfs/go-cid v0.9.0 h1:EdO7meRzk9MpAo8DbOmPDU3Yh2BQ4ABc0xN2wgEtREA= +github.com/ipfs/go-cid v0.9.0/go.mod h1:DEZAg7ik3SR8PY77P+hNaWtHtBirqeEgHbfmePL8WJA= github.com/ipfs/go-datastore v2.4.1+incompatible h1:gLbbrni0nvrTVBwneCo6UN3C3I2GZKDjEdZStlKG/XA= github.com/ipfs/go-datastore v2.4.1+incompatible/go.mod h1:bYmHO9fuKO1Ca7dpdDBWQl0mndy5b0HFqSJjGlNYtzs= +github.com/ipfs/go-datastore v3.2.0+incompatible h1:d9fANkqO9u1kgx6FSlZb8eZPDzD2uthVikkJAI7CUII= +github.com/ipfs/go-datastore v3.2.0+incompatible/go.mod h1:bYmHO9fuKO1Ca7dpdDBWQl0mndy5b0HFqSJjGlNYtzs= github.com/ipfs/go-detect-race v1.0.1 h1:cWfwbM/um9XsEc2qp8cBGqcXIUg9J8NzmjgJr55AAso= github.com/ipfs/go-detect-race v1.0.1/go.mod h1:8BNT7shDZPo99Q74BpGMK+4D8Mn4j46UU0LZ723meps= github.com/ipfs/go-ipfs-addr v0.1.24 h1:jWFyfBwSJ+64uPxDOb08SP2Mi4bv72oPn0hg+UnNEio= @@ -105,6 +124,7 @@ github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVY github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/konsorten/go-windows-terminal-sequences v0.0.0-20180402223658-b729f2633dfe h1:CHRGQ8V7OlCYtwaKPJi3iA7J+YdNKdo8j7nG5IgDhjs= github.com/konsorten/go-windows-terminal-sequences v0.0.0-20180402223658-b729f2633dfe/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/libp2p/go-addr-util v2.0.6+incompatible h1:Wamvv85z8aFXCRRW4F7q5J/6k+yvnDnqu3VY8LkCX7c= @@ -121,10 +141,14 @@ github.com/libp2p/go-flow-metrics v0.2.0 h1:GAJSg/g+xLuc7vz0RN96pRA9q/n5b5+Hs6Sn github.com/libp2p/go-flow-metrics v0.2.0/go.mod h1:Iv1GH0sG8DtYN3SVJ2eG221wMiNpZxBdp967ls1g+k8= github.com/libp2p/go-libp2p v6.0.9+incompatible h1:lesosUJ4uJsd9VFmDy6OPHj4nAIn0ncr4aYIdNVtYsM= github.com/libp2p/go-libp2p v6.0.9+incompatible/go.mod h1:CyUlFa6Mw04PkmMg8gBIlHUl8j3TrEiA6oFiF4SgD8w= +github.com/libp2p/go-libp2p v6.0.19+incompatible h1:6aMqs0wH9XNJti070uBbCYAZYm8DqISg+R5vq9hsCcM= +github.com/libp2p/go-libp2p v6.0.19+incompatible/go.mod h1:CyUlFa6Mw04PkmMg8gBIlHUl8j3TrEiA6oFiF4SgD8w= github.com/libp2p/go-libp2p-blankhost v0.3.13 h1:dICAE2QvFDSp4ABVd2g1IrPqefQGGcPxx3QbS4z8Smw= github.com/libp2p/go-libp2p-blankhost v0.3.13/go.mod h1:v1Lnlzn2DFfVeAk2O19BnVm/OaoRlFZwSyq015ZT11I= github.com/libp2p/go-libp2p-circuit v2.2.7+incompatible h1:ln+4XuIouqbVnKbqIdKnMrSkU7FeVSZSepDGQUYMNkY= github.com/libp2p/go-libp2p-circuit v2.2.7+incompatible/go.mod h1:DH3RV0Tb4cHZAdSsdNOitADXTqRiFZxJmSk7mMcCFN4= +github.com/libp2p/go-libp2p-circuit v2.2.8+incompatible h1:H+RdUkSwIBuu4VLGApOBfejGEfmIIblsajR8Wnecb8Y= +github.com/libp2p/go-libp2p-circuit v2.2.8+incompatible/go.mod h1:DH3RV0Tb4cHZAdSsdNOitADXTqRiFZxJmSk7mMcCFN4= github.com/libp2p/go-libp2p-crypto v2.0.1+incompatible h1:JAnZYupeAsZI5UqX50N9MWAVNO5HIfkow249YcmuvVs= github.com/libp2p/go-libp2p-crypto v2.0.1+incompatible/go.mod h1:WHpT3tvhh7GM2INNJhQBuI6J+5z/o3QI0lTF5UVjppk= github.com/libp2p/go-libp2p-host v3.0.13+incompatible h1:wWWH5jtgyR6vBABU7OMkL9F3eioqiUCyfgqa5KZl/V8= @@ -135,6 +159,8 @@ github.com/libp2p/go-libp2p-interface-pnet v3.0.0+incompatible h1:MNYpwR4opxOJGk github.com/libp2p/go-libp2p-interface-pnet v3.0.0+incompatible/go.mod h1:el9jHpQAXK5dnTpKA4yfCNBZXvrzdOU75zz+C6ryp3k= github.com/libp2p/go-libp2p-kad-dht v4.3.1+incompatible h1:iKhs9i4b4d5lgHWpvL3Ct8oue4GufrsH8shZs946ylQ= github.com/libp2p/go-libp2p-kad-dht v4.3.1+incompatible/go.mod h1:o7SLAgKvO96vfE0SrzjJfAdCbJjKRfRnbtyUIQg+rqg= +github.com/libp2p/go-libp2p-kad-dht v4.4.8+incompatible h1:ki4NmxpmtBh3Xrme7FE2lTPYAos0CW85zYYCSxIZStI= +github.com/libp2p/go-libp2p-kad-dht v4.4.8+incompatible/go.mod h1:o7SLAgKvO96vfE0SrzjJfAdCbJjKRfRnbtyUIQg+rqg= github.com/libp2p/go-libp2p-kbucket v2.2.11+incompatible h1:G2tHiXSVhQ9n404QR/L2qoikt+WVYzfkukHqQKXd13c= github.com/libp2p/go-libp2p-kbucket v2.2.11+incompatible/go.mod h1:MTtm31eal94QTxVOWYTDZ6G1YOJRN2G3ESQHbaPytLk= github.com/libp2p/go-libp2p-loggables v1.1.22 h1:n25P9uYpSCmZUE5brUZyjoyB9QjyFb4M60A/PM5wr3k= @@ -145,22 +171,30 @@ github.com/libp2p/go-libp2p-nat v0.8.7 h1:qSN1UQyx2RpOgnwU77+VwlSofbeDnAPdguTW1r github.com/libp2p/go-libp2p-nat v0.8.7/go.mod h1:cA6+rN+EcOAzmSL3vQ53VxX/FfOL1WGeJUvZgqjm2eQ= github.com/libp2p/go-libp2p-net v3.0.6+incompatible h1:A30mjsE544P7vY/fFKao/KGV3Ipqv4M78g2L0yGP+UY= github.com/libp2p/go-libp2p-net v3.0.6+incompatible/go.mod h1:8W6Wx3AZbTRTe8zSMLoAmT3mGyau+w6kGIRk+Z+MZ7Q= +github.com/libp2p/go-libp2p-net v3.0.13+incompatible h1:ZucdlyY1T7Sz7zDh4uP3aU+FHfYD8edcu5Gr+9ALarY= +github.com/libp2p/go-libp2p-net v3.0.13+incompatible/go.mod h1:8W6Wx3AZbTRTe8zSMLoAmT3mGyau+w6kGIRk+Z+MZ7Q= github.com/libp2p/go-libp2p-netutil v0.4.11 h1:eLPFmbMevDPTVee0MPd29Syc3sncvDjDun7vBH0gspQ= github.com/libp2p/go-libp2p-netutil v0.4.11/go.mod h1:lpxjq1x/eUtPYAZAtnC7dKWjQeTuYIYz2ZIPNDDBj3g= github.com/libp2p/go-libp2p-peer v2.3.8+incompatible h1:ZMYXJdcX/38UBDjrl5BEYRGRgDkc+r+oMSfysyPM/MQ= github.com/libp2p/go-libp2p-peer v2.3.8+incompatible/go.mod h1:fS2eFKRO1IomwBAf+SuE8P1XOT/AAiqSgVPNIFA7Jc0= github.com/libp2p/go-libp2p-peerstore v1.4.23 h1:CuajEFwUrSOT8YMAGJy++4+bNgjtEPYfyF99DrHi9P0= github.com/libp2p/go-libp2p-peerstore v1.4.23/go.mod h1:lLfgn0N3z2t+ER57a88K7NTZjMO27ez5TyWSURd428E= +github.com/libp2p/go-libp2p-peerstore v2.0.4+incompatible h1:4dOjYQ/y38mBw9m9/pcAGSv+5PxK4dS37cEOSsaF7zo= +github.com/libp2p/go-libp2p-peerstore v2.0.4+incompatible/go.mod h1:lLfgn0N3z2t+ER57a88K7NTZjMO27ez5TyWSURd428E= github.com/libp2p/go-libp2p-protocol v1.0.0 h1:6AnF76m2VjjiaDisOahQnWSnX2WWaISOXC7q9/YJIrM= github.com/libp2p/go-libp2p-protocol v1.0.0/go.mod h1:Af9n4PiruirSDjHycM1QuiMi/1VZNHYcK8cLgFJLZ4s= github.com/libp2p/go-libp2p-record v4.1.5+incompatible h1:x4WDrluwOZROh2+GLKes4RrrjY5MI5q30M2CosP5BxQ= github.com/libp2p/go-libp2p-record v4.1.5+incompatible/go.mod h1:fsxr7H89UzzL4pG23Aq2n/5aNAXxdGEbyBVepo8oXy8= +github.com/libp2p/go-libp2p-record v4.1.7+incompatible h1:SDxar7iuh4z03b85lr8tVMSKNWWK73RLkQKyPwcxIeo= +github.com/libp2p/go-libp2p-record v4.1.7+incompatible/go.mod h1:fsxr7H89UzzL4pG23Aq2n/5aNAXxdGEbyBVepo8oXy8= github.com/libp2p/go-libp2p-routing v2.6.5+incompatible h1:wYohT0oyssCQcGjNHFuZhRZMbMAVt5KtsoaHIvgbo0U= github.com/libp2p/go-libp2p-routing v2.6.5+incompatible/go.mod h1:Alff8O712wWiftX462zvknNmi5RmXtLq/gATcxJ/Hq8= github.com/libp2p/go-libp2p-secio v2.0.15+incompatible h1:WqyV9tDkHUaWt0P1UErXMw8aLyjDgPsnXch7BeIIwfI= github.com/libp2p/go-libp2p-secio v2.0.15+incompatible/go.mod h1:U7wBlYK2sZbUiTaGe6xJd/fyNq40gwn+jBk/iEUbUrA= github.com/libp2p/go-libp2p-swarm v3.0.7+incompatible h1:dKJJfS5qi1Dxg+KQRHUG1l13O60eA4kjIs801Cxy2P0= github.com/libp2p/go-libp2p-swarm v3.0.7+incompatible/go.mod h1:NHa7cA4/y8OKFw3BHQjLL9pwPDFXkgECO/k+2gqSFuk= +github.com/libp2p/go-libp2p-swarm v3.0.19+incompatible h1:GbyyHSORop2m9AGGQsdAVtKFyAplH2cjxFToFpoFDhM= +github.com/libp2p/go-libp2p-swarm v3.0.19+incompatible/go.mod h1:NHa7cA4/y8OKFw3BHQjLL9pwPDFXkgECO/k+2gqSFuk= github.com/libp2p/go-libp2p-transport v3.0.13+incompatible h1:mSMrXQklxnAu4qOJQtYB4AUAujPgpmvDkISp+13s2SY= github.com/libp2p/go-libp2p-transport v3.0.13+incompatible/go.mod h1:lcwgOszllbhvQXul37Kv5YbSYXPoUhRB2Z+Nr3jaBmo= github.com/libp2p/go-libp2p-transport-upgrader v0.1.14 h1:2VzOHRAuaT/rOBmggl0XmV0w17m0Vvt+4NMf/bvuQOU= @@ -190,6 +224,7 @@ github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRU github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-isatty v0.0.4 h1:bnP0vzxcAdeI1zdubAl5PjU6zsERjGZb7raWodagDYs= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-shellwords v1.0.3/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o= github.com/mattn/go-sqlite3 v1.9.0 h1:pDRiWfl+++eC2FEFRy6jXmQlvp4Yh3z1MJKg4UeYM/4= github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/miekg/dns v1.0.13 h1:Y72t3Ody/fSEkLQOC49kG0ALF7b8ax2TouzPFgIT40E= @@ -199,6 +234,7 @@ github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1/go.mod h1:pD8Rv github.com/minio/sha256-simd v0.0.0-20181005183134-51976451ce19 h1:d9VfRe71OW+ZtutCBgQ54kXBwFy5Tz5hR0OBIE6qlFo= github.com/minio/sha256-simd v0.0.0-20181005183134-51976451ce19/go.mod h1:2FMWW+8GMoPweT6+pI63m9YE3Lmw4J71hV56Chs1E/U= github.com/mitchellh/mapstructure v1.0.0/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mr-tron/base58 v1.0.0 h1:hyk/3LyneixLdKcOQ5aUUEGUK8vDunbHe/50G3Y8A9c= github.com/mr-tron/base58 v1.0.0/go.mod h1:xcD2VGqlgYjBdcBLw+TuYLr8afG+Hj8g2eTVqeSzSU8= github.com/multiformats/go-multiaddr v1.3.0 h1:qv23SBIX9ayNNoGuPFp26xW9cFl3gR4iRXEGFt86aRc= @@ -270,6 +306,8 @@ github.com/whyrusleeping/go-smux-multistream v2.0.2+incompatible h1:BdYHctE9HJZL github.com/whyrusleeping/go-smux-multistream v2.0.2+incompatible/go.mod h1:dRWHHvc4HDQSHh9gbKEBbUZ+f2Q8iZTPG3UOGYODxSQ= github.com/whyrusleeping/go-smux-yamux v2.0.5+incompatible h1:EXRy4Oj7lRNVGG4vI/uP3+VIniRQhgD2J5RoUP60JDM= github.com/whyrusleeping/go-smux-yamux v2.0.5+incompatible/go.mod h1:6qHUzBXUbB9MXmw3AUdB52L8sEb/hScCqOdW2kj/wuI= +github.com/whyrusleeping/go-smux-yamux v2.0.6+incompatible h1:bjtkc8H2gBsgF//9/SOkLGX0Y59xORXGez268K6S9H8= +github.com/whyrusleeping/go-smux-yamux v2.0.6+incompatible/go.mod h1:6qHUzBXUbB9MXmw3AUdB52L8sEb/hScCqOdW2kj/wuI= github.com/whyrusleeping/mafmt v0.0.0-20180627004827-1dc32401ee9f h1:K+jRchI301pbgC5O7JaM/ykXqQUhEukwzTwfujBVQbI= github.com/whyrusleeping/mafmt v0.0.0-20180627004827-1dc32401ee9f/go.mod h1:faQJFPbLSxzD9xpA02ttW/tS9vZykNvXwGvqIpk20FA= github.com/whyrusleeping/mdns v0.0.0-20180901202407-ef14215e6b30 h1:nMCC9Pwz1pxfC1Y6mYncdk+kq8d5aLx0Q+/gyZGE44M= @@ -289,15 +327,22 @@ go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941 h1:qBTHLajHecfu+xzRI9PqVDcqx7SdHj9d4B+EzSn3tAc= golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20181015023909-0c41d7ab0a0e h1:IzypfodbhbnViNUO/MEh0FzCUooG97cIGfdggUrUSyU= +golang.org/x/crypto v0.0.0-20181015023909-0c41d7ab0a0e/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20181011164241-5906bd5c48cd/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/mobile v0.0.0-20181010163405-92f3b9caf7ba h1:WoaHlcpvJeZkxHa+yq/jl4NazzTM0lWKCRpRGjotZto= golang.org/x/mobile v0.0.0-20181010163405-92f3b9caf7ba/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/net v0.0.0-20180524181706-dfa909b99c79/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181005035420-146acd28ed58 h1:otZG8yDCO4LVps5+9bxOeNiCvgmOyt96J3roHTYs7oE= golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1 h1:Y/KGZSOdz/2r0WJ9Mkmz6NJBusp0kiNx1Cn82lzJQ6w= +golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20181003184128-c57b0facaced/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f h1:wMNYb4v58l5UBM7MYRLPG6ZhfOqbKu7X5eyFl8ZhKvA= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -305,23 +350,32 @@ golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20180906133057-8cf3aee42992/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e h1:o3PsSEY8E4eXWkXrIP9YJALUkVZqzHJT5DOasTyn8Vs= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181011152604-fa43e7bc11ba h1:nZJIJPGow0Kf9bU9QTc1U6OXbs/7Hu4e+cNv+hxH+Zc= +golang.org/x/sys v0.0.0-20181011152604-fa43e7bc11ba/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20181013182035-5e66757b835f/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= google.golang.org/appengine v1.1.0 h1:igQkv0AAhEIvTEpD5LIpAfav2eeVO9HBTjvKHVJPRSs= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 h1:Nw54tB0rB7hY/N0NQvRW8DG4Yk3Q6T9cu9RcFQDu1tc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20181004005441-af9cb2a35e7f h1:FU37niK8AQ59mHcskRyQL7H0ErSeNh650vdcj8HqdSI= +google.golang.org/genproto v0.0.0-20181004005441-af9cb2a35e7f/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/grpc v1.15.0 h1:Az/KuahOM4NAidTEuJCv/RonAA7rYsTPkqXVjr+8OOw= google.golang.org/grpc v1.15.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/stretchr/testify.v1 v1.2.2 h1:yhQC6Uy5CqibAIlk1wlusa/MJ3iAN49/BsR/dCCKz3M= gopkg.in/stretchr/testify.v1 v1.2.2/go.mod h1:QI5V/q6UbPmuhtm10CaFZxED9NreB8PnFYN9JcR6TxU= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/urfave/cli.v1 v1.20.0/go.mod h1:vuBzUtMdQeixQj8LVd+/98pzhxNGQoyuPBlsXHOQNO0= gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20180920025451-e3ad64cb4ed3/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/client/react-native/gomobile/package.json b/client/react-native/gomobile/package.json deleted file mode 100644 index 7bfadad34c..0000000000 --- a/client/react-native/gomobile/package.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "@berty/gomobile", - "version": "0.0.1", - "description": "Berty's react native gomobile", - "scripts": { - "build": "make build", - "android:build": "make android.build", - "ios:build": "make ios.build", - "start": "true" - } -} diff --git a/client/react-native/gomobile/yarn.lock b/client/react-native/gomobile/yarn.lock deleted file mode 100644 index fb57ccd13a..0000000000 --- a/client/react-native/gomobile/yarn.lock +++ /dev/null @@ -1,4 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - diff --git a/client/react-native/index.js b/client/react-native/index.js new file mode 100644 index 0000000000..42c63c6898 --- /dev/null +++ b/client/react-native/index.js @@ -0,0 +1 @@ +import './common' diff --git a/client/react-native/mobile/ios/berty-tvOS/Info.plist b/client/react-native/ios/Berty-tvOS/Info.plist similarity index 100% rename from client/react-native/mobile/ios/berty-tvOS/Info.plist rename to client/react-native/ios/Berty-tvOS/Info.plist diff --git a/client/react-native/mobile/ios/berty-tvOSTests/Info.plist b/client/react-native/ios/Berty-tvOSTests/Info.plist similarity index 100% rename from client/react-native/mobile/ios/berty-tvOSTests/Info.plist rename to client/react-native/ios/Berty-tvOSTests/Info.plist diff --git a/client/react-native/mobile/ios/berty.xcodeproj/project.pbxproj b/client/react-native/ios/Berty.xcodeproj/project.pbxproj similarity index 81% rename from client/react-native/mobile/ios/berty.xcodeproj/project.pbxproj rename to client/react-native/ios/Berty.xcodeproj/project.pbxproj index 3c65aa0381..6e99d85fe2 100644 --- a/client/react-native/mobile/ios/berty.xcodeproj/project.pbxproj +++ b/client/react-native/ios/Berty.xcodeproj/project.pbxproj @@ -5,14 +5,13 @@ }; objectVersion = 46; objects = { - /* Begin PBXBuildFile section */ 00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; }; 00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */; }; 00C302E81ABCBA2D00DB3ED1 /* libRCTImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302C01ABCB91800DB3ED1 /* libRCTImage.a */; }; 00C302E91ABCBA2D00DB3ED1 /* libRCTNetwork.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302DC1ABCB9D200DB3ED1 /* libRCTNetwork.a */; }; 00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302E41ABCB9EE00DB3ED1 /* libRCTVibration.a */; }; - 0422FEFDDC544525976ABFED /* FontAwesome5_Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 2B5D27E5252244899403D47C /* FontAwesome5_Regular.ttf */; }; + 0E1990BBF6984EC6AA42E2E2 /* Octicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 21CCBE643C8E4CB7906A9EB3 /* Octicons.ttf */; }; 133E29F31AD74F7200F7D852 /* libRCTLinking.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 78C398B91ACF4ADC00677621 /* libRCTLinking.a */; }; 139105C61AF99C1200B5F7CC /* libRCTSettings.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139105C11AF99BAD00B5F7CC /* libRCTSettings.a */; }; 139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139FDEF41B06529B00C62182 /* libRCTWebSocket.a */; }; @@ -22,10 +21,9 @@ 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; 140ED2AC1D01E1AD002B40FF /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; }; 146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; }; - 178D61F1DE4F4D289FEC0B07 /* FontAwesome.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 165DE059991944759015999E /* FontAwesome.ttf */; }; - 1A7C2FDDDF924BD3857CD66F /* Feather.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 4B708943F7BA4873A25C673D /* Feather.ttf */; }; - 1C709F7764B9493EAE6C48EA /* Foundation.ttf in Resources */ = {isa = PBXBuildFile; fileRef = CE4B5BA10EE44951967C4DA8 /* Foundation.ttf */; }; - 2795D4E7135D4BF2BBDBE975 /* MaterialIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 13132FE8F7A04E12A5BA1E0B /* MaterialIcons.ttf */; }; + 2292CA4AD69F48168B992482 /* FontAwesome5_Brands.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 08C6539D305C462FAA6F5F85 /* FontAwesome5_Brands.ttf */; }; + 247844E0D2924C4A8483E1F1 /* FontAwesome.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 637D29C94C784190B7DFB7A8 /* FontAwesome.ttf */; }; + 25A8BAB5E2674DC1AFD11FFB /* AntDesign.ttf in Resources */ = {isa = PBXBuildFile; fileRef = FA49C5BF6A3A4426A9FE0AA2 /* AntDesign.ttf */; }; 2D02E4BC1E0B4A80006451C7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; }; 2D02E4BD1E0B4A84006451C7 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 2D02E4BF1E0B4AB3006451C7 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; @@ -38,27 +36,29 @@ 2D02E4C81E0B4AEC006451C7 /* libRCTWebSocket-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD3E991DF850E9000B6D8A /* libRCTWebSocket-tvOS.a */; }; 2D16E6881FA4F8E400B85C8A /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D16E6891FA4F8E400B85C8A /* libReact.a */; }; 2DF0FFEE2056DD460020B375 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD3EA31DF850E9000B6D8A /* libReact.a */; }; - 3CF43BBF511D49BA85A5596B /* libRNImagePicker.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1723FA72EE2642CC8B2BB388 /* libRNImagePicker.a */; }; + 3FD46C36ED444780B7A88579 /* libRNVectorIcons-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 404393F653304CE5B3D2FECF /* libRNVectorIcons-tvOS.a */; }; + 4345EBFF9B7A402B9CC2405B /* FontAwesome5_Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 229720DFD15E4E569BD1D6D2 /* FontAwesome5_Regular.ttf */; }; + 48FBC710B1FF4A4890B3C836 /* EvilIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 4852AC444E8740FEAA4DFAE9 /* EvilIcons.ttf */; }; + 5097099ECB874846A7B9FA6A /* Entypo.ttf in Resources */ = {isa = PBXBuildFile; fileRef = C98BB2E01D1E436A800597C6 /* Entypo.ttf */; }; + 54124C83C6A84A21A36FE047 /* MaterialCommunityIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E1C9A4F1DC6B4E75A55ACAF7 /* MaterialCommunityIcons.ttf */; }; 5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; }; - 6E9F74FE768A42B09E52A27E /* Octicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 1791E0D1F9B346C8A68607FA /* Octicons.ttf */; }; + 808BCE1F0B3E4563B513597D /* Ionicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 18B2261F7F324A489858D48F /* Ionicons.ttf */; }; 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; }; - 8BE05731D4114D808A909334 /* Zocial.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 3CFF0EED95594F98B7AA6A50 /* Zocial.ttf */; }; - 8E4104F64A4D4265AEEC570E /* libRNVectorIcons.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F667511A0660437B8CFB10EA /* libRNVectorIcons.a */; }; - 9178C24DF2D941DABC754314 /* FontAwesome5_Brands.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 46FAF9546D834A90A9D9AD9C /* FontAwesome5_Brands.ttf */; }; - A2B0F9E2DA59437BB76090B3 /* MaterialCommunityIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BD9D68487EDB415DB1F2605B /* MaterialCommunityIcons.ttf */; }; - AB44A868A1B240938308B0A3 /* Entypo.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 47586ADB6E2F409CB1A4654A /* Entypo.ttf */; }; + 895E8DFE9E05494099380954 /* libRNNetworkInfo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5EE7976B0AA348DBB9137627 /* libRNNetworkInfo.a */; }; + 8D1BA426216CF8EA00FEF0AE /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8D1BA425216CF8EA00FEF0AE /* libcrypto.a */; }; + 8D1BA428216CF8F700FEF0AE /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8D1BA427216CF8F700FEF0AE /* libssl.a */; }; ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */; }; - CB04920C0A13423280692377 /* SimpleLineIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 12B6AC934DDA4879A4331729 /* SimpleLineIcons.ttf */; }; - D1F574B813194C638DBB8677 /* EvilIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 1B56A66221FD44708D3DF553 /* EvilIcons.ttf */; }; - D2C37F48A843479C88E01010 /* Ionicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = DD138C911CB146FD8E521DC7 /* Ionicons.ttf */; }; - F18833A248144C8FBB4B7EA0 /* FontAwesome5_Solid.ttf in Resources */ = {isa = PBXBuildFile; fileRef = F4414BBA1619425594FBE61D /* FontAwesome5_Solid.ttf */; }; - F81633C3215E66D000425F92 /* libRNImagePicker.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F81633C1215E66A300425F92 /* libRNImagePicker.a */; }; + B40E0A9F7F7B4896A7D74589 /* libRNImagePicker.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 07047A03625844F59A6C0185 /* libRNImagePicker.a */; }; + C1553330747D43CDA733DAF9 /* libRNVectorIcons.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1C535EC78581401BA4695219 /* libRNVectorIcons.a */; }; + CF5A6F4CF389477EA33C6806 /* MaterialIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 4FF677D5EFF1404DB500EEBC /* MaterialIcons.ttf */; }; + CF864C8B0C0D4F43BB12B024 /* SimpleLineIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = D2D26EFC3B0F4124BD3EB762 /* SimpleLineIcons.ttf */; }; + D8F41B65D4574B55B47EF756 /* Foundation.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 17D9618F77704A108128C1D4 /* Foundation.ttf */; }; + DBCA0527B5E5452CBB25A469 /* FontAwesome5_Solid.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 81A473A5CA794BE987DF240A /* FontAwesome5_Solid.ttf */; }; + E06D3F08438E443B9720B383 /* Zocial.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 189BB2B54F564464817850BE /* Zocial.ttf */; }; + F625BCB39E3C45ADA463C308 /* Feather.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6BCA3B477305485C91CB74DA /* Feather.ttf */; }; F8799D7A2136F44B003B9FD7 /* CoreModule.m in Sources */ = {isa = PBXBuildFile; fileRef = F8799D752136F3C5003B9FD7 /* CoreModule.m */; }; F8799D7B2136F44E003B9FD7 /* CoreModule.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8799D782136F3EA003B9FD7 /* CoreModule.swift */; }; - F8799E3121395847003B9FD7 /* libRNNetworkInfo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F8799E2F21395818003B9FD7 /* libRNNetworkInfo.a */; }; F8EF7F482136A10600FDCCB5 /* core.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F8EF7F472136A10500FDCCB5 /* core.framework */; }; - F8EF7F7E2136A27E00FDCCB5 /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F8EF7F7D2136A27E00FDCCB5 /* libssl.a */; }; - F8EF7F802136A5AA00FDCCB5 /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F8EF7F7F2136A5AA00FDCCB5 /* libcrypto.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -102,7 +102,7 @@ containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */; proxyType = 1; remoteGlobalIDString = 13B07F861A680F5B00A75B9A; - remoteInfo = berty; + remoteInfo = Berty; }; 139105C01AF99BAD00B5F7CC /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -130,7 +130,7 @@ containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */; proxyType = 1; remoteGlobalIDString = 2D02E47A1E0B4A5D006451C7; - remoteInfo = "berty-tvOS"; + remoteInfo = "Berty-tvOS"; }; 2D16E6711FA4F8DC00B85C8A /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -328,40 +328,40 @@ remoteGlobalIDString = 58B5119B1A9E6C1200147676; remoteInfo = RCTText; }; - 8D63B06A2166335D00442190 /* PBXContainerItemProxy */ = { + 8D5E0FD8216E156A0085BF34 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 85FA2536A2C744CF86F40F35 /* RNImagePicker.xcodeproj */; + containerPortal = 315E18D636B840518CA9A54F /* RNImagePicker.xcodeproj */; proxyType = 2; remoteGlobalIDString = 014A3B5C1C6CF33500B6D375; remoteInfo = RNImagePicker; }; - ADBDB9261DFEBF0700ED6528 /* PBXContainerItemProxy */ = { + 8D5E0FDB216E156A0085BF34 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */; + containerPortal = 836972A508FE484CAFBB6331 /* RNNetworkInfo.xcodeproj */; proxyType = 2; - remoteGlobalIDString = 358F4ED71D1E81A9004DF814; - remoteInfo = RCTBlob; + remoteGlobalIDString = 045BEB3C1B52EA6A0013C1B9; + remoteInfo = RNNetworkInfo; }; - F81633C0215E66A300425F92 /* PBXContainerItemProxy */ = { + 8D5E0FDF216E156A0085BF34 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = F81633BC215E66A200425F92 /* RNImagePicker.xcodeproj */; + containerPortal = 48B5C9A179E04E4CA39C6E06 /* RNVectorIcons.xcodeproj */; proxyType = 2; - remoteGlobalIDString = 014A3B5C1C6CF33500B6D375; - remoteInfo = RNImagePicker; + remoteGlobalIDString = 5DBEB1501B18CEA900B34395; + remoteInfo = RNVectorIcons; }; - F8799E2E21395818003B9FD7 /* PBXContainerItemProxy */ = { + 8D5E0FE1216E156A0085BF34 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = F8799E0521395818003B9FD7 /* RNNetworkInfo.xcodeproj */; + containerPortal = 48B5C9A179E04E4CA39C6E06 /* RNVectorIcons.xcodeproj */; proxyType = 2; - remoteGlobalIDString = 045BEB3C1B52EA6A0013C1B9; - remoteInfo = RNNetworkInfo; + remoteGlobalIDString = A39873CE1EA65EE60051E01A; + remoteInfo = "RNVectorIcons-tvOS"; }; - F89E8F63212B11DF00F907A3 /* PBXContainerItemProxy */ = { + ADBDB9261DFEBF0700ED6528 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 9E9EB990FABF44D99028EA66 /* RNVectorIcons.xcodeproj */; + containerPortal = ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */; proxyType = 2; - remoteGlobalIDString = 5DBEB1501B18CEA900B34395; - remoteInfo = RNVectorIcons; + remoteGlobalIDString = 358F4ED71D1E81A9004DF814; + remoteInfo = RCTBlob; }; /* End PBXContainerItemProxy section */ @@ -372,50 +372,52 @@ 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTImage.xcodeproj; path = "../node_modules/react-native/Libraries/Image/RCTImage.xcodeproj"; sourceTree = ""; }; 00C302D31ABCB9D200DB3ED1 /* RCTNetwork.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTNetwork.xcodeproj; path = "../node_modules/react-native/Libraries/Network/RCTNetwork.xcodeproj"; sourceTree = ""; }; 00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTVibration.xcodeproj; path = "../node_modules/react-native/Libraries/Vibration/RCTVibration.xcodeproj"; sourceTree = ""; }; - 00E356EE1AD99517003FC87E /* bertyTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = bertyTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 12B6AC934DDA4879A4331729 /* SimpleLineIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = SimpleLineIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf"; sourceTree = ""; }; - 13132FE8F7A04E12A5BA1E0B /* MaterialIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = MaterialIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf"; sourceTree = ""; }; + 00E356EE1AD99517003FC87E /* BertyTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = BertyTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 07047A03625844F59A6C0185 /* libRNImagePicker.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNImagePicker.a; sourceTree = ""; }; + 08C6539D305C462FAA6F5F85 /* FontAwesome5_Brands.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome5_Brands.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Brands.ttf"; sourceTree = ""; }; 139105B61AF99BAD00B5F7CC /* RCTSettings.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTSettings.xcodeproj; path = "../node_modules/react-native/Libraries/Settings/RCTSettings.xcodeproj"; sourceTree = ""; }; 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWebSocket.xcodeproj; path = "../node_modules/react-native/Libraries/WebSocket/RCTWebSocket.xcodeproj"; sourceTree = ""; }; - 13B07F961A680F5B00A75B9A /* berty.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = berty.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = berty/AppDelegate.h; sourceTree = ""; }; - 13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = berty/AppDelegate.m; sourceTree = ""; }; + 13B07F961A680F5B00A75B9A /* Berty.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Berty.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = Berty/AppDelegate.h; sourceTree = ""; }; + 13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = Berty/AppDelegate.m; sourceTree = ""; }; 13B07FB21A68108700A75B9A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = ""; }; - 13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = berty/Images.xcassets; sourceTree = ""; }; - 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = berty/Info.plist; sourceTree = ""; }; - 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = berty/main.m; sourceTree = ""; }; + 13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = Berty/Images.xcassets; sourceTree = ""; }; + 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Berty/Info.plist; sourceTree = ""; }; + 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = Berty/main.m; sourceTree = ""; }; 146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = "../node_modules/react-native/React/React.xcodeproj"; sourceTree = ""; }; - 165DE059991944759015999E /* FontAwesome.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf"; sourceTree = ""; }; - 1723FA72EE2642CC8B2BB388 /* libRNImagePicker.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNImagePicker.a; sourceTree = ""; }; - 1791E0D1F9B346C8A68607FA /* Octicons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Octicons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Octicons.ttf"; sourceTree = ""; }; - 1B56A66221FD44708D3DF553 /* EvilIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = EvilIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf"; sourceTree = ""; }; - 2B5D27E5252244899403D47C /* FontAwesome5_Regular.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome5_Regular.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Regular.ttf"; sourceTree = ""; }; - 2D02E47B1E0B4A5D006451C7 /* berty-tvOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "berty-tvOS.app"; sourceTree = BUILT_PRODUCTS_DIR; }; - 2D02E4901E0B4A5D006451C7 /* berty-tvOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "berty-tvOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; + 17D9618F77704A108128C1D4 /* Foundation.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Foundation.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Foundation.ttf"; sourceTree = ""; }; + 189BB2B54F564464817850BE /* Zocial.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Zocial.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Zocial.ttf"; sourceTree = ""; }; + 18B2261F7F324A489858D48F /* Ionicons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Ionicons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Ionicons.ttf"; sourceTree = ""; }; + 1C535EC78581401BA4695219 /* libRNVectorIcons.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNVectorIcons.a; sourceTree = ""; }; + 21CCBE643C8E4CB7906A9EB3 /* Octicons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Octicons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Octicons.ttf"; sourceTree = ""; }; + 229720DFD15E4E569BD1D6D2 /* FontAwesome5_Regular.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome5_Regular.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Regular.ttf"; sourceTree = ""; }; + 2D02E47B1E0B4A5D006451C7 /* Berty-tvOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Berty-tvOS.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 2D02E4901E0B4A5D006451C7 /* Berty-tvOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Berty-tvOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; 2D16E6891FA4F8E400B85C8A /* libReact.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libReact.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 3CFF0EED95594F98B7AA6A50 /* Zocial.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Zocial.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Zocial.ttf"; sourceTree = ""; }; - 46FAF9546D834A90A9D9AD9C /* FontAwesome5_Brands.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome5_Brands.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Brands.ttf"; sourceTree = ""; }; - 47586ADB6E2F409CB1A4654A /* Entypo.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Entypo.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Entypo.ttf"; sourceTree = ""; }; - 4B708943F7BA4873A25C673D /* Feather.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Feather.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Feather.ttf"; sourceTree = ""; }; + 315E18D636B840518CA9A54F /* RNImagePicker.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNImagePicker.xcodeproj; path = "../node_modules/react-native-image-picker/ios/RNImagePicker.xcodeproj"; sourceTree = ""; }; + 404393F653304CE5B3D2FECF /* libRNVectorIcons-tvOS.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = "libRNVectorIcons-tvOS.a"; sourceTree = ""; }; + 4852AC444E8740FEAA4DFAE9 /* EvilIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = EvilIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf"; sourceTree = ""; }; + 48B5C9A179E04E4CA39C6E06 /* RNVectorIcons.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNVectorIcons.xcodeproj; path = "../node_modules/react-native-vector-icons/RNVectorIcons.xcodeproj"; sourceTree = ""; }; + 4FF677D5EFF1404DB500EEBC /* MaterialIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = MaterialIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf"; sourceTree = ""; }; 5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = "../node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj"; sourceTree = ""; }; + 5EE7976B0AA348DBB9137627 /* libRNNetworkInfo.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNNetworkInfo.a; sourceTree = ""; }; + 637D29C94C784190B7DFB7A8 /* FontAwesome.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf"; sourceTree = ""; }; + 6BCA3B477305485C91CB74DA /* Feather.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Feather.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Feather.ttf"; sourceTree = ""; }; 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = ""; }; + 81A473A5CA794BE987DF240A /* FontAwesome5_Solid.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome5_Solid.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Solid.ttf"; sourceTree = ""; }; 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = ""; }; - 85FA2536A2C744CF86F40F35 /* RNImagePicker.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNImagePicker.xcodeproj; path = "../../node_modules/react-native-image-picker/ios/RNImagePicker.xcodeproj"; sourceTree = ""; }; - 9E9EB990FABF44D99028EA66 /* RNVectorIcons.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNVectorIcons.xcodeproj; path = "../node_modules/react-native-vector-icons/RNVectorIcons.xcodeproj"; sourceTree = ""; }; + 836972A508FE484CAFBB6331 /* RNNetworkInfo.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNNetworkInfo.xcodeproj; path = "../node_modules/react-native-network-info/ios/RNNetworkInfo.xcodeproj"; sourceTree = ""; }; + 8D1BA425216CF8EA00FEF0AE /* libcrypto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcrypto.a; path = ../../common/openssl/built/ios/libcrypto.a; sourceTree = ""; }; + 8D1BA427216CF8F700FEF0AE /* libssl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libssl.a; path = ../../common/openssl/built/ios/libssl.a; sourceTree = ""; }; ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTBlob.xcodeproj; path = "../node_modules/react-native/Libraries/Blob/RCTBlob.xcodeproj"; sourceTree = ""; }; - BD9D68487EDB415DB1F2605B /* MaterialCommunityIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = MaterialCommunityIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/MaterialCommunityIcons.ttf"; sourceTree = ""; }; - CE4B5BA10EE44951967C4DA8 /* Foundation.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Foundation.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Foundation.ttf"; sourceTree = ""; }; - DD138C911CB146FD8E521DC7 /* Ionicons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Ionicons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Ionicons.ttf"; sourceTree = ""; }; - F4414BBA1619425594FBE61D /* FontAwesome5_Solid.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome5_Solid.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Solid.ttf"; sourceTree = ""; }; - F667511A0660437B8CFB10EA /* libRNVectorIcons.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNVectorIcons.a; sourceTree = ""; }; - F81633BC215E66A200425F92 /* RNImagePicker.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RNImagePicker.xcodeproj; path = "../../node_modules/react-native-image-picker/ios/RNImagePicker.xcodeproj"; sourceTree = ""; }; + C98BB2E01D1E436A800597C6 /* Entypo.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Entypo.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Entypo.ttf"; sourceTree = ""; }; + D2D26EFC3B0F4124BD3EB762 /* SimpleLineIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = SimpleLineIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf"; sourceTree = ""; }; + E1C9A4F1DC6B4E75A55ACAF7 /* MaterialCommunityIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = MaterialCommunityIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/MaterialCommunityIcons.ttf"; sourceTree = ""; }; F8799D752136F3C5003B9FD7 /* CoreModule.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CoreModule.m; sourceTree = ""; }; - F8799D772136F3EA003B9FD7 /* berty-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "berty-Bridging-Header.h"; sourceTree = ""; }; + F8799D772136F3EA003B9FD7 /* Berty-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Berty-Bridging-Header.h"; sourceTree = ""; }; F8799D782136F3EA003B9FD7 /* CoreModule.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoreModule.swift; sourceTree = ""; }; - F8799E0521395818003B9FD7 /* RNNetworkInfo.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RNNetworkInfo.xcodeproj; path = "../../node_modules/react-native-network-info/ios/RNNetworkInfo.xcodeproj"; sourceTree = ""; }; F8EF7F472136A10500FDCCB5 /* core.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = core.framework; sourceTree = ""; }; - F8EF7F7D2136A27E00FDCCB5 /* libssl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libssl.a; path = ../../../common/openssl/built/ios/libssl.a; sourceTree = ""; }; - F8EF7F7F2136A5AA00FDCCB5 /* libcrypto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcrypto.a; path = ../../../common/openssl/built/ios/libcrypto.a; sourceTree = ""; }; + FA49C5BF6A3A4426A9FE0AA2 /* AntDesign.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = AntDesign.ttf; path = "../node_modules/react-native-vector-icons/Fonts/AntDesign.ttf"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -431,15 +433,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - F81633C3215E66D000425F92 /* libRNImagePicker.a in Frameworks */, - F8799E3121395847003B9FD7 /* libRNNetworkInfo.a in Frameworks */, - F8EF7F802136A5AA00FDCCB5 /* libcrypto.a in Frameworks */, - F8EF7F7E2136A27E00FDCCB5 /* libssl.a in Frameworks */, + 8D1BA428216CF8F700FEF0AE /* libssl.a in Frameworks */, ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */, 5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */, F8EF7F482136A10600FDCCB5 /* core.framework in Frameworks */, 146834051AC3E58100842450 /* libReact.a in Frameworks */, 5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */, + 8D1BA426216CF8EA00FEF0AE /* libcrypto.a in Frameworks */, 00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */, 00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */, 00C302E81ABCBA2D00DB3ED1 /* libRCTImage.a in Frameworks */, @@ -449,8 +449,9 @@ 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */, 00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */, 139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */, - 8E4104F64A4D4265AEEC570E /* libRNVectorIcons.a in Frameworks */, - 3CF43BBF511D49BA85A5596B /* libRNImagePicker.a in Frameworks */, + 895E8DFE9E05494099380954 /* libRNNetworkInfo.a in Frameworks */, + C1553330747D43CDA733DAF9 /* libRNVectorIcons.a in Frameworks */, + B40E0A9F7F7B4896A7D74589 /* libRNImagePicker.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -466,6 +467,7 @@ 2D02E4C61E0B4AEC006451C7 /* libRCTSettings-tvOS.a in Frameworks */, 2D02E4C71E0B4AEC006451C7 /* libRCTText-tvOS.a in Frameworks */, 2D02E4C81E0B4AEC006451C7 /* libRCTWebSocket-tvOS.a in Frameworks */, + 3FD46C36ED444780B7A88579 /* libRNVectorIcons-tvOS.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -542,7 +544,7 @@ name = Products; sourceTree = ""; }; - 13B07FAE1A68108700A75B9A /* berty */ = { + 13B07FAE1A68108700A75B9A /* Berty */ = { isa = PBXGroup; children = ( 008F07F21AC5B25A0029DE68 /* main.jsbundle */, @@ -553,7 +555,7 @@ 13B07FB11A68108700A75B9A /* LaunchScreen.xib */, 13B07FB71A68108700A75B9A /* main.m */, ); - name = berty; + name = Berty; sourceTree = ""; }; 146834001AC3E56700842450 /* Products */ = { @@ -582,9 +584,8 @@ 2D16E6871FA4F8E400B85C8A /* Frameworks */ = { isa = PBXGroup; children = ( - F81633BC215E66A200425F92 /* RNImagePicker.xcodeproj */, - F8EF7F7F2136A5AA00FDCCB5 /* libcrypto.a */, - F8EF7F7D2136A27E00FDCCB5 /* libssl.a */, + 8D1BA427216CF8F700FEF0AE /* libssl.a */, + 8D1BA425216CF8EA00FEF0AE /* libcrypto.a */, F8EF7F472136A10500FDCCB5 /* core.framework */, 2D16E6891FA4F8E400B85C8A /* libReact.a */, ); @@ -603,20 +604,21 @@ 6E762EC1696A4D73A16C7F86 /* Resources */ = { isa = PBXGroup; children = ( - 47586ADB6E2F409CB1A4654A /* Entypo.ttf */, - 1B56A66221FD44708D3DF553 /* EvilIcons.ttf */, - 4B708943F7BA4873A25C673D /* Feather.ttf */, - 165DE059991944759015999E /* FontAwesome.ttf */, - 46FAF9546D834A90A9D9AD9C /* FontAwesome5_Brands.ttf */, - 2B5D27E5252244899403D47C /* FontAwesome5_Regular.ttf */, - F4414BBA1619425594FBE61D /* FontAwesome5_Solid.ttf */, - CE4B5BA10EE44951967C4DA8 /* Foundation.ttf */, - DD138C911CB146FD8E521DC7 /* Ionicons.ttf */, - BD9D68487EDB415DB1F2605B /* MaterialCommunityIcons.ttf */, - 13132FE8F7A04E12A5BA1E0B /* MaterialIcons.ttf */, - 1791E0D1F9B346C8A68607FA /* Octicons.ttf */, - 12B6AC934DDA4879A4331729 /* SimpleLineIcons.ttf */, - 3CFF0EED95594F98B7AA6A50 /* Zocial.ttf */, + FA49C5BF6A3A4426A9FE0AA2 /* AntDesign.ttf */, + C98BB2E01D1E436A800597C6 /* Entypo.ttf */, + 4852AC444E8740FEAA4DFAE9 /* EvilIcons.ttf */, + 6BCA3B477305485C91CB74DA /* Feather.ttf */, + 637D29C94C784190B7DFB7A8 /* FontAwesome.ttf */, + 08C6539D305C462FAA6F5F85 /* FontAwesome5_Brands.ttf */, + 229720DFD15E4E569BD1D6D2 /* FontAwesome5_Regular.ttf */, + 81A473A5CA794BE987DF240A /* FontAwesome5_Solid.ttf */, + 17D9618F77704A108128C1D4 /* Foundation.ttf */, + 18B2261F7F324A489858D48F /* Ionicons.ttf */, + E1C9A4F1DC6B4E75A55ACAF7 /* MaterialCommunityIcons.ttf */, + 4FF677D5EFF1404DB500EEBC /* MaterialIcons.ttf */, + 21CCBE643C8E4CB7906A9EB3 /* Octicons.ttf */, + D2D26EFC3B0F4124BD3EB762 /* SimpleLineIcons.ttf */, + 189BB2B54F564464817850BE /* Zocial.ttf */, ); name = Resources; sourceTree = ""; @@ -633,7 +635,6 @@ 832341AE1AAA6A7D00B99B32 /* Libraries */ = { isa = PBXGroup; children = ( - F8799E0521395818003B9FD7 /* RNNetworkInfo.xcodeproj */, 5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */, 146833FF1AC3E56700842450 /* React.xcodeproj */, 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */, @@ -646,8 +647,9 @@ 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */, 00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */, 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */, - 9E9EB990FABF44D99028EA66 /* RNVectorIcons.xcodeproj */, - 85FA2536A2C744CF86F40F35 /* RNImagePicker.xcodeproj */, + 836972A508FE484CAFBB6331 /* RNNetworkInfo.xcodeproj */, + 48B5C9A179E04E4CA39C6E06 /* RNVectorIcons.xcodeproj */, + 315E18D636B840518CA9A54F /* RNImagePicker.xcodeproj */, ); name = Libraries; sourceTree = ""; @@ -665,12 +667,12 @@ isa = PBXGroup; children = ( F8799D4D2136F37F003B9FD7 /* modules */, - 13B07FAE1A68108700A75B9A /* berty */, + 13B07FAE1A68108700A75B9A /* Berty */, 832341AE1AAA6A7D00B99B32 /* Libraries */, 83CBBA001A601CBA00E9B192 /* Products */, 2D16E6871FA4F8E400B85C8A /* Frameworks */, 6E762EC1696A4D73A16C7F86 /* Resources */, - F89E8F3A212B11D800F907A3 /* Recovered References */, + 8DC3820B216D3CD800FD3DBB /* Recovered References */, ); indentWidth = 2; sourceTree = ""; @@ -680,88 +682,83 @@ 83CBBA001A601CBA00E9B192 /* Products */ = { isa = PBXGroup; children = ( - 13B07F961A680F5B00A75B9A /* berty.app */, - 00E356EE1AD99517003FC87E /* bertyTests.xctest */, - 2D02E47B1E0B4A5D006451C7 /* berty-tvOS.app */, - 2D02E4901E0B4A5D006451C7 /* berty-tvOSTests.xctest */, + 13B07F961A680F5B00A75B9A /* Berty.app */, + 00E356EE1AD99517003FC87E /* BertyTests.xctest */, + 2D02E47B1E0B4A5D006451C7 /* Berty-tvOS.app */, + 2D02E4901E0B4A5D006451C7 /* Berty-tvOSTests.xctest */, ); name = Products; sourceTree = ""; }; - 8D63B0672166335D00442190 /* Products */ = { + 8D5E0FAC216E15690085BF34 /* Products */ = { isa = PBXGroup; children = ( - 8D63B06B2166335D00442190 /* libRNImagePicker.a */, + 8D5E0FDC216E156A0085BF34 /* libRNNetworkInfo.a */, ); name = Products; sourceTree = ""; }; - ADBDB9201DFEBF0600ED6528 /* Products */ = { + 8D5E0FAE216E15690085BF34 /* Products */ = { isa = PBXGroup; children = ( - ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */, - 2D16E6721FA4F8DC00B85C8A /* libRCTBlob-tvOS.a */, + 8D5E0FE0216E156A0085BF34 /* libRNVectorIcons.a */, + 8D5E0FE2216E156A0085BF34 /* libRNVectorIcons-tvOS.a */, ); name = Products; sourceTree = ""; }; - F81633BD215E66A200425F92 /* Products */ = { + 8D5E0FB0216E15690085BF34 /* Products */ = { isa = PBXGroup; children = ( - F81633C1215E66A300425F92 /* libRNImagePicker.a */, + 8D5E0FD9216E156A0085BF34 /* libRNImagePicker.a */, ); name = Products; sourceTree = ""; }; - F8799D4D2136F37F003B9FD7 /* modules */ = { + 8DC3820B216D3CD800FD3DBB /* Recovered References */ = { isa = PBXGroup; children = ( - F8799D772136F3EA003B9FD7 /* berty-Bridging-Header.h */, - F8799D742136F3A7003B9FD7 /* core */, + 5EE7976B0AA348DBB9137627 /* libRNNetworkInfo.a */, + 1C535EC78581401BA4695219 /* libRNVectorIcons.a */, + 07047A03625844F59A6C0185 /* libRNImagePicker.a */, + 404393F653304CE5B3D2FECF /* libRNVectorIcons-tvOS.a */, ); - path = modules; - sourceTree = ""; - }; - F8799D742136F3A7003B9FD7 /* core */ = { - isa = PBXGroup; - children = ( - F8799D752136F3C5003B9FD7 /* CoreModule.m */, - F8799D782136F3EA003B9FD7 /* CoreModule.swift */, - ); - path = core; + name = "Recovered References"; sourceTree = ""; }; - F8799E0621395818003B9FD7 /* Products */ = { + ADBDB9201DFEBF0600ED6528 /* Products */ = { isa = PBXGroup; children = ( - F8799E2F21395818003B9FD7 /* libRNNetworkInfo.a */, + ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */, + 2D16E6721FA4F8DC00B85C8A /* libRCTBlob-tvOS.a */, ); name = Products; sourceTree = ""; }; - F89E8F3A212B11D800F907A3 /* Recovered References */ = { + F8799D4D2136F37F003B9FD7 /* modules */ = { isa = PBXGroup; children = ( - F667511A0660437B8CFB10EA /* libRNVectorIcons.a */, - 1723FA72EE2642CC8B2BB388 /* libRNImagePicker.a */, + F8799D772136F3EA003B9FD7 /* Berty-Bridging-Header.h */, + F8799D742136F3A7003B9FD7 /* core */, ); - name = "Recovered References"; + path = modules; sourceTree = ""; }; - F89E8F60212B11DC00F907A3 /* Products */ = { + F8799D742136F3A7003B9FD7 /* core */ = { isa = PBXGroup; children = ( - F89E8F64212B11DF00F907A3 /* libRNVectorIcons.a */, + F8799D752136F3C5003B9FD7 /* CoreModule.m */, + F8799D782136F3EA003B9FD7 /* CoreModule.swift */, ); - name = Products; + path = core; sourceTree = ""; }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 00E356ED1AD99517003FC87E /* bertyTests */ = { + 00E356ED1AD99517003FC87E /* BertyTests */ = { isa = PBXNativeTarget; - buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "bertyTests" */; + buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "BertyTests" */; buildPhases = ( 00E356EA1AD99517003FC87E /* Sources */, 00E356EB1AD99517003FC87E /* Frameworks */, @@ -772,14 +769,14 @@ dependencies = ( 00E356F51AD99517003FC87E /* PBXTargetDependency */, ); - name = bertyTests; - productName = bertyTests; - productReference = 00E356EE1AD99517003FC87E /* bertyTests.xctest */; + name = BertyTests; + productName = BertyTests; + productReference = 00E356EE1AD99517003FC87E /* BertyTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; - 13B07F861A680F5B00A75B9A /* berty */ = { + 13B07F861A680F5B00A75B9A /* Berty */ = { isa = PBXNativeTarget; - buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "berty" */; + buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "Berty" */; buildPhases = ( 13B07F871A680F5B00A75B9A /* Sources */, 13B07F8C1A680F5B00A75B9A /* Frameworks */, @@ -790,14 +787,14 @@ ); dependencies = ( ); - name = berty; + name = Berty; productName = "Hello World"; - productReference = 13B07F961A680F5B00A75B9A /* berty.app */; + productReference = 13B07F961A680F5B00A75B9A /* Berty.app */; productType = "com.apple.product-type.application"; }; - 2D02E47A1E0B4A5D006451C7 /* berty-tvOS */ = { + 2D02E47A1E0B4A5D006451C7 /* Berty-tvOS */ = { isa = PBXNativeTarget; - buildConfigurationList = 2D02E4BA1E0B4A5E006451C7 /* Build configuration list for PBXNativeTarget "berty-tvOS" */; + buildConfigurationList = 2D02E4BA1E0B4A5E006451C7 /* Build configuration list for PBXNativeTarget "Berty-tvOS" */; buildPhases = ( 2D02E4771E0B4A5D006451C7 /* Sources */, 2D02E4781E0B4A5D006451C7 /* Frameworks */, @@ -808,14 +805,14 @@ ); dependencies = ( ); - name = "berty-tvOS"; - productName = "berty-tvOS"; - productReference = 2D02E47B1E0B4A5D006451C7 /* berty-tvOS.app */; + name = "Berty-tvOS"; + productName = "Berty-tvOS"; + productReference = 2D02E47B1E0B4A5D006451C7 /* Berty-tvOS.app */; productType = "com.apple.product-type.application"; }; - 2D02E48F1E0B4A5D006451C7 /* berty-tvOSTests */ = { + 2D02E48F1E0B4A5D006451C7 /* Berty-tvOSTests */ = { isa = PBXNativeTarget; - buildConfigurationList = 2D02E4BB1E0B4A5E006451C7 /* Build configuration list for PBXNativeTarget "berty-tvOSTests" */; + buildConfigurationList = 2D02E4BB1E0B4A5E006451C7 /* Build configuration list for PBXNativeTarget "Berty-tvOSTests" */; buildPhases = ( 2D02E48C1E0B4A5D006451C7 /* Sources */, 2D02E48D1E0B4A5D006451C7 /* Frameworks */, @@ -826,9 +823,9 @@ dependencies = ( 2D02E4921E0B4A5D006451C7 /* PBXTargetDependency */, ); - name = "berty-tvOSTests"; - productName = "berty-tvOSTests"; - productReference = 2D02E4901E0B4A5D006451C7 /* berty-tvOSTests.xctest */; + name = "Berty-tvOSTests"; + productName = "Berty-tvOSTests"; + productReference = 2D02E4901E0B4A5D006451C7 /* Berty-tvOSTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; /* End PBXNativeTarget section */ @@ -921,28 +918,24 @@ ProjectRef = 146833FF1AC3E56700842450 /* React.xcodeproj */; }, { - ProductGroup = 8D63B0672166335D00442190 /* Products */; - ProjectRef = 85FA2536A2C744CF86F40F35 /* RNImagePicker.xcodeproj */; - }, - { - ProductGroup = F81633BD215E66A200425F92 /* Products */; - ProjectRef = F81633BC215E66A200425F92 /* RNImagePicker.xcodeproj */; + ProductGroup = 8D5E0FB0216E15690085BF34 /* Products */; + ProjectRef = 315E18D636B840518CA9A54F /* RNImagePicker.xcodeproj */; }, { - ProductGroup = F8799E0621395818003B9FD7 /* Products */; - ProjectRef = F8799E0521395818003B9FD7 /* RNNetworkInfo.xcodeproj */; + ProductGroup = 8D5E0FAC216E15690085BF34 /* Products */; + ProjectRef = 836972A508FE484CAFBB6331 /* RNNetworkInfo.xcodeproj */; }, { - ProductGroup = F89E8F60212B11DC00F907A3 /* Products */; - ProjectRef = 9E9EB990FABF44D99028EA66 /* RNVectorIcons.xcodeproj */; + ProductGroup = 8D5E0FAE216E15690085BF34 /* Products */; + ProjectRef = 48B5C9A179E04E4CA39C6E06 /* RNVectorIcons.xcodeproj */; }, ); projectRoot = ""; targets = ( - 13B07F861A680F5B00A75B9A /* berty */, - 00E356ED1AD99517003FC87E /* bertyTests */, - 2D02E47A1E0B4A5D006451C7 /* berty-tvOS */, - 2D02E48F1E0B4A5D006451C7 /* berty-tvOSTests */, + 13B07F861A680F5B00A75B9A /* Berty */, + 00E356ED1AD99517003FC87E /* BertyTests */, + 2D02E47A1E0B4A5D006451C7 /* Berty-tvOS */, + 2D02E48F1E0B4A5D006451C7 /* Berty-tvOSTests */, ); }; /* End PBXProject section */ @@ -1200,39 +1193,39 @@ remoteRef = 832341B41AAA6A8300B99B32 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 8D63B06B2166335D00442190 /* libRNImagePicker.a */ = { + 8D5E0FD9216E156A0085BF34 /* libRNImagePicker.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; path = libRNImagePicker.a; - remoteRef = 8D63B06A2166335D00442190 /* PBXContainerItemProxy */; + remoteRef = 8D5E0FD8216E156A0085BF34 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */ = { + 8D5E0FDC216E156A0085BF34 /* libRNNetworkInfo.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = libRCTBlob.a; - remoteRef = ADBDB9261DFEBF0700ED6528 /* PBXContainerItemProxy */; + path = libRNNetworkInfo.a; + remoteRef = 8D5E0FDB216E156A0085BF34 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - F81633C1215E66A300425F92 /* libRNImagePicker.a */ = { + 8D5E0FE0216E156A0085BF34 /* libRNVectorIcons.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = libRNImagePicker.a; - remoteRef = F81633C0215E66A300425F92 /* PBXContainerItemProxy */; + path = libRNVectorIcons.a; + remoteRef = 8D5E0FDF216E156A0085BF34 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - F8799E2F21395818003B9FD7 /* libRNNetworkInfo.a */ = { + 8D5E0FE2216E156A0085BF34 /* libRNVectorIcons-tvOS.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = libRNNetworkInfo.a; - remoteRef = F8799E2E21395818003B9FD7 /* PBXContainerItemProxy */; + path = "libRNVectorIcons-tvOS.a"; + remoteRef = 8D5E0FE1216E156A0085BF34 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - F89E8F64212B11DF00F907A3 /* libRNVectorIcons.a */ = { + ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = libRNVectorIcons.a; - remoteRef = F89E8F63212B11DF00F907A3 /* PBXContainerItemProxy */; + path = libRCTBlob.a; + remoteRef = ADBDB9261DFEBF0700ED6528 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXReferenceProxy section */ @@ -1251,20 +1244,21 @@ files = ( 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */, 13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */, - AB44A868A1B240938308B0A3 /* Entypo.ttf in Resources */, - D1F574B813194C638DBB8677 /* EvilIcons.ttf in Resources */, - 1A7C2FDDDF924BD3857CD66F /* Feather.ttf in Resources */, - 178D61F1DE4F4D289FEC0B07 /* FontAwesome.ttf in Resources */, - 9178C24DF2D941DABC754314 /* FontAwesome5_Brands.ttf in Resources */, - 0422FEFDDC544525976ABFED /* FontAwesome5_Regular.ttf in Resources */, - F18833A248144C8FBB4B7EA0 /* FontAwesome5_Solid.ttf in Resources */, - 1C709F7764B9493EAE6C48EA /* Foundation.ttf in Resources */, - D2C37F48A843479C88E01010 /* Ionicons.ttf in Resources */, - A2B0F9E2DA59437BB76090B3 /* MaterialCommunityIcons.ttf in Resources */, - 2795D4E7135D4BF2BBDBE975 /* MaterialIcons.ttf in Resources */, - 6E9F74FE768A42B09E52A27E /* Octicons.ttf in Resources */, - CB04920C0A13423280692377 /* SimpleLineIcons.ttf in Resources */, - 8BE05731D4114D808A909334 /* Zocial.ttf in Resources */, + 25A8BAB5E2674DC1AFD11FFB /* AntDesign.ttf in Resources */, + 5097099ECB874846A7B9FA6A /* Entypo.ttf in Resources */, + 48FBC710B1FF4A4890B3C836 /* EvilIcons.ttf in Resources */, + F625BCB39E3C45ADA463C308 /* Feather.ttf in Resources */, + 247844E0D2924C4A8483E1F1 /* FontAwesome.ttf in Resources */, + 2292CA4AD69F48168B992482 /* FontAwesome5_Brands.ttf in Resources */, + 4345EBFF9B7A402B9CC2405B /* FontAwesome5_Regular.ttf in Resources */, + DBCA0527B5E5452CBB25A469 /* FontAwesome5_Solid.ttf in Resources */, + D8F41B65D4574B55B47EF756 /* Foundation.ttf in Resources */, + 808BCE1F0B3E4563B513597D /* Ionicons.ttf in Resources */, + 54124C83C6A84A21A36FE047 /* MaterialCommunityIcons.ttf in Resources */, + CF5A6F4CF389477EA33C6806 /* MaterialIcons.ttf in Resources */, + 0E1990BBF6984EC6AA42E2E2 /* Octicons.ttf in Resources */, + CF864C8B0C0D4F43BB12B024 /* SimpleLineIcons.ttf in Resources */, + E06D3F08438E443B9720B383 /* Zocial.ttf in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1356,12 +1350,12 @@ /* Begin PBXTargetDependency section */ 00E356F51AD99517003FC87E /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 13B07F861A680F5B00A75B9A /* berty */; + target = 13B07F861A680F5B00A75B9A /* Berty */; targetProxy = 00E356F41AD99517003FC87E /* PBXContainerItemProxy */; }; 2D02E4921E0B4A5D006451C7 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 2D02E47A1E0B4A5D006451C7 /* berty-tvOS */; + target = 2D02E47A1E0B4A5D006451C7 /* Berty-tvOS */; targetProxy = 2D02E4911E0B4A5D006451C7 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -1373,7 +1367,7 @@ 13B07FB21A68108700A75B9A /* Base */, ); name = LaunchScreen.xib; - path = berty; + path = Berty; sourceTree = ""; }; /* End PBXVariantGroup section */ @@ -1390,23 +1384,23 @@ ); HEADER_SEARCH_PATHS = ( "$(inherited)", + "$(SRCROOT)/../node_modules/react-native-network-info/ios", "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", - "$(SRCROOT)/../../node_modules/react-native-image-picker/ios", + "$(SRCROOT)/../node_modules/react-native-image-picker/ios", ); - INFOPLIST_FILE = bertyTests/Info.plist; + INFOPLIST_FILE = BertyTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)/$(TARGET_NAME)\"", - "\"$(SRCROOT)/$(TARGET_NAME)\"", ); OTHER_LDFLAGS = ( "-ObjC", "-lc++", ); PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/berty.app/berty"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Berty.app/Berty"; }; name = Debug; }; @@ -1418,23 +1412,23 @@ COPY_PHASE_STRIP = NO; HEADER_SEARCH_PATHS = ( "$(inherited)", + "$(SRCROOT)/../node_modules/react-native-network-info/ios", "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", - "$(SRCROOT)/../../node_modules/react-native-image-picker/ios", + "$(SRCROOT)/../node_modules/react-native-image-picker/ios", ); - INFOPLIST_FILE = bertyTests/Info.plist; + INFOPLIST_FILE = BertyTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)/$(TARGET_NAME)\"", - "\"$(SRCROOT)/$(TARGET_NAME)\"", ); OTHER_LDFLAGS = ( "-ObjC", "-lc++", ); PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/berty.app/berty"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Berty.app/Berty"; }; name = Release; }; @@ -1456,22 +1450,26 @@ ); HEADER_SEARCH_PATHS = ( "$(inherited)", + "$(SRCROOT)/../node_modules/react-native-network-info/ios", "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", - "$(SRCROOT)/../../node_modules/react-native-image-picker/ios", + "$(SRCROOT)/../node_modules/react-native-image-picker/ios", ); - INFOPLIST_FILE = berty/Info.plist; + INFOPLIST_FILE = Berty/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/../../../common/openssl/built/ios"; + LIBRARY_SEARCH_PATHS = ( + "$(PROJECT_DIR)/../../common/openssl/built/ios", + "$(PROJECT_DIR)", + ); OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", "-lc++", ); PRODUCT_BUNDLE_IDENTIFIER = chat.berty.ios; - PRODUCT_NAME = berty; + PRODUCT_NAME = Berty; PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_OBJC_BRIDGING_HEADER = "modules/berty-Bridging-Header.h"; + SWIFT_OBJC_BRIDGING_HEADER = "modules/Berty-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 3.0; VERSIONING_SYSTEM = "apple-generic"; @@ -1495,22 +1493,26 @@ ); HEADER_SEARCH_PATHS = ( "$(inherited)", + "$(SRCROOT)/../node_modules/react-native-network-info/ios", "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", - "$(SRCROOT)/../../node_modules/react-native-image-picker/ios", + "$(SRCROOT)/../node_modules/react-native-image-picker/ios", ); - INFOPLIST_FILE = berty/Info.plist; + INFOPLIST_FILE = Berty/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/../../../common/openssl/built/ios"; + LIBRARY_SEARCH_PATHS = ( + "$(PROJECT_DIR)/../../common/openssl/built/ios", + "$(PROJECT_DIR)", + ); OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", "-lc++", ); PRODUCT_BUNDLE_IDENTIFIER = chat.berty.ios; - PRODUCT_NAME = berty; + PRODUCT_NAME = Berty; PROVISIONING_PROFILE = "4b569825-a062-4e3b-927e-22ea802c7ca3"; PROVISIONING_PROFILE_SPECIFIER = "match AppStore chat.berty.ios"; - SWIFT_OBJC_BRIDGING_HEADER = "modules/berty-Bridging-Header.h"; + SWIFT_OBJC_BRIDGING_HEADER = "modules/Berty-Bridging-Header.h"; SWIFT_VERSION = 3.0; VERSIONING_SYSTEM = "apple-generic"; }; @@ -1530,21 +1532,21 @@ GCC_NO_COMMON_BLOCKS = YES; HEADER_SEARCH_PATHS = ( "$(inherited)", + "$(SRCROOT)/../node_modules/react-native-network-info/ios", "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", - "$(SRCROOT)/../../node_modules/react-native-image-picker/ios", + "$(SRCROOT)/../node_modules/react-native-image-picker/ios", ); - INFOPLIST_FILE = "berty-tvOS/Info.plist"; + INFOPLIST_FILE = "Berty-tvOS/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)/$(TARGET_NAME)\"", - "\"$(SRCROOT)/$(TARGET_NAME)\"", ); OTHER_LDFLAGS = ( "-ObjC", "-lc++", ); - PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.REACT.berty-tvOS"; + PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.REACT.Berty-tvOS"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; TARGETED_DEVICE_FAMILY = 3; @@ -1566,21 +1568,21 @@ GCC_NO_COMMON_BLOCKS = YES; HEADER_SEARCH_PATHS = ( "$(inherited)", + "$(SRCROOT)/../node_modules/react-native-network-info/ios", "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", - "$(SRCROOT)/../../node_modules/react-native-image-picker/ios", + "$(SRCROOT)/../node_modules/react-native-image-picker/ios", ); - INFOPLIST_FILE = "berty-tvOS/Info.plist"; + INFOPLIST_FILE = "Berty-tvOS/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)/$(TARGET_NAME)\"", - "\"$(SRCROOT)/$(TARGET_NAME)\"", ); OTHER_LDFLAGS = ( "-ObjC", "-lc++", ); - PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.REACT.berty-tvOS"; + PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.REACT.Berty-tvOS"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; TARGETED_DEVICE_FAMILY = 3; @@ -1601,24 +1603,24 @@ GCC_NO_COMMON_BLOCKS = YES; HEADER_SEARCH_PATHS = ( "$(inherited)", + "$(SRCROOT)/../node_modules/react-native-network-info/ios", "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", - "$(SRCROOT)/../../node_modules/react-native-image-picker/ios", + "$(SRCROOT)/../node_modules/react-native-image-picker/ios", ); - INFOPLIST_FILE = "berty-tvOSTests/Info.plist"; + INFOPLIST_FILE = "Berty-tvOSTests/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)/$(TARGET_NAME)\"", - "\"$(SRCROOT)/$(TARGET_NAME)\"", ); OTHER_LDFLAGS = ( "-ObjC", "-lc++", ); - PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.REACT.berty-tvOSTests"; + PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.REACT.Berty-tvOSTests"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/berty-tvOS.app/berty-tvOS"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Berty-tvOS.app/Berty-tvOS"; TVOS_DEPLOYMENT_TARGET = 10.1; }; name = Debug; @@ -1636,24 +1638,24 @@ GCC_NO_COMMON_BLOCKS = YES; HEADER_SEARCH_PATHS = ( "$(inherited)", + "$(SRCROOT)/../node_modules/react-native-network-info/ios", "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", - "$(SRCROOT)/../../node_modules/react-native-image-picker/ios", + "$(SRCROOT)/../node_modules/react-native-image-picker/ios", ); - INFOPLIST_FILE = "berty-tvOSTests/Info.plist"; + INFOPLIST_FILE = "Berty-tvOSTests/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)/$(TARGET_NAME)\"", - "\"$(SRCROOT)/$(TARGET_NAME)\"", ); OTHER_LDFLAGS = ( "-ObjC", "-lc++", ); - PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.REACT.berty-tvOSTests"; + PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.REACT.Berty-tvOSTests"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/berty-tvOS.app/berty-tvOS"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Berty-tvOS.app/Berty-tvOS"; TVOS_DEPLOYMENT_TARGET = 10.1; }; name = Release; @@ -1712,22 +1714,26 @@ ); HEADER_SEARCH_PATHS = ( "$(inherited)", + "$(SRCROOT)/../node_modules/react-native-network-info/ios", "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", - "$(SRCROOT)/../../node_modules/react-native-image-picker/ios", + "$(SRCROOT)/../node_modules/react-native-image-picker/ios", ); - INFOPLIST_FILE = berty/Info.plist; + INFOPLIST_FILE = Berty/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/../../../common/openssl/built/ios"; + LIBRARY_SEARCH_PATHS = ( + "$(PROJECT_DIR)/../../common/openssl/built/ios", + "$(PROJECT_DIR)", + ); OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", "-lc++", ); PRODUCT_BUNDLE_IDENTIFIER = chat.berty.ios; - PRODUCT_NAME = berty; + PRODUCT_NAME = Berty; PROVISIONING_PROFILE = "8cb57e8b-642d-4c1f-b5b3-0acde7d99f"; PROVISIONING_PROFILE_SPECIFIER = "match AdHoc chat.berty.ios"; - SWIFT_OBJC_BRIDGING_HEADER = "modules/berty-Bridging-Header.h"; + SWIFT_OBJC_BRIDGING_HEADER = "modules/Berty-Bridging-Header.h"; SWIFT_VERSION = 3.0; VERSIONING_SYSTEM = "apple-generic"; }; @@ -1741,23 +1747,23 @@ COPY_PHASE_STRIP = NO; HEADER_SEARCH_PATHS = ( "$(inherited)", + "$(SRCROOT)/../node_modules/react-native-network-info/ios", "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", - "$(SRCROOT)/../../node_modules/react-native-image-picker/ios", + "$(SRCROOT)/../node_modules/react-native-image-picker/ios", ); - INFOPLIST_FILE = bertyTests/Info.plist; + INFOPLIST_FILE = BertyTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)/$(TARGET_NAME)\"", - "\"$(SRCROOT)/$(TARGET_NAME)\"", ); OTHER_LDFLAGS = ( "-ObjC", "-lc++", ); PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/berty.app/berty"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Berty.app/Berty"; }; name = adhoc; }; @@ -1775,21 +1781,21 @@ GCC_NO_COMMON_BLOCKS = YES; HEADER_SEARCH_PATHS = ( "$(inherited)", + "$(SRCROOT)/../node_modules/react-native-network-info/ios", "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", - "$(SRCROOT)/../../node_modules/react-native-image-picker/ios", + "$(SRCROOT)/../node_modules/react-native-image-picker/ios", ); - INFOPLIST_FILE = "berty-tvOS/Info.plist"; + INFOPLIST_FILE = "Berty-tvOS/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)/$(TARGET_NAME)\"", - "\"$(SRCROOT)/$(TARGET_NAME)\"", ); OTHER_LDFLAGS = ( "-ObjC", "-lc++", ); - PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.REACT.berty-tvOS"; + PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.REACT.Berty-tvOS"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; TARGETED_DEVICE_FAMILY = 3; @@ -1810,24 +1816,24 @@ GCC_NO_COMMON_BLOCKS = YES; HEADER_SEARCH_PATHS = ( "$(inherited)", + "$(SRCROOT)/../node_modules/react-native-network-info/ios", "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", - "$(SRCROOT)/../../node_modules/react-native-image-picker/ios", + "$(SRCROOT)/../node_modules/react-native-image-picker/ios", ); - INFOPLIST_FILE = "berty-tvOSTests/Info.plist"; + INFOPLIST_FILE = "Berty-tvOSTests/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)/$(TARGET_NAME)\"", - "\"$(SRCROOT)/$(TARGET_NAME)\"", ); OTHER_LDFLAGS = ( "-ObjC", "-lc++", ); - PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.REACT.berty-tvOSTests"; + PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.REACT.Berty-tvOSTests"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/berty-tvOS.app/berty-tvOS"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Berty-tvOS.app/Berty-tvOS"; TVOS_DEPLOYMENT_TARGET = 10.1; }; name = adhoc; @@ -1912,7 +1918,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "bertyTests" */ = { + 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "BertyTests" */ = { isa = XCConfigurationList; buildConfigurations = ( 00E356F61AD99517003FC87E /* Debug */, @@ -1922,7 +1928,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "berty" */ = { + 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "Berty" */ = { isa = XCConfigurationList; buildConfigurations = ( 13B07F941A680F5B00A75B9A /* Debug */, @@ -1932,7 +1938,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 2D02E4BA1E0B4A5E006451C7 /* Build configuration list for PBXNativeTarget "berty-tvOS" */ = { + 2D02E4BA1E0B4A5E006451C7 /* Build configuration list for PBXNativeTarget "Berty-tvOS" */ = { isa = XCConfigurationList; buildConfigurations = ( 2D02E4971E0B4A5E006451C7 /* Debug */, @@ -1942,7 +1948,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 2D02E4BB1E0B4A5E006451C7 /* Build configuration list for PBXNativeTarget "berty-tvOSTests" */ = { + 2D02E4BB1E0B4A5E006451C7 /* Build configuration list for PBXNativeTarget "Berty-tvOSTests" */ = { isa = XCConfigurationList; buildConfigurations = ( 2D02E4991E0B4A5E006451C7 /* Debug */, diff --git a/client/react-native/mobile/ios/berty.xcodeproj/xcshareddata/xcschemes/adhoc.xcscheme b/client/react-native/ios/Berty.xcodeproj/xcshareddata/xcschemes/adhoc.xcscheme similarity index 91% rename from client/react-native/mobile/ios/berty.xcodeproj/xcshareddata/xcschemes/adhoc.xcscheme rename to client/react-native/ios/Berty.xcodeproj/xcshareddata/xcschemes/adhoc.xcscheme index b144bf57cc..6dbeb1499f 100644 --- a/client/react-native/mobile/ios/berty.xcodeproj/xcshareddata/xcschemes/adhoc.xcscheme +++ b/client/react-native/ios/Berty.xcodeproj/xcshareddata/xcschemes/adhoc.xcscheme @@ -29,8 +29,8 @@ @@ -47,8 +47,8 @@ @@ -70,8 +70,8 @@ @@ -89,8 +89,8 @@ diff --git a/client/react-native/mobile/ios/berty.xcodeproj/xcshareddata/xcschemes/debug.xcscheme b/client/react-native/ios/Berty.xcodeproj/xcshareddata/xcschemes/debug.xcscheme similarity index 92% rename from client/react-native/mobile/ios/berty.xcodeproj/xcshareddata/xcschemes/debug.xcscheme rename to client/react-native/ios/Berty.xcodeproj/xcshareddata/xcschemes/debug.xcscheme index 42f2e8b857..3188f91559 100644 --- a/client/react-native/mobile/ios/berty.xcodeproj/xcshareddata/xcschemes/debug.xcscheme +++ b/client/react-native/ios/Berty.xcodeproj/xcshareddata/xcschemes/debug.xcscheme @@ -29,8 +29,8 @@ @@ -47,8 +47,8 @@ @@ -70,8 +70,8 @@ @@ -89,8 +89,8 @@ diff --git a/client/react-native/mobile/ios/berty.xcodeproj/xcshareddata/xcschemes/release.xcscheme b/client/react-native/ios/Berty.xcodeproj/xcshareddata/xcschemes/release.xcscheme similarity index 91% rename from client/react-native/mobile/ios/berty.xcodeproj/xcshareddata/xcschemes/release.xcscheme rename to client/react-native/ios/Berty.xcodeproj/xcshareddata/xcschemes/release.xcscheme index 36671571a3..75ceb816e3 100644 --- a/client/react-native/mobile/ios/berty.xcodeproj/xcshareddata/xcschemes/release.xcscheme +++ b/client/react-native/ios/Berty.xcodeproj/xcshareddata/xcschemes/release.xcscheme @@ -29,8 +29,8 @@ @@ -47,8 +47,8 @@ @@ -70,8 +70,8 @@ @@ -89,8 +89,8 @@ diff --git a/client/react-native/mobile/ios/berty/AppDelegate.h b/client/react-native/ios/Berty/AppDelegate.h similarity index 100% rename from client/react-native/mobile/ios/berty/AppDelegate.h rename to client/react-native/ios/Berty/AppDelegate.h diff --git a/client/react-native/mobile/ios/berty/AppDelegate.m b/client/react-native/ios/Berty/AppDelegate.m similarity index 100% rename from client/react-native/mobile/ios/berty/AppDelegate.m rename to client/react-native/ios/Berty/AppDelegate.m diff --git a/client/react-native/mobile/ios/berty/Base.lproj/LaunchScreen.xib b/client/react-native/ios/Berty/Base.lproj/LaunchScreen.xib similarity index 72% rename from client/react-native/mobile/ios/berty/Base.lproj/LaunchScreen.xib rename to client/react-native/ios/Berty/Base.lproj/LaunchScreen.xib index 2aa04a0fe7..13b6a4dac8 100644 --- a/client/react-native/mobile/ios/berty/Base.lproj/LaunchScreen.xib +++ b/client/react-native/ios/Berty/Base.lproj/LaunchScreen.xib @@ -1,9 +1,12 @@ - - + + + + + - - + + @@ -12,20 +15,20 @@ - - + diff --git a/client/react-native/mobile/ios/berty/BertyBluetoothModule.h b/client/react-native/ios/Berty/BertyBluetoothModule.h similarity index 100% rename from client/react-native/mobile/ios/berty/BertyBluetoothModule.h rename to client/react-native/ios/Berty/BertyBluetoothModule.h diff --git a/client/react-native/mobile/ios/berty/BertyBluetoothModule.m b/client/react-native/ios/Berty/BertyBluetoothModule.m similarity index 100% rename from client/react-native/mobile/ios/berty/BertyBluetoothModule.m rename to client/react-native/ios/Berty/BertyBluetoothModule.m diff --git a/client/react-native/mobile/ios/berty/BertyCentralManager.h b/client/react-native/ios/Berty/BertyCentralManager.h similarity index 100% rename from client/react-native/mobile/ios/berty/BertyCentralManager.h rename to client/react-native/ios/Berty/BertyCentralManager.h diff --git a/client/react-native/mobile/ios/berty/BertyCentralManager.m b/client/react-native/ios/Berty/BertyCentralManager.m similarity index 100% rename from client/react-native/mobile/ios/berty/BertyCentralManager.m rename to client/react-native/ios/Berty/BertyCentralManager.m diff --git a/client/react-native/mobile/ios/berty/BertyPeripheral.h b/client/react-native/ios/Berty/BertyPeripheral.h similarity index 100% rename from client/react-native/mobile/ios/berty/BertyPeripheral.h rename to client/react-native/ios/Berty/BertyPeripheral.h diff --git a/client/react-native/mobile/ios/berty/BertyPeripheral.m b/client/react-native/ios/Berty/BertyPeripheral.m similarity index 100% rename from client/react-native/mobile/ios/berty/BertyPeripheral.m rename to client/react-native/ios/Berty/BertyPeripheral.m diff --git a/client/react-native/mobile/ios/berty/Images.xcassets/AppIcon.appiconset/Contents.json b/client/react-native/ios/Berty/Images.xcassets/AppIcon.appiconset/Contents.json similarity index 99% rename from client/react-native/mobile/ios/berty/Images.xcassets/AppIcon.appiconset/Contents.json rename to client/react-native/ios/Berty/Images.xcassets/AppIcon.appiconset/Contents.json index ef30cfec79..4ff5d62c95 100644 --- a/client/react-native/mobile/ios/berty/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/client/react-native/ios/Berty/Images.xcassets/AppIcon.appiconset/Contents.json @@ -65,4 +65,4 @@ "version" : 1, "author" : "xcode" } -} \ No newline at end of file +} diff --git a/client/react-native/mobile/ios/berty/Images.xcassets/AppIcon.appiconset/Icon.png b/client/react-native/ios/Berty/Images.xcassets/AppIcon.appiconset/Icon.png similarity index 100% rename from client/react-native/mobile/ios/berty/Images.xcassets/AppIcon.appiconset/Icon.png rename to client/react-native/ios/Berty/Images.xcassets/AppIcon.appiconset/Icon.png diff --git a/client/react-native/mobile/ios/berty/Images.xcassets/AppIcon.appiconset/icon_20pt@2x.png b/client/react-native/ios/Berty/Images.xcassets/AppIcon.appiconset/icon_20pt@2x.png similarity index 100% rename from client/react-native/mobile/ios/berty/Images.xcassets/AppIcon.appiconset/icon_20pt@2x.png rename to client/react-native/ios/Berty/Images.xcassets/AppIcon.appiconset/icon_20pt@2x.png diff --git a/client/react-native/mobile/ios/berty/Images.xcassets/AppIcon.appiconset/icon_20pt@3x.png b/client/react-native/ios/Berty/Images.xcassets/AppIcon.appiconset/icon_20pt@3x.png similarity index 100% rename from client/react-native/mobile/ios/berty/Images.xcassets/AppIcon.appiconset/icon_20pt@3x.png rename to client/react-native/ios/Berty/Images.xcassets/AppIcon.appiconset/icon_20pt@3x.png diff --git a/client/react-native/mobile/ios/berty/Images.xcassets/AppIcon.appiconset/icon_29pt.png b/client/react-native/ios/Berty/Images.xcassets/AppIcon.appiconset/icon_29pt.png similarity index 100% rename from client/react-native/mobile/ios/berty/Images.xcassets/AppIcon.appiconset/icon_29pt.png rename to client/react-native/ios/Berty/Images.xcassets/AppIcon.appiconset/icon_29pt.png diff --git a/client/react-native/mobile/ios/berty/Images.xcassets/AppIcon.appiconset/icon_29pt@2x.png b/client/react-native/ios/Berty/Images.xcassets/AppIcon.appiconset/icon_29pt@2x.png similarity index 100% rename from client/react-native/mobile/ios/berty/Images.xcassets/AppIcon.appiconset/icon_29pt@2x.png rename to client/react-native/ios/Berty/Images.xcassets/AppIcon.appiconset/icon_29pt@2x.png diff --git a/client/react-native/mobile/ios/berty/Images.xcassets/AppIcon.appiconset/icon_29pt@3x.png b/client/react-native/ios/Berty/Images.xcassets/AppIcon.appiconset/icon_29pt@3x.png similarity index 100% rename from client/react-native/mobile/ios/berty/Images.xcassets/AppIcon.appiconset/icon_29pt@3x.png rename to client/react-native/ios/Berty/Images.xcassets/AppIcon.appiconset/icon_29pt@3x.png diff --git a/client/react-native/mobile/ios/berty/Images.xcassets/AppIcon.appiconset/icon_40pt@2x.png b/client/react-native/ios/Berty/Images.xcassets/AppIcon.appiconset/icon_40pt@2x.png similarity index 100% rename from client/react-native/mobile/ios/berty/Images.xcassets/AppIcon.appiconset/icon_40pt@2x.png rename to client/react-native/ios/Berty/Images.xcassets/AppIcon.appiconset/icon_40pt@2x.png diff --git a/client/react-native/mobile/ios/berty/Images.xcassets/AppIcon.appiconset/icon_40pt@3x.png b/client/react-native/ios/Berty/Images.xcassets/AppIcon.appiconset/icon_40pt@3x.png similarity index 100% rename from client/react-native/mobile/ios/berty/Images.xcassets/AppIcon.appiconset/icon_40pt@3x.png rename to client/react-native/ios/Berty/Images.xcassets/AppIcon.appiconset/icon_40pt@3x.png diff --git a/client/react-native/mobile/ios/berty/Images.xcassets/AppIcon.appiconset/icon_60pt@2x.png b/client/react-native/ios/Berty/Images.xcassets/AppIcon.appiconset/icon_60pt@2x.png similarity index 100% rename from client/react-native/mobile/ios/berty/Images.xcassets/AppIcon.appiconset/icon_60pt@2x.png rename to client/react-native/ios/Berty/Images.xcassets/AppIcon.appiconset/icon_60pt@2x.png diff --git a/client/react-native/mobile/ios/berty/Images.xcassets/AppIcon.appiconset/icon_60pt@3x.png b/client/react-native/ios/Berty/Images.xcassets/AppIcon.appiconset/icon_60pt@3x.png similarity index 100% rename from client/react-native/mobile/ios/berty/Images.xcassets/AppIcon.appiconset/icon_60pt@3x.png rename to client/react-native/ios/Berty/Images.xcassets/AppIcon.appiconset/icon_60pt@3x.png diff --git a/client/react-native/mobile/ios/berty/Images.xcassets/Contents.json b/client/react-native/ios/Berty/Images.xcassets/Contents.json similarity index 96% rename from client/react-native/mobile/ios/berty/Images.xcassets/Contents.json rename to client/react-native/ios/Berty/Images.xcassets/Contents.json index da4a164c91..2d92bd53fd 100644 --- a/client/react-native/mobile/ios/berty/Images.xcassets/Contents.json +++ b/client/react-native/ios/Berty/Images.xcassets/Contents.json @@ -3,4 +3,4 @@ "version" : 1, "author" : "xcode" } -} \ No newline at end of file +} diff --git a/client/react-native/mobile/ios/berty/Info.plist b/client/react-native/ios/Berty/Info.plist similarity index 96% rename from client/react-native/mobile/ios/berty/Info.plist rename to client/react-native/ios/Berty/Info.plist index 46a8c12fab..234ff2910e 100644 --- a/client/react-native/mobile/ios/berty/Info.plist +++ b/client/react-native/ios/Berty/Info.plist @@ -5,7 +5,7 @@ CFBundleDevelopmentRegion en CFBundleDisplayName - berty + Berty CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.0.0 + 0.0.488 CFBundleSignature ???? CFBundleVersion @@ -35,8 +35,16 @@ + NSCameraUsageDescription + Berty would like to use your camera NSLocationWhenInUseUsageDescription + NSMicrophoneUsageDescription + Berty would like to your microphone (for videos) + NSPhotoLibraryAddUsageDescription + Berty would like to save photos to your photo gallery + NSPhotoLibraryUsageDescription + Berty would like access to your photo gallery UIAppFonts Entypo.ttf @@ -53,6 +61,7 @@ Octicons.ttf SimpleLineIcons.ttf Zocial.ttf + AntDesign.ttf UILaunchStoryboardName LaunchScreen @@ -68,13 +77,5 @@ UIViewControllerBasedStatusBarAppearance - NSPhotoLibraryUsageDescription - Berty would like access to your photo gallery - NSCameraUsageDescription - Berty would like to use your camera - NSPhotoLibraryAddUsageDescription - Berty would like to save photos to your photo gallery - NSMicrophoneUsageDescription - Berty would like to your microphone (for videos) diff --git a/client/react-native/mobile/ios/berty/main.m b/client/react-native/ios/Berty/main.m similarity index 100% rename from client/react-native/mobile/ios/berty/main.m rename to client/react-native/ios/Berty/main.m diff --git a/client/react-native/mobile/ios/bertyTests/bertyTests.m b/client/react-native/ios/BertyTests/BertyTests.m similarity index 96% rename from client/react-native/mobile/ios/bertyTests/bertyTests.m rename to client/react-native/ios/BertyTests/BertyTests.m index 830a2a7640..be1d20c4f3 100644 --- a/client/react-native/mobile/ios/bertyTests/bertyTests.m +++ b/client/react-native/ios/BertyTests/BertyTests.m @@ -14,11 +14,11 @@ #define TIMEOUT_SECONDS 600 #define TEXT_TO_LOOK_FOR @"Welcome to React Native!" -@interface bertyTests : XCTestCase +@interface BertyTests : XCTestCase @end -@implementation bertyTests +@implementation BertyTests - (BOOL)findSubviewInView:(UIView *)view matching:(BOOL(^)(UIView *view))test { diff --git a/client/react-native/mobile/ios/bertyTests/Info.plist b/client/react-native/ios/BertyTests/Info.plist similarity index 100% rename from client/react-native/mobile/ios/bertyTests/Info.plist rename to client/react-native/ios/BertyTests/Info.plist diff --git a/client/react-native/mobile/ios/modules/berty-Bridging-Header.h b/client/react-native/ios/modules/berty-Bridging-Header.h similarity index 100% rename from client/react-native/mobile/ios/modules/berty-Bridging-Header.h rename to client/react-native/ios/modules/berty-Bridging-Header.h diff --git a/client/react-native/mobile/ios/modules/core/CoreModule.m b/client/react-native/ios/modules/core/CoreModule.m similarity index 100% rename from client/react-native/mobile/ios/modules/core/CoreModule.m rename to client/react-native/ios/modules/core/CoreModule.m diff --git a/client/react-native/mobile/ios/modules/core/CoreModule.swift b/client/react-native/ios/modules/core/CoreModule.swift similarity index 100% rename from client/react-native/mobile/ios/modules/core/CoreModule.swift rename to client/react-native/ios/modules/core/CoreModule.swift diff --git a/client/react-native/mobile/.babelrc b/client/react-native/mobile/.babelrc deleted file mode 120000 index efde5266a6..0000000000 --- a/client/react-native/mobile/.babelrc +++ /dev/null @@ -1 +0,0 @@ -../.babelrc \ No newline at end of file diff --git a/client/react-native/mobile/.eslint b/client/react-native/mobile/.eslint deleted file mode 120000 index 8a7b10984c..0000000000 --- a/client/react-native/mobile/.eslint +++ /dev/null @@ -1 +0,0 @@ -../.eslintrc \ No newline at end of file diff --git a/client/react-native/mobile/.gitignore b/client/react-native/mobile/.gitignore deleted file mode 100644 index 5d647565fa..0000000000 --- a/client/react-native/mobile/.gitignore +++ /dev/null @@ -1,56 +0,0 @@ -# OSX -# -.DS_Store - -# Xcode -# -build/ -*.pbxuser -!default.pbxuser -*.mode1v3 -!default.mode1v3 -*.mode2v3 -!default.mode2v3 -*.perspectivev3 -!default.perspectivev3 -xcuserdata -*.xccheckout -*.moved-aside -DerivedData -*.hmap -*.ipa -*.xcuserstate -project.xcworkspace - -# Android/IntelliJ -# -build/ -.idea -.gradle -local.properties -*.iml - -# node.js -# -node_modules/ -npm-debug.log -yarn-error.log - -# BUCK -buck-out/ -\.buckd/ -*.keystore - -# fastlane -# -# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the -# screenshots whenever they are needed. -# For more information about the recommended setup visit: -# https://docs.fastlane.tools/best-practices/source-control/ - -*/fastlane/report.xml -*/fastlane/Preview.html -*/fastlane/screenshots - -# Bundle artifact -*.jsbundle diff --git a/client/react-native/mobile/.watchmanconfig b/client/react-native/mobile/.watchmanconfig deleted file mode 100644 index 0967ef424b..0000000000 --- a/client/react-native/mobile/.watchmanconfig +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/client/react-native/mobile/android/.settings/org.eclipse.buildship.core.prefs b/client/react-native/mobile/android/.settings/org.eclipse.buildship.core.prefs deleted file mode 100644 index 2aaf53542a..0000000000 --- a/client/react-native/mobile/android/.settings/org.eclipse.buildship.core.prefs +++ /dev/null @@ -1,2 +0,0 @@ -#Mon Aug 20 17:15:12 CEST 2018 -connection.project.dir= diff --git a/client/react-native/mobile/android/Gemfile b/client/react-native/mobile/android/Gemfile deleted file mode 100644 index 7a118b49be..0000000000 --- a/client/react-native/mobile/android/Gemfile +++ /dev/null @@ -1,3 +0,0 @@ -source "https://rubygems.org" - -gem "fastlane" diff --git a/client/react-native/mobile/android/Gemfile.lock b/client/react-native/mobile/android/Gemfile.lock deleted file mode 100644 index b66a9a9569..0000000000 --- a/client/react-native/mobile/android/Gemfile.lock +++ /dev/null @@ -1,152 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - CFPropertyList (3.0.0) - addressable (2.5.2) - public_suffix (>= 2.0.2, < 4.0) - atomos (0.1.2) - babosa (1.0.2) - claide (1.0.2) - colored (1.2) - colored2 (3.1.2) - commander-fastlane (4.4.6) - highline (~> 1.7.2) - declarative (0.0.10) - declarative-option (0.1.0) - domain_name (0.5.20180417) - unf (>= 0.0.5, < 1.0.0) - dotenv (2.5.0) - emoji_regex (0.1.1) - excon (0.62.0) - faraday (0.15.2) - multipart-post (>= 1.2, < 3) - faraday-cookie_jar (0.0.6) - faraday (>= 0.7.4) - http-cookie (~> 1.0.0) - faraday_middleware (0.12.2) - faraday (>= 0.7.4, < 1.0) - fastimage (2.1.3) - fastlane (2.101.1) - CFPropertyList (>= 2.3, < 4.0.0) - addressable (>= 2.3, < 3.0.0) - babosa (>= 1.0.2, < 2.0.0) - bundler (>= 1.12.0, < 2.0.0) - colored - commander-fastlane (>= 4.4.6, < 5.0.0) - dotenv (>= 2.1.1, < 3.0.0) - emoji_regex (~> 0.1) - excon (>= 0.45.0, < 1.0.0) - faraday (~> 0.9) - faraday-cookie_jar (~> 0.0.6) - faraday_middleware (~> 0.9) - fastimage (>= 2.1.0, < 3.0.0) - gh_inspector (>= 1.1.2, < 2.0.0) - google-api-client (>= 0.21.2, < 0.24.0) - highline (>= 1.7.2, < 2.0.0) - json (< 3.0.0) - mini_magick (~> 4.5.1) - multi_json - multi_xml (~> 0.5) - multipart-post (~> 2.0.0) - plist (>= 3.1.0, < 4.0.0) - public_suffix (~> 2.0.0) - rubyzip (>= 1.2.1, < 2.0.0) - security (= 0.1.3) - simctl (~> 1.6.3) - slack-notifier (>= 2.0.0, < 3.0.0) - terminal-notifier (>= 1.6.2, < 2.0.0) - terminal-table (>= 1.4.5, < 2.0.0) - tty-screen (>= 0.6.3, < 1.0.0) - tty-spinner (>= 0.8.0, < 1.0.0) - word_wrap (~> 1.0.0) - xcodeproj (>= 1.5.7, < 2.0.0) - xcpretty (~> 0.2.8) - xcpretty-travis-formatter (>= 0.0.3) - gh_inspector (1.1.3) - google-api-client (0.23.4) - addressable (~> 2.5, >= 2.5.1) - googleauth (>= 0.5, < 0.7.0) - httpclient (>= 2.8.1, < 3.0) - mime-types (~> 3.0) - representable (~> 3.0) - retriable (>= 2.0, < 4.0) - googleauth (0.6.2) - faraday (~> 0.12) - jwt (>= 1.4, < 3.0) - logging (~> 2.0) - memoist (~> 0.12) - multi_json (~> 1.11) - os (~> 0.9) - signet (~> 0.7) - highline (1.7.10) - http-cookie (1.0.3) - domain_name (~> 0.5) - httpclient (2.8.3) - json (2.1.0) - jwt (2.1.0) - little-plugger (1.1.4) - logging (2.2.2) - little-plugger (~> 1.1) - multi_json (~> 1.10) - memoist (0.16.0) - mime-types (3.1) - mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) - mini_magick (4.5.1) - multi_json (1.13.1) - multi_xml (0.6.0) - multipart-post (2.0.0) - nanaimo (0.2.6) - naturally (2.2.0) - os (0.9.6) - plist (3.4.0) - public_suffix (2.0.5) - representable (3.0.4) - declarative (< 0.1.0) - declarative-option (< 0.2.0) - uber (< 0.2.0) - retriable (3.1.2) - rouge (2.0.7) - rubyzip (1.2.1) - security (0.1.3) - signet (0.8.1) - addressable (~> 2.3) - faraday (~> 0.9) - jwt (>= 1.5, < 3.0) - multi_json (~> 1.10) - simctl (1.6.5) - CFPropertyList - naturally - slack-notifier (2.3.2) - terminal-notifier (1.8.0) - terminal-table (1.8.0) - unicode-display_width (~> 1.1, >= 1.1.1) - tty-cursor (0.6.0) - tty-screen (0.6.5) - tty-spinner (0.8.0) - tty-cursor (>= 0.5.0) - uber (0.1.0) - unf (0.1.4) - unf_ext - unf_ext (0.0.7.5) - unicode-display_width (1.4.0) - word_wrap (1.0.0) - xcodeproj (1.5.9) - CFPropertyList (>= 2.3.3, < 4.0) - atomos (~> 0.1.2) - claide (>= 1.0.2, < 2.0) - colored2 (~> 3.1) - nanaimo (~> 0.2.5) - xcpretty (0.2.8) - rouge (~> 2.0.7) - xcpretty-travis-formatter (1.0.0) - xcpretty (~> 0.2, >= 0.0.7) - -PLATFORMS - ruby - -DEPENDENCIES - fastlane - -BUNDLED WITH - 1.16.2 diff --git a/client/react-native/mobile/android/app/.settings/org.eclipse.buildship.core.prefs b/client/react-native/mobile/android/app/.settings/org.eclipse.buildship.core.prefs deleted file mode 100644 index e2fe267515..0000000000 --- a/client/react-native/mobile/android/app/.settings/org.eclipse.buildship.core.prefs +++ /dev/null @@ -1,2 +0,0 @@ -#Mon Aug 20 17:15:12 CEST 2018 -connection.project.dir=.. diff --git a/client/react-native/mobile/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/client/react-native/mobile/android/app/src/main/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index a2f5908281..0000000000 Binary files a/client/react-native/mobile/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/client/react-native/mobile/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/client/react-native/mobile/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index 1b52399808..0000000000 Binary files a/client/react-native/mobile/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ diff --git a/client/react-native/mobile/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/client/react-native/mobile/android/app/src/main/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index ff10afd6e1..0000000000 Binary files a/client/react-native/mobile/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/client/react-native/mobile/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/client/react-native/mobile/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index 115a4c768a..0000000000 Binary files a/client/react-native/mobile/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ diff --git a/client/react-native/mobile/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/client/react-native/mobile/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index dcd3cd8083..0000000000 Binary files a/client/react-native/mobile/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/client/react-native/mobile/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/client/react-native/mobile/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index 459ca609d3..0000000000 Binary files a/client/react-native/mobile/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ diff --git a/client/react-native/mobile/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/client/react-native/mobile/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 8ca12fe024..0000000000 Binary files a/client/react-native/mobile/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/client/react-native/mobile/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/client/react-native/mobile/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index 8e19b410a1..0000000000 Binary files a/client/react-native/mobile/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/client/react-native/mobile/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/client/react-native/mobile/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index b824ebdd48..0000000000 Binary files a/client/react-native/mobile/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/client/react-native/mobile/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/client/react-native/mobile/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index 4c19a13c23..0000000000 Binary files a/client/react-native/mobile/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/client/react-native/mobile/android/app/src/main/res/values/strings.xml b/client/react-native/mobile/android/app/src/main/res/values/strings.xml deleted file mode 100644 index 9a8be2ecbd..0000000000 --- a/client/react-native/mobile/android/app/src/main/res/values/strings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - berty - diff --git a/client/react-native/mobile/android/gradle/wrapper/gradle-wrapper.jar b/client/react-native/mobile/android/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index b5166dad4d..0000000000 Binary files a/client/react-native/mobile/android/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/client/react-native/mobile/app.json b/client/react-native/mobile/app.json deleted file mode 100644 index 83f1f98e31..0000000000 --- a/client/react-native/mobile/app.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "expo": { - "sdkVersion": "27.0.0" - }, - "name": "berty", - "displayName": "Berty" -} diff --git a/client/react-native/mobile/index.js b/client/react-native/mobile/index.js deleted file mode 100644 index 59506f2fff..0000000000 --- a/client/react-native/mobile/index.js +++ /dev/null @@ -1 +0,0 @@ -import '../common' diff --git a/client/react-native/mobile/package.json b/client/react-native/mobile/package.json deleted file mode 100644 index 4e25f6c10a..0000000000 --- a/client/react-native/mobile/package.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "@berty/mobile", - "version": "0.0.1", - "scripts": { - "postinstall": "mkdir -p node_modules/@berty && yarn link:rn && yarn link:rn-vector-icons && yarn link:rn-net-info && yarn link:rn-img-pick && yarn link:berty", - "start": "rm -rf $TMPDIR/metro-* && react-native start --reset-cache --root $PWD/../common", - "android": "react-native run-android --no-packager", - "ios": "react-native run-ios --no-packager --scheme=debug", - "debug:relay": "relay-devtools", - "debug:react-native": "open \"rndebugger://set-debugger-loc?host=localhost&port=8081\"", - "test": "jest", - "link:rn": "ln -fs ../../node_modules/react-native node_modules", - "link:rn-vector-icons": "ln -fs ../../node_modules/react-native-vector-icons node_modules", - "link:rn-net-info": "ln -fs ../../node_modules/react-native-network-info node_modules", - "link:rn-img-pick": "ln -fs ../../node_modules/react-native-image-picker node_modules", - "link:berty": "ln -fs ../../../common node_modules/@berty" - } -} diff --git a/client/react-native/mobile/yarn.lock b/client/react-native/mobile/yarn.lock deleted file mode 100644 index fb57ccd13a..0000000000 --- a/client/react-native/mobile/yarn.lock +++ /dev/null @@ -1,4 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - diff --git a/client/react-native/package.json b/client/react-native/package.json index 1220f57343..053a84fc3f 100644 --- a/client/react-native/package.json +++ b/client/react-native/package.json @@ -1,62 +1,44 @@ { "name": "@berty/react-native", - "version": "0.0.0", + "version": "0.0.1", "description": "Berty's react native", "license": "Apache-2.0", "scripts": { - "postinstall": "relay-compiler --src common --schema common/schema.graphql" + "postinstall": "yarn relay", + "start": "concurrently 'yarn relay --watch' 'react-native start --reset-cache'", + "test": "jest", + "relay": "relay-compiler --src common --schema common/schema.graphql" }, "dependencies": { "b64-lite": "^1.3.1", - "graphql": "^0.13.2", + "concurrently": "^4.0.1", + "graphql": "^14.0.2", "graphql-relay": "^0.5.5", "isomorphic-fetch": "^2.2.1", "qrcode-react": "^0.1.16", - "react": "^16.4.2", - "react-art": "^16.4.2", - "react-dom": "^16.4.2", - "react-native": "^0.55.4", - "react-native-image-picker": "^0.26.10", + "react": "16.5.0", + "react-dom": "16.4.2", + "react-native": "0.57.2", + "react-native-image-picker": "^0.27.1", "react-native-keyboard-spacer": "^0.4.1", - "react-native-network-info": "^3.2.2", - "react-native-vector-icons": "^5.0.0", - "react-native-web": "^0.8.9", - "react-navigation": "^2.12.1", - "react-qr-reader": "^2.1.0", - "react-relay": "^1.4.1", - "relay-compiler": "^1.4.1", + "react-native-network-info": "^4.0.0", + "react-native-vector-icons": "^6.0.1", + "react-navigation": "^2.17.0", + "react-qr-reader": "^2.1.1", + "react-relay": "^1.6.2", + "relay-compiler": "^1.6.2", "relay-devtools": "^1.4.0", - "subscriptions-transport-ws": "^0.9.14" + "subscriptions-transport-ws": "^0.9.15" }, "devDependencies": { - "babel-core": "^6.26.3", - "babel-eslint": "^8.2.6", - "babel-loader": "^7.1.5", - "babel-plugin-react-native-web": "^0.8.9", + "@babel/plugin-proposal-export-namespace-from": "^7.0.0", + "babel-jest": "23.6.0", "babel-plugin-relay": "^1.6.2", - "babel-preset-react-app": "^3.1.2", - "babel-preset-react-native": "^4.0.0", - "babel-preset-stage-0": "^6.24.1", - "babel-runtime": "^6.26.0", - "eslint": "^5.4.0", - "eslint-config-prettier": "^3.0.1", - "eslint-config-prettier-standard": "^2.0.0", - "eslint-config-react-app": "^2.1.0", - "eslint-config-standard": "^11.0.0", - "eslint-config-standard-react": "^6.0.0", - "eslint-config-typescript": "^1.1.0", - "eslint-loader": "^2.1.0", - "eslint-plugin-flowtype": "2.50.0", - "eslint-plugin-import": "^2.13.0", - "eslint-plugin-jsx-a11y": "^6.1.1", - "eslint-plugin-node": "^7.0.1", - "eslint-plugin-prettier": "^2.6.2", - "eslint-plugin-promise": "^3.8.0", - "eslint-plugin-react": "^7.11.1", - "eslint-plugin-standard": "^3.1.0", - "eslint-plugin-typescript": "^0.12.0", - "prettier": "^1.13.7", - "prettier-eslint": "^8.8.2", - "prettier-eslint-cli": "^4.7.1" + "babel-plugin-transform-export-extensions": "^6.22.0", + "jest": "23.6.0", + "metro-react-native-babel-preset": "0.48.0" + }, + "jest": { + "preset": "react-native" } } diff --git a/client/react-native/patch/ios-install-third-party.sh.patch b/client/react-native/patch/ios-install-third-party.sh.patch deleted file mode 100644 index 47c5ee5a17..0000000000 --- a/client/react-native/patch/ios-install-third-party.sh.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- scripts/ios-install-third-party.sh 2018-09-19 11:51:10.000000000 +0200 -+++ scripts/ios-install-third-party.sh.new 2018-09-19 11:50:05.000000000 +0200 -@@ -59,7 +59,7 @@ - - mkdir -p third-party - --SCRIPTDIR=$(dirname "$0") -+SCRIPTDIR="$PWD/$(dirname $0)" - - fetch_and_unpack glog-0.3.4.tar.gz https://github.com/google/glog/archive/v0.3.4.tar.gz 69f91cd5a1de35ead0bc4103ea87294b0206a456 "\"$SCRIPTDIR/ios-configure-glog.sh\"" - fetch_and_unpack double-conversion-1.1.5.tar.gz https://github.com/google/double-conversion/archive/v1.1.5.tar.gz 96a8aba1b4ce7d4a7a3c123be26c379c2fed1def diff --git a/client/react-native/patch/project.pbxproj.patch b/client/react-native/patch/project.pbxproj.patch deleted file mode 100644 index d62b489e61..0000000000 --- a/client/react-native/patch/project.pbxproj.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- project.pbxproj 2018-09-19 12:00:47.000000000 +0200 -+++ project.pbxproj.new 2018-09-19 12:00:59.000000000 +0200 -@@ -9,7 +9,6 @@ - /* Begin PBXBuildFile section */ - 1338BBE01B04ACC80064A9C9 /* RCTSRWebSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 1338BBDD1B04ACC80064A9C9 /* RCTSRWebSocket.m */; }; - 1338BBE11B04ACC80064A9C9 /* RCTWebSocketExecutor.m in Sources */ = {isa = PBXBuildFile; fileRef = 1338BBDF1B04ACC80064A9C9 /* RCTWebSocketExecutor.m */; }; -- 13526A521F362F7F0008EF00 /* libfishhook.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 13526A511F362F7F0008EF00 /* libfishhook.a */; }; - 2D3B5F3D1D9B165B00451313 /* RCTSRWebSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 1338BBDD1B04ACC80064A9C9 /* RCTSRWebSocket.m */; }; - 2D3B5F3E1D9B165B00451313 /* RCTWebSocketExecutor.m in Sources */ = {isa = PBXBuildFile; fileRef = 1338BBDF1B04ACC80064A9C9 /* RCTWebSocketExecutor.m */; }; - 2D3B5F401D9B165B00451313 /* RCTWebSocketModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C86DF7B1ADF695F0047B81A /* RCTWebSocketModule.m */; }; -@@ -19,6 +18,7 @@ - 3DBE0D151F3B185A0099AA32 /* fishhook.c in Sources */ = {isa = PBXBuildFile; fileRef = 3DBE0D121F3B185A0099AA32 /* fishhook.c */; }; - 3DBE0D801F3B1AF00099AA32 /* fishhook.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3DBE0D131F3B185A0099AA32 /* fishhook.h */; }; - 3DBE0D821F3B1B0C0099AA32 /* fishhook.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3DBE0D131F3B185A0099AA32 /* fishhook.h */; }; -+ 48E9CF3C215255DA0068DE0F /* libfishhook.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DBE0D001F3B181A0099AA32 /* libfishhook.a */; }; - A12E9E2E1E5DEC4E0029001B /* RCTReconnectingWebSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = A12E9E2D1E5DEC4E0029001B /* RCTReconnectingWebSocket.m */; }; - A12E9E2F1E5DEC550029001B /* RCTReconnectingWebSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = A12E9E2D1E5DEC4E0029001B /* RCTReconnectingWebSocket.m */; }; - /* End PBXBuildFile section */ -@@ -87,7 +87,7 @@ - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( -- 13526A521F362F7F0008EF00 /* libfishhook.a in Frameworks */, -+ 48E9CF3C215255DA0068DE0F /* libfishhook.a in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -@@ -435,7 +435,7 @@ - EXECUTABLE_PREFIX = lib; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", -- "RCT_METRO_PORT=${RCT_METRO_PORT}", -+ "RCT_METRO_PORT=${RCT_METRO_PORT}", - "$(inherited)", - ); - GCC_TREAT_WARNINGS_AS_ERRORS = NO; diff --git a/client/react-native/web/config/env.js b/client/react-native/web/config/env.js deleted file mode 100644 index 1707c381d3..0000000000 --- a/client/react-native/web/config/env.js +++ /dev/null @@ -1,92 +0,0 @@ - -const fs = require('fs') -const path = require('path') -const paths = require('./paths') - -// Make sure that including paths.js after env.js will read .env variables. -delete require.cache[require.resolve('./paths')] - -const NODE_ENV = process.env.NODE_ENV -if (!NODE_ENV) { - throw new Error( - 'The NODE_ENV environment variable is required but was not specified.' - ) -} - -// https://github.com/bkeepers/dotenv#what-other-env-files-can-i-use -var dotenvFiles = [ - `${paths.dotenv}.${NODE_ENV}.local`, - `${paths.dotenv}.${NODE_ENV}`, - // Don't include `.env.local` for `test` environment - // since normally you expect tests to produce the same - // results for everyone - NODE_ENV !== 'test' && `${paths.dotenv}.local`, - paths.dotenv, -].filter(Boolean) - -// Load environment variables from .env* files. Suppress warnings using silent -// if this file is missing. dotenv will never modify any environment variables -// that have already been set. Variable expansion is supported in .env files. -// https://github.com/motdotla/dotenv -// https://github.com/motdotla/dotenv-expand -dotenvFiles.forEach(dotenvFile => { - if (fs.existsSync(dotenvFile)) { - require('dotenv-expand')( - require('dotenv').config({ - path: dotenvFile, - }) - ) - } -}) - -// We support resolving modules according to `NODE_PATH`. -// This lets you use absolute paths in imports inside large monorepos: -// https://github.com/facebook/create-react-app/issues/253. -// It works similar to `NODE_PATH` in Node itself: -// https://nodejs.org/api/modules.html#modules_loading_from_the_global_folders -// Note that unlike in Node, only *relative* paths from `NODE_PATH` are honored. -// Otherwise, we risk importing Node.js core modules into an app instead of Webpack shims. -// https://github.com/facebook/create-react-app/issues/1023#issuecomment-265344421 -// We also resolve them to make sure all tools using them work consistently. -const appDirectory = fs.realpathSync(process.cwd()) -process.env.NODE_PATH = (process.env.NODE_PATH || '') - .split(path.delimiter) - .filter(folder => folder && !path.isAbsolute(folder)) - .map(folder => path.resolve(appDirectory, folder)) - .join(path.delimiter) - -// Grab NODE_ENV and REACT_APP_* environment variables and prepare them to be -// injected into the application via DefinePlugin in Webpack configuration. -const REACT_APP = /^REACT_APP_/i - -function getClientEnvironment (publicUrl) { - const raw = Object.keys(process.env) - .filter(key => REACT_APP.test(key)) - .reduce( - (env, key) => { - env[key] = process.env[key] - return env - }, - { - // Useful for determining whether we’re running in production mode. - // Most importantly, it switches React into the correct mode. - NODE_ENV: process.env.NODE_ENV || 'development', - // Useful for resolving the correct path to static assets in `public`. - // For example, . - // This should only be used as an escape hatch. Normally you would put - // images into the `src` and `import` them in code to get their paths. - PUBLIC_URL: publicUrl, - } - ) - // Stringify all values so we can feed into Webpack DefinePlugin - const stringified = { - 'process.env': Object.keys(raw).reduce((env, key) => { - env[key] = JSON.stringify(raw[key]) - return env - }, {}), - } - - return { raw, stringified } -} - -module.exports = getClientEnvironment diff --git a/client/react-native/web/config/jest/babelTransform.js b/client/react-native/web/config/jest/babelTransform.js deleted file mode 100644 index 885cb2adca..0000000000 --- a/client/react-native/web/config/jest/babelTransform.js +++ /dev/null @@ -1,8 +0,0 @@ -'use strict'; - -const babelJest = require('babel-jest'); - -module.exports = babelJest.createTransformer({ - presets: [require.resolve('babel-preset-react-app')], - -}); diff --git a/client/react-native/web/config/jest/cssTransform.js b/client/react-native/web/config/jest/cssTransform.js deleted file mode 100644 index 8f65114812..0000000000 --- a/client/react-native/web/config/jest/cssTransform.js +++ /dev/null @@ -1,14 +0,0 @@ -'use strict'; - -// This is a custom Jest transformer turning style imports into empty objects. -// http://facebook.github.io/jest/docs/en/webpack.html - -module.exports = { - process() { - return 'module.exports = {};'; - }, - getCacheKey() { - // The output is always the same. - return 'cssTransform'; - }, -}; diff --git a/client/react-native/web/config/jest/fileTransform.js b/client/react-native/web/config/jest/fileTransform.js deleted file mode 100644 index e167d31bb1..0000000000 --- a/client/react-native/web/config/jest/fileTransform.js +++ /dev/null @@ -1,22 +0,0 @@ -'use strict'; - -const path = require('path'); - -// This is a custom Jest transformer turning file imports into filenames. -// http://facebook.github.io/jest/docs/en/webpack.html - -module.exports = { - process(src, filename) { - const assetFilename = JSON.stringify(path.basename(filename)); - - if (filename.match(/\.svg$/)) { - return `module.exports = { - __esModule: true, - default: ${assetFilename}, - ReactComponent: () => ${assetFilename}, - };`; - } - - return `module.exports = ${assetFilename};`; - }, -}; diff --git a/client/react-native/web/config/jest/graphqlTransform.js b/client/react-native/web/config/jest/graphqlTransform.js deleted file mode 100644 index 1249902010..0000000000 --- a/client/react-native/web/config/jest/graphqlTransform.js +++ /dev/null @@ -1,9 +0,0 @@ -'use strict'; - -const loader = require('graphql-tag/loader'); - -module.exports = { - process(src) { - return loader.call({ cacheable() {} }, src); - }, -}; diff --git a/client/react-native/web/config/paths.js b/client/react-native/web/config/paths.js deleted file mode 100644 index 6a9cdeee50..0000000000 --- a/client/react-native/web/config/paths.js +++ /dev/null @@ -1,55 +0,0 @@ - -const path = require('path') -const fs = require('fs') -const url = require('url') - -// Make sure any symlinks in the project folder are resolved: -// https://github.com/facebookincubator/create-react-app/issues/637 -const appDirectory = fs.realpathSync(process.cwd()) -const resolveApp = relativePath => path.resolve(appDirectory, relativePath) - -const envPublicUrl = process.env.PUBLIC_URL - -function ensureSlash (path, needsSlash) { - const hasSlash = path.endsWith('/') - if (hasSlash && !needsSlash) { - return path.substr(path, path.length - 1) - } else if (!hasSlash && needsSlash) { - return `${path}/` - } else { - return path - } -} - -const getPublicUrl = appPackageJson => - envPublicUrl || require(appPackageJson).homepage - -// We use `PUBLIC_URL` environment variable or "homepage" field to infer -// "public path" at which the app is served. -// Webpack needs to know it to put the right