Compare commits

..

7 Commits

Author SHA1 Message Date
Adrian Castro
ac4e5cc6bd fix: temporarily pin openssl pod until new quick crypto release 2024-04-20 03:10:51 +02:00
Jorrin
0820e5b7c7 Update package.json 2024-04-20 00:57:54 +02:00
Jorrin
1e7f3b9dc0 update pnpm to v9 2024-04-20 00:56:12 +02:00
Jorrin
59f27b0397 update node in action 2024-04-20 00:54:06 +02:00
Jorrin
c1e3d91d84 that didnt work 2024-04-20 00:50:03 +02:00
Jorrin
aeeb34db0f weird typescript thing 2024-04-20 00:45:56 +02:00
Jorrin
61076b344f Update tsconfig.json 2024-04-20 00:43:09 +02:00
9 changed files with 128 additions and 108 deletions

View File

@@ -24,14 +24,14 @@ jobs:
- uses: pnpm/action-setup@v3 - uses: pnpm/action-setup@v3
name: Install pnpm name: Install pnpm
with: with:
version: 8 version: 9
run_install: false run_install: false
- name: Install Node.js - name: Install Node.js
uses: actions/setup-node@v4 uses: actions/setup-node@v4
with: with:
node-version: 21 node-version: 21
cache: "pnpm" cache: "pnpm"
- name: Set up JDK 17 - name: Set up JDK 17
uses: actions/setup-java@v4 uses: actions/setup-java@v4
@@ -45,7 +45,7 @@ jobs:
- name: Cache Node Modules - name: Cache Node Modules
uses: actions/cache@v4 uses: actions/cache@v4
with: with:
path: '**/node_modules' path: "**/node_modules"
key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }} key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}
- name: Install dependencies - name: Install dependencies
@@ -78,7 +78,7 @@ jobs:
- uses: pnpm/action-setup@v3 - uses: pnpm/action-setup@v3
name: Install pnpm name: Install pnpm
with: with:
version: 8 version: 9
run_install: false run_install: false
- name: Install Node.js - name: Install Node.js
@@ -90,7 +90,7 @@ jobs:
- name: Cache Node Modules - name: Cache Node Modules
uses: actions/cache@v4 uses: actions/cache@v4
with: with:
path: '**/node_modules' path: "**/node_modules"
key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }} key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}
- name: Install dependencies - name: Install dependencies

View File

@@ -20,7 +20,7 @@ jobs:
- uses: pnpm/action-setup@v3 - uses: pnpm/action-setup@v3
name: Install pnpm name: Install pnpm
with: with:
version: 8 version: 9
run_install: false run_install: false
- name: Install Node.js - name: Install Node.js
@@ -41,7 +41,7 @@ jobs:
- name: Cache Node Modules - name: Cache Node Modules
uses: actions/cache@v4 uses: actions/cache@v4
with: with:
path: '**/node_modules' path: "**/node_modules"
key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }} key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}
- name: Install dependencies - name: Install dependencies
@@ -69,7 +69,7 @@ jobs:
- uses: pnpm/action-setup@v3 - uses: pnpm/action-setup@v3
name: Install pnpm name: Install pnpm
with: with:
version: 8 version: 9
run_install: false run_install: false
- name: Install Node.js - name: Install Node.js
@@ -81,7 +81,7 @@ jobs:
- name: Cache Node Modules - name: Cache Node Modules
uses: actions/cache@v4 uses: actions/cache@v4
with: with:
path: '**/node_modules' path: "**/node_modules"
key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }} key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}
- name: Install dependencies - name: Install dependencies

View File

@@ -42,8 +42,8 @@ jobs:
- uses: pnpm/action-setup@v3 - uses: pnpm/action-setup@v3
name: Install pnpm name: Install pnpm
with: with:
version: 8 version: 9
run_install: false run_install: false
- name: Install Node.js - name: Install Node.js
uses: actions/setup-node@v4 uses: actions/setup-node@v4
@@ -63,7 +63,7 @@ jobs:
- name: Cache Node Modules - name: Cache Node Modules
uses: actions/cache@v4 uses: actions/cache@v4
with: with:
path: '**/node_modules' path: "**/node_modules"
key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }} key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}
- name: Install dependencies - name: Install dependencies
@@ -95,7 +95,7 @@ jobs:
- uses: pnpm/action-setup@v3 - uses: pnpm/action-setup@v3
name: Install pnpm name: Install pnpm
with: with:
version: 8 version: 9
run_install: false run_install: false
- name: Install Node.js - name: Install Node.js
@@ -107,7 +107,7 @@ jobs:
- name: Cache Node Modules - name: Cache Node Modules
uses: actions/cache@v4 uses: actions/cache@v4
with: with:
path: '**/node_modules' path: "**/node_modules"
key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }} key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}
- name: Install dependencies - name: Install dependencies

View File

@@ -4,90 +4,99 @@ import { version } from "./package.json";
import withRemoveiOSNotificationEntitlement from "./src/plugins/withRemoveiOSNotificationEntitlement"; import withRemoveiOSNotificationEntitlement from "./src/plugins/withRemoveiOSNotificationEntitlement";
const defineConfig = (): ExpoConfig => ({ const defineConfig = (): ExpoConfig => ({
name: "movie-web", name: "movie-web",
slug: "mw-mobile", slug: "mw-mobile",
scheme: "movieweb", scheme: "movieweb",
version, version,
icon: "./assets/images/icon.png", icon: "./assets/images/icon.png",
userInterfaceStyle: "automatic", userInterfaceStyle: "automatic",
splash: { splash: {
image: "./assets/images/splash.png", image: "./assets/images/splash.png",
resizeMode: "contain", resizeMode: "contain",
backgroundColor: "#000000", backgroundColor: "#000000",
}, },
updates: { updates: {
fallbackToCacheTimeout: 0, fallbackToCacheTimeout: 0,
}, },
assetBundlePatterns: ["**/*"], assetBundlePatterns: ["**/*"],
ios: { ios: {
bundleIdentifier: "dev.movieweb.app", bundleIdentifier: "dev.movieweb.app",
supportsTablet: true, supportsTablet: true,
requireFullScreen: true, requireFullScreen: true,
infoPlist: { infoPlist: {
CFBundleName: "movie-web", CFBundleName: "movie-web",
NSPhotoLibraryUsageDescription: NSPhotoLibraryUsageDescription:
"This app saves videos to the photo library.", "This app saves videos to the photo library.",
NSAppTransportSecurity: { NSAppTransportSecurity: {
NSAllowsArbitraryLoads: true, NSAllowsArbitraryLoads: true,
}, },
}, },
}, },
android: { android: {
package: "dev.movieweb.app", package: "dev.movieweb.app",
permissions: ["WRITE_SETTINGS"], permissions: ["WRITE_SETTINGS"],
}, },
web: { web: {
favicon: "./assets/images/favicon.png", favicon: "./assets/images/favicon.png",
bundler: "metro", bundler: "metro",
}, },
experiments: { experiments: {
tsconfigPaths: true, tsconfigPaths: true,
typedRoutes: true, typedRoutes: true,
}, },
plugins: [ plugins: [
"expo-router", "expo-router",
[withRemoveiOSNotificationEntitlement as unknown as string], [withRemoveiOSNotificationEntitlement as unknown as string],
[ [
"expo-screen-orientation", "expo-screen-orientation",
{ {
initialOrientation: "PORTRAIT_UP", initialOrientation: "PORTRAIT_UP",
}, },
], ],
[ [
"expo-build-properties", "expo-build-properties",
{ {
android: { android: {
minSdkVersion: 24, minSdkVersion: 24,
packagingOptions: { packagingOptions: {
pickFirst: [ pickFirst: [
"lib/x86/libcrypto.so", "lib/x86/libcrypto.so",
"lib/x86_64/libcrypto.so", "lib/x86_64/libcrypto.so",
"lib/armeabi-v7a/libcrypto.so", "lib/armeabi-v7a/libcrypto.so",
"lib/arm64-v8a/libcrypto.so", "lib/arm64-v8a/libcrypto.so",
], ],
}, },
}, },
}, },
], ],
[ [
"expo-alternate-app-icons", "expo-alternate-app-icons",
[ [
"./assets/images/main.png", "./assets/images/main.png",
"./assets/images/blue.png", "./assets/images/blue.png",
"./assets/images/gray.png", "./assets/images/gray.png",
"./assets/images/red.png", "./assets/images/red.png",
"./assets/images/teal.png", "./assets/images/teal.png",
], ],
], ],
[ [
"expo-media-library", "expo-media-library",
{ {
photosPermission: "Allow $(PRODUCT_NAME) to access your photos.", photosPermission: "Allow $(PRODUCT_NAME) to access your photos.",
savePhotosPermission: "Allow $(PRODUCT_NAME) to save photos.", savePhotosPermission: "Allow $(PRODUCT_NAME) to save photos.",
isAccessMediaLocationEnabled: true, isAccessMediaLocationEnabled: true,
}, },
], ],
], [
"expo-pod-pinner",
{
"targetName": "movieweb",
"pods": [
{ "OpenSSL-Universal": "1.1.2200" }
]
}
]
],
}); });
export default defineConfig; export default defineConfig;

View File

@@ -50,6 +50,7 @@
"expo-media-library": "~15.9.1", "expo-media-library": "~15.9.1",
"expo-navigation-bar": "^2.8.1", "expo-navigation-bar": "^2.8.1",
"expo-network": "~5.8.0", "expo-network": "~5.8.0",
"expo-pod-pinner": "^1.0.1",
"expo-router": "~3.4.8", "expo-router": "~3.4.8",
"expo-screen-orientation": "~6.4.1", "expo-screen-orientation": "~6.4.1",
"expo-splash-screen": "~0.26.4", "expo-splash-screen": "~0.26.4",

View File

@@ -1,7 +1,6 @@
{ {
"extends": ["@movie-web/tsconfig/base.json"], "extends": ["@movie-web/tsconfig/base.json"],
"compilerOptions": { "compilerOptions": {
"incremental": true,
"allowJs": true, "allowJs": true,
"baseUrl": ".", "baseUrl": ".",
"paths": { "paths": {

View File

@@ -4,7 +4,7 @@
"engines": { "engines": {
"node": ">=20.11.0" "node": ">=20.11.0"
}, },
"packageManager": "pnpm@8.15.0", "packageManager": "pnpm@9.0.4",
"scripts": { "scripts": {
"build": "turbo build", "build": "turbo build",
"clean": "git clean -xdf node_modules", "clean": "git clean -xdf node_modules",

7
pnpm-lock.yaml generated
View File

@@ -122,6 +122,9 @@ importers:
expo-network: expo-network:
specifier: ~5.8.0 specifier: ~5.8.0
version: 5.8.0(expo@50.0.14) version: 5.8.0(expo@50.0.14)
expo-pod-pinner:
specifier: ^1.0.1
version: 1.0.1
expo-router: expo-router:
specifier: ~3.4.8 specifier: ~3.4.8
version: 3.4.8(expo-constants@15.4.5)(expo-linking@6.2.2)(expo-modules-autolinking@1.10.3)(expo-status-bar@1.11.1)(expo@50.0.14)(react-dom@18.2.0)(react-native-reanimated@3.6.2)(react-native-safe-area-context@4.8.2)(react-native-screens@3.29.0)(react-native@0.73.6)(react@18.2.0) version: 3.4.8(expo-constants@15.4.5)(expo-linking@6.2.2)(expo-modules-autolinking@1.10.3)(expo-status-bar@1.11.1)(expo@50.0.14)(react-dom@18.2.0)(react-native-reanimated@3.6.2)(react-native-safe-area-context@4.8.2)(react-native-screens@3.29.0)(react-native@0.73.6)(react@18.2.0)
@@ -7981,6 +7984,10 @@ packages:
expo: 50.0.14(@babel/core@7.23.9)(@react-native/babel-preset@0.73.21) expo: 50.0.14(@babel/core@7.23.9)(@react-native/babel-preset@0.73.21)
dev: false dev: false
/expo-pod-pinner@1.0.1:
resolution: {integrity: sha512-UeyCRXrI13tjb+rtQkjBjgs+eS1KntAgTRnLoawFdMp8s1T2bOcm9P4cIrFlLHt9aZBLLMdHra1TY6LiMI3+kw==}
dev: false
/expo-router@3.4.8(expo-constants@15.4.5)(expo-linking@6.2.2)(expo-modules-autolinking@1.10.3)(expo-status-bar@1.11.1)(expo@50.0.14)(react-dom@18.2.0)(react-native-reanimated@3.6.2)(react-native-safe-area-context@4.8.2)(react-native-screens@3.29.0)(react-native@0.73.6)(react@18.2.0): /expo-router@3.4.8(expo-constants@15.4.5)(expo-linking@6.2.2)(expo-modules-autolinking@1.10.3)(expo-status-bar@1.11.1)(expo@50.0.14)(react-dom@18.2.0)(react-native-reanimated@3.6.2)(react-native-safe-area-context@4.8.2)(react-native-screens@3.29.0)(react-native@0.73.6)(react@18.2.0):
resolution: {integrity: sha512-fOOAWHH4LSPjPFtIZbApxdTNU8xSS8qKvhZ7PfWNMfx9510J1R1Ce/nwENPzcRLHRuVofDsSAEBfi4kV03fJwg==} resolution: {integrity: sha512-fOOAWHH4LSPjPFtIZbApxdTNU8xSS8qKvhZ7PfWNMfx9510J1R1Ce/nwENPzcRLHRuVofDsSAEBfi4kV03fJwg==}
peerDependencies: peerDependencies:

View File

@@ -4,10 +4,14 @@ description: "Common setup steps for Actions"
runs: runs:
using: composite using: composite
steps: steps:
- uses: pnpm/action-setup@v2 - uses: pnpm/action-setup@v3
name: Install pnpm
with:
version: 9
run_install: false
- uses: actions/setup-node@v4 - uses: actions/setup-node@v4
with: with:
node-version: 18 node-version: 21
cache: "pnpm" cache: "pnpm"
- shell: bash - shell: bash