Merge branch 'mac-release'
This commit is contained in:
commit
833a789e6e
|
@ -12,7 +12,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.14
|
|||
IPHONEOS_DEPLOYMENT_TARGET = 13.0
|
||||
|
||||
CLANG_ENABLE_OBJC_WEAK = YES
|
||||
SWIFT_VERSION = 5.0
|
||||
SWIFT_VERSION = 5.1
|
||||
COMBINE_HIDPI_IMAGES = YES
|
||||
|
||||
COPY_PHASE_STRIP = NO
|
||||
|
|
|
@ -330,7 +330,7 @@
|
|||
buildSettings = {
|
||||
ALWAYS_SEARCH_USER_PATHS = NO;
|
||||
SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos";
|
||||
SWIFT_VERSION = 5.0;
|
||||
SWIFT_VERSION = 5.1;
|
||||
};
|
||||
name = Debug;
|
||||
};
|
||||
|
@ -340,7 +340,7 @@
|
|||
buildSettings = {
|
||||
ALWAYS_SEARCH_USER_PATHS = NO;
|
||||
SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos";
|
||||
SWIFT_VERSION = 5.0;
|
||||
SWIFT_VERSION = 5.1;
|
||||
};
|
||||
name = Release;
|
||||
};
|
||||
|
|
|
@ -11,7 +11,7 @@ SDKROOT = macosx
|
|||
MACOSX_DEPLOYMENT_TARGET = 10.13
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 13.0
|
||||
CLANG_ENABLE_OBJC_WEAK = YES
|
||||
SWIFT_VERSION = 5.0
|
||||
SWIFT_VERSION = 5.1
|
||||
COMBINE_HIDPI_IMAGES = YES
|
||||
|
||||
COPY_PHASE_STRIP = NO
|
||||
|
|
|
@ -11,7 +11,7 @@ SDKROOT = macosx
|
|||
MACOSX_DEPLOYMENT_TARGET = 10.13
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 13.0
|
||||
CLANG_ENABLE_OBJC_WEAK = YES
|
||||
SWIFT_VERSION = 5.0
|
||||
SWIFT_VERSION = 5.1
|
||||
COMBINE_HIDPI_IMAGES = YES
|
||||
|
||||
COPY_PHASE_STRIP = NO
|
||||
|
|
|
@ -328,7 +328,6 @@
|
|||
PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.SyncDatabase;
|
||||
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
|
||||
SKIP_INSTALL = YES;
|
||||
SWIFT_VERSION = 5.0;
|
||||
};
|
||||
name = Debug;
|
||||
};
|
||||
|
@ -355,7 +354,6 @@
|
|||
PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.SyncDatabase;
|
||||
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
|
||||
SKIP_INSTALL = YES;
|
||||
SWIFT_VERSION = 5.0;
|
||||
};
|
||||
name = Release;
|
||||
};
|
||||
|
|
|
@ -11,7 +11,7 @@ SDKROOT = macosx
|
|||
MACOSX_DEPLOYMENT_TARGET = 10.14
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 13.0
|
||||
CLANG_ENABLE_OBJC_WEAK = YES
|
||||
SWIFT_VERSION = 5.0
|
||||
SWIFT_VERSION = 5.1
|
||||
COMBINE_HIDPI_IMAGES = YES
|
||||
|
||||
COPY_PHASE_STRIP = NO
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 388b58e2fde1a93233767f4dba61d236838b6900
|
||||
Subproject commit b3a3178b00810c9e2c668a8c3b17080501cf1f33
|
|
@ -1 +1 @@
|
|||
Subproject commit feb02ec73674fc572914f429e38428809c8d2281
|
||||
Subproject commit 9bb7e374518ad481c6da14b656d6676c02b33548
|
|
@ -1 +1 @@
|
|||
Subproject commit 8b1e47611995ef73744820ae4279b69351bee085
|
||||
Subproject commit d3fe846f8969f8914d233242b711f4314ec1cb17
|
|
@ -1 +1 @@
|
|||
Subproject commit b3381950412524c8f39726e139fccee92cca5ffb
|
||||
Subproject commit 7581b16d4e8f22fad183d34338d44af85d37b30d
|
|
@ -1 +1 @@
|
|||
Subproject commit c55f96018ef1c81db35376065e1f094840162943
|
||||
Subproject commit d140c97a13799a38fe62c09d1719c3963c3df3ce
|
|
@ -43,4 +43,4 @@ MACOSX_DEPLOYMENT_TARGET = 10.14.4
|
|||
IPHONEOS_DEPLOYMENT_TARGET = 12.2
|
||||
SDKROOT = macosx
|
||||
SWIFT_SWIFT3_OBJC_INFERENCE = Off
|
||||
SWIFT_VERSION = 5.0
|
||||
SWIFT_VERSION = 5.1
|
||||
|
|
Loading…
Reference in New Issue