Skip to content

Commit 0105e64

Browse files
authored
Merge pull request #115 from kylinroc/master
Update Carthage support
2 parents e52026a + 55d5629 commit 0105e64

File tree

3 files changed

+20
-12
lines changed

3 files changed

+20
-12
lines changed

Diff for: Cartfile.resolved

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
github "ReactiveX/RxSwift" "4.0.0"
2-
github "realm/realm-cocoa" "v3.0.0"
1+
github "ReactiveX/RxSwift" "4.4.0"
2+
github "realm/realm-cocoa" "v3.11.1"

Diff for: RxRealm.xcodeproj/project.pbxproj

+10-10
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@
485485
PRODUCT_BUNDLE_IDENTIFIER = com.RxSwiftCommunity.RxRealm;
486486
PRODUCT_NAME = RxRealm;
487487
SKIP_INSTALL = YES;
488-
SWIFT_VERSION = 3.0;
488+
SWIFT_VERSION = 4.2;
489489
};
490490
name = Debug;
491491
};
@@ -509,7 +509,7 @@
509509
PRODUCT_BUNDLE_IDENTIFIER = com.RxSwiftCommunity.RxRealm;
510510
PRODUCT_NAME = RxRealm;
511511
SKIP_INSTALL = YES;
512-
SWIFT_VERSION = 3.0;
512+
SWIFT_VERSION = 4.2;
513513
};
514514
name = Release;
515515
};
@@ -535,7 +535,7 @@
535535
PRODUCT_NAME = RxRealm;
536536
SDKROOT = macosx;
537537
SKIP_INSTALL = YES;
538-
SWIFT_VERSION = 3.0;
538+
SWIFT_VERSION = 4.2;
539539
};
540540
name = Debug;
541541
};
@@ -561,7 +561,7 @@
561561
PRODUCT_NAME = RxRealm;
562562
SDKROOT = macosx;
563563
SKIP_INSTALL = YES;
564-
SWIFT_VERSION = 3.0;
564+
SWIFT_VERSION = 4.2;
565565
};
566566
name = Release;
567567
};
@@ -586,7 +586,7 @@
586586
PRODUCT_NAME = RxRealm;
587587
SDKROOT = appletvos;
588588
SKIP_INSTALL = YES;
589-
SWIFT_VERSION = 3.0;
589+
SWIFT_VERSION = 4.2;
590590
TARGETED_DEVICE_FAMILY = 3;
591591
TVOS_DEPLOYMENT_TARGET = 9.0;
592592
};
@@ -613,7 +613,7 @@
613613
PRODUCT_NAME = RxRealm;
614614
SDKROOT = appletvos;
615615
SKIP_INSTALL = YES;
616-
SWIFT_VERSION = 3.0;
616+
SWIFT_VERSION = 4.2;
617617
TARGETED_DEVICE_FAMILY = 3;
618618
TVOS_DEPLOYMENT_TARGET = 9.0;
619619
};
@@ -640,9 +640,9 @@
640640
PRODUCT_NAME = RxRealm;
641641
SDKROOT = watchos;
642642
SKIP_INSTALL = YES;
643-
SWIFT_VERSION = 3.0;
643+
SWIFT_VERSION = 4.2;
644644
TARGETED_DEVICE_FAMILY = 4;
645-
WATCHOS_DEPLOYMENT_TARGET = 2.0;
645+
WATCHOS_DEPLOYMENT_TARGET = 3.0;
646646
};
647647
name = Debug;
648648
};
@@ -667,9 +667,9 @@
667667
PRODUCT_NAME = RxRealm;
668668
SDKROOT = watchos;
669669
SKIP_INSTALL = YES;
670-
SWIFT_VERSION = 3.0;
670+
SWIFT_VERSION = 4.2;
671671
TARGETED_DEVICE_FAMILY = 4;
672-
WATCHOS_DEPLOYMENT_TARGET = 2.0;
672+
WATCHOS_DEPLOYMENT_TARGET = 3.0;
673673
};
674674
name = Release;
675675
};
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

0 commit comments

Comments
 (0)