@@ -427,8 +427,9 @@ protected override bool Read(string filename, Logger logger) {
427
427
// target iOS or tvOS sdk version.
428
428
private const string TARGET_SDK_NEEDS_UPDATE_STRING = (
429
429
"Target SDK selected in the {0} Player Settings ({1}) is not supported by " +
430
- "the Cocoapods included in this project. The build will very likely fail. " +
431
- "The minimum supported version is \" {2}\" required by pods ({3})\n " +
430
+ "the Cocoapods included in this project. The build will very " +
431
+ "likely fail. The minimum supported version is \" {2}\" required " +
432
+ "by pods ({3})\n " +
432
433
"Would you like to update the target SDK version?" ) ;
433
434
434
435
// Dialog box text when the IOSResolver has updated the target sdk version on behalf
@@ -978,7 +979,7 @@ public static bool PodfileGenerationEnabled {
978
979
}
979
980
980
981
/// <summary>
981
- /// Enable / disable target iOS SDK polling .
982
+ /// Enable / disable polling of target iOS and tvOS SDK project setting values .
982
983
/// </summary>
983
984
private static void SetEnablePollTargetSdks ( bool enable ) {
984
985
if ( enable && EditorUserBuildSettings . activeBuildTarget == BuildTarget . iOS ) {
@@ -1441,8 +1442,8 @@ private static void PollTargetTvosSdk() {
1441
1442
private static int checkIosTargetSdkVersionJobId = 0 ;
1442
1443
1443
1444
/// <summary>
1444
- /// Schedule a check to ensure target iOS SDK is configured correctly given the set of selected
1445
- /// Cocoapods.
1445
+ /// Schedule a check to ensure target iOS SDK is configured correctly given the
1446
+ /// set of selected Cocoapods.
1446
1447
/// </summary>
1447
1448
private static void ScheduleCheckTargetIosSdkVersion ( ) {
1448
1449
if ( EditorUserBuildSettings . activeBuildTarget == BuildTarget . iOS ) {
@@ -1453,13 +1454,13 @@ private static void ScheduleCheckTargetIosSdkVersion() {
1453
1454
}
1454
1455
}
1455
1456
1456
- // ID of the job which checks that the target tvOS SDK is correct for the currently selected
1457
- // set of Cocoapods.
1457
+ // ID of the job which checks that the target tvOS SDK is correct for the
1458
+ // currently selected set of Cocoapods.
1458
1459
private static int checkTvosTargetSdkJobId = 0 ;
1459
1460
1460
1461
/// <summary>
1461
- /// Schedule a check to ensure target tvOS SDK is configured correctly given the set of selected
1462
- /// Cocoapods.
1462
+ /// Schedule a check to ensure target tvOS SDK is configured correctly given the
1463
+ /// set of selected Cocoapods.
1463
1464
/// </summary>
1464
1465
private static void ScheduleCheckTargetTvosSdkVersion ( ) {
1465
1466
if ( EditorUserBuildSettings . activeBuildTarget == BuildTarget . tvOS ) {
@@ -1545,7 +1546,8 @@ public static void UpdateTargetTvosSdkVersion(bool runningBuild) {
1545
1546
/// a list of pod names that require it (value) if the currently
1546
1547
/// selected target SDK version does not satisfy pod requirements, the list
1547
1548
/// (value) is null otherwise.</returns>
1548
- private static KeyValuePair < int , List < string > > TargetSdkNeedsUpdate ( int targetSdkVersionNum ) {
1549
+ private static KeyValuePair < int , List < string > >
1550
+ TargetSdkNeedsUpdate ( int targetSdkVersionNum ) {
1549
1551
var emptyVersionAndPodNames = new KeyValuePair < int , List < string > > ( 0 , null ) ;
1550
1552
var minVersionAndPodNames = emptyVersionAndPodNames ;
1551
1553
int maxOfMinRequiredVersions = 0 ;
@@ -1587,7 +1589,8 @@ static string TargetIosSdkVersionString {
1587
1589
string name = null ;
1588
1590
1589
1591
var iosSettingsType = typeof ( UnityEditor . PlayerSettings . iOS ) ;
1590
- var osVersionProperty = iosSettingsType . GetProperty ( "targetOSVersionString" ) ;
1592
+ var osVersionProperty =
1593
+ iosSettingsType . GetProperty ( "targetOSVersionString" ) ;
1591
1594
if ( osVersionProperty != null ) {
1592
1595
name = ( string ) osVersionProperty . GetValue ( null , null ) ;
1593
1596
}
@@ -1624,7 +1627,8 @@ static string TargetTvosSdkVersionString {
1624
1627
get {
1625
1628
string name = null ;
1626
1629
var tvosSettingsType = typeof ( UnityEditor . PlayerSettings . tvOS ) ;
1627
- var osVersionProperty = tvosSettingsType . GetProperty ( "targetOSVersionString" ) ;
1630
+ var osVersionProperty =
1631
+ tvosSettingsType . GetProperty ( "targetOSVersionString" ) ;
1628
1632
if ( osVersionProperty != null ) {
1629
1633
name = ( string ) osVersionProperty . GetValue ( null , null ) ;
1630
1634
}
@@ -1636,7 +1640,8 @@ static string TargetTvosSdkVersionString {
1636
1640
1637
1641
set {
1638
1642
var tvosSettingsType = typeof ( UnityEditor . PlayerSettings . tvOS ) ;
1639
- var osVersionProperty = tvosSettingsType . GetProperty ( "targetOSVersionString" ) ;
1643
+ var osVersionProperty =
1644
+ tvosSettingsType . GetProperty ( "targetOSVersionString" ) ;
1640
1645
osVersionProperty . SetValue ( null , value , null ) ;
1641
1646
}
1642
1647
}
@@ -2308,8 +2313,8 @@ public static void GenPodfile(BuildTarget buildTarget,
2308
2313
TargetTvosSdkVersionString ) ) ;
2309
2314
break ;
2310
2315
default :
2311
- throw new Exception ( "IOSResolver.GenPodfile() invoked for a build target " +
2312
- " other than iOS or tvOS.") ;
2316
+ throw new Exception ( "IOSResolver.GenPodfile() invoked for a " +
2317
+ "build target other than iOS or tvOS.") ;
2313
2318
break ;
2314
2319
}
2315
2320
0 commit comments