Skip to content

Commit

Permalink
IOS-7818 Bump deployment target up to 15 (#370)
Browse files Browse the repository at this point in the history
  • Loading branch information
tureck1y authored Sep 12, 2024
1 parent 8df589c commit 59943df
Show file tree
Hide file tree
Showing 239 changed files with 171 additions and 752 deletions.
2 changes: 1 addition & 1 deletion Example/Gemfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source "https://rubygems.org"

gem "cocoapods", "~> 1.14.0"
gem "cocoapods", "~> 1.15.2"
34 changes: 17 additions & 17 deletions Example/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,29 +5,30 @@ GEM
base64
nkf
rexml
activesupport (7.1.3.3)
activesupport (7.2.1)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
concurrent-ruby (~> 1.0, >= 1.3.1)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
logger (>= 1.4.2)
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
algoliasearch (1.27.5)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
atomos (0.1.3)
base64 (0.2.0)
bigdecimal (3.1.8)
claide (1.1.0)
cocoapods (1.14.3)
cocoapods (1.15.2)
addressable (~> 2.8)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.14.3)
cocoapods-core (= 1.15.2)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 2.1, < 3.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
Expand All @@ -42,7 +43,7 @@ GEM
nap (~> 1.0)
ruby-macho (>= 2.3.0, < 3.0)
xcodeproj (>= 1.23.0, < 2.0)
cocoapods-core (1.14.3)
cocoapods-core (1.15.2)
activesupport (>= 5.0, < 8)
addressable (~> 2.8)
algoliasearch (~> 1.0)
Expand All @@ -62,32 +63,31 @@ GEM
netrc (~> 0.11)
cocoapods-try (1.2.0)
colored2 (3.1.2)
concurrent-ruby (1.2.3)
concurrent-ruby (1.3.4)
connection_pool (2.4.1)
drb (2.2.1)
escape (0.0.4)
ethon (0.16.0)
ffi (>= 1.15.0)
ffi (1.16.3)
ffi (1.17.0)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
httpclient (2.8.3)
i18n (1.14.5)
concurrent-ruby (~> 1.0)
json (2.7.2)
minitest (5.23.0)
logger (1.6.1)
minitest (5.25.1)
molinillo (0.8.0)
mutex_m (0.2.0)
nanaimo (0.3.0)
nap (1.1.0)
netrc (0.11.0)
nkf (0.2.0)
public_suffix (4.0.7)
rexml (3.3.6)
strscan
rexml (3.3.7)
ruby-macho (2.5.1)
strscan (3.1.0)
securerandom (0.3.1)
typhoeus (1.4.1)
ethon (>= 0.9.0)
tzinfo (2.0.6)
Expand All @@ -106,7 +106,7 @@ PLATFORMS
x86_64-linux

DEPENDENCIES
cocoapods (~> 1.14.0)
cocoapods (~> 1.15.2)

BUNDLED WITH
2.4.22
2 changes: 1 addition & 1 deletion Example/Podfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use_frameworks!
install! 'cocoapods', :disable_input_output_paths => true

platform :ios, '13.0'
platform :ios, '15.0'

target 'TangemSdkExample' do
pod 'TangemSdk', :path => '../'
Expand Down
8 changes: 4 additions & 4 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PODS:
- TangemSdk (3.8.0)
- TangemSdk (3.10.0)

DEPENDENCIES:
- TangemSdk (from `../`)
Expand All @@ -9,8 +9,8 @@ EXTERNAL SOURCES:
:path: "../"

SPEC CHECKSUMS:
TangemSdk: 61e07ff112d4095cfa688fa7d4694e59fa29f76d
TangemSdk: 943099314a07e448307f994dca6217bb27366b66

PODFILE CHECKSUM: fb4745483d8583db4c8ae8aa3ccbde86ca112a6b
PODFILE CHECKSUM: 2d95b9bdd729cea3714086cfd92024ae5b1bb1af

COCOAPODS: 1.14.3
COCOAPODS: 1.15.2
14 changes: 11 additions & 3 deletions Example/TangemSdkExample.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@
attributes = {
BuildIndependentTargetsInParallel = YES;
LastSwiftUpdateCheck = 1120;
LastUpgradeCheck = 1510;
LastUpgradeCheck = 1540;
ORGANIZATIONNAME = "Tangem AG";
TargetAttributes = {
5D78C1B5234F435B008D7478 = {
Expand Down Expand Up @@ -522,7 +522,6 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
Expand Down Expand Up @@ -578,7 +577,6 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
SDKROOT = iphoneos;
Expand All @@ -598,12 +596,17 @@
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 4897UJ6D8C;
INFOPLIST_FILE = TangemSDKExample/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.tangem.TangemSDKExample;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
SWIFT_INCLUDE_PATHS = "$(inherited)";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 1;
Expand All @@ -620,12 +623,17 @@
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 4897UJ6D8C;
INFOPLIST_FILE = TangemSDKExample/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.tangem.TangemSDKExample;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
SWIFT_INCLUDE_PATHS = "$(inherited)";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 1;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1510"
LastUpgradeVersion = "1540"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -17,7 +17,7 @@
BlueprintIdentifier = "5D78C1B5234F435B008D7478"
BuildableName = "TangemSdkExample.app"
BlueprintName = "TangemSdkExample"
ReferencedContainer = "container:TangemSdkExample.xcodeproj">
ReferencedContainer = "container:TangemSDKExample.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
Expand Down Expand Up @@ -47,7 +47,7 @@
BlueprintIdentifier = "5D78C1B5234F435B008D7478"
BuildableName = "TangemSdkExample.app"
BlueprintName = "TangemSdkExample"
ReferencedContainer = "container:TangemSdkExample.xcodeproj">
ReferencedContainer = "container:TangemSDKExample.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
Expand All @@ -64,7 +64,7 @@
BlueprintIdentifier = "5D78C1B5234F435B008D7478"
BuildableName = "TangemSdkExample.app"
BlueprintName = "TangemSdkExample"
ReferencedContainer = "container:TangemSdkExample.xcodeproj">
ReferencedContainer = "container:TangemSDKExample.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1510"
LastUpgradeVersion = "1540"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
26 changes: 0 additions & 26 deletions Example/TangemSdkExample/AppModel.swift
Original file line number Diff line number Diff line change
Expand Up @@ -192,16 +192,6 @@ extension AppModel {
}
}

func printEditor() {
switch method {
case .jsonrpc:
printJson()
case .personalize:
printPersonalizationConfig()
default: break
}
}

func pasteEditor() {
switch method {
case .jsonrpc:
Expand Down Expand Up @@ -660,34 +650,18 @@ extension AppModel {
private func pasteJson() {
if let string = UIPasteboard.general.string {
json = string

if #available(iOS 14.0, *) {} else {
printJson()
}
}
}

private func printJson() {
logger.log(json)
}
}

//personalization
extension AppModel {
private func pastePersonalizationConfig() {
if let string = UIPasteboard.general.string {
personalizationConfig = string

if #available(iOS 14.0, *) {} else {
printPersonalizationConfig()
}
}
}

private func printPersonalizationConfig() {
logger.log(personalizationConfig)
}

func personalize() {
do {
guard let configData = personalizationConfig.data(using: .utf8) else {
Expand Down
28 changes: 9 additions & 19 deletions Example/TangemSdkExample/ContentView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -188,25 +188,15 @@ struct ContentView: View {
.font(.headline)
.bold()

if #available(iOS 14.0, *) {
TextEditor(text: $model.editorData)
.frame(height: 100)

HStack {
Spacer()
Button("Paste json", action: model.pasteEditor)
Spacer()
Button("End editing", action: model.endEditing)
Spacer()
}
} else {
HStack {
Spacer()
Button("Print json", action: model.printEditor)
Spacer()
Button("Paste json", action: model.pasteEditor)
Spacer()
}
TextEditor(text: $model.editorData)
.frame(height: 100)

HStack {
Spacer()
Button("Paste json", action: model.pasteEditor)
Spacer()
Button("End editing", action: model.endEditing)
Spacer()
}
}
.autocapitalization(.none)
Expand Down
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
source "https://rubygems.org"

gem "fastlane", "~> 2.217.0"
gem "cocoapods", "~> 1.14.0"
gem "fastlane", "~> 2.222.0"
gem "cocoapods", "~> 1.15.2"
Loading

0 comments on commit 59943df

Please sign in to comment.