Skip to content

Commit 3ae1016

Browse files
committed
formatting fixes and final testing
1 parent 7d28552 commit 3ae1016

File tree

5 files changed

+20
-15
lines changed

5 files changed

+20
-15
lines changed
Binary file not shown.
-5 Bytes
Binary file not shown.
-5 Bytes
Binary file not shown.

source/IOSResolver/src/IOSResolver.cs

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -427,8 +427,9 @@ protected override bool Read(string filename, Logger logger) {
427427
// target iOS or tvOS sdk version.
428428
private const string TARGET_SDK_NEEDS_UPDATE_STRING = (
429429
"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" +
432433
"Would you like to update the target SDK version?");
433434

434435
// Dialog box text when the IOSResolver has updated the target sdk version on behalf
@@ -978,7 +979,7 @@ public static bool PodfileGenerationEnabled {
978979
}
979980

980981
/// <summary>
981-
/// Enable / disable target iOS SDK polling.
982+
/// Enable / disable polling of target iOS and tvOS SDK project setting values.
982983
/// </summary>
983984
private static void SetEnablePollTargetSdks(bool enable) {
984985
if (enable && EditorUserBuildSettings.activeBuildTarget == BuildTarget.iOS) {
@@ -1441,8 +1442,8 @@ private static void PollTargetTvosSdk() {
14411442
private static int checkIosTargetSdkVersionJobId = 0;
14421443

14431444
/// <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.
14461447
/// </summary>
14471448
private static void ScheduleCheckTargetIosSdkVersion() {
14481449
if(EditorUserBuildSettings.activeBuildTarget == BuildTarget.iOS) {
@@ -1453,13 +1454,13 @@ private static void ScheduleCheckTargetIosSdkVersion() {
14531454
}
14541455
}
14551456

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.
14581459
private static int checkTvosTargetSdkJobId = 0;
14591460

14601461
/// <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.
14631464
/// </summary>
14641465
private static void ScheduleCheckTargetTvosSdkVersion() {
14651466
if(EditorUserBuildSettings.activeBuildTarget == BuildTarget.tvOS) {
@@ -1545,7 +1546,8 @@ public static void UpdateTargetTvosSdkVersion(bool runningBuild) {
15451546
/// a list of pod names that require it (value) if the currently
15461547
/// selected target SDK version does not satisfy pod requirements, the list
15471548
/// (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) {
15491551
var emptyVersionAndPodNames = new KeyValuePair<int, List<string>>(0, null);
15501552
var minVersionAndPodNames = emptyVersionAndPodNames;
15511553
int maxOfMinRequiredVersions = 0;
@@ -1587,7 +1589,8 @@ static string TargetIosSdkVersionString {
15871589
string name = null;
15881590

15891591
var iosSettingsType = typeof(UnityEditor.PlayerSettings.iOS);
1590-
var osVersionProperty = iosSettingsType.GetProperty("targetOSVersionString");
1592+
var osVersionProperty =
1593+
iosSettingsType.GetProperty("targetOSVersionString");
15911594
if (osVersionProperty != null) {
15921595
name = (string)osVersionProperty.GetValue(null, null);
15931596
}
@@ -1624,7 +1627,8 @@ static string TargetTvosSdkVersionString {
16241627
get {
16251628
string name = null;
16261629
var tvosSettingsType = typeof(UnityEditor.PlayerSettings.tvOS);
1627-
var osVersionProperty = tvosSettingsType.GetProperty("targetOSVersionString");
1630+
var osVersionProperty =
1631+
tvosSettingsType.GetProperty("targetOSVersionString");
16281632
if (osVersionProperty != null) {
16291633
name = (string)osVersionProperty.GetValue(null, null);
16301634
}
@@ -1636,7 +1640,8 @@ static string TargetTvosSdkVersionString {
16361640

16371641
set {
16381642
var tvosSettingsType = typeof(UnityEditor.PlayerSettings.tvOS);
1639-
var osVersionProperty = tvosSettingsType.GetProperty("targetOSVersionString");
1643+
var osVersionProperty =
1644+
tvosSettingsType.GetProperty("targetOSVersionString");
16401645
osVersionProperty.SetValue(null, value, null);
16411646
}
16421647
}
@@ -2308,8 +2313,8 @@ public static void GenPodfile(BuildTarget buildTarget,
23082313
TargetTvosSdkVersionString));
23092314
break;
23102315
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.");
23132318
break;
23142319
}
23152320

0 commit comments

Comments
 (0)