keybase · chrisnojima · Jan 5, 2024 · Jan 8, 2024 · Jan 9, 2024
diff --git a/go/libkb/version.go b/go/libkb/version.go
@@ -4,4 +4,4 @@
 package libkb
 
 // Version is the current version (should be MAJOR.MINOR.PATCH)
-const Version = "6.2.6"
+const Version = "6.2.7"
diff --git a/packaging/android/build_and_publish.sh b/packaging/android/build_and_publish.sh
@@ -4,7 +4,7 @@ set -eE -u -o pipefail # Fail on error, call ERR trap
 
 automated_build=${AUTOMATED_BUILD:-}
 gopath=${GOPATH:-}
-dir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+dir=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 client_dir="$dir/../.."
 kbfs_dir="$client_dir/go/kbfs"
 shared_dir="$client_dir/shared"
@@ -16,9 +16,9 @@ check_ci=${CHECK_CI:-1}
 
 # Notify Slack on failure
 function notify_slack {
-  if [ -n "$automated_build" ]; then
-    "$client_dir/packaging/slack/send.sh" "<@channel> Automated Android build failed, please check out the log."
-  fi
+	if [ -n "$automated_build" ]; then
+		"$client_dir/packaging/slack/send.sh" "<@channel> Automated Android build failed, please check out the log."
+	fi
 }
 trap notify_slack ERR
 
@@ -28,20 +28,20 @@ trap notify_slack ERR
 client_branch=$(cd "$client_dir" && git rev-parse --abbrev-ref HEAD)
 rn_packager_pid=""
 function reset {
-  (cd "$client_dir" && git checkout "$client_branch")
+	(cd "$client_dir" && git checkout "$client_branch")
 
-  if [ ! "$rn_packager_pid" = "" ]; then
-    echo "Killing packager $rn_packager_pid"
-    pkill -P $rn_packager_pid || true
-  fi
+	if [ ! "$rn_packager_pid" = "" ]; then
+		echo "Killing packager $rn_packager_pid"
+		pkill -P $rn_packager_pid || true
+	fi
 }
 trap reset EXIT
 
 if [ -n "$client_commit" ]; then
-  cd "$client_dir"
-  echo "Checking out $client_commit on client (will reset to $client_branch)"
-  git fetch
-  git checkout "$client_commit"
+	cd "$client_dir"
+	echo "Checking out $client_commit on client (will reset to $client_branch)"
+	git fetch
+	git checkout "$client_commit"
 fi
 
 cd "$client_dir"
@@ -51,14 +51,14 @@ git log -n 3
 cd "$shared_dir"
 
 if [ ! "$cache_npm" = "1" ]; then
-  echo "Cleaning up main node_modules from previous runs"
-  yarn install --pure-lockfile --ignore-optional --prefer-offline --check-files
+	echo "Cleaning up main node_modules from previous runs"
+	rm -rf node_modules
+	yarn modules
 fi
 
-
 if [ ! "$cache_go_lib" = "1" ]; then
-  echo "Building Go library"
-  CHECK_CI="$check_ci" yarn run rn-gobuild-android
+	echo "Building Go library"
+	CHECK_CI="$check_ci" yarn run rn-gobuild-android
 fi
 
 # We can't currently automate this :(, we used to be able to `echo y | android update ...` but that no longer works

diff --git a/packaging/ios/build_and_publish.sh b/packaging/ios/build_and_publish.sh
@@ -17,9 +17,9 @@ check_ci=${CHECK_CI:-1}
 
 # Notify Slack on failure
 function notify_slack {
-  if [ -n "$automated_build" ]; then
-    "$client_dir/packaging/slack/send.sh" "<@channel> Automated iOS build failed, please check out the log."
-  fi
+	if [ -n "$automated_build" ]; then
+		"$client_dir/packaging/slack/send.sh" "<@channel> Automated iOS build failed, please check out the log."
+	fi
 }
 trap notify_slack ERR
 
@@ -28,41 +28,41 @@ kbfs_branch=$(cd "$kbfs_dir" && git rev-parse --abbrev-ref HEAD)
 client_branch=$(cd "$client_dir" && git rev-parse --abbrev-ref HEAD)
 rn_packager_pid=""
 function reset {
-  (cd "$kbfs_dir" && git checkout "$kbfs_branch")
-  (cd "$client_dir" && git checkout "$client_branch")
-  (cd "$client_dir" && git checkout shared/ios/)
-
-  if [ ! "$rn_packager_pid" = "" ]; then
-    echo "Killing packager $rn_packager_pid"
-    pkill -P $rn_packager_pid || true
-  fi
+	(cd "$kbfs_dir" && git checkout "$kbfs_branch")
+	(cd "$client_dir" && git checkout "$client_branch")
+	(cd "$client_dir" && git checkout shared/ios/)
+
+	if [ ! "$rn_packager_pid" = "" ]; then
+		echo "Killing packager $rn_packager_pid"
+		pkill -P $rn_packager_pid || true
+	fi
 }
 trap reset EXIT
 
 if [ -n "$kbfs_commit" ]; then
-  cd "$kbfs_dir"
-  echo "Checking out $kbfs_commit on kbfs (will reset to $kbfs_branch)"
-  git fetch
-  git reset --hard
-  git clean -f
-  git checkout "$kbfs_commit"
-  # tell gobuild.sh (called via "yarn run rn-gobuild-ios" below) to use our local commit
-  export LOCAL_KBFS=1
+	cd "$kbfs_dir"
+	echo "Checking out $kbfs_commit on kbfs (will reset to $kbfs_branch)"
+	git fetch
+	git reset --hard
+	git clean -f
+	git checkout "$kbfs_commit"
+	# tell gobuild.sh (called via "yarn run rn-gobuild-ios" below) to use our local commit
+	export LOCAL_KBFS=1
 fi
 
 cd "$kbfs_dir"
 echo "Recent KBFS commit log"
 git log -n 3
 
 if [ -n "$client_commit" ]; then
-  cd "$client_dir"
-  echo "Checking out $client_commit on client (will reset to $client_branch)"
-  git fetch
-  git reset --hard
-  git clean -f
-  git checkout "$client_commit"
+	cd "$client_dir"
+	echo "Checking out $client_commit on client (will reset to $client_branch)"
+	git fetch
+	git reset --hard
+	git clean -f
+	git checkout "$client_commit"
 else
-  "$client_dir/packaging/check_status_and_pull.sh" "$client_dir"
+	"$client_dir/packaging/check_status_and_pull.sh" "$client_dir"
 fi
 
 cd "$client_dir"
@@ -74,17 +74,12 @@ cd "$shared_dir"
 echo "Cleaning up main node_modules from previous runs"
 rm -rf node_modules
 yarn modules
-echo "Ensuring correct"
-yarn --check-files
-
-echo "Cocoapods"
-cd ios
-pod install --repo-update
-cd ..
+yarn pod-clean
+yarn pod-install
 
 if [ ! "$cache_go_lib" = "1" ]; then
-  echo "Building Go library"
-  CHECK_CI="$check_ci" yarn run rn-gobuild-ios
+	echo "Building Go library"
+	CHECK_CI="$check_ci" yarn run rn-gobuild-ios
 fi
 
 "$client_dir/packaging/manage_react_native_packager.sh" &
@@ -94,7 +89,7 @@ echo "Packager running with PID $rn_packager_pid"
 # Build and publish the apk
 cd "$ios_dir"
 if [ -n "$clean" ]; then
-    xcodebuild clean -workspace "Keybase.xcworkspace" -scheme "Keybase"
+	xcodebuild clean -workspace "Keybase.xcworkspace" -scheme "Keybase"
 fi
 
 # fastlane wants these set

diff --git a/shared/android/app/build.gradle b/shared/android/app/build.gradle
@@ -5,7 +5,7 @@ import com.android.build.OutputFile
 import org.apache.tools.ant.taskdefs.condition.Os
 
 // KB: app version
-def VERSION_NAME = "6.2.6"
+def VERSION_NAME = "6.2.7"
 
 /**
  * The react.gradle file registers a task for each build variant (e.g. bundleDebugJsAndAssets

diff --git a/shared/ios/Keybase/Info.plist b/shared/ios/Keybase/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.2.6</string>
+	<string>6.2.7</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>

diff --git a/shared/ios/KeybaseShare/Info.plist b/shared/ios/KeybaseShare/Info.plist
@@ -17,7 +17,7 @@
         <key>CFBundlePackageType</key>
         <string>XPC!</string>
         <key>CFBundleShortVersionString</key>
-        <string>6.2.6</string>
+        <string>6.2.7</string>
         <key>CFBundleVersion</key>
         <string>1</string>
         <key>NSExtension</key>

diff --git a/shared/ios/Podfile.lock b/shared/ios/Podfile.lock
@@ -16,6 +16,8 @@ PODS:
     - ExpoModulesCore
   - EXContacts (11.0.1):
     - ExpoModulesCore
+  - EXErrorRecovery (4.0.1):
+    - ExpoModulesCore
   - EXFileSystem (15.1.1):
     - ExpoModulesCore
   - EXFont (11.0.1):
@@ -477,7 +479,7 @@ PODS:
     - React-RCTText
     - ReactCommon/turbomodule/core
     - Yoga
-  - RNScreens (3.20.0):
+  - RNScreens (3.29.0):
     - React-Core
     - React-RCTImage
   - SDWebImage (5.12.6):
@@ -506,6 +508,7 @@ DEPENDENCIES:
   - EXBarCodeScanner (from `../node_modules/expo-barcode-scanner/ios`)
   - EXConstants (from `../node_modules/expo-constants/ios`)
   - EXContacts (from `../node_modules/expo-contacts/ios`)
+  - EXErrorRecovery (from `../node_modules/expo-error-recovery/ios`)
   - EXFileSystem (from `../node_modules/expo-file-system/ios`)
   - EXFont (from `../node_modules/expo-font/ios`)
   - EXImageLoader (from `../node_modules/expo-image-loader/ios`)
@@ -632,6 +635,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/expo-constants/ios"
   EXContacts:
     :path: "../node_modules/expo-contacts/ios"
+  EXErrorRecovery:
+    :path: "../node_modules/expo-error-recovery/ios"
   EXFileSystem:
     :path: "../node_modules/expo-file-system/ios"
   EXFont:
@@ -768,6 +773,7 @@ SPEC CHECKSUMS:
   EXBarCodeScanner: cb4deb49e59b6c7ed6bbf38d187802359908d2a8
   EXConstants: 3c86653c422dd77e40d10cbbabb3025003977415
   EXContacts: 81d2963abb188d5f79d746cfff94c58cc7e8d713
+  EXErrorRecovery: ae43433feb0608a64dc5b1c8363b3e7769a9ea24
   EXFileSystem: 60602b6eefa6873f97172c684b7537c9760b50d6
   EXFont: 319606bfe48c33b5b5063fb0994afdc496befe80
   EXImageLoader: 84b65e6bd9d3345d6fbb3ab936a546c54496a64d
@@ -841,7 +847,7 @@ SPEC CHECKSUMS:
   RNFlashList: 7fbca4fc075484a9426f1610d648dbea2de94eb0
   RNGestureHandler: 071d7a9ad81e8b83fe7663b303d132406a7d8f39
   RNReanimated: 0dd48c050ab4b6b55922fbeeddb2965dad1240b3
-  RNScreens: 218801c16a2782546d30bd2026bb625c0302d70f
+  RNScreens: fa9b582d85ae5d62c91c66003b5278458fed7aaa
   SDWebImage: a47aea9e3d8816015db4e523daff50cfd294499d
   SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d
   SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17

diff --git a/shared/package.json b/shared/package.json
@@ -61,7 +61,7 @@
     "DEPRECATED_build-storybook": "build-storybook",
     "DEPRECATED_test": "yarn run _helper test",
     "pod-install": "cd ios; pod install --repo-update",
-    "pod-clean": "rm -rf ios/build; rm -rf ios/Pods; rm ios/.xcode.env.local",
+    "pod-clean": "pod cache clean --all ; rm -rf ios/build; rm -rf ios/Pods; rm -f ios/.xcode.env.local",
     "pod-install-new": "cd ios; RCT_NEW_ARCH_ENABLED=1 pod install --repo-update",
     "android-clean": "cd android; ./gradlew clean",
     "android-debug": "react-native run-android --variant 'debug'",
@@ -130,7 +130,7 @@
     "react-native-iphone-x-helper": "1.3.1",
     "react-native-reanimated": "3.0.1",
     "react-native-safe-area-context": "4.5.0",
-    "react-native-screens": "3.20.0",
+    "react-native-screens": "3.29.0",
     "react-native-web": "0.18.12",
     "react-native-webview": "11.26.0",
     "react-redux": "8.0.5",

diff --git a/shared/yarn.lock b/shared/yarn.lock
@@ -8937,10 +8937,10 @@ react-native-safe-modules@^1.0.3:
   dependencies:
     dedent "^0.6.0"
 
-react-native-screens@3.20.0:
-  version "3.20.0"
-  resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-3.20.0.tgz#4d154177395e5541387d9a05bc2e12e54d2fb5b1"
-  integrity sha512-joWUKWAVHxymP3mL9gYApFHAsbd9L6ZcmpoZa6Sl3W/82bvvNVMqcfP7MeNqVCg73qZ8yL4fW+J/syusHleUgg==
+react-native-screens@3.29.0:
+  version "3.29.0"
+  resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-3.29.0.tgz#1dee0326defbc1d4ef4e68287abb32a8e6b76b29"
+  integrity sha512-yB1GoAMamFAcYf4ku94uBPn0/ani9QG7NdI98beJ5cet2YFESYYzuEIuU+kt+CNRcO8qqKeugxlfgAa3HyTqlg==
   dependencies:
     react-freeze "^1.0.0"
     warn-once "^0.1.0"