Skip to content

Commit

Permalink
fix: Migration Expo SDK 51 (#1758)
Browse files Browse the repository at this point in the history
* Rebase master (#1746)

* fix: release (#1732)

* fix: add CNPG prod cluster (#1729)

* fix: add CNPG prod cluster

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* Update values.yaml

* fix

* fix

* fix

* fix

* chore: fix preprod workflow

* fix: release

* chore(release): version 1.135.1

* release ([#1732](#1732)) ([8393d46](8393d46)), closes [#1729](#1729)

* chore(release): version 1.135.2

* add CNPG prod cluster ([#1729](#1729)) ([4b74272](4b74272))
* allow metabse ingress ([#1733](#1733)) ([1f841e1](1f841e1))
* release ([dffeb6c](dffeb6c))

* fix: 🐛 Corrige la navigation vers les articles depuis calendar

* fix(ci): restore from cnpg (#1736)

* fix: restore from CNPG

* fix: reset dbs on dev/preprod deploys

* fix

* fix

* fix

* fix

* fix

* fix

* Update values.yaml

* Update values.yaml

* Update values.yaml

* fix(cnpg): use fixed name DB

* fix(restore): use defaults recovery user (#1738)

* fix(restore): use defaults recovery user

* Update values.yaml

* Update values.yaml

* Update values.yaml

* fix(cnpg): disable preprod backups for real

* fix: Corrige les notifications articles et certaines redirections vers les articles

* chore: change le numéro de version (v1.1.98)

* chore(release): version 1.135.3

* Corrige les notifications articles et certaines redirections vers les articles ([5364e89](5364e89))
* **ci:** restore from cnpg ([#1736](#1736)) ([fb94763](fb94763))
* **cnpg:** disable preprod backups for real ([67ea71b](67ea71b))
* **cnpg:** use fixed name DB ([e5073fb](e5073fb))
* **restore:** use defaults recovery user ([#1738](#1738)) ([c230ef1](c230ef1))
* 🐛 Corrige la navigation vers les articles depuis calendar ([b0904c0](b0904c0))

* fix: yarn berry + fetch + docker opti (#1739)

* fix: 🐛 Corrige la redirection vers les articles depuis les tnd

* chore(release): version 1.135.4

* 🐛 Corrige la redirection vers les articles depuis les tnd ([2e1a2d7](2e1a2d7))
* yarn berry + fetch + docker opti ([#1739](#1739)) ([772e4ca](772e4ca))

* chore(release): version 1.135.5

* 🐛 Corrige la redirection vers les articles depuis les tnd ([ad155a0](ad155a0))
* Corrige les notifications articles et certaines redirections vers les articles ([e2ab03f](e2ab03f))
* yarn berry + fetch + docker opti ([#1739](#1739)) ([204a176](204a176))
* **ci:** restore from cnpg ([#1736](#1736)) ([8cb13d5](8cb13d5))
* **cnpg:** disable preprod backups for real ([0a313f0](0a313f0))
* **cnpg:** use fixed name DB ([8f8796c](8f8796c))
* **restore:** use defaults recovery user ([#1738](#1738)) ([3cefc73](3cefc73))
* 🐛 Corrige la navigation vers les articles depuis calendar ([5bcfd15](5bcfd15))

* feat: ajoute un champ dans la config pour activer zeroAccident

* chore(release): version 1.136.0

* ajoute un champ dans la config pour activer zeroAccident ([bf2ce24](bf2ce24))

* feat: ajoute un flag zeroAccident sur les articles

* chore(release): version 1.137.0

* ajoute un flag zeroAccident sur les articles ([a782dc6](a782dc6))

* chore(release): version 1.138.0

* ajoute un champ dans la config pour activer zeroAccident ([c31e085](c31e085))
* ajoute un flag zeroAccident sur les articles ([29ee0fd](29ee0fd))
* zeroaaccident ([438aab0](438aab0))

* chore(release): version 1.138.1

* Expo build iOS ([1b5b9ff](1b5b9ff))

* chore(release): version 1.138.2

* 🐛 Politique de confidentialité 2024 ([5661675](5661675))

* chore(release): version 1.139.0

* 🐛 Ajoute les liens de l'app ZéroAccident ([a75f778](a75f778))

* 🎸 Ajoute un champ 'note' pour l'annuaire 1000j blues ([c1e552c](c1e552c))

* chore(release): version 1.140.0

* **recosante:** add recosante widget on evaluation page ([#1742](#1742)) ([dafc7be](dafc7be))

* chore(release): version 1.140.1

* add info dev (expoUpdates enabled) ([00d337c](00d337c))

* feat: add contact type for widget epds

---------

Co-authored-by: Julien Bouquillon <julien.bouquillon@sg.social.gouv.fr>
Co-authored-by: semantic-release-bot <semantic-release-bot@martynus.net>
Co-authored-by: Jo <jo@surikat.pro>

* chore: Expo SDK Migration (v51)

* fix: update yarn.lock

* fix: downgrade version of react-native-snap-carousel

* fix: replace react-native-snap-carousel by react-native-reanimated-carousel

* fix: sentry config

* fix: sentry url config

* fix: android build (expo-build-properties)

---------

Co-authored-by: Julien Bouquillon <julien.bouquillon@sg.social.gouv.fr>
Co-authored-by: semantic-release-bot <semantic-release-bot@martynus.net>
Co-authored-by: Jo <jo@surikat.pro>
  • Loading branch information
4 people committed Aug 12, 2024
1 parent 1b9f3f6 commit f045d37
Show file tree
Hide file tree
Showing 10 changed files with 1,838 additions and 3,594 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
## [1.141.4](https://github.com/SocialGouv/1000jours/compare/v1.141.3...v1.141.4) (2024-07-22)


### Bug Fixes

<<<<<<< HEAD
* Expo Build (yarn.lock + node version) ([#1757](https://github.com/SocialGouv/1000jours/issues/1757)) ([86c66d3](https://github.com/SocialGouv/1000jours/commit/86c66d3acaecdcb49c1dfb3a62134dea13a78242)), closes [#1746](https://github.com/SocialGouv/1000jours/issues/1746) [#1732](https://github.com/SocialGouv/1000jours/issues/1732) [#1729](https://github.com/SocialGouv/1000jours/issues/1729) [#1729](https://github.com/SocialGouv/1000jours/issues/1729) [#1729](https://github.com/SocialGouv/1000jours/issues/1729) [#1733](https://github.com/SocialGouv/1000jours/issues/1733) [#1736](https://github.com/SocialGouv/1000jours/issues/1736) [#1738](https://github.com/SocialGouv/1000jours/issues/1738) [#1736](https://github.com/SocialGouv/1000jours/issues/1736) [#1738](https://github.com/SocialGouv/1000jours/issues/1738) [#1739](https://github.com/SocialGouv/1000jours/issues/1739) [#1739](https://github.com/SocialGouv/1000jours/issues/1739) [#1739](https://github.com/SocialGouv/1000jours/issues/1739) [#1736](https://github.com/SocialGouv/1000jours/issues/1736) [#1738](https://github.com/SocialGouv/1000jours/issues/1738) [#1742](https://github.com/SocialGouv/1000jours/issues/1742)

## [1.141.3](https://github.com/SocialGouv/1000jours/compare/v1.141.2...v1.141.3) (2024-07-22)

### Bug Fixes

=======
>>>>>>> 104fa43d (Rebase master (#1746))
- Mise à jour des notifications après changement de profil ([#1756](https://github.com/SocialGouv/1000jours/issues/1756)) ([31f4939](https://github.com/SocialGouv/1000jours/commit/31f4939f904cbf7c04bdbf13e85fafeded381a56)), closes [#1746](https://github.com/SocialGouv/1000jours/issues/1746) [#1732](https://github.com/SocialGouv/1000jours/issues/1732) [#1729](https://github.com/SocialGouv/1000jours/issues/1729) [#1729](https://github.com/SocialGouv/1000jours/issues/1729) [#1729](https://github.com/SocialGouv/1000jours/issues/1729) [#1733](https://github.com/SocialGouv/1000jours/issues/1733) [#1736](https://github.com/SocialGouv/1000jours/issues/1736) [#1738](https://github.com/SocialGouv/1000jours/issues/1738) [#1736](https://github.com/SocialGouv/1000jours/issues/1736) [#1738](https://github.com/SocialGouv/1000jours/issues/1738) [#1739](https://github.com/SocialGouv/1000jours/issues/1739) [#1739](https://github.com/SocialGouv/1000jours/issues/1739) [#1739](https://github.com/SocialGouv/1000jours/issues/1739) [#1736](https://github.com/SocialGouv/1000jours/issues/1736) [#1738](https://github.com/SocialGouv/1000jours/issues/1738) [#1742](https://github.com/SocialGouv/1000jours/issues/1742)
## [1.141.2](https://github.com/SocialGouv/1000jours/compare/v1.141.1...v1.141.2) (2024-07-08)
Expand Down
15 changes: 0 additions & 15 deletions front/App.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import * as Font from "expo-font";
import { StatusBar } from "expo-status-bar";
import * as Updates from "expo-updates";
import type { FC } from "react";
import * as React from "react";
import { useEffect, useState } from "react";
Expand Down Expand Up @@ -120,21 +119,7 @@ const MainAppContainer: FC = () => {
);
};

const onFetchUpdateAsync = async () => {
try {
const update = await Updates.checkForUpdateAsync();

if (update.isAvailable) {
await Updates.fetchUpdateAsync();
await Updates.reloadAsync();
}
} catch (error: unknown) {
console.error(error);
}
};

useEffect(() => {
void onFetchUpdateAsync();
const init = async () => {
await Font.loadAsync(customFonts)
.then(() => {
Expand Down
126 changes: 0 additions & 126 deletions front/app.config.js

This file was deleted.

120 changes: 120 additions & 0 deletions front/app.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
import { ExpoConfig, ConfigContext } from "expo/config";

/* eslint-disable @typescript-eslint/naming-convention */
const APP_VERSION = "1.1.107";
const APP_VERSION_NUM = 107;

export default ({ config }: ConfigContext): ExpoConfig => ({
...config,
android: {
adaptiveIcon: {
backgroundColor: "#FFFFFF",
foregroundImage: "./src/assets/images/adaptive-icon.png",
},
config: {
googleMaps: {
apiKey: process.env.GOOGLE_MAPS_API_KEY,
},
},
intentFilters: [
{
action: "VIEW",
autoVerify: true,
category: ["DEFAULT", "BROWSABLE"],
data: [
{
host: process.env.DEEPLINK_DOMAIN,
pathPrefix: `/${process.env.DEEPLINK_PATH}`,
scheme: "https",
},
],
},
],
package: "com.fabrique.millejours",
permissions: [
"ACCESS_COARSE_LOCATION",
"ACCESS_FINE_LOCATION",
"READ_CALENDAR",
"WRITE_CALENDAR",
"RECEIVE_BOOT_COMPLETED",
"SCHEDULE_EXACT_ALARM",
"VIBRATE",
],
playStoreUrl:
"https://play.google.com/store/apps/details?id=com.fabrique.millejours",
versionCode: APP_VERSION_NUM,
},
assetBundlePatterns: ["**/*"],
extra: {
eas: {
projectId: "f6ac4fdc-cbef-49b5-9e33-fca51d77281e",
},
},
icon: "./src/assets/images/icon.png",
ios: {
appStoreUrl:
"https://apps.apple.com/us/app/1000-premiers-jours/id1573729958",
associatedDomains: [`applinks:${process.env.DEEPLINK_DOMAIN}`],
buildNumber: APP_VERSION,
bundleIdentifier: "com.fabrique.millejours",
infoPlist: {
NSCalendarsUsageDescription:
"Permet de synchroniser les événements avec le calendrier de votre téléphone",
NSLocationWhenInUseUsageDescription:
"Permet de vous positionner précisément sur la carte et de lancer une recherche des POI autour de vous.",
NSRemindersUsageDescription:
"Permet à l'application de vous faire des rappels sur les événements",
},
supportsTablet: true,
},
name: "1000 jours",
orientation: "portrait",
owner: "1000.jours",
plugins: [
[
"@sentry/react-native/expo",
{
project: "nos-1000-jours",
organization: "incubateur",
url: "https://sentry.fabrique.social.gouv.fr",
},
],
[
"expo-notifications",
{
icon: "./src/assets/images/notification_icon.png",
},
],
"expo-localization",
[
"expo-build-properties",
{
android: {
buildToolsVersion: "34.0.0",
compileSdkVersion: 34,
targetSdkVersion: 34,
},
ios: {
deploymentTarget: "16.0",
},
},
],
"expo-font",
"expo-asset",
],
runtimeVersion: {
policy: "sdkVersion",
},
scheme: "millejours",
slug: "1000jours",
splash: {
backgroundColor: "#ffffff",
image: "./src/assets/images/splash.png",
resizeMode: "contain",
},
userInterfaceStyle: "light",
version: APP_VERSION,
// web: {
// favicon: "./src/assets/images/favicon.png",
// },
});
Loading

0 comments on commit f045d37

Please # to comment.