Skip to content

Commit 9011b2a

Browse files
committed
Merge branch 'release/1.2.1'
2 parents 76a8d15 + 2901d3b commit 9011b2a

File tree

2 files changed

+19
-6
lines changed

2 files changed

+19
-6
lines changed

pom.xml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>org.cryptomator</groupId>
77
<artifactId>integrations-mac</artifactId>
8-
<version>1.2.0</version>
8+
<version>1.2.1</version>
99

1010
<name>Cryptomator Integrations for macOS</name>
1111
<description>Provides optional macOS services used by Cryptomator</description>
@@ -30,15 +30,15 @@
3030
<project.jdk.version>17</project.jdk.version>
3131

3232
<!-- runtime dependencies -->
33-
<api.version>1.2.0-beta4</api.version>
33+
<api.version>1.2.0</api.version>
3434
<slf4j.version>1.7.36</slf4j.version>
3535

3636
<!-- test dependencies -->
3737
<junit.jupiter.version>5.8.2</junit.jupiter.version>
3838
<mockito.version>4.4.0</mockito.version>
3939

4040
<!-- build plugin dependencies -->
41-
<dependency-check.version>7.1.1</dependency-check.version>
41+
<dependency-check.version>8.1.0</dependency-check.version>
4242
<nexus-staging.version>1.6.8</nexus-staging.version>
4343
</properties>
4444

@@ -362,6 +362,15 @@
362362
<url>https://maven.pkg.github.com/cryptomator/integrations-mac</url>
363363
</repository>
364364
</distributionManagement>
365+
<build>
366+
<plugins>
367+
<plugin>
368+
<groupId>org.apache.maven.plugins</groupId>
369+
<artifactId>maven-deploy-plugin</artifactId>
370+
<version>3.1.0</version>
371+
</plugin>
372+
</plugins>
373+
</build>
365374
</profile>
366375
</profiles>
367376
</project>

src/main/native/Integrations.xcodeproj/project.pbxproj

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
9E0819AF1D748ECC000C89E6 /* Project object */ = {
105105
isa = PBXProject;
106106
attributes = {
107-
LastUpgradeCheck = 1210;
107+
LastUpgradeCheck = 1420;
108108
ORGANIZATIONNAME = Cryptomator;
109109
TargetAttributes = {
110110
9E0819B61D748ECC000C89E6 = {
@@ -178,6 +178,7 @@
178178
CLANG_WARN_UNREACHABLE_CODE = YES;
179179
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
180180
COPY_PHASE_STRIP = NO;
181+
DEAD_CODE_STRIPPING = YES;
181182
DEBUG_INFORMATION_FORMAT = dwarf;
182183
ENABLE_STRICT_OBJC_MSGSEND = YES;
183184
ENABLE_TESTABILITY = YES;
@@ -198,7 +199,7 @@
198199
GCC_WARN_UNUSED_VARIABLE = YES;
199200
HEADER_SEARCH_PATHS = "$(JAVA_HOME)/include/**";
200201
JAVA_HOME = "$(HOME)/.sdkman/candidates/java/current";
201-
MACOSX_DEPLOYMENT_TARGET = 10.11;
202+
MACOSX_DEPLOYMENT_TARGET = 10.13;
202203
MTL_ENABLE_DEBUG_INFO = YES;
203204
ONLY_ACTIVE_ARCH = YES;
204205
SDKROOT = macosx;
@@ -236,6 +237,7 @@
236237
CLANG_WARN_UNREACHABLE_CODE = YES;
237238
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
238239
COPY_PHASE_STRIP = NO;
240+
DEAD_CODE_STRIPPING = YES;
239241
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
240242
ENABLE_NS_ASSERTIONS = NO;
241243
ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -250,7 +252,7 @@
250252
GCC_WARN_UNUSED_VARIABLE = YES;
251253
HEADER_SEARCH_PATHS = "$(JAVA_HOME)/include/**";
252254
JAVA_HOME = "$(HOME)/.sdkman/candidates/java/current";
253-
MACOSX_DEPLOYMENT_TARGET = 10.11;
255+
MACOSX_DEPLOYMENT_TARGET = 10.13;
254256
MTL_ENABLE_DEBUG_INFO = NO;
255257
SDKROOT = macosx;
256258
USER_HEADER_SEARCH_PATHS = ../headers;
@@ -260,6 +262,7 @@
260262
9E0819BC1D748ECC000C89E6 /* Debug */ = {
261263
isa = XCBuildConfiguration;
262264
buildSettings = {
265+
DEAD_CODE_STRIPPING = YES;
263266
DYLIB_COMPATIBILITY_VERSION = 1;
264267
DYLIB_CURRENT_VERSION = 1;
265268
EXECUTABLE_PREFIX = lib;
@@ -270,6 +273,7 @@
270273
9E0819BD1D748ECC000C89E6 /* Release */ = {
271274
isa = XCBuildConfiguration;
272275
buildSettings = {
276+
DEAD_CODE_STRIPPING = YES;
273277
DYLIB_COMPATIBILITY_VERSION = 1;
274278
DYLIB_CURRENT_VERSION = 1;
275279
EXECUTABLE_PREFIX = lib;

0 commit comments

Comments
 (0)