Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 0435dd1

Browse files
nathanfalletnathanfallet
authoredApr 13, 2024
Merge pull request #1255 from SagarSDagdu/privacy-manifest
Change deployment targets for Xcode 15 and add dependency on custom Cocoapods fork
2 parents c361380 + 6491e38 commit 0435dd1

File tree

4 files changed

+131
-14
lines changed

4 files changed

+131
-14
lines changed
 

‎Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
gem 'cocoapods', :git => 'https://github.com/SagarSDagdu/CocoaPods.git', tag: '1.15.2.1-sagard'

‎Gemfile.lock

Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
GIT
2+
remote: https://github.com/SagarSDagdu/CocoaPods.git
3+
revision: d96f491f79abd2804d1359c5228cce404dd365b7
4+
tag: 1.15.2.1-sagard
5+
specs:
6+
cocoapods (1.15.2.1.pre.sagard)
7+
addressable (~> 2.8)
8+
claide (>= 1.0.2, < 2.0)
9+
cocoapods-core (= 1.15.2)
10+
cocoapods-deintegrate (>= 1.0.3, < 2.0)
11+
cocoapods-downloader (>= 2.1, < 3.0)
12+
cocoapods-plugins (>= 1.0.0, < 2.0)
13+
cocoapods-search (>= 1.0.0, < 2.0)
14+
cocoapods-trunk (>= 1.6.0, < 2.0)
15+
cocoapods-try (>= 1.1.0, < 2.0)
16+
colored2 (~> 3.1)
17+
escape (~> 0.0.4)
18+
fourflusher (>= 2.3.0, < 3.0)
19+
gh_inspector (~> 1.0)
20+
molinillo (~> 0.8.0)
21+
nap (~> 1.0)
22+
ruby-macho (>= 2.3.0, < 3.0)
23+
xcodeproj (>= 1.23.0, < 2.0)
24+
25+
GEM
26+
specs:
27+
CFPropertyList (3.0.7)
28+
base64
29+
nkf
30+
rexml
31+
activesupport (7.1.3.2)
32+
base64
33+
bigdecimal
34+
concurrent-ruby (~> 1.0, >= 1.0.2)
35+
connection_pool (>= 2.2.5)
36+
drb
37+
i18n (>= 1.6, < 2)
38+
minitest (>= 5.1)
39+
mutex_m
40+
tzinfo (~> 2.0)
41+
addressable (2.8.6)
42+
public_suffix (>= 2.0.2, < 6.0)
43+
algoliasearch (1.27.5)
44+
httpclient (~> 2.8, >= 2.8.3)
45+
json (>= 1.5.1)
46+
atomos (0.1.3)
47+
base64 (0.2.0)
48+
bigdecimal (3.1.5)
49+
claide (1.1.0)
50+
cocoapods-core (1.15.2)
51+
activesupport (>= 5.0, < 8)
52+
addressable (~> 2.8)
53+
algoliasearch (~> 1.0)
54+
concurrent-ruby (~> 1.1)
55+
fuzzy_match (~> 2.0.4)
56+
nap (~> 1.0)
57+
netrc (~> 0.11)
58+
public_suffix (~> 4.0)
59+
typhoeus (~> 1.0)
60+
cocoapods-deintegrate (1.0.5)
61+
cocoapods-downloader (2.1)
62+
cocoapods-plugins (1.0.0)
63+
nap
64+
cocoapods-search (1.0.1)
65+
cocoapods-trunk (1.6.0)
66+
nap (>= 0.8, < 2.0)
67+
netrc (~> 0.11)
68+
cocoapods-try (1.2.0)
69+
colored2 (3.1.2)
70+
concurrent-ruby (1.2.3)
71+
connection_pool (2.4.1)
72+
drb (2.2.0)
73+
ruby2_keywords
74+
escape (0.0.4)
75+
ethon (0.16.0)
76+
ffi (>= 1.15.0)
77+
ffi (1.16.3)
78+
fourflusher (2.3.1)
79+
fuzzy_match (2.0.4)
80+
gh_inspector (1.1.3)
81+
httpclient (2.8.3)
82+
i18n (1.14.4)
83+
concurrent-ruby (~> 1.0)
84+
json (2.7.1)
85+
minitest (5.22.0)
86+
molinillo (0.8.0)
87+
mutex_m (0.2.0)
88+
nanaimo (0.3.0)
89+
nap (1.1.0)
90+
netrc (0.11.0)
91+
nkf (0.1.3)
92+
public_suffix (4.0.7)
93+
rexml (3.2.6)
94+
ruby-macho (2.5.1)
95+
ruby2_keywords (0.0.5)
96+
typhoeus (1.4.1)
97+
ethon (>= 0.9.0)
98+
tzinfo (2.0.6)
99+
concurrent-ruby (~> 1.0)
100+
xcodeproj (1.24.0)
101+
CFPropertyList (>= 2.3.3, < 4.0)
102+
atomos (~> 0.1.3)
103+
claide (>= 1.0.2, < 2.0)
104+
colored2 (~> 3.1)
105+
nanaimo (~> 0.3.0)
106+
rexml (~> 3.2.4)
107+
108+
PLATFORMS
109+
arm64-darwin-23
110+
ruby
111+
112+
DEPENDENCIES
113+
cocoapods!
114+
115+
BUNDLED WITH
116+
2.5.4

‎SQLite.swift.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ Pod::Spec.new do |s|
1818
s.default_subspec = 'standard'
1919
s.swift_versions = ['5']
2020

21-
ios_deployment_target = '11.0'
22-
tvos_deployment_target = '11.0'
21+
ios_deployment_target = '12.0'
22+
tvos_deployment_target = '12.0'
2323
osx_deployment_target = '10.13'
2424
watchos_deployment_target = '4.0'
2525

‎SQLite.xcodeproj/project.pbxproj

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1299,7 +1299,7 @@
12991299
SDKROOT = appletvos;
13001300
SKIP_INSTALL = YES;
13011301
SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;
1302-
TVOS_DEPLOYMENT_TARGET = 11.0;
1302+
TVOS_DEPLOYMENT_TARGET = 12.0;
13031303
};
13041304
name = Debug;
13051305
};
@@ -1321,7 +1321,7 @@
13211321
SDKROOT = appletvos;
13221322
SKIP_INSTALL = YES;
13231323
SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;
1324-
TVOS_DEPLOYMENT_TARGET = 11.0;
1324+
TVOS_DEPLOYMENT_TARGET = 12.0;
13251325
};
13261326
name = Release;
13271327
};
@@ -1335,7 +1335,7 @@
13351335
PRODUCT_NAME = "$(TARGET_NAME)";
13361336
SDKROOT = appletvos;
13371337
SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;
1338-
TVOS_DEPLOYMENT_TARGET = 11.0;
1338+
TVOS_DEPLOYMENT_TARGET = 12.0;
13391339
};
13401340
name = Debug;
13411341
};
@@ -1349,7 +1349,7 @@
13491349
PRODUCT_NAME = "$(TARGET_NAME)";
13501350
SDKROOT = appletvos;
13511351
SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;
1352-
TVOS_DEPLOYMENT_TARGET = 11.0;
1352+
TVOS_DEPLOYMENT_TARGET = 12.0;
13531353
};
13541354
name = Release;
13551355
};
@@ -1450,7 +1450,7 @@
14501450
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
14511451
GCC_WARN_UNUSED_FUNCTION = YES;
14521452
GCC_WARN_UNUSED_VARIABLE = YES;
1453-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
1453+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
14541454
MACOSX_DEPLOYMENT_TARGET = 10.13;
14551455
MTL_ENABLE_DEBUG_INFO = YES;
14561456
ONLY_ACTIVE_ARCH = YES;
@@ -1459,7 +1459,7 @@
14591459
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
14601460
SWIFT_VERSION = 5.0;
14611461
TARGETED_DEVICE_FAMILY = "1,2,3";
1462-
TVOS_DEPLOYMENT_TARGET = 11.0;
1462+
TVOS_DEPLOYMENT_TARGET = 12.0;
14631463
VERSIONING_SYSTEM = "apple-generic";
14641464
VERSION_INFO_PREFIX = "";
14651465
WATCHOS_DEPLOYMENT_TARGET = 4.0;
@@ -1509,15 +1509,15 @@
15091509
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
15101510
GCC_WARN_UNUSED_FUNCTION = YES;
15111511
GCC_WARN_UNUSED_VARIABLE = YES;
1512-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
1512+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
15131513
MACOSX_DEPLOYMENT_TARGET = 10.13;
15141514
MTL_ENABLE_DEBUG_INFO = NO;
15151515
PRODUCT_NAME = "";
15161516
SDKROOT = iphoneos;
15171517
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
15181518
SWIFT_VERSION = 5.0;
15191519
TARGETED_DEVICE_FAMILY = "1,2,3";
1520-
TVOS_DEPLOYMENT_TARGET = 11.0;
1520+
TVOS_DEPLOYMENT_TARGET = 12.0;
15211521
VALIDATE_PRODUCT = YES;
15221522
VERSIONING_SYSTEM = "apple-generic";
15231523
VERSION_INFO_PREFIX = "";
@@ -1538,7 +1538,7 @@
15381538
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
15391539
INFOPLIST_FILE = "$(SRCROOT)/Sources/SQLite/Info.plist";
15401540
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1541-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
1541+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
15421542
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
15431543
MARKETING_VERSION = 0.14.0;
15441544
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLite;
@@ -1562,7 +1562,7 @@
15621562
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
15631563
INFOPLIST_FILE = "$(SRCROOT)/Sources/SQLite/Info.plist";
15641564
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1565-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
1565+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
15661566
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
15671567
MARKETING_VERSION = 0.14.0;
15681568
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLite;
@@ -1577,7 +1577,7 @@
15771577
buildSettings = {
15781578
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
15791579
INFOPLIST_FILE = Tests/SQLiteTests/Info.plist;
1580-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
1580+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
15811581
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
15821582
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLiteTests;
15831583
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1590,7 +1590,7 @@
15901590
buildSettings = {
15911591
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
15921592
INFOPLIST_FILE = Tests/SQLiteTests/Info.plist;
1593-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
1593+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
15941594
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
15951595
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLiteTests;
15961596
PRODUCT_NAME = "$(TARGET_NAME)";

0 commit comments

Comments
 (0)
Please sign in to comment.