diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7d54e68436..ae2e6df8dd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -43,7 +43,7 @@ builder-image: before_script: - echo HOST=$HOST - | - if [ "$HOST" = "x86_64-apple-darwin16" ]; then + if [ "$HOST" = "x86_64-apple-darwin18" ]; then mkdir -p depends/SDKs mkdir -p depends/sdk-sources OSX_SDK_BASENAME="Xcode-${XCODE_VERSION}-${XCODE_BUILD_ID}-extracted-SDK-with-libcxx-headers.tar.gz" @@ -186,12 +186,12 @@ x86_64-unknown-linux-gnu-release: HOST: x86_64-unknown-linux-gnu DEP_OPTS: "NO_UPNP=1" -x86_64-apple-darwin16: +x86_64-apple-darwin18: extends: - .build-depends-template - .skip-in-fast-mode-template variables: - HOST: x86_64-apple-darwin16 + HOST: x86_64-apple-darwin18 ### @@ -257,7 +257,7 @@ mac-build: - .build-template - .skip-in-fast-mode-template needs: - - x86_64-apple-darwin16 + - x86_64-apple-darwin18 variables: BUILD_TARGET: mac diff --git a/.travis.yml b/.travis.yml index 961efc8a35..7ea3b7dc67 100644 --- a/.travis.yml +++ b/.travis.yml @@ -294,7 +294,7 @@ after_success: - stage: test name: 'macOS 10.12 [GOAL: deploy]' env: >- - HOST=x86_64-apple-darwin16 + HOST=x86_64-apple-darwin18 PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python3-dev python3-setuptools" export XCODE_VERSION=11.3.1 export XCODE_BUILD_ID=11C505 diff --git a/CMakeLists.txt b/CMakeLists.txt index fb78ca81fa..25b9869709 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,7 +20,7 @@ include_directories( if(UNIX AND NOT APPLE) set(DEPENDS_PREFIX depends/x86_64-pc-linux-gnu) elseif(APPLE) - set(DEPENDS_PREFIX depends/x86_64-apple-darwin16) + set(DEPENDS_PREFIX depends/x86_64-apple-darwin18) elseif(WIN32) set(DEPENDS_PREFIX depends/x86_64-w64-mingw32) endif() diff --git a/ci/matrix.sh b/ci/matrix.sh index 325e76d128..adaadbac26 100755 --- a/ci/matrix.sh +++ b/ci/matrix.sh @@ -76,7 +76,7 @@ elif [ "$BUILD_TARGET" = "linux64_release" ]; then export BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports" export PYZMQ=true elif [ "$BUILD_TARGET" = "mac" ]; then - export HOST=x86_64-apple-darwin16 + export HOST=x86_64-apple-darwin18 export BITCOIN_CONFIG="--enable-gui --enable-reduce-exports --disable-miner --enable-werror" export XCODE_VERSION=11.3.1 export XCODE_BUILD_ID=11C505 diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml index 609507b3b9..f966522e05 100644 --- a/contrib/gitian-descriptors/gitian-osx.yml +++ b/contrib/gitian-descriptors/gitian-osx.yml @@ -36,7 +36,7 @@ script: | set -e -o pipefail WRAP_DIR=$HOME/wrapped - HOSTS="x86_64-apple-darwin16" + HOSTS="x86_64-apple-darwin18" CONFIGFLAGS="--enable-reduce-exports --disable-miner --disable-bench --disable-gui-tests GENISOIMAGE=$WRAP_DIR/genisoimage --enable-crash-hooks" FAKETIME_HOST_PROGS="" FAKETIME_PROGS="ar ranlib date dmg genisoimage" @@ -186,8 +186,8 @@ script: | done mkdir -p $OUTDIR/src mv $SOURCEDIST $OUTDIR/src - mv ${OUTDIR}/${DISTNAME}-x86_64-apple-darwin16.tar.gz ${OUTDIR}/${DISTNAME}-osx64.tar.gz - mv ${OUTDIR}/${DISTNAME}-x86_64-apple-darwin16-debug.tar.gz ${OUTDIR}/${DISTNAME}-osx64-debug.tar.gz + mv ${OUTDIR}/${DISTNAME}-x86_64-apple-darwin18.tar.gz ${OUTDIR}/${DISTNAME}-osx64.tar.gz + mv ${OUTDIR}/${DISTNAME}-x86_64-apple-darwin18-debug.tar.gz ${OUTDIR}/${DISTNAME}-osx64-debug.tar.gz # Compress ccache (otherwise the assert file will get too huge) if [ "$CCACHE_DIR" != "" ]; then diff --git a/depends/README.md b/depends/README.md index b2c61b5787..d126fb7510 100644 --- a/depends/README.md +++ b/depends/README.md @@ -21,7 +21,7 @@ created. To use it for Dash: Common `host-platform-triplets` for cross compilation are: - `x86_64-w64-mingw32` for Win64 -- `x86_64-apple-darwin16` for macOS +- `x86_64-apple-darwin18` for macOS - `arm-linux-gnueabihf` for Linux ARM 32 bit - `aarch64-linux-gnu` for Linux ARM 64 bit - `riscv32-linux-gnu` for Linux RISC-V 32 bit diff --git a/depends/hosts/darwin.mk b/depends/hosts/darwin.mk index 1147329523..8d9b1a7023 100644 --- a/depends/hosts/darwin.mk +++ b/depends/hosts/darwin.mk @@ -1,4 +1,4 @@ -OSX_MIN_VERSION=10.12 +OSX_MIN_VERSION=10.14 OSX_SDK_VERSION=10.15.1 XCODE_VERSION=11.3.1 XCODE_BUILD_ID=11C505 diff --git a/doc/build-cross.md b/doc/build-cross.md index 79a50af4ee..a11a7b3e69 100644 --- a/doc/build-cross.md +++ b/doc/build-cross.md @@ -26,13 +26,13 @@ $ tar -C depends/SDKs -xf depends/sdk-sources/Xcode-11.3.1-11C505-extracted-SDK- When building the dependencies, as described in [build-generic](build-generic.md), use ```bash -$ make HOST=x86_64-apple-darwin16 -j4 +$ make HOST=x86_64-apple-darwin18 -j4 ``` When building Dash Core, use ```bash -$ ./configure --prefix=`pwd`/depends/x86_64-apple-darwin16 +$ ./configure --prefix=`pwd`/depends/x86_64-apple-darwin18 ``` Windows 64bit Cross-compilation diff --git a/doc/build-generic.md b/doc/build-generic.md index 2e6a543d45..e0fdf1b1af 100644 --- a/doc/build-generic.md +++ b/doc/build-generic.md @@ -48,7 +48,7 @@ Please replace `` with your local system's `host-platform-triplet`. The fo - `i686-pc-linux-gnu` for Linux32 - `x86_64-pc-linux-gnu` for Linux64 - `x86_64-w64-mingw32` for Win64 -- `x86_64-apple-darwin16` for MacOSX +- `x86_64-apple-darwin18` for MacOSX - `arm-linux-gnueabihf` for Linux ARM 32 bit - `aarch64-linux-gnu` for Linux ARM 64 bit diff --git a/share/qt/Info.plist.in b/share/qt/Info.plist.in index 12c661d016..bb6c0e9bf3 100644 --- a/share/qt/Info.plist.in +++ b/share/qt/Info.plist.in @@ -3,7 +3,7 @@ LSMinimumSystemVersion - 10.12.0 + 10.14.0 LSArchitecturePriority