@@ -1424,6 +1424,7 @@ private static void AddPodInternal(string podName,
1424
1424
/// Determine whether the target iOS SDK has changed.
1425
1425
/// </summary>
1426
1426
private static void PollTargetIosSdk ( ) {
1427
+ LogToDialog ( "DEDB PollTargetIosSdk" ) ;
1427
1428
iosTargetSdkPoller . Poll ( ( ) => TargetIosSdkVersionString ,
1428
1429
( previousValue , currentValue ) => { ScheduleCheckTargetIosSdkVersion ( ) ; } ) ;
1429
1430
}
@@ -1432,6 +1433,7 @@ private static void PollTargetIosSdk() {
1432
1433
/// Determine whether the target tvOS SDK has changed.
1433
1434
/// </summary>
1434
1435
private static void PollTargetTvosSdk ( ) {
1436
+ LogToDialog ( "DEDB PollTargetTvosSdk" ) ;
1435
1437
tvosTargetSdkPoller . Poll ( ( ) => TargetTvosSdkVersionString ,
1436
1438
( previousValue , currentValue ) => { ScheduleCheckTargetTvosSdkVersion ( ) ; } ) ;
1437
1439
}
@@ -1445,7 +1447,9 @@ private static void PollTargetTvosSdk() {
1445
1447
/// Cocoapods.
1446
1448
/// </summary>
1447
1449
private static void ScheduleCheckTargetIosSdkVersion ( ) {
1450
+ LogToDialog ( "DEDB ScheduleCheckTargetIosSdkVersion" ) ;
1448
1451
if ( EditorUserBuildSettings . activeBuildTarget == BuildTarget . iOS ) {
1452
+ LogToDialog ( "DEDB Scheduling Check" ) ;
1449
1453
RunOnMainThread . Cancel ( checkIosTargetSdkVersionJobId ) ;
1450
1454
checkIosTargetSdkVersionJobId = RunOnMainThread . Schedule ( ( ) => {
1451
1455
UpdateTargetIosSdkVersion ( false ) ;
@@ -1462,7 +1466,9 @@ private static void ScheduleCheckTargetIosSdkVersion() {
1462
1466
/// Cocoapods.
1463
1467
/// </summary>
1464
1468
private static void ScheduleCheckTargetTvosSdkVersion ( ) {
1469
+ LogToDialog ( "DEDB ScheduleCheckTargetTvosSdkVersion" ) ;
1465
1470
if ( EditorUserBuildSettings . activeBuildTarget == BuildTarget . tvOS ) {
1471
+ LogToDialog ( "DEDB Scheduling Check" ) ;
1466
1472
RunOnMainThread . Cancel ( checkTvosTargetSdkJobId ) ;
1467
1473
checkTvosTargetSdkJobId = RunOnMainThread . Schedule ( ( ) => {
1468
1474
UpdateTargetTvosSdkVersion ( false ) ;
@@ -1475,9 +1481,12 @@ private static void ScheduleCheckTargetTvosSdkVersion() {
1475
1481
/// </summary>
1476
1482
/// <param name="runningBuild">Whether the build is being processed.</param>
1477
1483
public static void UpdateTargetIosSdkVersion ( bool runningBuild ) {
1484
+ LogToDialog ( "DEDB UpdateTargetIosSdkVersion" ) ;
1478
1485
var minVersionAndPodNames = TargetSdkNeedsUpdate ( TargetIosSdkVersionNum ) ;
1486
+ LogToDialog ( "DEDB minVersionAndPodNames: " + minVersionAndPodNames ) ;
1479
1487
if ( minVersionAndPodNames . Value != null ) {
1480
1488
var minVersionString = TargetSdkVersionToString ( minVersionAndPodNames . Key ) ;
1489
+ LogToDialog ( "DEDB minVersionString: " + minVersionString ) ;
1481
1490
DialogWindow . Display ( "Unsupported Target iOS SDK" ,
1482
1491
String . Format (
1483
1492
TARGET_SDK_NEEDS_UPDATE_STRING , /*platformName=*/ "iOS" ,
@@ -1508,10 +1517,13 @@ public static void UpdateTargetIosSdkVersion(bool runningBuild) {
1508
1517
/// </summary>
1509
1518
/// <param name="runningBuild">Whether the build is being processed.</param>
1510
1519
public static void UpdateTargetTvosSdkVersion ( bool runningBuild ) {
1520
+ LogToDialog ( "DEDB UpdateTargetTvosSdkVersion" ) ;
1511
1521
var minVersionAndPodNames = TargetSdkNeedsUpdate ( TargetTvosSdkVersionNum ) ;
1522
+ LogToDialog ( "DEDB minVersionAndPodNames: " + minVersionAndPodNames ) ;
1512
1523
if ( minVersionAndPodNames . Value != null ) {
1513
1524
var minVersionString =
1514
1525
TargetSdkVersionToString ( minVersionAndPodNames . Key ) ;
1526
+ LogToDialog ( "DEDB minVersionString: " + minVersionString ) ;
1515
1527
DialogWindow . Display ( "Unsupported Target tvOS SDK" ,
1516
1528
String . Format (
1517
1529
TARGET_SDK_NEEDS_UPDATE_STRING , /*platformName=*/ "tvOS" ,
@@ -1546,6 +1558,7 @@ public static void UpdateTargetTvosSdkVersion(bool runningBuild) {
1546
1558
/// selected target SDK version does not satisfy pod requirements, the list
1547
1559
/// (value) is null otherwise.</returns>
1548
1560
private static KeyValuePair < int , List < string > > TargetSdkNeedsUpdate ( int targetSdkVersionNum ) {
1561
+ LogToDialog ( "DEDB TargetSdkNeedsUpdate" ) ;
1549
1562
var emptyVersionAndPodNames = new KeyValuePair < int , List < string > > ( 0 , null ) ;
1550
1563
var minVersionAndPodNames = emptyVersionAndPodNames ;
1551
1564
int maxOfMinRequiredVersions = 0 ;
@@ -1555,6 +1568,7 @@ private static KeyValuePair<int, List<string>> TargetSdkNeedsUpdate(int targetSd
1555
1568
minVersionAndPodNames = versionAndPodList ;
1556
1569
}
1557
1570
}
1571
+ LogToDialog ( "DEDB targetSdkVersionNum: " + targetSdkVersionNum + " maxOfMinRequiredVersions: " + maxOfMinRequiredVersions ) ;
1558
1572
// If the target SDK version exceeds the minimum required version return an empty tuple
1559
1573
// otherwise return the minimum required SDK version and the set of pods that need it.
1560
1574
return targetSdkVersionNum >= maxOfMinRequiredVersions ? emptyVersionAndPodNames :
@@ -1584,6 +1598,7 @@ public static string GetProjectPath(string relativeTo) {
1584
1598
/// </summary>
1585
1599
static string TargetIosSdkVersionString {
1586
1600
get {
1601
+ LogToDialog ( "DEDB TargetIosSdkVersionString get" ) ;
1587
1602
string name = null ;
1588
1603
1589
1604
var iosSettingsType = typeof ( UnityEditor . PlayerSettings . iOS ) ;
@@ -1598,6 +1613,7 @@ static string TargetIosSdkVersionString {
1598
1613
}
1599
1614
1600
1615
set {
1616
+ LogToDialog ( "DEDB TargetIosSdkVersionString set" ) ;
1601
1617
var iosSettingsType = typeof ( UnityEditor . PlayerSettings . iOS ) ;
1602
1618
// Write the version (Unity 5.5 and above).
1603
1619
var osVersionProperty =
@@ -1622,6 +1638,7 @@ static string TargetIosSdkVersionString {
1622
1638
/// </summary>
1623
1639
static string TargetTvosSdkVersionString {
1624
1640
get {
1641
+ LogToDialog ( "DEDB TargetTvosSdkVersionString get" ) ;
1625
1642
string name = null ;
1626
1643
var tvosSettingsType = typeof ( UnityEditor . PlayerSettings . tvOS ) ;
1627
1644
var osVersionProperty = tvosSettingsType . GetProperty ( "targetOSVersionString" ) ;
@@ -1635,6 +1652,7 @@ static string TargetTvosSdkVersionString {
1635
1652
}
1636
1653
1637
1654
set {
1655
+ LogToDialog ( "DEDB TargetTvosSdkVersionString set" ) ;
1638
1656
var tvosSettingsType = typeof ( UnityEditor . PlayerSettings . tvOS ) ;
1639
1657
var osVersionProperty = tvosSettingsType . GetProperty ( "targetOSVersionString" ) ;
1640
1658
osVersionProperty . SetValue ( null , value , null ) ;
@@ -2298,7 +2316,6 @@ public static void GenPodfile(BuildTarget buildTarget,
2298
2316
2299
2317
using ( StreamWriter file = new StreamWriter ( podfilePath ) ) {
2300
2318
file . WriteLine ( GeneratePodfileSourcesSection ( ) ) ;
2301
- file . WriteLine ( "# DellaBitta\n " ) ;
2302
2319
switch ( EditorUserBuildSettings . activeBuildTarget ) {
2303
2320
case BuildTarget . iOS :
2304
2321
file . WriteLine ( String . Format ( "platform :ios, '{0}'\n " ,
0 commit comments