Skip to content

Commit 29bbdfd

Browse files
PalaashPandeybwees
andauthored
feat: expo 53 and formatter (#198)
Co-authored-by: bwees <brandonwees@gmail.com>
1 parent 39bcc65 commit 29bbdfd

62 files changed

Lines changed: 15551 additions & 26546 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/pull_request_template.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
## Describe your changes
2+
23
(provide a description of changes and a overview of solution)
34

45
## Issue number and link
6+
57
(if this PR is in response to a issue, put the link to the issue here)
68

79
## Dependency Changes
10+
811
(place any new libraries or updates to exisiting libraries here, you can check by looking at the changes to `package.json`)
912

1013
## Checklist before requesting a review
14+
1115
- [ ] I have performed a self-review of my code
1216
- [ ] I have verified that any UI changes I have made work in dark mode
1317
- [ ] All of my GitHub checks have passed
1418
- [ ] I have added any new packages/updates above
15-
- [ ] I have verified that I am not submitting other changes/features outside the scope of my PR
19+
- [ ] I have verified that I am not submitting other changes/features outside the scope of my PR

.github/workflows/build.yml

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "Build App and Upload"
1+
name: 'Build App and Upload'
22

33
on:
44
# manual trigger but change to any supported event
@@ -11,14 +11,13 @@ on:
1111
default: 'all'
1212
type: choice
1313
options:
14-
- all
15-
- ios
16-
- android
14+
- all
15+
- ios
16+
- android
1717

1818
release:
1919
types: [published]
2020

21-
2221
jobs:
2322
build_ios:
2423
runs-on: macos-latest
@@ -37,22 +36,22 @@ jobs:
3736
run: /usr/bin/xcodebuild -version
3837

3938
- name: Checkout Repository
40-
uses: actions/checkout@v4
39+
uses: actions/checkout@v4
4140

4241
- name: Install Fastlane and Fix CocoaPods
4342
run: |
4443
sudo gem install cocoapods -v 1.15.2
4544
sudo gem install fastlane -NV
4645
fastlane --version
47-
46+
4847
- name: Install Node.js
4948
uses: actions/setup-node@v4
5049
with:
5150
node-version: '22.x'
52-
51+
5352
- name: Install Dependencies
54-
run: npm install
55-
53+
run: pnpm install
54+
5655
- name: Expo Prebuild [iOS]
5756
run: |
5857
npx expo prebuild --platform ios --npm
@@ -69,7 +68,7 @@ jobs:
6968

7069
build_android:
7170
runs-on: ubuntu-latest
72-
71+
7372
# build for android if platform is android or all, or if triggered by a release
7473
if: github.event_name == 'release' || inputs.buildPlatform == 'all' || inputs.buildPlatform == 'android'
7574

@@ -87,21 +86,26 @@ jobs:
8786
with:
8887
distribution: 'temurin' # See 'Supported distributions' for available options
8988
java-version: '17'
90-
89+
9190
- name: Install Node.js
9291
uses: actions/setup-node@v4
9392
with:
9493
node-version: '22.x'
9594

95+
- name: Setup pnpm
96+
uses: pnpm/action-setup@v4
97+
with:
98+
version: 10
99+
96100
- name: Install Dependencies
97-
run: npm install
101+
run: pnpm install
98102

99103
- name: Write Google Maps API Key to app.json
100104
run: |
101105
sed -i "s/{{GOOGLE_MAPS_KEY}}/$GOOGLE_MAPS_KEY/g" app.json
102106
env:
103107
GOOGLE_MAPS_KEY: ${{ secrets.GOOGLE_MAPS_KEY }}
104-
108+
105109
- name: Expo Prebuild [Android]
106110
run: |
107111
npx expo prebuild --platform android --npm
@@ -129,16 +133,16 @@ jobs:
129133
KEY_PASSWORD: ${{ secrets.AAB_PASSWORD }}
130134
STORE_PASSWORD: ${{ secrets.AAB_PASSWORD }}
131135
KEY_PATH: ${{ github.workspace }}/android/app/maroon-rides-release-key.jks
132-
136+
133137
GOOGLE_PLAY_KEY: ${{ secrets.GOOGLE_PLAY_KEY }}
134-
PACKAGE_NAME: "com.maroonrides.maroonrides"
138+
PACKAGE_NAME: 'com.maroonrides.maroonrides'
135139
APP_GRADLE_FILE: ${{ github.workspace }}/android/app/build.gradle
136-
140+
137141
- uses: actions/upload-artifact@v4
138142
with:
139143
name: app-bundle.aab
140144
path: ./android/app/build/outputs/bundle/release/app-release.aab
141-
145+
142146
- name: Set outputs
143147
id: git_sha
144148
run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
@@ -148,4 +152,4 @@ jobs:
148152
env:
149153
GOOGLE_PLAY_KEY: ${{ secrets.GOOGLE_PLAY_KEY }}
150154
RELEASE_NAME: ${{ github.event.release.tag_name || steps.git_sha.outputs.sha_short }}
151-
PACKAGE_NAME: "com.maroonrides.maroonrides"
155+
PACKAGE_NAME: 'com.maroonrides.maroonrides'

.github/workflows/format.yml

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
name: Fix formatting
2+
3+
on:
4+
pull_request:
5+
types: [labeled]
6+
7+
permissions: {}
8+
9+
jobs:
10+
format:
11+
runs-on: ubuntu-latest
12+
if: ${{ github.event.label.name == 'ci:format' }}
13+
permissions:
14+
contents: write
15+
pull-requests: write
16+
steps:
17+
- name: Checkout code
18+
uses: actions/checkout@v4
19+
20+
- name: Set up Node.js
21+
uses: actions/setup-node@v4
22+
with:
23+
node-version: 22
24+
25+
- name: Setup pnpm
26+
uses: pnpm/action-setup@v4
27+
with:
28+
version: 10
29+
30+
- name: Install dependencies
31+
run: pnpm install
32+
33+
- name: Lint with expo
34+
run: npx expo lint --fix
35+
36+
- name: Commit and push
37+
uses: EndBug/add-and-commit
38+
with:
39+
default_author: github_actions
40+
message: 'chore: fix formatting'
41+
42+
- name: Remove label
43+
uses: actions/github-script
44+
if: always()
45+
with:
46+
script: |
47+
github.rest.issues.removeLabel({
48+
issue_number: context.payload.pull_request.number,
49+
owner: context.repo.owner,
50+
repo: context.repo.repo,
51+
name: 'ci:format'
52+
})
Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@ name: TypeScript Linting
33
on:
44
push:
55
paths-ignore:
6-
- ".github/**"
7-
- "fastlane/**"
6+
- '.github/**'
7+
- 'fastlane/**'
8+
branches:
9+
- main
810
pull_request:
911

1012
jobs:
11-
tsc:
13+
lint:
1214
runs-on: ubuntu-latest
1315

1416
steps:
@@ -20,9 +22,16 @@ jobs:
2022
with:
2123
node-version: 22
2224

25+
- name: Setup pnpm
26+
uses: pnpm/action-setup@v4
27+
with:
28+
version: 10
29+
2330
- name: Install dependencies
24-
run: npm install
31+
run: pnpm install
32+
33+
- name: Lint with expo
34+
run: npx expo lint --max-warnings 0
2535

2636
- name: Run TypeScript checks
2737
run: npx tsc
28-

.prettierrc.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"trailingComma": "all",
3+
"tabWidth": 2,
4+
"singleQuote": true
5+
}

.vscode/extensions.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"recommendations": ["dbaeumer.vscode-eslint"]
3+
}

.vscode/settings.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"eslint.validate": [
3+
"javascript",
4+
"javascriptreact",
5+
"typescript",
6+
"typescriptreact"
7+
],
8+
"editor.codeActionsOnSave": {
9+
"source.fixAll.eslint": "explicit",
10+
"source.organizeImports": "always"
11+
},
12+
"eslint.rules.customizations": [
13+
{
14+
"rule": "prettier/prettier",
15+
"severity": "off"
16+
}
17+
]
18+
}

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Maroon Rides
2+
23
[![API Canary](https://github.com/Maroon-Rides/canary/actions/workflows/canary.yml/badge.svg)](https://github.com/Maroon-Rides/canary/actions/workflows/canary.yml)
34

45
We are building the best native mobile app for the Texas A&M University bus system.
56

6-
77
![maroonrides_header](https://github.com/user-attachments/assets/f85ba3ce-9ad9-49cc-aebc-f26d1cee1105)

app.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
declare module 'moment-strftime';
1+
declare module 'moment-strftime';

app.json

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
{
22
"expo": {
33
"name": "Maroon Rides",
4-
"slug": "Maroon Rides",
4+
"slug": "Maroon_Rides",
55
"version": "1.6.5",
66
"orientation": "portrait",
77
"icon": "./assets/icon.png",
88
"userInterfaceStyle": "automatic",
9+
"newArchEnabled": false,
910
"scheme": "myapp",
1011
"assetBundlePatterns": [
1112
"**/*"
@@ -82,7 +83,6 @@
8283
"bundler": "metro"
8384
},
8485
"plugins": [
85-
"@config-plugins/detox",
8686
[
8787
"@bacons/apple-targets",
8888
{
@@ -97,16 +97,21 @@
9797
"locationWhenInUsePermission": "Allow location for map display and route planning"
9898
}
9999
],
100-
["expo-build-properties", {
101-
"android": {
100+
[
101+
"expo-build-properties",
102+
{
103+
"android": {
102104
"compileSdkVersion": 35,
103105
"targetSdkVersion": 35,
104106
"buildToolsVersion": "35.0.0"
105-
},
106-
"ios": {
107-
"deploymentTarget": "13.4"
107+
},
108+
"ios": {
109+
"deploymentTarget": "15.1"
110+
}
108111
}
109-
}]
112+
],
113+
"expo-font",
114+
"expo-router"
110115
]
111116
}
112-
}
117+
}

0 commit comments

Comments
 (0)