Skip to content

Commit 434a513

Browse files
guytepperguytepper
authored
🔧 - Set minimum iOS deployment version to iOS 17 (#433)
See #432
1 parent 8fdd493 commit 434a513

File tree

7 files changed

+29
-45
lines changed

7 files changed

+29
-45
lines changed

‎ios/BetterRail.xcodeproj/project.pbxproj

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1325,17 +1325,17 @@
13251325
CLANG_ENABLE_MODULES = YES;
13261326
CODE_SIGN_ENTITLEMENTS = BetterRail/BetterRailDebug.entitlements;
13271327
CODE_SIGN_STYLE = Manual;
1328-
CURRENT_PROJECT_VERSION = 14;
1328+
CURRENT_PROJECT_VERSION = 1;
13291329
DEVELOPMENT_TEAM = "";
13301330
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = UE6BVYPPFX;
13311331
ENABLE_BITCODE = NO;
13321332
INFOPLIST_FILE = BetterRail/Info.plist;
1333-
IPHONEOS_DEPLOYMENT_TARGET = 15.1;
1333+
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
13341334
LD_RUNPATH_SEARCH_PATHS = (
13351335
"$(inherited)",
13361336
"@executable_path/Frameworks",
13371337
);
1338-
MARKETING_VERSION = 2.4.0;
1338+
MARKETING_VERSION = 2.4.02;
13391339
OTHER_LDFLAGS = (
13401340
"$(inherited)",
13411341
"-ObjC",
@@ -1368,16 +1368,16 @@
13681368
CODE_SIGN_IDENTITY = "Apple Development";
13691369
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
13701370
CODE_SIGN_STYLE = Manual;
1371-
CURRENT_PROJECT_VERSION = 14;
1371+
CURRENT_PROJECT_VERSION = 1;
13721372
DEVELOPMENT_TEAM = "";
13731373
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = UE6BVYPPFX;
13741374
INFOPLIST_FILE = BetterRail/Info.plist;
1375-
IPHONEOS_DEPLOYMENT_TARGET = 15.1;
1375+
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
13761376
LD_RUNPATH_SEARCH_PATHS = (
13771377
"$(inherited)",
13781378
"@executable_path/Frameworks",
13791379
);
1380-
MARKETING_VERSION = 2.4.0;
1380+
MARKETING_VERSION = 2.4.02;
13811381
OTHER_LDFLAGS = (
13821382
"$(inherited)",
13831383
"-ObjC",
@@ -1575,7 +1575,7 @@
15751575
CODE_SIGN_ENTITLEMENTS = BetterRailWidgetExtensionDebug.entitlements;
15761576
"CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Developer";
15771577
CODE_SIGN_STYLE = Manual;
1578-
CURRENT_PROJECT_VERSION = 14;
1578+
CURRENT_PROJECT_VERSION = 1;
15791579
DEBUG_INFORMATION_FORMAT = dwarf;
15801580
DEVELOPMENT_TEAM = "";
15811581
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = UE6BVYPPFX;
@@ -1587,7 +1587,7 @@
15871587
"@executable_path/Frameworks",
15881588
"@executable_path/../../Frameworks",
15891589
);
1590-
MARKETING_VERSION = 2.4.0;
1590+
MARKETING_VERSION = 2.4.02;
15911591
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
15921592
MTL_FAST_MATH = YES;
15931593
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
@@ -1624,7 +1624,7 @@
16241624
"CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Distribution";
16251625
CODE_SIGN_STYLE = Manual;
16261626
COPY_PHASE_STRIP = NO;
1627-
CURRENT_PROJECT_VERSION = 14;
1627+
CURRENT_PROJECT_VERSION = 1;
16281628
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
16291629
DEVELOPMENT_TEAM = "";
16301630
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = UE6BVYPPFX;
@@ -1636,7 +1636,7 @@
16361636
"@executable_path/Frameworks",
16371637
"@executable_path/../../Frameworks",
16381638
);
1639-
MARKETING_VERSION = 2.4.0;
1639+
MARKETING_VERSION = 2.4.02;
16401640
MTL_FAST_MATH = YES;
16411641
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
16421642
PRODUCT_BUNDLE_IDENTIFIER = "il.co.better-rail.watchkitapp.BetterRailWidget";
@@ -1669,7 +1669,7 @@
16691669
CODE_SIGN_ENTITLEMENTS = BetterRailWatch.entitlements;
16701670
"CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Developer";
16711671
CODE_SIGN_STYLE = Manual;
1672-
CURRENT_PROJECT_VERSION = 14;
1672+
CURRENT_PROJECT_VERSION = 1;
16731673
DEBUG_INFORMATION_FORMAT = dwarf;
16741674
DEVELOPMENT_ASSET_PATHS = "";
16751675
DEVELOPMENT_TEAM = "";
@@ -1688,7 +1688,7 @@
16881688
"@executable_path/Frameworks",
16891689
);
16901690
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
1691-
MARKETING_VERSION = 2.4.0;
1691+
MARKETING_VERSION = 2.4.02;
16921692
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
16931693
MTL_FAST_MATH = YES;
16941694
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
@@ -1726,7 +1726,7 @@
17261726
"CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Distribution";
17271727
CODE_SIGN_STYLE = Manual;
17281728
COPY_PHASE_STRIP = NO;
1729-
CURRENT_PROJECT_VERSION = 14;
1729+
CURRENT_PROJECT_VERSION = 1;
17301730
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
17311731
DEVELOPMENT_ASSET_PATHS = "";
17321732
DEVELOPMENT_TEAM = "";
@@ -1745,7 +1745,7 @@
17451745
"@executable_path/Frameworks",
17461746
);
17471747
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
1748-
MARKETING_VERSION = 2.4.0;
1748+
MARKETING_VERSION = 2.4.02;
17491749
MTL_FAST_MATH = YES;
17501750
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
17511751
PRODUCT_BUNDLE_IDENTIFIER = "il.co.better-rail.watchkitapp";
@@ -1776,19 +1776,19 @@
17761776
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
17771777
CODE_SIGN_ENTITLEMENTS = BetterRailWidgetExtensionDebug.entitlements;
17781778
CODE_SIGN_STYLE = Manual;
1779-
CURRENT_PROJECT_VERSION = 14;
1779+
CURRENT_PROJECT_VERSION = 1;
17801780
DEBUG_INFORMATION_FORMAT = dwarf;
17811781
DEVELOPMENT_TEAM = "";
17821782
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = UE6BVYPPFX;
17831783
GCC_C_LANGUAGE_STANDARD = gnu11;
17841784
INFOPLIST_FILE = BetterRailWidget/Info.plist;
1785-
IPHONEOS_DEPLOYMENT_TARGET = 16.2;
1785+
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
17861786
LD_RUNPATH_SEARCH_PATHS = (
17871787
"$(inherited)",
17881788
"@executable_path/Frameworks",
17891789
"@executable_path/../../Frameworks",
17901790
);
1791-
MARKETING_VERSION = 2.4.0;
1791+
MARKETING_VERSION = 2.4.02;
17921792
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
17931793
MTL_FAST_MATH = YES;
17941794
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
@@ -1821,19 +1821,19 @@
18211821
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
18221822
CODE_SIGN_STYLE = Manual;
18231823
COPY_PHASE_STRIP = NO;
1824-
CURRENT_PROJECT_VERSION = 14;
1824+
CURRENT_PROJECT_VERSION = 1;
18251825
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
18261826
DEVELOPMENT_TEAM = "";
18271827
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = UE6BVYPPFX;
18281828
GCC_C_LANGUAGE_STANDARD = gnu11;
18291829
INFOPLIST_FILE = BetterRailWidget/Info.plist;
1830-
IPHONEOS_DEPLOYMENT_TARGET = 16.2;
1830+
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
18311831
LD_RUNPATH_SEARCH_PATHS = (
18321832
"$(inherited)",
18331833
"@executable_path/Frameworks",
18341834
"@executable_path/../../Frameworks",
18351835
);
1836-
MARKETING_VERSION = 2.4.0;
1836+
MARKETING_VERSION = 2.4.02;
18371837
MTL_FAST_MATH = YES;
18381838
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
18391839
PRODUCT_BUNDLE_IDENTIFIER = "il.co.better-rail.BetterRailWidget";
@@ -1859,19 +1859,19 @@
18591859
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
18601860
CODE_SIGN_ENTITLEMENTS = StationIntent/StationIntentDebug.entitlements;
18611861
CODE_SIGN_STYLE = Manual;
1862-
CURRENT_PROJECT_VERSION = 14;
1862+
CURRENT_PROJECT_VERSION = 1;
18631863
DEBUG_INFORMATION_FORMAT = dwarf;
18641864
DEVELOPMENT_TEAM = "";
18651865
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = UE6BVYPPFX;
18661866
GCC_C_LANGUAGE_STANDARD = gnu11;
18671867
INFOPLIST_FILE = StationIntent/Info.plist;
1868-
IPHONEOS_DEPLOYMENT_TARGET = 15.1;
1868+
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
18691869
LD_RUNPATH_SEARCH_PATHS = (
18701870
"$(inherited)",
18711871
"@executable_path/Frameworks",
18721872
"@executable_path/../../Frameworks",
18731873
);
1874-
MARKETING_VERSION = 2.4.0;
1874+
MARKETING_VERSION = 2.4.02;
18751875
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
18761876
MTL_FAST_MATH = YES;
18771877
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
@@ -1902,19 +1902,19 @@
19021902
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
19031903
CODE_SIGN_STYLE = Manual;
19041904
COPY_PHASE_STRIP = NO;
1905-
CURRENT_PROJECT_VERSION = 14;
1905+
CURRENT_PROJECT_VERSION = 1;
19061906
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
19071907
DEVELOPMENT_TEAM = "";
19081908
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = UE6BVYPPFX;
19091909
GCC_C_LANGUAGE_STANDARD = gnu11;
19101910
INFOPLIST_FILE = StationIntent/Info.plist;
1911-
IPHONEOS_DEPLOYMENT_TARGET = 15.1;
1911+
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
19121912
LD_RUNPATH_SEARCH_PATHS = (
19131913
"$(inherited)",
19141914
"@executable_path/Frameworks",
19151915
"@executable_path/../../Frameworks",
19161916
);
1917-
MARKETING_VERSION = 2.4.0;
1917+
MARKETING_VERSION = 2.4.02;
19181918
MTL_FAST_MATH = YES;
19191919
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
19201920
PRODUCT_BUNDLE_IDENTIFIER = "il.co.better-rail.StationIntent";

‎ios/BetterRail/RNBetterRail.swift

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,11 @@ class RNBetterRail: NSObject {
4444
}
4545

4646
// MARK - Live Activities methods
47-
48-
@available(iOS 16.2, *)
49-
@objc func monitorActivities() {
47+
@objc func monitorActivities() {
5048
LiveActivitiesController.shared.monitorLiveActivities()
5149
}
5250

5351
/// data - A JSON representation of a Route
54-
@available(iOS 16.2, *)
5552
@objc func startActivity(_ routeJSON: String, resolver resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) -> Void {
5653
let decoder = JSONDecoder()
5754

@@ -87,7 +84,6 @@ class RNBetterRail: NSObject {
8784
}
8885

8986

90-
@available(iOS 16.2, *)
9187
@objc func endActivity(_ rideId: String, resolver resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) -> Void {
9288
Task {
9389
// delete the activity on the device
@@ -106,7 +102,6 @@ class RNBetterRail: NSObject {
106102
}
107103
}
108104

109-
@available(iOS 16.2, *)
110105
@objc func isRideActive(_ rideId: String, resolver resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) -> Void {
111106
Task {
112107
let tokens = await LiveActivitiesController.tokenRegistry.getTokens()
@@ -126,7 +121,6 @@ class RNBetterRail: NSObject {
126121
}
127122
}
128123

129-
@available(iOS 16.2, *)
130124
@objc func activityAuthorizationInfo(_ emptyString: String, resolver resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) -> Void {
131125
let info = ActivityAuthorizationInfo()
132126
resolve([

‎ios/BetterRailWidget/Extensions.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ extension Font {
4444
}
4545
}
4646

47-
@available(iOS, deprecated: 15.0, message: "Use the built-in API instead")
4847
extension URLSession {
4948
func data(from url: URL) async throws -> (Data, URLResponse) {
5049
try await withCheckedThrowingContinuation { continuation in

‎ios/BetterRailWidget/Live Activity/Activity.swift

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import Foundation
22
import SwiftUI
33
import ActivityKit
44

5-
@available(iOS 16.1, *)
65
enum ActivityStatus: String, Codable {
76
case waitForTrain
87
case inTransit
@@ -19,7 +18,6 @@ enum ActivityStatus: String, Codable {
1918
}
2019
}
2120

22-
@available(iOS 16.1, *)
2321
struct BetterRailActivityAttributes: ActivityAttributes {
2422
// Dynamic stateful properties
2523
public struct ContentState: Codable, Hashable {
@@ -48,7 +46,6 @@ struct BetterRailActivityAttributes: ActivityAttributes {
4846
var frequentPushesEnabled: Bool = true
4947
}
5048

51-
@available(iOS 16.2, *)
5249
class LiveActivitiesController {
5350
typealias LiveActivityRoute = Activity<BetterRailActivityAttributes>
5451
static let shared = LiveActivitiesController()

‎ios/BetterRailWidget/Live Activity/ActivityNotificationsAPI.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ struct EndActivityResult: Decodable {
3737
let success: Bool
3838
}
3939

40-
@available(iOS 16.2, *)
4140
class ActivityNotificationsAPI {
4241
static let envPath = LiveActivitiesController.env == "production" ? "" : "-test"
4342
static let basePath = "https://better-rail\(envPath).up.railway.app/api/v1"

‎ios/BetterRailWidget/Live Activity/ActivityUtils.swift

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ func rideProgress(route: Route, nextStationId: Int) -> (Int, Int) {
6565

6666
/// Get the start date for the current status
6767
/// e.g. for `waitForTrain` we'll use the activity start date, and for `inTransit` we'd want to use the train departure time
68-
@available(iOS 16.1, *)
6968
func getStatusStartDate(context: ActivityViewContext<BetterRailActivityAttributes>) -> Date {
7069
let status = context.state.status;
7170
let route = context.attributes.route
@@ -88,7 +87,6 @@ func getStatusStartDate(context: ActivityViewContext<BetterRailActivityAttribute
8887
}
8988
}
9089

91-
@available(iOS 16.1, *)
9290
func getStatusEndDate(context: ActivityViewContext<BetterRailActivityAttributes>) -> Date {
9391
let status = context.state.status
9492
let route = context.attributes.route
@@ -125,7 +123,6 @@ func getMinutesLeft(targetDate: Date) -> Int {
125123
/// Used to test what's the inital station Id for the activity, especially for cases where
126124
/// the train has departured already.
127125
/// - Returns: The station Id
128-
@available(iOS 15, *)
129126
func findClosestStationInRoute(route: Route, updatedDelay: Int? = nil, now: Date = .now) -> Int {
130127
// find the first station where the departure time is after the current time
131128
for train in route.trains {
@@ -150,7 +147,6 @@ func findClosestStationInRoute(route: Route, updatedDelay: Int? = nil, now: Date
150147
return route.trains.last!.destinationStation
151148
}
152149

153-
@available(iOS 16.1, *)
154150
func getActivityStatus(route: Route, train: Train, nextStationId: Int, updatedDelay: Int? = nil, now: Date = .now) -> ActivityStatus {
155151
let delay = updatedDelay ?? train.delay
156152

@@ -191,7 +187,6 @@ func getActivityStatus(route: Route, train: Train, nextStationId: Int, updatedDe
191187
return .inTransit
192188
}
193189

194-
@available(iOS 16.1, *)
195190
func getActivityCurrentState(route: Route, updatedDelay: Int? = nil, now: Date = .now) throws -> BetterRailActivityAttributes.ContentState {
196191
let nextStationId = findClosestStationInRoute(route: route, updatedDelay: updatedDelay, now: now)
197192
let train = getTrainFromStationId(route: route, stationId: nextStationId)!

‎ios/Podfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2694,7 +2694,7 @@ PODS:
26942694
- Yoga
26952695
- react-native-context-menu-view (1.17.0):
26962696
- React
2697-
- react-native-date-picker (5.0.11):
2697+
- react-native-date-picker (5.0.12):
26982698
- DoubleConversion
26992699
- glog
27002700
- hermes-engine
@@ -3958,7 +3958,7 @@ SPEC CHECKSUMS:
39583958
react-native-actions-shortcuts: 241812296acd3d1b1babbb91d053f01be2810dcd
39593959
react-native-blur: d81883c19b028d3d04b44126ea661ae9e7ff35b6
39603960
react-native-context-menu-view: 4a4de8bc59bc3fc4215f041881cbc6b2aeac31fe
3961-
react-native-date-picker: 933dc643f41869d1d2237eda49095595f248c89b
3961+
react-native-date-picker: e4586d7f426fb213b922e6e4e9002a9b0db62200
39623962
react-native-in-app-review: db8bb167a5f238e7ceca5c242d6b36ce8c4404a4
39633963
react-native-ios-context-menu: c7f5bb808d8d4664e01af91ef2789204178368eb
39643964
react-native-ios-utilities: 8bd4936eff99d616b6313eee4673cc4fa61d55f5

0 commit comments

Comments
 (0)