Page MenuHomePhorge

D15220.1765056251.diff
No OneTemporary

Size
3 KB
Referenced Files
None
Subscribers
None

D15220.1765056251.diff

diff --git a/.github/workflows/android_ci.yml b/.github/workflows/android_ci.yml
--- a/.github/workflows/android_ci.yml
+++ b/.github/workflows/android_ci.yml
@@ -48,6 +48,10 @@
- name: Fix node-gyp
run: python -m pip install packaging setuptools
+
+ - name: Install CMake
+ run: |
+ yes | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager "cmake;3.18.1"
- name: yarn ci-cleaninstall
run: yarn ci-cleaninstall
@@ -71,4 +75,4 @@
working-directory: ./native/android
env:
ANDROID_SIGNING_PASSWORD: ${{secrets.ANDROID_SIGNING_PASSWORD}}
- run: JAVA_HOME=${JAVA_HOME_11_arm64} ./gradlew bundleRelease
+ run: JAVA_HOME=${JAVA_HOME_17_arm64} ./gradlew bundleRelease
diff --git a/.github/workflows/android_release.yml b/.github/workflows/android_release.yml
--- a/.github/workflows/android_release.yml
+++ b/.github/workflows/android_release.yml
@@ -41,6 +41,10 @@
- name: Fix node-gyp
run: python -m pip install packaging setuptools
+
+ - name: Install CMake
+ run: |
+ yes | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager "cmake;3.18.1"
- name: yarn ci-cleaninstall
run: yarn ci-cleaninstall
@@ -76,7 +80,7 @@
working-directory: ./native/android
env:
ANDROID_SIGNING_PASSWORD: ${{secrets.ANDROID_SIGNING_PASSWORD}}
- run: JAVA_HOME=${JAVA_HOME_11_arm64} ./gradlew bundleRelease
+ run: JAVA_HOME=${JAVA_HOME_17_arm64} ./gradlew bundleRelease
- name: Save PLAY_STORE_PUBLISHING_KEY to file
working-directory: ./native/android
diff --git a/.github/workflows/ios_ci.yml b/.github/workflows/ios_ci.yml
--- a/.github/workflows/ios_ci.yml
+++ b/.github/workflows/ios_ci.yml
@@ -35,13 +35,12 @@
- name: Delete iOS simulator caches
run: sudo rm -rf ~/Library/Developer/CoreSimulator/Caches/*
-
- - name: Patch in working Xcode + iOS version
+
+ - name: Download iOS Platform
run: |
# https://github.com/actions/runner-images/issues/12758
- sudo xcode-select --switch /Applications/Xcode_16.2.app
sudo xcodebuild -downloadPlatform iOS
-
+
- name: Install Developer certificate
env:
BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
diff --git a/.github/workflows/ios_release.yml b/.github/workflows/ios_release.yml
--- a/.github/workflows/ios_release.yml
+++ b/.github/workflows/ios_release.yml
@@ -28,11 +28,10 @@
- name: Delete iOS simulator caches
run: sudo rm -rf ~/Library/Developer/CoreSimulator/Caches/*
-
- - name: Patch in working Xcode + iOS version
+
+ - name: Download iOS Platform
run: |
# https://github.com/actions/runner-images/issues/12758
- sudo xcode-select --switch /Applications/Xcode_16.2.app
sudo xcodebuild -downloadPlatform iOS
- name: Install Developer certificate
diff --git a/native/ios/Podfile.lock b/native/ios/Podfile.lock
--- a/native/ios/Podfile.lock
+++ b/native/ios/Podfile.lock
@@ -3518,7 +3518,7 @@
SPTPersistentCache: df36ea46762d7cf026502bbb86a8b79d0080dff4
SQLCipher-Amalgamation: 121e91239c53a3aba13ca742d6dd824c627c66ee
VisionCamera: b5c2b3c45e641102902a5194af11dc532805221e
- Yoga: 703055a9f39562521cdb8657162dfd80f8c174c3
+ Yoga: daa1e4de4b971b977b23bc842aaa3e135324f1f3
PODFILE CHECKSUM: 9f6849cc38fa757240f5b662c372d5adac184891
diff --git a/postinstall.sh b/postinstall.sh
--- a/postinstall.sh
+++ b/postinstall.sh
@@ -14,5 +14,5 @@
yarn workspace native jetify
if [[ "$OSTYPE" == "darwin"* ]]; then
- (cd native/ios && PATH=/usr/bin:/bin:"$PATH" bundle install && PATH=/usr/bin:/bin:"$PATH" MACOSX_DEPLOYMENT_TARGET='' bundle exec pod install --repo-update)
+ (cd native/ios && bundle install && MACOSX_DEPLOYMENT_TARGET='' bundle exec pod install --repo-update)
fi

File Metadata

Mime Type
text/plain
Expires
Sat, Dec 6, 9:24 PM (20 h, 4 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5840919
Default Alt Text
D15220.1765056251.diff (3 KB)

Event Timeline