Skip to content

Commit b7905cd

Browse files
sinarionnsinarionn
committed
Project fixed for Carthage support.
1 parent cdc02f8 commit b7905cd

File tree

8 files changed

+26
-16
lines changed

8 files changed

+26
-16
lines changed

Diff for: ‎.swift-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.1
1+
4.2

Diff for: ‎.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ matrix:
44
env: ACTION=iOS
55

66
language: objective-c
7-
osx_image: xcode9.1
7+
osx_image: xcode10
88

99
script:
1010
- git submodule update --init --recursive

Diff for: ‎Cartfile.resolved

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "ReactiveX/RxSwift" "4.2.0"
1+
github "ReactiveX/RxSwift" "4.3.0"

Diff for: ‎Carthage/Checkouts/RxSwift

Submodule RxSwift updated 73 files

Diff for: ‎ReusableView.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Pod::Spec.new do |s|
33
s.name = "ReusableView"
4-
s.version = "2.0.1"
4+
s.version = "2.0.2"
55
s.summary = "Reusable and NonReusable viewModel containers"
66

77
s.homepage = "https://github.com/sinarionn/ReusableView"

Diff for: ‎ReusableView.xcodeproj/project.pbxproj

+12-10
Original file line numberDiff line numberDiff line change
@@ -369,12 +369,12 @@
369369
attributes = {
370370
LastSwiftMigration = 0700;
371371
LastSwiftUpdateCheck = 0730;
372-
LastUpgradeCheck = 0910;
372+
LastUpgradeCheck = 1000;
373373
ORGANIZATIONNAME = "Artem Antihevich";
374374
TargetAttributes = {
375375
C089D3261D54A3BF00599DD7 = {
376376
CreatedOnToolsVersion = 7.3;
377-
LastSwiftMigration = 0820;
377+
LastSwiftMigration = 1000;
378378
ProvisioningStyle = Automatic;
379379
};
380380
C0D5E8C21E4731B900860A05 = {
@@ -612,12 +612,14 @@
612612
CLANG_WARN_BOOL_CONVERSION = YES;
613613
CLANG_WARN_COMMA = YES;
614614
CLANG_WARN_CONSTANT_CONVERSION = YES;
615+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
615616
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
616617
CLANG_WARN_EMPTY_BODY = YES;
617618
CLANG_WARN_ENUM_CONVERSION = YES;
618619
CLANG_WARN_INFINITE_RECURSION = YES;
619620
CLANG_WARN_INT_CONVERSION = YES;
620621
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
622+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
621623
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
622624
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
623625
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -650,7 +652,7 @@
650652
ONLY_ACTIVE_ARCH = YES;
651653
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx";
652654
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
653-
SWIFT_VERSION = 4.0;
655+
SWIFT_VERSION = 4.2;
654656
TARGETED_DEVICE_FAMILY = "1,2";
655657
VERSIONING_SYSTEM = "apple-generic";
656658
};
@@ -666,12 +668,14 @@
666668
CLANG_WARN_BOOL_CONVERSION = YES;
667669
CLANG_WARN_COMMA = YES;
668670
CLANG_WARN_CONSTANT_CONVERSION = YES;
671+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
669672
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
670673
CLANG_WARN_EMPTY_BODY = YES;
671674
CLANG_WARN_ENUM_CONVERSION = YES;
672675
CLANG_WARN_INFINITE_RECURSION = YES;
673676
CLANG_WARN_INT_CONVERSION = YES;
674677
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
678+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
675679
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
676680
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
677681
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -697,7 +701,7 @@
697701
METAL_ENABLE_DEBUG_INFO = NO;
698702
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx";
699703
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
700-
SWIFT_VERSION = 4.0;
704+
SWIFT_VERSION = 4.2;
701705
TARGETED_DEVICE_FAMILY = "1,2";
702706
VALIDATE_PRODUCT = YES;
703707
VERSIONING_SYSTEM = "apple-generic";
@@ -722,9 +726,8 @@
722726
MTL_ENABLE_DEBUG_INFO = YES;
723727
PRODUCT_BUNDLE_IDENTIFIER = mlsdev.AppRouterTests;
724728
PRODUCT_NAME = "$(TARGET_NAME)";
725-
SDKROOT = iphoneos;
726729
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
727-
SWIFT_VERSION = 4.0;
730+
SWIFT_VERSION = 4.2;
728731
};
729732
name = Debug;
730733
};
@@ -747,8 +750,7 @@
747750
MTL_ENABLE_DEBUG_INFO = NO;
748751
PRODUCT_BUNDLE_IDENTIFIER = mlsdev.AppRouterTests;
749752
PRODUCT_NAME = "$(TARGET_NAME)";
750-
SDKROOT = iphoneos;
751-
SWIFT_VERSION = 4.0;
753+
SWIFT_VERSION = 4.2;
752754
};
753755
name = Release;
754756
};
@@ -777,7 +779,7 @@
777779
SKIP_INSTALL = YES;
778780
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
779781
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
780-
SWIFT_VERSION = 4.0;
782+
SWIFT_VERSION = 4.2;
781783
VERSION_INFO_PREFIX = "";
782784
};
783785
name = Debug;
@@ -805,7 +807,7 @@
805807
PRODUCT_BUNDLE_IDENTIFIER = sinarionn.ReusableView;
806808
PRODUCT_NAME = "$(TARGET_NAME)";
807809
SKIP_INSTALL = YES;
808-
SWIFT_VERSION = 4.0;
810+
SWIFT_VERSION = 4.2;
809811
VERSION_INFO_PREFIX = "";
810812
};
811813
name = Release;

Diff for: ‎ReusableView.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

+8
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>BuildSystemType</key>
6+
<string>Original</string>
7+
</dict>
8+
</plist>

Diff for: ‎ReusableView.xcodeproj/xcshareddata/xcschemes/ReusableView.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0910"
3+
LastUpgradeVersion = "1000"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

0 commit comments

Comments
 (0)