Merge pull request #59 from berty/bump-rn

fix: bump react-native

.github/workflows/ios.yml

@@ -77,21 +77,10 @@ jobs:
         with:
           node-version: ${{ matrix.node }}
 
-      - name: Setup Bundler
-        if: ${{ matrix.selfhosted }}
-        working-directory: ./rn/ios
-        run: |
-          gem --version
-          gem install bundler --user-install
-          bundler -v
-          bundle update --bundler
-
-      - name: Cache Ruby modules
-        uses: actions/[email protected]
+      - uses: ruby/setup-ruby@v1
         with:
-          path: rn/ios/vendor/bundle
-          key: ${{ runner.OS }}-bundle-v2-${{ hashFiles('rn/Gemfile.lock') }}
-          restore-keys: ${{ runner.OS }}-bundle-v2-
+          working-directory: rn
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
 
       - name: Setup macOS keychain
         working-directory: rn/ios/dummy-identity

rn/ios/.bundle/config → rn/.bundle/config

@@ -1,2 +1,2 @@
----
 BUNDLE_PATH: "vendor/bundle"
+BUNDLE_FORCE_RUBY_PLATFORM: 1

rn/.gitignore

@@ -69,7 +69,7 @@ android/app/gradlew.bat
 # Berty
 
 /.link
-/ios/vendor/
+/vendor/
 /gomobile-ipfs/
 /ios/vendored_pods/
 /react-native-labs-bridge/ios/Labsbridge.xcframework

rn/.ruby-version

@@ -0,0 +1 @@
+2.7.4

rn/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
+ruby '2.7.4'
+gem 'cocoapods', '~> 1.11', '>= 1.11.2'

rn/ios/Gemfile.lock → rn/Gemfile.lock

@@ -15,7 +15,7 @@ GEM
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
     atomos (0.1.3)
-    claide (1.0.3)
+    claide (1.1.0)
     cocoapods (1.11.2)
       addressable (~> 2.8)
       claide (>= 1.0.2, < 2.0)
@@ -58,12 +58,12 @@ GEM
     escape (0.0.4)
     ethon (0.15.0)
       ffi (>= 1.15.0)
-    ffi (1.15.4)
+    ffi (1.15.5)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
     httpclient (2.8.3)
-    i18n (1.8.11)
+    i18n (1.9.1)
       concurrent-ruby (~> 1.0)
     json (2.6.1)
     minitest (5.15.0)
@@ -85,17 +85,16 @@ GEM
       colored2 (~> 3.1)
       nanaimo (~> 0.3.0)
       rexml (~> 3.2.4)
-    zeitwerk (2.5.3)
+    zeitwerk (2.5.4)
 
 PLATFORMS
-  arm64-darwin-21
   ruby
-  universal-darwin-20
 
 DEPENDENCIES
-  cocoapods (~> 1.11.2)
-  ethon (>= 0.13.0)
-  rexml (~> 3.2)
+  cocoapods (~> 1.11, >= 1.11.2)
+
+RUBY VERSION
+   ruby 2.7.4p191
 
 BUNDLED WITH
-   2.2.32
+   2.2.27

rn/Makefile

@@ -67,12 +67,12 @@ node_modules/.mkt: yarn.lock package.json $(wildcard patches/*)
 
 #### iOS
 
-ios/vendor/bundle: ios/Gemfile ios/Gemfile.lock
-	cd ios && bundle install
+vendor/bundle: Gemfile Gemfile.lock
+	eval "$$(frum init)" && bundle install
 	touch $@
 
-ios/Pods/.mkt: $(IOS_CORE) ios/Podfile ios/Podfile.lock node_modules/.mkt ios/vendor/bundle
-	cd ios && bundle exec pod install --repo-update
+ios/Pods/.mkt: $(IOS_CORE) ios/Podfile ios/Podfile.lock node_modules/.mkt vendor/bundle
+	eval "$$(frum init)" && cd ios && bundle exec pod install --repo-update
 	touch $@
 
 #### Android

rn/android/app/src/main/res/drawable/rn_edit_text_material.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+          http://www.apache.org/licenses/LICENSE-2.0
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+       android:insetLeft="@dimen/abc_edit_text_inset_horizontal_material"
+       android:insetRight="@dimen/abc_edit_text_inset_horizontal_material"
+       android:insetTop="@dimen/abc_edit_text_inset_top_material"
+       android:insetBottom="@dimen/abc_edit_text_inset_bottom_material">
+    <selector>
+        <!-- 
+          This file is a copy of abc_edit_text_material (https://bit.ly/3k8fX7I).
+          The item below with state_pressed="false" and state_focused="false" causes a NullPointerException.
+          NullPointerException:tempt to invoke virtual method 'android.graphics.drawable.Drawable android.graphics.drawable.Drawable$ConstantState.newDrawable(android.content.res.Resources)'
+          <item android:state_pressed="false" android:state_focused="false" android:drawable="@drawable/abc_textfield_default_mtrl_alpha"/>
+          For more info, see https://bit.ly/3CdLStv (react-native/pull/29452) and https://bit.ly/3nxOMoR.
+        -->
+        <item android:state_enabled="false" android:drawable="@drawable/abc_textfield_default_mtrl_alpha"/>
+        <item android:drawable="@drawable/abc_textfield_activated_mtrl_alpha"/>
+    </selector>
+</inset>

rn/android/app/src/main/res/values/styles.xml

@@ -0,0 +1,9 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
+        <!-- Customize your theme here. -->
+        <item name="android:editTextBackground">@drawable/rn_edit_text_material</item>
+    </style>
+
+</resources>

rn/ios/BertyLabs.xcodeproj/project.pbxproj

@@ -660,7 +660,7 @@
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 ";
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -684,7 +684,6 @@
 				LIBRARY_SEARCH_PATHS = (
 					"\"$(SDKROOT)/usr/lib/swift\"",
 					"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
-					"\"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)\"",
 					"\"$(inherited)\"",
 				);
 				MTL_ENABLE_DEBUG_INFO = YES;
@@ -726,7 +725,7 @@
 				COPY_PHASE_STRIP = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 ";
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -743,7 +742,6 @@
 				LIBRARY_SEARCH_PATHS = (
 					"\"$(SDKROOT)/usr/lib/swift\"",
 					"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
-					"\"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)\"",
 					"\"$(inherited)\"",
 				);
 				MTL_ENABLE_DEBUG_INFO = NO;