From f57a7ed6a2627aea19f0afd3737210f3862b780d Mon Sep 17 00:00:00 2001 From: Sebastian Szewczyk Date: Fri, 15 Nov 2024 15:53:34 +0100 Subject: [PATCH 1/6] testing PR with JS changes --- .github/workflows/eas-fingerprint.yml | 2 +- packages/AppOne/app/(tabs)/index.tsx | 2 +- packages/AppOne/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/eas-fingerprint.yml b/.github/workflows/eas-fingerprint.yml index 7f12cb8..bb4c4b4 100644 --- a/.github/workflows/eas-fingerprint.yml +++ b/.github/workflows/eas-fingerprint.yml @@ -107,7 +107,7 @@ jobs: fingerprint-db-cache-key: fingerprint-db-app-one-local-android - name: Setup Java 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: '17' diff --git a/packages/AppOne/app/(tabs)/index.tsx b/packages/AppOne/app/(tabs)/index.tsx index 56baaa5..a4f2d91 100644 --- a/packages/AppOne/app/(tabs)/index.tsx +++ b/packages/AppOne/app/(tabs)/index.tsx @@ -20,7 +20,7 @@ export default function HomeScreen() { - Step 1: Try it- version with monorepo + Only some js changes Edit app/(tabs)/index.tsx to see changes. Press{' '} diff --git a/packages/AppOne/package.json b/packages/AppOne/package.json index 9879ae5..fed0fc5 100644 --- a/packages/AppOne/package.json +++ b/packages/AppOne/package.json @@ -2,7 +2,7 @@ "name": "AppOne", "license": "0BSD", "main": "expo-router/entry", - "version": "0.0.1", + "version": "0.0.2", "scripts": { "start": "expo start", "reset-project": "node ./scripts/reset-project.js", From 5130b95f8ee487ad1851191f2cdaa88e10668646 Mon Sep 17 00:00:00 2001 From: Sebastian Szewczyk Date: Fri, 15 Nov 2024 16:01:12 +0100 Subject: [PATCH 2/6] Upload artifact for local builds --- .github/workflows/eas-fingerprint.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.github/workflows/eas-fingerprint.yml b/.github/workflows/eas-fingerprint.yml index bb4c4b4..15ad187 100644 --- a/.github/workflows/eas-fingerprint.yml +++ b/.github/workflows/eas-fingerprint.yml @@ -118,6 +118,13 @@ jobs: eas build --local --non-interactive --output=./app-build --platform android --profile preview working-directory: packages/AppOne + - uses: actions/upload-artifact@v4 + if: ${{ github.event_name == 'pull_request' && steps.fingerprint.outputs.fingerprint-diff != '[]' }} + working-directory: packages/AppOne + with: + name: android-app-build + path: ./app-build + build-app-one-local-ios: runs-on: macos-latest # REQUIRED: limit concurrency when pushing main(default) branch to prevent conflict for this action to update its fingerprint database @@ -156,3 +163,9 @@ jobs: eas build --local --non-interactive --output=./app-build-ios --platform ios --profile preview working-directory: packages/AppOne + - uses: actions/upload-artifact@v4 + if: ${{ github.event_name == 'pull_request' && steps.fingerprint.outputs.fingerprint-diff != '[]' }} + working-directory: packages/AppOne + with: + name: ios-app-build + path: ./app-build-ios From 27991fd7853b8480c0b36db80587fe969e711500 Mon Sep 17 00:00:00 2001 From: Sebastian Szewczyk Date: Fri, 15 Nov 2024 16:03:37 +0100 Subject: [PATCH 3/6] fixed upload task --- .github/workflows/eas-fingerprint.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/eas-fingerprint.yml b/.github/workflows/eas-fingerprint.yml index 15ad187..0a3387d 100644 --- a/.github/workflows/eas-fingerprint.yml +++ b/.github/workflows/eas-fingerprint.yml @@ -120,10 +120,9 @@ jobs: - uses: actions/upload-artifact@v4 if: ${{ github.event_name == 'pull_request' && steps.fingerprint.outputs.fingerprint-diff != '[]' }} - working-directory: packages/AppOne with: name: android-app-build - path: ./app-build + path: packages/AppOne/app-build build-app-one-local-ios: runs-on: macos-latest @@ -165,7 +164,6 @@ jobs: - uses: actions/upload-artifact@v4 if: ${{ github.event_name == 'pull_request' && steps.fingerprint.outputs.fingerprint-diff != '[]' }} - working-directory: packages/AppOne with: name: ios-app-build - path: ./app-build-ios + path: packages/AppOne/app-build-ios From 8d9ce6d395f6899fde1aa8f229f2885007464e2e Mon Sep 17 00:00:00 2001 From: Sebastian Szewczyk Date: Fri, 15 Nov 2024 18:10:56 +0100 Subject: [PATCH 4/6] added package with native deps --- packages/AppOne/eas.json | 1 - packages/AppOne/package.json | 109 ++++++++++++++++++----------------- yarn.lock | 7 +++ 3 files changed, 62 insertions(+), 55 deletions(-) diff --git a/packages/AppOne/eas.json b/packages/AppOne/eas.json index 28efaf3..b8be8fd 100644 --- a/packages/AppOne/eas.json +++ b/packages/AppOne/eas.json @@ -13,7 +13,6 @@ "channel": "development" }, "preview": { - "distribution": "internal", "ios": { "simulator": true }, diff --git a/packages/AppOne/package.json b/packages/AppOne/package.json index fed0fc5..81ed7a4 100644 --- a/packages/AppOne/package.json +++ b/packages/AppOne/package.json @@ -1,55 +1,56 @@ { - "name": "AppOne", - "license": "0BSD", - "main": "expo-router/entry", - "version": "0.0.2", - "scripts": { - "start": "expo start", - "reset-project": "node ./scripts/reset-project.js", - "android": "expo run:android", - "ios": "expo run:ios", - "web": "expo start --web", - "test": "jest --watchAll", - "lint": "expo lint" - }, - "jest": { - "preset": "jest-expo" - }, - "dependencies": { - "@expo/vector-icons": "^14.0.2", - "@react-navigation/native": "7.0.0-rc.20", - "expo": "~52.0.0-preview.5", - "expo-blur": "~14.0.1", - "expo-constants": "~17.0.1", - "expo-dev-client": "~5.0.0-preview.2", - "expo-font": "~13.0.0", - "expo-haptics": "~14.0.0", - "expo-linking": "~7.0.2", - "expo-router": "~4.0.0-preview.3", - "expo-splash-screen": "~0.28.2", - "expo-status-bar": "~2.0.0", - "expo-symbols": "~0.2.0", - "expo-system-ui": "~4.0.1", - "expo-updates": "~0.26.3", - "expo-web-browser": "~14.0.0", - "react": "18.3.1", - "react-dom": "18.3.1", - "react-native": "0.76.0", - "react-native-gesture-handler": "~2.20.2", - "react-native-reanimated": "~3.16.1", - "react-native-safe-area-context": "4.11.0", - "react-native-screens": "4.0.0-beta.14", - "react-native-web": "~0.19.13" - }, - "devDependencies": { - "@babel/core": "^7.25.2", - "@types/jest": "^29.5.12", - "@types/react": "~18.3.12", - "@types/react-test-renderer": "^18.3.0", - "jest": "^29.2.1", - "jest-expo": "~52.0.0-preview.1", - "react-test-renderer": "18.3.1", - "typescript": "^5.3.3" - }, - "private": true - } + "name": "AppOne", + "license": "0BSD", + "main": "expo-router/entry", + "version": "0.0.2", + "scripts": { + "start": "expo start", + "reset-project": "node ./scripts/reset-project.js", + "android": "expo run:android", + "ios": "expo run:ios", + "web": "expo start --web", + "test": "jest --watchAll", + "lint": "expo lint" + }, + "jest": { + "preset": "jest-expo" + }, + "dependencies": { + "@expo/vector-icons": "^14.0.2", + "@react-navigation/native": "7.0.0-rc.20", + "expo": "~52.0.0-preview.5", + "expo-blur": "~14.0.1", + "expo-camera": "~16.0.5", + "expo-constants": "~17.0.1", + "expo-dev-client": "~5.0.0-preview.2", + "expo-font": "~13.0.0", + "expo-haptics": "~14.0.0", + "expo-linking": "~7.0.2", + "expo-router": "~4.0.0-preview.3", + "expo-splash-screen": "~0.28.2", + "expo-status-bar": "~2.0.0", + "expo-symbols": "~0.2.0", + "expo-system-ui": "~4.0.1", + "expo-updates": "~0.26.3", + "expo-web-browser": "~14.0.0", + "react": "18.3.1", + "react-dom": "18.3.1", + "react-native": "0.76.0", + "react-native-gesture-handler": "~2.20.2", + "react-native-reanimated": "~3.16.1", + "react-native-safe-area-context": "4.11.0", + "react-native-screens": "4.0.0-beta.14", + "react-native-web": "~0.19.13" + }, + "devDependencies": { + "@babel/core": "^7.25.2", + "@types/jest": "^29.5.12", + "@types/react": "~18.3.12", + "@types/react-test-renderer": "^18.3.0", + "jest": "^29.2.1", + "jest-expo": "~52.0.0-preview.1", + "react-test-renderer": "18.3.1", + "typescript": "^5.3.3" + }, + "private": true +} diff --git a/yarn.lock b/yarn.lock index 13a289f..b38816c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3495,6 +3495,13 @@ expo-blur@~14.0.1: resolved "https://registry.npmjs.org/expo-blur/-/expo-blur-14.0.1.tgz" integrity sha512-3Q6jFBLbY8n2vwk28ycUC+eIlVhnlqwkXUKk/Lfaj+SGV3AZMQyrixe7OYwJdUfwqETBrnYYMB6uNrJzOSbG+g== +expo-camera@~16.0.5: + version "16.0.5" + resolved "https://registry.yarnpkg.com/expo-camera/-/expo-camera-16.0.5.tgz#e99fe00e06f7fd9c11af9bc57c2ceff4c4141c3f" + integrity sha512-GmsqBl+to5oEy01kUXu2Ul5Z38ugSLlA7sd3f+2PVJHNFv1Gou0nbkGTx6k5JZrSiP/vxuP6QKPIg8rIJoeWGA== + dependencies: + invariant "^2.2.4" + expo-constants@~17.0.0, expo-constants@~17.0.1, expo-constants@~17.0.2: version "17.0.2" resolved "https://registry.npmjs.org/expo-constants/-/expo-constants-17.0.2.tgz" From ca41aebd39f8603ea3eb314640729356f2b0d160 Mon Sep 17 00:00:00 2001 From: Sebastian Szewczyk Date: Fri, 15 Nov 2024 19:23:59 +0100 Subject: [PATCH 5/6] js change --- packages/AppOne/app/(tabs)/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/AppOne/app/(tabs)/index.tsx b/packages/AppOne/app/(tabs)/index.tsx index a4f2d91..91c99fe 100644 --- a/packages/AppOne/app/(tabs)/index.tsx +++ b/packages/AppOne/app/(tabs)/index.tsx @@ -20,7 +20,7 @@ export default function HomeScreen() { - Only some js changes + Only some js changes, and more js changes Edit app/(tabs)/index.tsx to see changes. Press{' '} From 78f72361eb161f7e15be87df3aa6a930e9e77c9c Mon Sep 17 00:00:00 2001 From: Sebastian Szewczyk Date: Fri, 15 Nov 2024 19:38:03 +0100 Subject: [PATCH 6/6] broke ios build --- packages/AppOne/ios/testingexpobetasdk/AppDelegate.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/AppOne/ios/testingexpobetasdk/AppDelegate.h b/packages/AppOne/ios/testingexpobetasdk/AppDelegate.h index 1658a43..2c91a1d 100644 --- a/packages/AppOne/ios/testingexpobetasdk/AppDelegate.h +++ b/packages/AppOne/ios/testingexpobetasdk/AppDelegate.h @@ -2,6 +2,6 @@ #import #import -@interface AppDelegate : EXAppDelegateWrapper +@interface AppDelegate @end