diff --git a/Frameworks/Account/Account.xcodeproj/project.pbxproj b/Frameworks/Account/Account.xcodeproj/project.pbxproj index 1a0c7387f..e59c109e3 100644 --- a/Frameworks/Account/Account.xcodeproj/project.pbxproj +++ b/Frameworks/Account/Account.xcodeproj/project.pbxproj @@ -631,6 +631,7 @@ 848934F31F62484F00CEBD24 /* Headers */, 848934F41F62484F00CEBD24 /* Resources */, 51E148EE234B8FFC0004F7A5 /* Embed Frameworks */, + 51C8F34C234FB14B0048ED95 /* Run Script: Verify No Build Settings */, ); buildRules = ( ); @@ -782,6 +783,27 @@ }; /* End PBXResourcesBuildPhase section */ +/* Begin PBXShellScriptBuildPhase section */ + 51C8F34C234FB14B0048ED95 /* Run Script: Verify No Build Settings */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + name = "Run Script: Verify No Build Settings"; + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "xcrun -sdk macosx swiftc -target x86_64-macosx10.11 ../../buildscripts/VerifyNoBuildSettings.swift -o $CONFIGURATION_TEMP_DIR/VerifyNoBS\n$CONFIGURATION_TEMP_DIR/VerifyNoBS ${PROJECT_NAME}.xcodeproj/project.pbxproj\n"; + }; +/* End PBXShellScriptBuildPhase section */ + /* Begin PBXSourcesBuildPhase section */ 848934F11F62484F00CEBD24 /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -896,8 +918,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = D511EEB5202422BB00712EC3 /* Account_project_debug.xcconfig */; buildSettings = { - CURRENT_PROJECT_VERSION = 1; - SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Debug; }; @@ -905,8 +925,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = D511EEB7202422BB00712EC3 /* Account_project_release.xcconfig */; buildSettings = { - CURRENT_PROJECT_VERSION = 1; - SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Release; }; diff --git a/Frameworks/Account/xcconfig/Account_project.xcconfig b/Frameworks/Account/xcconfig/Account_project.xcconfig index 66c502769..f1144a6e9 100644 --- a/Frameworks/Account/xcconfig/Account_project.xcconfig +++ b/Frameworks/Account/xcconfig/Account_project.xcconfig @@ -11,6 +11,7 @@ PROVISIONING_PROFILE_SPECIFIER = SDKROOT = macosx MACOSX_DEPLOYMENT_TARGET = 10.14 IPHONEOS_DEPLOYMENT_TARGET = 13.0 +SUPPORTED_PLATFORMS = macosx iphoneos iphonesimulator CLANG_ENABLE_OBJC_WEAK = YES SWIFT_VERSION = 5.1 diff --git a/Frameworks/Articles/Articles.xcodeproj/project.pbxproj b/Frameworks/Articles/Articles.xcodeproj/project.pbxproj index 9f99a1132..21bf0c385 100644 --- a/Frameworks/Articles/Articles.xcodeproj/project.pbxproj +++ b/Frameworks/Articles/Articles.xcodeproj/project.pbxproj @@ -177,6 +177,7 @@ 844BEE571F0AB3C8004AB7CD /* Frameworks */, 844BEE581F0AB3C8004AB7CD /* Headers */, 844BEE591F0AB3C8004AB7CD /* Resources */, + 51C8F34B234FB11A0048ED95 /* Run Script: Verify No Build Settings */, ); buildRules = ( ); @@ -217,11 +218,13 @@ TargetAttributes = { 844BEE5A1F0AB3C8004AB7CD = { CreatedOnToolsVersion = 8.3.2; + DevelopmentTeam = SHJK2V3AJG; LastSwiftMigration = 0830; ProvisioningStyle = Automatic; }; 844BEE631F0AB3C9004AB7CD = { CreatedOnToolsVersion = 8.3.2; + DevelopmentTeam = SHJK2V3AJG; ProvisioningStyle = Automatic; }; }; @@ -292,6 +295,27 @@ }; /* End PBXResourcesBuildPhase section */ +/* Begin PBXShellScriptBuildPhase section */ + 51C8F34B234FB11A0048ED95 /* Run Script: Verify No Build Settings */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + name = "Run Script: Verify No Build Settings"; + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "xcrun -sdk macosx swiftc -target x86_64-macosx10.11 ../../buildscripts/VerifyNoBuildSettings.swift -o $CONFIGURATION_TEMP_DIR/VerifyNoBS\n$CONFIGURATION_TEMP_DIR/VerifyNoBS ${PROJECT_NAME}.xcodeproj/project.pbxproj\n"; + }; +/* End PBXShellScriptBuildPhase section */ + /* Begin PBXSourcesBuildPhase section */ 844BEE561F0AB3C8004AB7CD /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -328,9 +352,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = D511EEE120242DFB00712EC3 /* Articles_project_debug.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; - SWIFT_VERSION = 5.1; }; name = Debug; }; @@ -338,9 +359,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = D511EEE420242DFB00712EC3 /* Articles_project_release.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; - SWIFT_VERSION = 5.1; }; name = Release; }; @@ -348,13 +366,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = D511EEE320242DFB00712EC3 /* Articles_target.xcconfig */; buildSettings = { - APPLICATION_EXTENSION_API_ONLY = YES; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = "$(SRCROOT)/Info.plist"; - MACOSX_DEPLOYMENT_TARGET = 10.13; - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.Articles; - PRODUCT_NAME = Articles; - SKIP_INSTALL = YES; }; name = Debug; }; @@ -362,13 +373,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = D511EEE320242DFB00712EC3 /* Articles_target.xcconfig */; buildSettings = { - APPLICATION_EXTENSION_API_ONLY = YES; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = "$(SRCROOT)/Info.plist"; - MACOSX_DEPLOYMENT_TARGET = 10.13; - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.Articles; - PRODUCT_NAME = Articles; - SKIP_INSTALL = YES; }; name = Release; }; @@ -376,7 +380,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = D511EEE020242DFB00712EC3 /* ArticlesDataTests_target.xcconfig */; buildSettings = { - PRODUCT_NAME = ArticlesTests; }; name = Debug; }; @@ -384,7 +387,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = D511EEE020242DFB00712EC3 /* ArticlesDataTests_target.xcconfig */; buildSettings = { - PRODUCT_NAME = ArticlesTests; }; name = Release; }; diff --git a/Frameworks/Articles/xcconfig/Articles_project.xcconfig b/Frameworks/Articles/xcconfig/Articles_project.xcconfig index 31f54f3a9..8378c7f81 100644 --- a/Frameworks/Articles/xcconfig/Articles_project.xcconfig +++ b/Frameworks/Articles/xcconfig/Articles_project.xcconfig @@ -11,6 +11,8 @@ PROVISIONING_PROFILE_SPECIFIER = SDKROOT = macosx MACOSX_DEPLOYMENT_TARGET = 10.13 IPHONEOS_DEPLOYMENT_TARGET = 13.0 +SUPPORTED_PLATFORMS = macosx iphoneos iphonesimulator + CLANG_ENABLE_OBJC_WEAK = YES SWIFT_VERSION = 5.1 COMBINE_HIDPI_IMAGES = YES diff --git a/Frameworks/ArticlesDatabase/ArticlesDatabase.xcodeproj/project.pbxproj b/Frameworks/ArticlesDatabase/ArticlesDatabase.xcodeproj/project.pbxproj index 45fcc705a..f54728016 100644 --- a/Frameworks/ArticlesDatabase/ArticlesDatabase.xcodeproj/project.pbxproj +++ b/Frameworks/ArticlesDatabase/ArticlesDatabase.xcodeproj/project.pbxproj @@ -313,6 +313,7 @@ 844BEE331F0AB3AA004AB7CD /* Frameworks */, 844BEE341F0AB3AA004AB7CD /* Headers */, 844BEE351F0AB3AA004AB7CD /* Resources */, + 51C8F34A234FB0F50048ED95 /* Run Script: Verify No Build Settings */, ); buildRules = ( ); @@ -353,13 +354,13 @@ TargetAttributes = { 844BEE361F0AB3AA004AB7CD = { CreatedOnToolsVersion = 8.3.2; - DevelopmentTeam = 9C84TZ7Q6Z; + DevelopmentTeam = SHJK2V3AJG; LastSwiftMigration = 0830; ProvisioningStyle = Automatic; }; 844BEE3F1F0AB3AB004AB7CD = { CreatedOnToolsVersion = 8.3.2; - DevelopmentTeam = 9C84TZ7Q6Z; + DevelopmentTeam = SHJK2V3AJG; ProvisioningStyle = Automatic; }; }; @@ -491,6 +492,27 @@ }; /* End PBXResourcesBuildPhase section */ +/* Begin PBXShellScriptBuildPhase section */ + 51C8F34A234FB0F50048ED95 /* Run Script: Verify No Build Settings */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + name = "Run Script: Verify No Build Settings"; + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "xcrun -sdk macosx swiftc -target x86_64-macosx10.11 ../../buildscripts/VerifyNoBuildSettings.swift -o $CONFIGURATION_TEMP_DIR/VerifyNoBS\n$CONFIGURATION_TEMP_DIR/VerifyNoBS ${PROJECT_NAME}.xcodeproj/project.pbxproj\n"; + }; +/* End PBXShellScriptBuildPhase section */ + /* Begin PBXSourcesBuildPhase section */ 844BEE321F0AB3AA004AB7CD /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -538,8 +560,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = D511EEEA20242E0800712EC3 /* ArticlesDatabase_project_debug.xcconfig */; buildSettings = { - SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; - SWIFT_SWIFT3_OBJC_INFERENCE = Off; }; name = Debug; }; @@ -547,8 +567,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = D511EEEB20242E0800712EC3 /* ArticlesDatabase_project_release.xcconfig */; buildSettings = { - SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; - SWIFT_SWIFT3_OBJC_INFERENCE = Off; }; name = Release; }; @@ -556,8 +574,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = D511EEE820242E0800712EC3 /* ArticlesDatabase_target.xcconfig */; buildSettings = { - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.ArticlesDatabase; - PRODUCT_NAME = ArticlesDatabase; }; name = Debug; }; @@ -565,8 +581,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = D511EEE820242E0800712EC3 /* ArticlesDatabase_target.xcconfig */; buildSettings = { - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.ArticlesDatabase; - PRODUCT_NAME = ArticlesDatabase; }; name = Release; }; @@ -574,7 +588,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = D511EEE720242E0800712EC3 /* ArticlesDatabaseTests_target.xcconfig */; buildSettings = { - PRODUCT_NAME = ArticlesDatabaseTests; }; name = Debug; }; @@ -582,7 +595,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = D511EEE720242E0800712EC3 /* ArticlesDatabaseTests_target.xcconfig */; buildSettings = { - PRODUCT_NAME = ArticlesDatabaseTests; }; name = Release; }; diff --git a/Frameworks/ArticlesDatabase/xcconfig/ArticlesDatabase_project.xcconfig b/Frameworks/ArticlesDatabase/xcconfig/ArticlesDatabase_project.xcconfig index 31f54f3a9..8378c7f81 100644 --- a/Frameworks/ArticlesDatabase/xcconfig/ArticlesDatabase_project.xcconfig +++ b/Frameworks/ArticlesDatabase/xcconfig/ArticlesDatabase_project.xcconfig @@ -11,6 +11,8 @@ PROVISIONING_PROFILE_SPECIFIER = SDKROOT = macosx MACOSX_DEPLOYMENT_TARGET = 10.13 IPHONEOS_DEPLOYMENT_TARGET = 13.0 +SUPPORTED_PLATFORMS = macosx iphoneos iphonesimulator + CLANG_ENABLE_OBJC_WEAK = YES SWIFT_VERSION = 5.1 COMBINE_HIDPI_IMAGES = YES diff --git a/Frameworks/SyncDatabase/SyncDatabase.xcodeproj/project.pbxproj b/Frameworks/SyncDatabase/SyncDatabase.xcodeproj/project.pbxproj index c5eb4d576..d7b57480e 100644 --- a/Frameworks/SyncDatabase/SyncDatabase.xcodeproj/project.pbxproj +++ b/Frameworks/SyncDatabase/SyncDatabase.xcodeproj/project.pbxproj @@ -110,6 +110,7 @@ 51554BE7228B6E8F0055115A /* Sources */, 51554BE8228B6E8F0055115A /* Frameworks */, 51554BE9228B6E8F0055115A /* Resources */, + 51C8F349234FB0C40048ED95 /* Run Script: Verfiy No Build Settings */, ); buildRules = ( ); @@ -165,6 +166,27 @@ }; /* End PBXResourcesBuildPhase section */ +/* Begin PBXShellScriptBuildPhase section */ + 51C8F349234FB0C40048ED95 /* Run Script: Verfiy No Build Settings */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + name = "Run Script: Verfiy No Build Settings"; + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "xcrun -sdk macosx swiftc -target x86_64-macosx10.11 ../../buildscripts/VerifyNoBuildSettings.swift -o $CONFIGURATION_TEMP_DIR/VerifyNoBS\n$CONFIGURATION_TEMP_DIR/VerifyNoBS ${PROJECT_NAME}.xcodeproj/project.pbxproj\n"; + }; +/* End PBXShellScriptBuildPhase section */ + /* Begin PBXSourcesBuildPhase section */ 51554BE7228B6E8F0055115A /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -184,7 +206,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = 51554C1A228B701F0055115A /* SyncDatabase_project_debug.xcconfig */; buildSettings = { - SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Debug; }; @@ -192,7 +213,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = 51554C1C228B701F0055115A /* SyncDatabase_project_release.xcconfig */; buildSettings = { - SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Release; }; diff --git a/Frameworks/SyncDatabase/xcconfig/SyncDatabase_project.xcconfig b/Frameworks/SyncDatabase/xcconfig/SyncDatabase_project.xcconfig index e2b77cc11..09f243ba8 100644 --- a/Frameworks/SyncDatabase/xcconfig/SyncDatabase_project.xcconfig +++ b/Frameworks/SyncDatabase/xcconfig/SyncDatabase_project.xcconfig @@ -11,6 +11,8 @@ PROVISIONING_PROFILE_SPECIFIER = SDKROOT = macosx MACOSX_DEPLOYMENT_TARGET = 10.14 IPHONEOS_DEPLOYMENT_TARGET = 13.0 +SUPPORTED_PLATFORMS = macosx iphoneos iphonesimulator + CLANG_ENABLE_OBJC_WEAK = YES SWIFT_VERSION = 5.1 COMBINE_HIDPI_IMAGES = YES diff --git a/submodules/RSCore b/submodules/RSCore index fb0e88da4..6d6228ac4 160000 --- a/submodules/RSCore +++ b/submodules/RSCore @@ -1 +1 @@ -Subproject commit fb0e88da4ceba9a48d471f96febc56accab86d15 +Subproject commit 6d6228ac4f209480c12396e21b2ee1990487f8b3 diff --git a/submodules/RSDatabase b/submodules/RSDatabase index 80a317ac8..663817044 160000 --- a/submodules/RSDatabase +++ b/submodules/RSDatabase @@ -1 +1 @@ -Subproject commit 80a317ac8858d8ea7cbc916d366af495f5d6359e +Subproject commit 663817044b9180af67ffdfc5f63fccf8b9a188c7 diff --git a/submodules/RSParser b/submodules/RSParser index eb905edf2..94cb4fa15 160000 --- a/submodules/RSParser +++ b/submodules/RSParser @@ -1 +1 @@ -Subproject commit eb905edf2d4dbe36f3f8b91427e30677d56e54e4 +Subproject commit 94cb4fa153a987ffbd1e7371f76c943a5b5f62fb diff --git a/submodules/RSTree b/submodules/RSTree index d65e76261..3206a2073 160000 --- a/submodules/RSTree +++ b/submodules/RSTree @@ -1 +1 @@ -Subproject commit d65e76261eb694571653bbbac9c3bf1d58bcbd1b +Subproject commit 3206a2073576bd808cbf0b13e20a9372d977d7f9 diff --git a/submodules/RSWeb b/submodules/RSWeb index 31115e974..e984f1996 160000 --- a/submodules/RSWeb +++ b/submodules/RSWeb @@ -1 +1 @@ -Subproject commit 31115e974f97b0206739943f1434fcb36d0cba48 +Subproject commit e984f1996cb418bb88c54889bae8a3f2adf39f73