Upgrade to go 1.18

janelia-flyem · Oct 25, 2022 · 88a2c1b · 88a2c1b
1 parent a3b0410
commit 88a2c1b
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 17 deletions.
diff --git a/GUIDE.md b/GUIDE.md
@@ -178,23 +178,24 @@ For each platform (Mac and Linux):
    ```
    </details>
 
-   **Note:** For maximum macOS compatibility, make sure you have the SDK for MacOSX 10.10,
+   **Note:** For maximum macOS compatibility, make sure you have the SDK for MacOSX 10.13,
    which can be installed via the [xcodelegacy project](https://github.com/devernay/xcodelegacy).
+   (We use go 1.18, which [requires at least [MacOSX 10.13](https://go.dev/dl).)
 
    <details>
 
-   <summary>Click here for MacOSX 10.10 SDK installation commands</summary>
+   <summary>Click here for MacOSX 10.13 SDK installation commands</summary>
 
    ```
    curl https://raw.githubusercontent.com/devernay/xcodelegacy/master/XcodeLegacy.sh > XcodeLegacy.sh
    chmod +x XcodeLegacy.sh
 
-   ./XcodeLegacy.sh -osx1010 buildpackages
-   sudo ./XcodeLegacy.sh -osx1010 install
+   ./XcodeLegacy.sh -osx1013 buildpackages
+   sudo ./XcodeLegacy.sh -osx1013 install
    ```
 
    **Note:** The XcodeLegacy script will probably tell you that the
-   10.10 SDK can only be built/installed by an old version of Xcode,
+   10.13 SDK can only be built/installed by an old version of Xcode,
    and ask you to download the old version (but not install it).
    
    Follow the download instructions it gives you, and then re-run

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/janelia-flyem/dvid
 
-go 1.16
+go 1.18
 
 require (
 	cloud.google.com/go/bigtable v1.13.0

diff --git a/scripts/conda-recipe/build.sh b/scripts/conda-recipe/build.sh
@@ -26,10 +26,6 @@ fi
 DVID_REPO=${GOPATH}/src/github.com/janelia-flyem/dvid
 cd ${DVID_REPO}
 
-# go-1.11 requires at least macOS 10.10, but conda-build targets 10.9 by default.
-# Setting this variable explicitly overrides some linker warnings.
-export MACOSX_DEPLOYMENT_TARGET=10.10
-
 # Build
 make dvid
 

diff --git a/scripts/conda-recipe/conda_build_config.yaml b/scripts/conda-recipe/conda_build_config.yaml
@@ -17,7 +17,8 @@ pin_run_as_build:
 
 CONDA_BUILD_SYSROOT:
   # Most conda-forge packages are compatible with MacOSX 10.9,
-  # but golang-1.16 requires at least MacOSX 10.12
+  # but golang-1.16 requires at least MacOSX 10.13.
+  # (See the download page: https://go.dev/dl/)
   #
   # You will have to install this SDK manually, via this project:
   #
@@ -27,10 +28,10 @@ CONDA_BUILD_SYSROOT:
   #
   #   curl https://raw.githubusercontent.com/devernay/xcodelegacy/master/XcodeLegacy.sh > XcodeLegacy.sh
   #   chmod +x XcodeLegacy.sh
-  #   sudo ./XcodeLegacy.sh -osx1012 buildpackages
-  #   sudo ./XcodeLegacy.sh -osx1012 install
+  #   sudo ./XcodeLegacy.sh -osx1013 buildpackages
+  #   sudo ./XcodeLegacy.sh -osx1013 install
   #
-  - /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk
+  - /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk
 
 MACOSX_DEPLOYMENT_TARGET:
-  - 10.12
+  - 10.13
diff --git a/scripts/conda-recipe/meta.yaml b/scripts/conda-recipe/meta.yaml
@@ -52,7 +52,7 @@ requirements:
   # or incorporated into the executable in any way.
   build:
     # Note: Make sure this matches GO_VERSION in scripts/install-developer-dependencies.sh
-    - go-cgo=1.16
+    - go-cgo=1.18
 
     - {{ compiler('c') }}
     - {{ compiler('cxx') }}

diff --git a/scripts/install-developer-dependencies.sh b/scripts/install-developer-dependencies.sh
@@ -17,7 +17,7 @@ THIS_SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd ${THIS_SCRIPT_DIR}
 
 # Note: Make sure this matches meta.yaml
-GO_VERSION=1.16
+GO_VERSION=1.18
 
 if [[ $(uname) == "Darwin" ]]; then
     COMPILER_PACKAGE=clangxx_osx-64