From e6b8f92493a256940ee1e55c0bf5df6a60cb8760 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 25 Sep 2020 15:17:06 +0000
Subject: Build Travis with Xcode 12 and 12u (Universal Apps)

---
 .travis.yml | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ac27dd2..32ccb48 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -112,9 +112,9 @@ jobs:
         - BUILD_DIR=unix
         - CFGOPT="--enable-symbols=mem"
 # Testing on Mac, various styles
-    - name: "macOS/Xcode 11.7/Shared"
+    - name: "macOS/Xcode 12/Shared"
       os: osx
-      osx_image: xcode11.7
+      osx_image: xcode12
       env:
         - BUILD_DIR=macosx
       install: []
@@ -122,34 +122,42 @@ jobs:
         - make all
         # The styles=develop avoids some weird problems on OSX
         - make test styles=develop
-    - name: "macOS/Xcode 11.7/Shared/Unix-like"
+    - name: "macOS/Xcode 12/Shared/Unix-like"
       os: osx
-      osx_image: xcode11.7
+      osx_image: xcode12
       env:
         - BUILD_DIR=unix
+# Newer MacOS versions
+    - name: "macOS 10.15/Xcode 12/Universal Apps/Shared"
+      os: osx
+      osx_image: xcode12u
+      env:
+        - BUILD_DIR=macosx
+      install: []
+      script: *mactest
 # Older MacOS versions
-    - name: "macOS/Xcode 11/Shared"
+    - name: "macOS 10.15/Xcode 11/Shared"
       os: osx
-      osx_image: xcode11
+      osx_image: xcode11.7
       env:
         - BUILD_DIR=macosx
       install: []
       script: *mactest
-    - name: "macOS/Xcode 10/Shared"
+    - name: "macOS 10.14/Xcode 10/Shared"
       os: osx
       osx_image: xcode10.3
       env:
         - BUILD_DIR=macosx
       install: []
       script: *mactest
-    - name: "macOS/Xcode 9/Shared"
+    - name: "macOS 10.13/Xcode 9/Shared"
       os: osx
-      osx_image: xcode9.2
+      osx_image: xcode9.4
       env:
         - BUILD_DIR=macosx
       install: []
       script: *mactest
-    - name: "macOS/Xcode 8/Shared"
+    - name: "macOS 10.12/Xcode 8/Shared"
       os: osx
       osx_image: xcode8.3
       env:
-- 
cgit v0.12


From 636e4d4826142fcd8b3d159eeca1c226ea25e9c6 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sat, 26 Sep 2020 18:25:56 +0000
Subject: Tweak xcode labels for Travis build

---
 .travis.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 32ccb48..5773b5b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -128,7 +128,7 @@ jobs:
       env:
         - BUILD_DIR=unix
 # Newer MacOS versions
-    - name: "macOS 10.15/Xcode 12/Universal Apps/Shared"
+    - name: "macOS/Xcode 12/Universal Apps/Shared"
       os: osx
       osx_image: xcode12u
       env:
@@ -136,28 +136,28 @@ jobs:
       install: []
       script: *mactest
 # Older MacOS versions
-    - name: "macOS 10.15/Xcode 11/Shared"
+    - name: "macOS/Xcode 11/Shared"
       os: osx
       osx_image: xcode11.7
       env:
         - BUILD_DIR=macosx
       install: []
       script: *mactest
-    - name: "macOS 10.14/Xcode 10/Shared"
+    - name: "macOS/Xcode 10/Shared"
       os: osx
       osx_image: xcode10.3
       env:
         - BUILD_DIR=macosx
       install: []
       script: *mactest
-    - name: "macOS 10.13/Xcode 9/Shared"
+    - name: "macOS/Xcode 9/Shared"
       os: osx
       osx_image: xcode9.4
       env:
         - BUILD_DIR=macosx
       install: []
       script: *mactest
-    - name: "macOS 10.12/Xcode 8/Shared"
+    - name: "macOS/Xcode 8/Shared"
       os: osx
       osx_image: xcode8.3
       env:
-- 
cgit v0.12