Merge pull request #204 from cuappdev/main

Deploy v1.0.4 again
cuappdev · May 26, 2024 · 7ae74ab · 7ae74ab
2 parents d6229fc + 0093ac5
commit 7ae74ab
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -76,7 +76,9 @@ If you need to switch between environments, make sure that you are using the cor
 
 ## Deployment
 
-TODO
+1. In `app.config.ts`, change `expo.version` to the next version and increment `ios.buildNumber` by 1.
+2. Create a PR to merge `main` to `release`.
+3. A GitHub Actions workflow should automatically run. Note that EAS Build and EAS Submit can be quite buggy sometimes so manual deployment may need to be done. If that's the case, make sure that you update the versions properly through the native files (such as Xcode).
 
 ## Troubleshooting
 

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -87,8 +87,8 @@ android {
         applicationId 'com.cornellappdev.resell.android'
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 2
-        versionName "1.0.0"
+        versionCode 3
+        versionName "1.0.4"
 
         buildConfigField("boolean", "REACT_NATIVE_UNSTABLE_USE_RUNTIME_SCHEDULER_ALWAYS", (findProperty("reactNative.unstable_useRuntimeSchedulerAlways") ?: true).toString())
     }

diff --git a/android/gradle.properties b/android/gradle.properties
@@ -55,4 +55,5 @@ expo.webp.animated=false
 # Enable network inspector
 EX_DEV_CLIENT_NETWORK_INSPECTOR=true
 
-expo.jsEngine=jsc
+expo.jsEngine=jsc
+android.compileSdkVersion=33
diff --git a/app.config.ts b/app.config.ts
@@ -51,7 +51,7 @@ export default {
     ios: {
       supportsTablet: false,
       bundleIdentifier: "com.cornellappdev.resell",
-      googleServicesFile: "./config/GoogleService-Info.plist",
+      googleServicesFile: "$(GOOGLE_SERVICES_INFO_PLIST)",
       buildNumber: "15",
       infoPlist: {
         NSCalendarsUsageDescription: "Allow Resell to access your calendar",
@@ -70,7 +70,7 @@ export default {
       permissions: ["READ_CALENDAR", "WRITE_CALENDAR"],
 
       package: "com.cornellappdev.resell.android",
-      googleServicesFile: "./config/google-services.json",
+      googleServicesFile: "$(GOOGLE_SERVICES_JSON)",
       versionCode: 2,
       intentFilters: [
         {