diff options
| author | Memphiz <memphis@machzwo.de> | 2019-06-13 09:38:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-13 09:38:24 +0200 |
| commit | 78bef3bfe6bc1b41eee18ca9596641613423cfb3 (patch) | |
| tree | c15a92ed296726d259df02a0fa403a0e5c223f20 | |
| parent | a6dd4f7f034569ad1fa2706d6445c97c959aa61f (diff) | |
| parent | 13d2eb18cac93d8cae8e83dfd12e7a770417838e (diff) | |
Merge pull request #16218 from Memphiz/bump_xcode
[darwin/jenkins] - bump to xcode10.2 and its SDKs for tvos, ios and macOS
| -rw-r--r-- | tools/buildsteps/defaultenv | 12 | ||||
| -rw-r--r-- | xbmc/video/VideoInfoTag.cpp | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/tools/buildsteps/defaultenv b/tools/buildsteps/defaultenv index d0eec81459..3403427461 100644 --- a/tools/buildsteps/defaultenv +++ b/tools/buildsteps/defaultenv @@ -19,25 +19,25 @@ DEPLOYED_BINARY_ADDONS="-e /addons" #$XBMC_PLATFORM_DIR matches the platform subdirs! case $XBMC_PLATFORM_DIR in ios) - DEFAULT_SDK_VERSION=11.0 + DEFAULT_SDK_VERSION=12.2 DEFAULT_XBMC_DEPENDS_ROOT=$WORKSPACE/tools/depends/xbmc-depends DEFAULT_CONFIGURATION="Debug" DEFAULT_DARWIN_ARM_CPU="armv7" - DEFAULT_XCODE_APP="Xcode9.0.app" + DEFAULT_XCODE_APP="Xcode10.2.app" ;; tvos) - DEFAULT_SDK_VERSION=11.0 + DEFAULT_SDK_VERSION=12.2 DEFAULT_XBMC_DEPENDS_ROOT=$WORKSPACE/tools/depends/xbmc-depends DEFAULT_CONFIGURATION="Debug" - DEFAULT_XCODE_APP="Xcode9.0.app" + DEFAULT_XCODE_APP="Xcode10.2.app" ;; osx64) - DEFAULT_SDK_VERSION=10.13 + DEFAULT_SDK_VERSION=10.14 DEFAULT_XBMC_DEPENDS_ROOT=$WORKSPACE/tools/depends/xbmc-depends DEFAULT_CONFIGURATION="Debug" - DEFAULT_XCODE_APP="Xcode9.0.app" + DEFAULT_XCODE_APP="Xcode10.2.app" ;; android) diff --git a/xbmc/video/VideoInfoTag.cpp b/xbmc/video/VideoInfoTag.cpp index 562dfbb761..2594038a4f 100644 --- a/xbmc/video/VideoInfoTag.cpp +++ b/xbmc/video/VideoInfoTag.cpp @@ -1545,7 +1545,7 @@ std::vector<std::string> CVideoInfoTag::Trim(std::vector<std::string>&& items) std::for_each(items.begin(), items.end(), [](std::string &str){ str = StringUtils::Trim(str); }); - return items; + return std::move(items); } int CVideoInfoTag::GetPlayCount() const |