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

chore(Cross): [IOAPPX-292] Update iOS deployment version to 14.0 #5751

Merged
merged 20 commits into from
Jun 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
ffdb924
chore: update iOS version
hevelius May 8, 2024
32e54a4
Merge branch 'master' into IOAPPX-292-upgrade-ios-deployment-version
hevelius May 9, 2024
289a185
Merge branch 'master' into IOAPPX-292-upgrade-ios-deployment-version
dmnplb May 17, 2024
6641e41
Merge branch 'master' into IOAPPX-292-upgrade-ios-deployment-version
hevelius May 20, 2024
b9eab53
Merge branch 'master' into IOAPPX-292-upgrade-ios-deployment-version
hevelius May 20, 2024
5263b51
Merge branch 'master' into IOAPPX-292-upgrade-ios-deployment-version
hevelius May 21, 2024
a746088
Merge branch 'master' into IOAPPX-292-upgrade-ios-deployment-version
hevelius May 23, 2024
ce6f6e7
Merge branch 'master' into IOAPPX-292-upgrade-ios-deployment-version
CrisTofani May 27, 2024
ce585fd
Merge branch 'master' into IOAPPX-292-upgrade-ios-deployment-version
hevelius Jun 4, 2024
b30b1bf
Merge branch 'master' into IOAPPX-292-upgrade-ios-deployment-version
hevelius Jun 5, 2024
b213cda
Merge branch 'master' into IOAPPX-292-upgrade-ios-deployment-version
hevelius Jun 10, 2024
a8bbd08
Merge branch 'master' into IOAPPX-292-upgrade-ios-deployment-version
hevelius Jun 11, 2024
558116f
Merge branch 'master' into IOAPPX-292-upgrade-ios-deployment-version
hevelius Jun 11, 2024
ac60178
Revert "chore(IT Wallet): [SIW-1165] Add status banner to warn about …
hevelius Jun 11, 2024
e0976a9
Merge branch 'master' into IOAPPX-292-upgrade-ios-deployment-version
hevelius Jun 11, 2024
3419bcd
Merge branch 'master' into IOAPPX-292-upgrade-ios-deployment-version
hevelius Jun 13, 2024
89fb798
Merge branch 'master' into IOAPPX-292-upgrade-ios-deployment-version
hevelius Jun 18, 2024
b4c1184
Merge branch 'master' into IOAPPX-292-upgrade-ios-deployment-version
hevelius Jun 18, 2024
29d5dcd
Merge branch 'master' into IOAPPX-292-upgrade-ios-deployment-version
hevelius Jun 19, 2024
8bd321b
Merge branch 'master' into IOAPPX-292-upgrade-ios-deployment-version
hevelius Jun 19, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions ios/ItaliaApp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -757,7 +757,7 @@
INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional";
INFOPLIST_PREFIX_HEADER = "${BUILD_DIR}/GeneratedInfoPlistDotEnv.h";
INFOPLIST_PREPROCESS = NO;
IPHONEOS_DEPLOYMENT_TARGET = 12.4;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
OTHER_LDFLAGS = (
"$(inherited)",
Expand Down Expand Up @@ -798,7 +798,7 @@
INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional";
INFOPLIST_PREFIX_HEADER = "${BUILD_DIR}/GeneratedInfoPlistDotEnv.h";
INFOPLIST_PREPROCESS = NO;
IPHONEOS_DEPLOYMENT_TARGET = 12.4;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
OTHER_LDFLAGS = (
"$(inherited)",
Expand Down Expand Up @@ -863,7 +863,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.4;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)";
LIBRARY_SEARCH_PATHS = (
"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
Expand Down Expand Up @@ -927,7 +927,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.4;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)";
LIBRARY_SEARCH_PATHS = (
"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
Expand Down
2 changes: 1 addition & 1 deletion ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ require_relative '../node_modules/react-native/scripts/react_native_pods'
require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
require_relative '../node_modules/react-native-permissions/scripts/setup'

platform :ios, '12.4'
platform :ios, '14.0'
install! 'cocoapods', :deterministic_uuids => false

# Required by react-native-permissions
Expand Down
2 changes: 1 addition & 1 deletion ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1047,6 +1047,6 @@ SPEC CHECKSUMS:
ZendeskSupportSDK: 8cf921c496269bb5f53aac9320f3d002a793991d
ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb

PODFILE CHECKSUM: 7dfdfa4afe9355d54bec685917054fc54ab9040f
PODFILE CHECKSUM: eb8caf6058660eae1ef9ea3a352628c7e1f0ba76

COCOAPODS: 1.15.2
2 changes: 1 addition & 1 deletion locales/en/index.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ global:
unknown: unknown
disclaimer_beta: If you're having trouble signing in, please let us know!
sectionStatus:
moreInfo: More info
moreInfo: more info
accessibility:
minusSymbol: minus
switchLabel: "Select to activate"
Expand Down
2 changes: 1 addition & 1 deletion locales/it/index.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ global:
disclaimer_beta: Se riscontri problemi di accesso, segnalacelo!
unknown: sconosciuto
sectionStatus:
moreInfo: Più info
moreInfo: più info
accessibility:
minusSymbol: meno
reload: "Ricarica"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@ import { pipe } from "fp-ts/lib/function";
import React, { useEffect } from "react";
import { connect } from "react-redux";
import { Dispatch } from "redux";
import { Platform } from "react-native";
import SectionStatusComponent, {
InnerSectionStatus
} from "../../../../components/SectionStatus";
import SectionStatusComponent from "../../../../components/SectionStatus";
import { ContextualHelpPropsMarkdown } from "../../../../components/screens/BaseScreenComponent";
import TopScreenComponent from "../../../../components/screens/TopScreenComponent";
import { MIN_CHARACTER_SEARCH_TEXT } from "../../../../components/search/SearchButton";
Expand Down Expand Up @@ -44,8 +41,6 @@ import {
MessagesStatus,
messagesStatusSelector
} from "../../store/reducers/messagesStatus";
import { unsupportedDeviceMoreInfoUrl } from "../../../../config";
import { LevelEnum } from "../../../../../definitions/content/SectionStatus";
import MigratingMessage from "./MigratingMessage";

type Props = ReturnType<typeof mapStateToProps> &
Expand All @@ -56,9 +51,6 @@ const contextualHelpMarkdown: ContextualHelpPropsMarkdown = {
body: "messages.contextualHelpContent"
};

const isIOSVersionLessThan14 =
Platform.OS === "ios" && parseInt(Platform.Version as string, 10) < 14;

/**
* Screen to gather and organize the information for the Inbox and SearchMessage views.
*/
Expand Down Expand Up @@ -123,24 +115,6 @@ const LegacyMessagesHomeScreen = ({
/>
);

const unsupportedDevicesStatusComponent = isIOSVersionLessThan14 && (
<InnerSectionStatus
sectionKey={"messages"}
sectionStatus={{
is_visible: true,
level: LevelEnum.warning,
web_url: {
"it-IT": unsupportedDeviceMoreInfoUrl,
"en-EN": unsupportedDeviceMoreInfoUrl
},
message: {
"it-IT": I18n.t("features.itWallet.unsupportedDevice.text"),
"en-EN": I18n.t("features.itWallet.unsupportedDevice.text")
}
}}
/>
);

return (
<TopScreenComponent
accessibilityEvents={{
Expand All @@ -159,7 +133,6 @@ const LegacyMessagesHomeScreen = ({
backgroundColor={IOColors.white}
/>
{isScreenReaderEnabled && statusComponent}
{isScreenReaderEnabled && unsupportedDevicesStatusComponent}
{!isSearchEnabled && (
<React.Fragment>
{needsMigration ? (
Expand Down Expand Up @@ -198,7 +171,6 @@ const LegacyMessagesHomeScreen = ({
))
)}
{!isScreenReaderEnabled && statusComponent}
{!isScreenReaderEnabled && unsupportedDevicesStatusComponent}
{bottomSheet}
{securitySuggestionBottomSheet}
</TopScreenComponent>
Expand Down