Skip to content

Commit 8963d05

Browse files
committed
Bump deployment target to macOS 12, rebuild deps
1 parent 5157eb9 commit 8963d05

File tree

64 files changed

+1223
-1201
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+1223
-1201
lines changed
Binary file not shown.

BetterFontPicker/BetterFontPicker.framework/Versions/A/Modules/BetterFontPicker.swiftmodule/arm64-apple-macos.private.swiftinterface

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// swift-interface-format-version: 1.0
22
// swift-compiler-version: Apple Swift version 6.1.2 effective-5.10 (swiftlang-6.1.2.1.2 clang-1700.0.13.5)
3-
// swift-module-flags: -target arm64-apple-macos10.15 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -enable-experimental-feature DebugDescriptionMacro -enable-bare-slash-regex -module-name BetterFontPicker
3+
// swift-module-flags: -target arm64-apple-macos12.4 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -enable-experimental-feature DebugDescriptionMacro -enable-bare-slash-regex -module-name BetterFontPicker
44
// swift-module-flags-ignorable: -no-verify-emitted-module-interface -interface-compiler-version 6.1.2
55
@_exported import BetterFontPicker
66
import Cocoa

BetterFontPicker/BetterFontPicker.framework/Versions/A/Modules/BetterFontPicker.swiftmodule/arm64-apple-macos.swiftinterface

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// swift-interface-format-version: 1.0
22
// swift-compiler-version: Apple Swift version 6.1.2 effective-5.10 (swiftlang-6.1.2.1.2 clang-1700.0.13.5)
3-
// swift-module-flags: -target arm64-apple-macos10.15 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -enable-experimental-feature DebugDescriptionMacro -enable-bare-slash-regex -module-name BetterFontPicker
3+
// swift-module-flags: -target arm64-apple-macos12.4 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -enable-experimental-feature DebugDescriptionMacro -enable-bare-slash-regex -module-name BetterFontPicker
44
// swift-module-flags-ignorable: -no-verify-emitted-module-interface -interface-compiler-version 6.1.2
55
@_exported import BetterFontPicker
66
import Cocoa

BetterFontPicker/BetterFontPicker.framework/Versions/A/Modules/BetterFontPicker.swiftmodule/x86_64-apple-macos.private.swiftinterface

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// swift-interface-format-version: 1.0
22
// swift-compiler-version: Apple Swift version 6.1.2 effective-5.10 (swiftlang-6.1.2.1.2 clang-1700.0.13.5)
3-
// swift-module-flags: -target x86_64-apple-macos10.15 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -enable-experimental-feature DebugDescriptionMacro -enable-bare-slash-regex -module-name BetterFontPicker
3+
// swift-module-flags: -target x86_64-apple-macos12.4 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -enable-experimental-feature DebugDescriptionMacro -enable-bare-slash-regex -module-name BetterFontPicker
44
// swift-module-flags-ignorable: -no-verify-emitted-module-interface -interface-compiler-version 6.1.2
55
@_exported import BetterFontPicker
66
import Cocoa

BetterFontPicker/BetterFontPicker.framework/Versions/A/Modules/BetterFontPicker.swiftmodule/x86_64-apple-macos.swiftinterface

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// swift-interface-format-version: 1.0
22
// swift-compiler-version: Apple Swift version 6.1.2 effective-5.10 (swiftlang-6.1.2.1.2 clang-1700.0.13.5)
3-
// swift-module-flags: -target x86_64-apple-macos10.15 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -enable-experimental-feature DebugDescriptionMacro -enable-bare-slash-regex -module-name BetterFontPicker
3+
// swift-module-flags: -target x86_64-apple-macos12.4 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -enable-experimental-feature DebugDescriptionMacro -enable-bare-slash-regex -module-name BetterFontPicker
44
// swift-module-flags-ignorable: -no-verify-emitted-module-interface -interface-compiler-version 6.1.2
55
@_exported import BetterFontPicker
66
import Cocoa

BetterFontPicker/BetterFontPicker.framework/Versions/A/Resources/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<key>DTXcodeBuild</key>
4242
<string>16F6</string>
4343
<key>LSMinimumSystemVersion</key>
44-
<string>10.15</string>
44+
<string>12.4</string>
4545
<key>NSHumanReadableCopyright</key>
4646
<string>Copyright © 2019 George Nachman. All rights reserved.</string>
4747
</dict>

BetterFontPicker/BetterFontPicker.framework/Versions/A/_CodeSignature/CodeResources

Lines changed: 14 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,9 @@
1818
</data>
1919
<key>Resources/Info.plist</key>
2020
<data>
21-
trjDMcuH5H/roLxpyc7n6HXZtIA=
21+
G32h4xo33bjpPrZ9FD2O/sto13g=
2222
</data>
23-
<key>Resources/MainViewController.nib/keyedobjects-101500.nib</key>
24-
<data>
25-
OBSUvU70Ji2RbdBRt0g3R/mLK7M=
26-
</data>
27-
<key>Resources/MainViewController.nib/keyedobjects-110000.nib</key>
23+
<key>Resources/MainViewController.nib</key>
2824
<data>
2925
gY/rWBMOJ4i6DNNk5DLEwhGoEj8=
3026
</data>
@@ -53,14 +49,14 @@
5349
<dict>
5450
<key>hash2</key>
5551
<data>
56-
ZpuYNWr7eucPeM2Z7P4wEDE0ctcIw8P3GYudmvQM0NA=
52+
lM8t2sMCH8PRWKFdrx14OzIh98DfZuCtPRsh6sw2KzA=
5753
</data>
5854
</dict>
5955
<key>Modules/BetterFontPicker.swiftmodule/Project/x86_64-apple-macos.swiftsourceinfo</key>
6056
<dict>
6157
<key>hash2</key>
6258
<data>
63-
P3dWxRKl7o/HRp7zJ8dU3oXvh5MSnMQEaBnevTkd0pY=
59+
8lMbvKec3gINcEsT7/KJXqn3NrcZKZ99lP2chp0n8wc=
6460
</data>
6561
</dict>
6662
<key>Modules/BetterFontPicker.swiftmodule/arm64-apple-macos.abi.json</key>
@@ -74,28 +70,28 @@
7470
<dict>
7571
<key>hash2</key>
7672
<data>
77-
zqDiBWqiucM5wIQnlS3kKsFyPm15D3GEJ9kvzcO8VfU=
73+
bUPB+dwXbxiFrAx7OiJJ0UbfrmCkhEKUSf6jrYkJicY=
7874
</data>
7975
</dict>
8076
<key>Modules/BetterFontPicker.swiftmodule/arm64-apple-macos.swiftdoc</key>
8177
<dict>
8278
<key>hash2</key>
8379
<data>
84-
Bk60yE0wJrZhG/w9MJ7R2KJk14dCu70qo3zKmxF5DTY=
80+
K8IG0ker4lVSBJWq6S5X8hzEh++nJUPGt5KQP2YQfiQ=
8581
</data>
8682
</dict>
8783
<key>Modules/BetterFontPicker.swiftmodule/arm64-apple-macos.swiftinterface</key>
8884
<dict>
8985
<key>hash2</key>
9086
<data>
91-
zqDiBWqiucM5wIQnlS3kKsFyPm15D3GEJ9kvzcO8VfU=
87+
bUPB+dwXbxiFrAx7OiJJ0UbfrmCkhEKUSf6jrYkJicY=
9288
</data>
9389
</dict>
9490
<key>Modules/BetterFontPicker.swiftmodule/arm64-apple-macos.swiftmodule</key>
9591
<dict>
9692
<key>hash2</key>
9793
<data>
98-
EEn3WMk40JQvfOveE6as7QnMVb0Tpd9pMGtM5NBIL60=
94+
rgabHdWj090frrH+Hu+oBhb51L8qKIkRh8Hd1PIev1Q=
9995
</data>
10096
</dict>
10197
<key>Modules/BetterFontPicker.swiftmodule/x86_64-apple-macos.abi.json</key>
@@ -109,28 +105,28 @@
109105
<dict>
110106
<key>hash2</key>
111107
<data>
112-
XwF06LO0XyF1I4XWy6fJVA38lNk+TyCq99meqaCRwKM=
108+
fLPN319cDUwCsEaOp+ORhsbJM43pSaNU1TWalQZ9noA=
113109
</data>
114110
</dict>
115111
<key>Modules/BetterFontPicker.swiftmodule/x86_64-apple-macos.swiftdoc</key>
116112
<dict>
117113
<key>hash2</key>
118114
<data>
119-
gAAzSUZJS/VB+ywCeomY10Gp7yREDW5TcX4Esvx3RQU=
115+
u+2d3l+4MoOgqCmGmiiUQMPv3dbD03ddk40HHvIXlpw=
120116
</data>
121117
</dict>
122118
<key>Modules/BetterFontPicker.swiftmodule/x86_64-apple-macos.swiftinterface</key>
123119
<dict>
124120
<key>hash2</key>
125121
<data>
126-
XwF06LO0XyF1I4XWy6fJVA38lNk+TyCq99meqaCRwKM=
122+
fLPN319cDUwCsEaOp+ORhsbJM43pSaNU1TWalQZ9noA=
127123
</data>
128124
</dict>
129125
<key>Modules/BetterFontPicker.swiftmodule/x86_64-apple-macos.swiftmodule</key>
130126
<dict>
131127
<key>hash2</key>
132128
<data>
133-
vZB6YhPxbbiSjJPqQPhc2eC3BLdmGU74+Yzit06sZa0=
129+
BW8+hMWtV1NaEQwVqIPzpYC3N3ycAXrrKgZiYGwU6To=
134130
</data>
135131
</dict>
136132
<key>Modules/module.modulemap</key>
@@ -165,17 +161,10 @@
165161
<dict>
166162
<key>hash2</key>
167163
<data>
168-
fuyK4urzxfaZOF91UkZZiZuW5r4uQkgbqf48h09UI/M=
169-
</data>
170-
</dict>
171-
<key>Resources/MainViewController.nib/keyedobjects-101500.nib</key>
172-
<dict>
173-
<key>hash2</key>
174-
<data>
175-
FtykrAmyh4EGkuBRMuYMOlo8LU9OPGbEzO9y4MwmdS0=
164+
ECtQSBYABuFcwqnMhoRmGMfZg552dlvW9zurQ+DPqMI=
176165
</data>
177166
</dict>
178-
<key>Resources/MainViewController.nib/keyedobjects-110000.nib</key>
167+
<key>Resources/MainViewController.nib</key>
179168
<dict>
180169
<key>hash2</key>
181170
<data>

BetterFontPicker/BetterFontPicker.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@
478478
"@executable_path/../Frameworks",
479479
"@loader_path/Frameworks",
480480
);
481-
MACOSX_DEPLOYMENT_TARGET = 10.15;
481+
MACOSX_DEPLOYMENT_TARGET = 12.4;
482482
PRODUCT_BUNDLE_IDENTIFIER = com.iterm2.BetterFontPicker;
483483
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
484484
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -509,7 +509,7 @@
509509
"@executable_path/../Frameworks",
510510
"@loader_path/Frameworks",
511511
);
512-
MACOSX_DEPLOYMENT_TARGET = 10.15;
512+
MACOSX_DEPLOYMENT_TARGET = 12.4;
513513
PRODUCT_BUNDLE_IDENTIFIER = com.iterm2.BetterFontPicker;
514514
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
515515
PROVISIONING_PROFILE_SPECIFIER = "";
Binary file not shown.

ColorPicker/ColorPicker.framework/Versions/A/Resources/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<key>DTXcodeBuild</key>
4444
<string>16F6</string>
4545
<key>LSMinimumSystemVersion</key>
46-
<string>10.15</string>
46+
<string>12.4</string>
4747
<key>NSHumanReadableCopyright</key>
4848
<string>Copyright © 2015 Google. All rights reserved.</string>
4949
</dict>

ColorPicker/ColorPicker.framework/Versions/A/_CodeSignature/CodeResources

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
</data>
3131
<key>Resources/Info.plist</key>
3232
<data>
33-
pGZiBXX+Ohs6aSzI1mI28vUYGnU=
33+
vIb+bJxOTcis+apTuwA28bjiJ5U=
3434
</data>
3535
<key>Resources/NoColor.tiff</key>
3636
<data>
@@ -151,7 +151,7 @@
151151
<dict>
152152
<key>hash2</key>
153153
<data>
154-
J9KsSlYqtRsS7m9uWkO0ibKafOiyloHfByl31S6YjfM=
154+
aBBWaFfAcqkE0Haksz/Y4Rcgv976ElmqSVGHM8unMEs=
155155
</data>
156156
</dict>
157157
<key>Resources/NoColor.tiff</key>

ColorPicker/ColorPicker.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -879,7 +879,7 @@
879879
INFOPLIST_FILE = ColorPicker/Info.plist;
880880
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
881881
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
882-
MACOSX_DEPLOYMENT_TARGET = 10.15;
882+
MACOSX_DEPLOYMENT_TARGET = 12.4;
883883
PRODUCT_BUNDLE_IDENTIFIER = "com.googlecode.iterm2.$(PRODUCT_NAME:rfc1034identifier)";
884884
PRODUCT_NAME = "$(TARGET_NAME)";
885885
SKIP_INSTALL = YES;
@@ -899,7 +899,7 @@
899899
INFOPLIST_FILE = ColorPicker/Info.plist;
900900
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
901901
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
902-
MACOSX_DEPLOYMENT_TARGET = 10.15;
902+
MACOSX_DEPLOYMENT_TARGET = 12.4;
903903
PRODUCT_BUNDLE_IDENTIFIER = "com.googlecode.iterm2.$(PRODUCT_NAME:rfc1034identifier)";
904904
PRODUCT_NAME = "$(TARGET_NAME)";
905905
SKIP_INSTALL = YES;

Makefile

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ COMPACTDATE=$(shell date +"%Y%m%d")
99
VERSION = $(shell cat version.txt | sed -e "s/%(extra)s/$(COMPACTDATE)/")
1010
NAME=$(shell echo $(VERSION) | sed -e "s/\\./_/g")
1111
CMAKE ?= /opt/homebrew/bin/cmake
12+
DEPLOYMENT_TARGET=12.0
1213

1314
.PHONY: clean all backup-old-iterm restart
1415

@@ -98,11 +99,11 @@ preview:
9899

99100
x86libsixel: force
100101
mkdir -p submodules/libsixel/build-x86
101-
cd submodules/libsixel/build-x86 && PKG_CONFIG=/opt/homebrew/bin/pkg-config CC="/usr/bin/clang -target x86_64-apple-macos10.14" LDFLAGS="-ld_classic -target x86_64-apple-macos10.14" CFLAGS="-target x86_64-apple-macos10.14" LIBTOOLFLAGS="-target x86_64-apple-macos10.14" ../configure -host=x86_64-apple-darwin --prefix=${PWD}/ThirdParty/libsixel-x86 --without-libcurl --without-jpeg --without-png --disable-python --disable-shared && $(MAKE) && $(MAKE) install
102+
cd submodules/libsixel/build-x86 && PKG_CONFIG=/opt/homebrew/bin/pkg-config CC="/usr/bin/clang -target x86_64-apple-macos$(DEPLOYMENT_TARGET)" LDFLAGS="-ld_classic -target x86_64-apple-macos$(DEPLOYMENT_TARGET)" CFLAGS="-target x86_64-apple-macos$(DEPLOYMENT_TARGET)" LIBTOOLFLAGS="-target x86_64-apple-macos$(DEPLOYMENT_TARGET)" ../configure -host=x86_64-apple-darwin --prefix=${PWD}/ThirdParty/libsixel-x86 --without-libcurl --without-jpeg --without-png --disable-python --disable-shared && $(MAKE) && $(MAKE) install
102103

103104
armsixel: force
104105
mkdir -p submodules/libsixel/build-arm
105-
cd submodules/libsixel/build-arm && PKG_CONFIG=/opt/homebrew/bin/pkg-config CC="/usr/bin/clang -target arm64-apple-macos10.14" LDFLAGS="-ld_classic -target arm64-apple-macos10.14" CFLAGS="-target arm64-apple-macos10.14" LIBTOOLFLAGS="-target arm64-apple-macos10.14" ../configure --host=aarch64-apple-darwin --prefix=${PWD}/ThirdParty/libsixel-arm --without-libcurl --without-jpeg --without-png --disable-python --disable-shared && $(MAKE) && $(MAKE) install
106+
cd submodules/libsixel/build-arm && PKG_CONFIG=/opt/homebrew/bin/pkg-config CC="/usr/bin/clang -target arm64-apple-macos$(DEPLOYMENT_TARGET)" LDFLAGS="-ld_classic -target arm64-apple-macos$(DEPLOYMENT_TARGET)" CFLAGS="-target arm64-apple-macos$(DEPLOYMENT_TARGET)" LIBTOOLFLAGS="-target arm64-apple-macos$(DEPLOYMENT_TARGET)" ../configure --host=aarch64-apple-darwin --prefix=${PWD}/ThirdParty/libsixel-arm --without-libcurl --without-jpeg --without-png --disable-python --disable-shared && $(MAKE) && $(MAKE) install
106107

107108
# Usage: go to an intel mac and run make x86libsixel and commit it. Go to an arm mac and run make armsixel && make libsixel.
108109
fatlibsixel: force armsixel x86libsixel
@@ -111,7 +112,7 @@ fatlibsixel: force armsixel x86libsixel
111112
armopenssl: force
112113
echo Begin building configure-armopenssl
113114
cd submodules/openssl && make clean && make distclean || echo make failed
114-
cd submodules/openssl && ./Configure darwin64-arm64-cc no-shared -fPIC -mmacosx-version-min=10.15 -Wl,-ld_classic
115+
cd submodules/openssl && ./Configure darwin64-arm64-cc no-shared -fPIC -mmacosx-version-min=$(DEPLOYMENT_TARGET) -Wl,-ld_classic
115116
echo Begin building armopenssl
116117
cd submodules/openssl && $(MAKE)
117118
rm -rf submodules/openssl/build-arm
@@ -121,7 +122,7 @@ armopenssl: force
121122
x86openssl: force
122123
echo Begin building configure-x86openssl
123124
cd submodules/openssl && make clean && make distclean || echo make failed
124-
cd submodules/openssl && ./Configure darwin64-x86_64-cc no-shared -fPIC -mmacosx-version-min=10.15 -Wl,-ld_classic
125+
cd submodules/openssl && ./Configure darwin64-x86_64-cc no-shared -fPIC -mmacosx-version-min=$(DEPLOYMENT_TARGET) -Wl,-ld_classic
125126
echo Begin building x86openssl
126127
cd submodules/openssl && $(MAKE)
127128
rm -rf submodules/openssl/build-x86
@@ -143,14 +144,14 @@ x86libssh2: force
143144
mkdir -p submodules/libssh2/build_x86_64
144145
# Add this flag to enable tracing:
145146
# -DCMAKE_C_FLAGS="-DLIBSSH2DEBUG"
146-
cd submodules/libssh2/build_x86_64 && $(CMAKE) -DCMAKE_IGNORE_PREFIX_PATH=/opt/homebrew -DOPENSSL_INCLUDE_DIR=${PWD}/submodules/openssl/build-fat/include -DOPENSSL_ROOT_DIR=${PWD}/submodules/openssl/build-fat -DBUILD_EXAMPLES=NO -DBUILD_TESTING=NO -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCRYPTO_BACKEND=OpenSSL -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DCMAKE_EXE_LINKER_FLAGS="-ld_classic" -DCMAKE_MODULE_LINKER_FLAGS="-ld_classic" .. && $(MAKE) libssh2_static
147+
cd submodules/libssh2/build_x86_64 && $(CMAKE) -DCMAKE_IGNORE_PREFIX_PATH=/opt/homebrew -DOPENSSL_INCLUDE_DIR=${PWD}/submodules/openssl/build-fat/include -DOPENSSL_ROOT_DIR=${PWD}/submodules/openssl/build-fat -DBUILD_EXAMPLES=NO -DBUILD_TESTING=NO -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCRYPTO_BACKEND=OpenSSL -DCMAKE_OSX_DEPLOYMENT_TARGET=$(DEPLOYMENT_TARGET) -DCMAKE_EXE_LINKER_FLAGS="-ld_classic" -DCMAKE_MODULE_LINKER_FLAGS="-ld_classic" .. && $(MAKE) libssh2_static
147148

148149
armlibssh2: force
149150
echo Begin building armlibssh2
150151
mkdir -p submodules/libssh2/build_arm64
151152
# Add this flag to enable tracing:
152153
# -DCMAKE_C_FLAGS="-DLIBSSH2DEBUG"
153-
cd submodules/libssh2/build_arm64 && $(CMAKE) -DCMAKE_IGNORE_PREFIX_PATH=/opt/homebrew -DOPENSSL_INCLUDE_DIR=${PWD}/submodules/openssl/include -DOPENSSL_ROOT_DIR=${PWD}/submodules/openssl -DBUILD_EXAMPLES=NO -DBUILD_TESTING=NO -DCMAKE_OSX_ARCHITECTURES=arm64 -DCRYPTO_BACKEND=OpenSSL -DCMAKE_EXE_LINKER_FLAGS="-ld_classic" -DCMAKE_MODULE_LINKER_FLAGS="-ld_classic" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 .. && $(MAKE) libssh2_static
154+
cd submodules/libssh2/build_arm64 && $(CMAKE) -DCMAKE_IGNORE_PREFIX_PATH=/opt/homebrew -DOPENSSL_INCLUDE_DIR=${PWD}/submodules/openssl/include -DOPENSSL_ROOT_DIR=${PWD}/submodules/openssl -DBUILD_EXAMPLES=NO -DBUILD_TESTING=NO -DCMAKE_OSX_ARCHITECTURES=arm64 -DCRYPTO_BACKEND=OpenSSL -DCMAKE_EXE_LINKER_FLAGS="-ld_classic" -DCMAKE_MODULE_LINKER_FLAGS="-ld_classic" -DCMAKE_OSX_DEPLOYMENT_TARGET=$(DEPLOYMENT_TARGET) .. && $(MAKE) libssh2_static
154155

155156
fatlibssh2: force fatopenssl
156157
echo Begin building fatlibssh2
@@ -195,7 +196,7 @@ paranoidrailroad: force
195196

196197
libgit2: force
197198
mkdir -p submodules/libgit2/build
198-
PATH=/usr/local/bin:${PATH} cd submodules/libgit2/build && ${CMAKE} -DBUILD_CLAR=OFF -DCMAKE_IGNORE_PREFIX_PATH=/opt/homebrew -DBUILD_SHARED_LIBS=OFF -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DCMAKE_OSX_DEPLOYMENT_TARGET="10.14" -DCMAKE_INSTALL_PREFIX=../../../ThirdParty/libgit2 -DUSE_SSH=OFF -DUSE_ICONV=OFF ..
199+
PATH=/usr/local/bin:${PATH} cd submodules/libgit2/build && ${CMAKE} -DBUILD_CLAR=OFF -DCMAKE_IGNORE_PREFIX_PATH=/opt/homebrew -DBUILD_SHARED_LIBS=OFF -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DCMAKE_OSX_DEPLOYMENT_TARGET="$(DEPLOYMENT_TARGET)" -DCMAKE_INSTALL_PREFIX=../../../ThirdParty/libgit2 -DUSE_SSH=OFF -DUSE_ICONV=OFF ..
199200
PATH=/usr/local/bin:${PATH} cd submodules/libgit2/build && ${CMAKE} --build . --target install --parallel "$$(sysctl -n hw.ncpu)"
200201

201202
sparkle: force

SearchableComboListView/SearchableComboListView.framework/Versions/A/Modules/SearchableComboListView.swiftmodule/arm64-apple-macos.private.swiftinterface

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// swift-interface-format-version: 1.0
22
// swift-compiler-version: Apple Swift version 6.1.2 effective-5.10 (swiftlang-6.1.2.1.2 clang-1700.0.13.5)
3-
// swift-module-flags: -target arm64-apple-macos10.15 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -enable-experimental-feature DebugDescriptionMacro -enable-bare-slash-regex -module-name SearchableComboListView
3+
// swift-module-flags: -target arm64-apple-macos12.4 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -enable-experimental-feature DebugDescriptionMacro -enable-bare-slash-regex -module-name SearchableComboListView
44
// swift-module-flags-ignorable: -no-verify-emitted-module-interface -interface-compiler-version 6.1.2
55
import AppKit
66
import Foundation

SearchableComboListView/SearchableComboListView.framework/Versions/A/Modules/SearchableComboListView.swiftmodule/arm64-apple-macos.swiftinterface

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// swift-interface-format-version: 1.0
22
// swift-compiler-version: Apple Swift version 6.1.2 effective-5.10 (swiftlang-6.1.2.1.2 clang-1700.0.13.5)
3-
// swift-module-flags: -target arm64-apple-macos10.15 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -enable-experimental-feature DebugDescriptionMacro -enable-bare-slash-regex -module-name SearchableComboListView
3+
// swift-module-flags: -target arm64-apple-macos12.4 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -enable-experimental-feature DebugDescriptionMacro -enable-bare-slash-regex -module-name SearchableComboListView
44
// swift-module-flags-ignorable: -no-verify-emitted-module-interface -interface-compiler-version 6.1.2
55
import AppKit
66
import Foundation

SearchableComboListView/SearchableComboListView.framework/Versions/A/Modules/SearchableComboListView.swiftmodule/x86_64-apple-macos.private.swiftinterface

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// swift-interface-format-version: 1.0
22
// swift-compiler-version: Apple Swift version 6.1.2 effective-5.10 (swiftlang-6.1.2.1.2 clang-1700.0.13.5)
3-
// swift-module-flags: -target x86_64-apple-macos10.15 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -enable-experimental-feature DebugDescriptionMacro -enable-bare-slash-regex -module-name SearchableComboListView
3+
// swift-module-flags: -target x86_64-apple-macos12.4 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -enable-experimental-feature DebugDescriptionMacro -enable-bare-slash-regex -module-name SearchableComboListView
44
// swift-module-flags-ignorable: -no-verify-emitted-module-interface -interface-compiler-version 6.1.2
55
import AppKit
66
import Foundation

SearchableComboListView/SearchableComboListView.framework/Versions/A/Modules/SearchableComboListView.swiftmodule/x86_64-apple-macos.swiftinterface

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// swift-interface-format-version: 1.0
22
// swift-compiler-version: Apple Swift version 6.1.2 effective-5.10 (swiftlang-6.1.2.1.2 clang-1700.0.13.5)
3-
// swift-module-flags: -target x86_64-apple-macos10.15 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -enable-experimental-feature DebugDescriptionMacro -enable-bare-slash-regex -module-name SearchableComboListView
3+
// swift-module-flags: -target x86_64-apple-macos12.4 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -enable-experimental-feature DebugDescriptionMacro -enable-bare-slash-regex -module-name SearchableComboListView
44
// swift-module-flags-ignorable: -no-verify-emitted-module-interface -interface-compiler-version 6.1.2
55
import AppKit
66
import Foundation

SearchableComboListView/SearchableComboListView.framework/Versions/A/Resources/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@
4141
<key>DTXcodeBuild</key>
4242
<string>16F6</string>
4343
<key>LSMinimumSystemVersion</key>
44-
<string>10.15</string>
44+
<string>12.4</string>
4545
</dict>
4646
</plist>

0 commit comments

Comments
 (0)