Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Migration Expo SDK 51 #1758

Merged
merged 8 commits into from
Aug 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Loading