Merge pull request #53 from confusiontech/last_updates_for_release

Last updates for release
confusiontech · Sep 14, 2023 · 349c4c9 · 349c4c9
2 parents fec2f24 + 2adf9f6
commit 349c4c9
Show file tree

Hide file tree

Showing 8 changed files with 2,948 additions and 3,400 deletions.
diff --git a/.gitignore b/.gitignore
@@ -79,4 +79,5 @@ web-build/
 # @end expo-cli
 
 #Pietro tokens
-.github_pietro_auth_token
+.github_pietro_auth_token
+eas.json
diff --git a/app.json b/app.json
@@ -28,10 +28,11 @@
       "bundleIdentifier": "es.beniconfusionfest.confusion",
       "infoPlist": {
         "NSLocationWhenInUseUsageDescription": "Mostraremos tu localización en los mapas para que ubiques los espacios más fácilmente"
-      }
+      },
+      "buildNumber": 19
     },
     "android": {
-      "package": "es.beniconfusionfest.confusion", 
+      "package": "es.beniconfusionfest.confusion",
       "adaptiveIcon": {
         "foregroundImage": "./assets/adaptive_icon_foreground.png",
         "backgroundColor": "#FFF4E2"
@@ -40,7 +41,13 @@
         "INTERNET",
         "WRITE_SETTINGS",
         "ACCESS_FINE_LOCATION"
-      ]
+      ],
+      "versionCode": 19
+    },
+    "extra": {
+      "eas": {
+        "projectId": "728863cd-f38c-4412-a4fa-befa5bbb9696"
+      }
     }
   }
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -16,32 +16,33 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.10.2",
-    "@react-native-async-storage/async-storage": "~1.17.3",
+    "@react-native-async-storage/async-storage": "1.17.11",
     "@react-native-community/masked-view": "*",
     "@react-native-picker/picker": "2.4.8",
     "@react-navigation/native": "^5.5.1",
     "@react-navigation/stack": "^5.5.1",
-    "expo": "^47.0.0",
-    "expo-splash-screen": "^0.17.5",
+    "expo": "^48.0.0",
+    "expo-splash-screen": "~0.18.2",
     "expo-status-bar": "~1.4.2",
-    "expo-updates": "~0.15.6",
+    "expo-updates": "~0.16.4",
     "fastest-levenshtein": "1.0.12",
     "local-cors-proxy": "^1.1.0",
     "moment": "^2.27.0",
     "native-base": "^3.4.8",
     "patch-package": "^8.0.0",
-    "react": "18.1.0",
-    "react-dom": "18.1.0",
-    "react-native": "0.70.8",
-    "react-native-gesture-handler": "~2.8.0",
+    "react": "18.2.0",
+    "react-dom": "18.2.0",
+    "react-native": "0.71.8",
+    "react-native-gesture-handler": "~2.9.0",
     "react-native-maps": "1.3.2",
-    "react-native-reanimated": "~2.12.0",
-    "react-native-safe-area-context": "4.4.1",
-    "react-native-screens": "~3.18.0",
+    "react-native-reanimated": "~2.14.4",
+    "react-native-safe-area-context": "4.5.0",
+    "react-native-screens": "~3.20.0",
     "react-native-svg": "13.4.0",
-    "react-native-unimodules": "~0.14.0",
     "react-native-web": "~0.18.9",
-    "remove-accents": "0.4.2"
+    "remove-accents": "0.4.2",
+    "@types/react": "~18.0.27",
+    "jest": "^29.2.1"
   },
   "devDependencies": {
     "@babel/core": "^7.12.9",

diff --git a/prepare-release.sh b/prepare-release.sh
@@ -12,5 +12,5 @@ trap cleanup EXIT
 
 ln -sf app.config.source.js app.config.js
 
-expo build:android -t app-bundle
-expo build:ios -t archive
+eas build --platform android
+eas build --platform ios
diff --git a/src/containers/info-container.js b/src/containers/info-container.js
@@ -18,7 +18,7 @@ const InfoContainer = ({ navigation }) => {
       <ScrollView style={styles.mainScrollView}>
         <View style={styles.textContainer}>
           <Text style={styles.title}>
-            conFusión 2022 - IX edición
+            conFusión
           </Text>
         </View>
         <View style={styles.linksContainer}>

diff --git a/src/helpers/with-async-storage.js b/src/helpers/with-async-storage.js
@@ -10,7 +10,7 @@ export const withAsyncStorage = (cacheKey, fallback) => {
     const storedValue = await Storage.get(cacheKey);
     const newValue = await fallback(...params, storedValue);
 
-    if (storedValue.program_timestamp !== newValue.program_timestamp) {
+    if (!storedValue || storedValue.program_timestamp !== newValue.program_timestamp) {
       await Storage.set(cacheKey, newValue);
       newValue.new = true;
     }

diff --git a/src/services/program-updater.js b/src/services/program-updater.js
@@ -5,7 +5,7 @@ import { ProgramContext } from './program-context';
 import { withAsyncStorage, Storage, PROGRAM_STORAGE_KEY, FAVORITES_STORAGE_KEY } from '../helpers/with-async-storage';
 import { programAdapter } from '../helpers/program-helpers';
 
-const UPDATE_INTERVALL_IN_MILLISEC = 600000; // 10 minutes
+const UPDATE_INTERVALL_IN_MILLISEC = 600000; // 600000 == 10 minutes
 
 const ProgramUpdater = () => {
   const { setAllShows, allShows, setFavorites } = useContext(ProgramContext);